code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

2022年5月24日19:20:31 修复查询设备日志和检测数据报错问题

Browse Source
This commit is contained in:
wxy001
2022-05-24 19:20:54 +08:00
parent 14197e7436
commit 2788764430
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
springboot/wumei-admin/src/main/resources/application.yml
View File

@@ -43,7 +43,7 @@ spring:
# 国际化资源文件路径 # 国际化资源文件路径
basename: i18n/messages basename: i18n/messages
profiles: profiles:
active: druid active: dev
# 文件上传 # 文件上传
servlet: servlet:
multipart: multipart:
@@ -65,7 +65,7 @@ spring:
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
password: wumei-smart password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:

3
springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java
View File

@@ -49,6 +49,9 @@ public class TdengineLogServiceImpl implements ILogService {
@Override @Override
public List<MonitorModel> selectMonitorList(DeviceLog deviceLog) { public List<MonitorModel> selectMonitorList(DeviceLog deviceLog) {
if(deviceLog.getIdentity()!=null){
deviceLog.setIdentity("%"+deviceLog.getIdentity()+"%");
}
return tdDeviceLogDAO.selectMonitorList(dbName,deviceLog); return tdDeviceLogDAO.selectMonitorList(dbName,deviceLog);
} }
} }

4
springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml
View File

@@ -117,7 +117,7 @@
<where> <where>
is_monitor=1 is_monitor=1
<if test="device.deviceId!=null"> and device_id = #{device.deviceId} </if> <if test="device.deviceId!=null"> and device_id = #{device.deviceId} </if>
<if test="device.identity != null and device.identity != ''"> and identity like concat('%', #{device.identity}, '%')</if> <if test="device.identity != null and device.identity != ''"> and identity like #{device.identity}</if>
order by ts desc order by ts desc
limit 2000 limit 2000
@@ -130,7 +130,7 @@
is_monitor !=1 is_monitor !=1
<if test="device.deviceId!=null"> and device_id = #{device.deviceId} </if> <if test="device.deviceId!=null"> and device_id = #{device.deviceId} </if>
<if test="device.logType != null "> and log_type = #{device.logType}</if> <if test="device.logType != null "> and log_type = #{device.logType}</if>
<if test="device.identity != null and device.identity != ''"> and identity like concat('%', #{device.identity}, '%')</if> <if test="device.identity != null and device.identity != ''"> and identity like #{device.identity}</if>
</where> </where>
order by ts desc order by ts desc
</select> </select>