!36 修复查询日志和监控数据报错问题

Merge pull request !36 from xxmfl/master

springboot/wumei-admin/src/main/resources/application.yml

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

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

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

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

@@ -117,7 +117,7 @@
         <where>
              is_monitor=1
             <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
         limit 2000
@@ -130,7 +130,7 @@
             is_monitor !=1
             <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.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>
         order by ts desc
     </select>