参数报警修改

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

@@ -56,10 +56,10 @@ public class DeviceCheckAlarmDto {
       return  new StringBuilder().append(this.deviceName)
                 .append(this.attributeName)
                 .append(receivedValue)
-                .append(this.unit)
+                .append(StringUtils.isNotBlank(this.unit)?this.unit:"")
                 .append(this.alarmCondition)
                 .append(this.attributeName)
                 .append(this.alarmValue)
-                .append(this.unit).toString();
+                .append(StringUtils.isNotBlank(this.unit)?this.unit:"").toString();
     }
 }

sms_water/src/main/java/com/huaxu/rabbitmq/ReceiveData.java

@@ -147,18 +147,18 @@ public class ReceiveData {
                                insert.add(alarmDetailsEntity);
                            }
                        }
-                       //处理完成后，剩下的标记为历史数据
-                       for(AlarmDetailsDto alarmDetailsDto:alarmDetailsDtoMap.values()){
-                           alarmDetailsDto.setState(0);
-                           alarmDetailsDto.setAlarmEndTime(receiveDateTime);
-                           alarmDetailsDto.setDateUpdate(new Date());
-                           alarmDetailMapper.update(alarmDetailsDto);
-                       }
-                       //批量插入新增报警
-                       if(insert.size()>0){
-                        alarmDetailMapper.batchInsert(insert);
-                       }
                     }
+                   //处理完成后，剩下的标记为历史数据
+                   for(AlarmDetailsDto alarmDetailsDto:alarmDetailsDtoMap.values()){
+                       alarmDetailsDto.setState(0);
+                       alarmDetailsDto.setAlarmEndTime(receiveDateTime);
+                       alarmDetailsDto.setDateUpdate(new Date());
+                       alarmDetailMapper.update(alarmDetailsDto);
+                   }
+                   //批量插入新增报警
+                   if(insert.size()>0){
+                    alarmDetailMapper.batchInsert(insert);
+                   }
                }
            }
         }