修改bug

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -123,8 +123,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         page.setCurrent(current);
         page.setSize(size);
         String table = gateway;
-        StringBuffer querysql = new StringBuffer("SELECT createdTime ,equipmentNumber,gatewayId,address,valueLabel,equipmentSpecificName,value FROM indicators_%s  WHERE isAlarm='1'   and value!='0.0'  and  gatewayId=  %s ORDER BY time  desc   LIMIT %d OFFSET %d  ");
-        StringBuffer querysqlcount = new StringBuffer("SELECT count(value) FROM indicators_%s  WHERE isAlarm='1'   and value!='0.0'  and  gatewayId=   %s ");
+        StringBuffer querysql = new StringBuffer("SELECT createdTime ,equipmentNumber,gatewayId,address,valueLabel,equipmentSpecificName,value FROM indicators_%s  WHERE isAlarm='1'   and value!='0.0' and value!=valueLabel and  gatewayId=  %s ORDER BY time  desc   LIMIT %d OFFSET %d  ");
+        StringBuffer querysqlcount = new StringBuffer("SELECT count(value) FROM indicators_%s  WHERE isAlarm='1'   and value!='0.0' and value!=valueLabel and  gatewayId=   %s ");
         if (StringUtils.isNotEmpty(equipmentNumber)) {
             String date = "'%s'  and equipmentNumber = '%s' ";
             gateway = String.format(date, gateway, equipmentNumber);
@@ -160,8 +160,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         page.setCurrent(current);
         page.setSize(size);
         String table = gateway;
-        StringBuffer querysql = new StringBuffer("SELECT createdTime ,gatewayId,address,valueLabel,equipmentSpecificName,value FROM iot_data_%s  WHERE isAlarm='1'   and value!='0.0'  and  gatewayId=  %s ORDER BY time  desc   LIMIT %d OFFSET %d  ");
-        StringBuffer querysqlcount = new StringBuffer("SELECT count(value) FROM iot_data_%s  WHERE isAlarm='1'   and value!='0.0'  and  gatewayId=   %s ");
+        StringBuffer querysql = new StringBuffer("SELECT createdTime ,gatewayId,address,valueLabel,equipmentSpecificName,value FROM iot_data_%s  WHERE isAlarm='1'  and value!=valueLabel  and value!='0.0'  and  gatewayId=  %s ORDER BY time  desc   LIMIT %d OFFSET %d  ");
+        StringBuffer querysqlcount = new StringBuffer("SELECT count(value) FROM iot_data_%s  WHERE isAlarm='1'   and value!='0.0' and value!=valueLabel  and  gatewayId=   %s ");
         if (StringUtils.isNotEmpty(equipmentNumber)) {
             String date = " '%s' and equipmentSpecificName=~/.*%s风机.*/ ";
             gateway = String.format(date, gateway, equipmentNumber);