工单生成修改

sms_water/src/main/java/com/huaxu/service/impl/AlarmDetailsServiceImpl.java

@@ -171,7 +171,8 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
         List<AlarmDetailsEntity>  deviceStateAlarmDtoNews =alarmlist.stream()
                 .filter(deviceCheckAlarmDto -> !alarmDetailsDtoMap.containsKey(deviceCheckAlarmDto.getAlarmSettingId()))
                 .map(d ->{
-                    AlarmDetailsEntity alarmDetailsEntity = new AlarmDetailsEntity();
+
+                     AlarmDetailsEntity alarmDetailsEntity = new AlarmDetailsEntity();
                     alarmDetailsEntity.setDateUpdate(new Date());
                     alarmDetailsEntity.setDateCreate(new Date());
                     alarmDetailsEntity.setStatus(1);
@@ -219,7 +220,7 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
                         }
                     }catch(Exception e){
                         e.printStackTrace();
-                        log.info("推送报警消息失败：{}"+e.getMessage());
+                        log.info("推送报警消息失败：{}",e.getMessage());
                     }
                     return alarmDetailsEntity;
                 })

sms_water/src/main/java/com/huaxu/service/impl/MonitorDataReportServiceImpl.java

@@ -775,9 +775,12 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                         if (monitorDataEntity != null && monitorDataEntity.getDataValues() != null && monitorDataEntity.getDataValues().size() > 0) {
                             monitorDataEntity.getDataValues().stream()
                                     .filter(monitorDataValueEntity -> monitorDataValueEntity.getAttributeId().equals(deviceWaterDetail.getAttributeId()))
-                                    .forEach(monitorDataValueEntity ->
+                                    .forEach(monitorDataValueEntity -> {
                                             //累计当前压力
-                                            sceneWaterAmount.setWaterAmount(sceneWaterAmount.getWaterAmount().add(new BigDecimal(monitorDataValueEntity.getDataValue())))
+                                            if (monitorDataValueEntity.getDataValue() != null) {
+                                                sceneWaterAmount.setWaterAmount(sceneWaterAmount.getWaterAmount().add(new BigDecimal(monitorDataValueEntity.getDataValue())));
+                                            }
+                                        }
                                     );
                         }
                     });
@@ -914,6 +917,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
 
         //查询设备编码
         List<String> deviceCodes = monitorDataReportMapper.selectDeviceCode(loginUser.getTenantId(),loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
+        deviceCodes.add("300220070692");
         //根据编码获取redis中的实时数据
         List<MonitorDataEntity> monitorDataEntities = new ArrayList<>();
         for (String deviceCode : deviceCodes) {

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

@@ -629,6 +629,7 @@
             left join sms_device_attribute da on da.id=a.ATTRIBUTE_ID
         </if>
         where  a.ALARM_VALUE is not null and a.ALARM_CONDITION is not null and d.status = 1 and a.status = 1
+        and a.status = 1
         <if test="deviceId != null">
             and d.id=#{deviceId}
         </if>