报警修改

sms_water/src/main/java/com/huaxu/dto/DeviceCheckAlarmDto.java

@@ -47,7 +47,7 @@ public class DeviceCheckAlarmDto {
     public Boolean checkdeviceAttributeAlarm(Double value){
         if( value != null && alarmValue != null
                 &&  StringUtils.isNotBlank(this.alarmCondition)){
-                return CalcUtil.compareBySign(this.duration,this.alarmValue,this.alarmCondition);
+                return CalcUtil.compareBySign(value,this.alarmValue,this.alarmCondition);
         }
         return false;
     }

sms_water/src/main/resources/mapper/AlarmDetailMapper.xml

@@ -54,7 +54,7 @@
             ,d.POINT_Y as "pointY"
 
             ,ast.id as "alarmSettingId"
-            ,concat(a.ALARM_VALUE,ifnull(ast.unit,'')) as "alarmValue"
+            ,concat(a.ALARM_VALUE,ifnull(att.unit,'')) as "alarmValue"
             ,a.ALARM_CONTENT as "alarmContent"
 
     </sql>
@@ -73,12 +73,12 @@
             ,d.POINT_X as "pointX"
             ,d.POINT_Y as "pointY"
 
-            ,concat(a.MIN_VALUE,ifnull(ast.unit,'')) as "minValue"
-            ,concat(a.MAX_VALUE,ifnull(ast.unit,''))as "maxValue"
+            ,concat(a.MIN_VALUE,ifnull(att.unit,'')) as "minValue"
+            ,concat(a.MAX_VALUE,ifnull(att.unit,''))as "maxValue"
             ,ast.id as "alarmSettingId"
-            ,concat(ifnull(ast.ALARM_CONDITION,''),ifnull(ast.ALARM_VALUE,''),ifnull(ast.unit,'')) as "alermRule"
+            ,concat(ifnull(ast.ALARM_CONDITION,''),ifnull(ast.ALARM_VALUE,''),ifnull(att.unit,'')) as "alermRule"
             ,a.ALARM_END_TIME as "alarmEndTime"
-            ,concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now())),,'分钟') as "duration"
+            ,concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now())),'分钟') as "duration"
 
     </sql>