diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index da52d0f..542fff2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -23,6 +23,7 @@ import java.nio.channels.AcceptPendingException; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -117,21 +118,22 @@ AlarmLevel alarmLevel = new AlarmLevel(); alarmLevel.setName(alarmLevelParam.getName()); alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setOpenAlarm(String.valueOf(alarmLevelParam.getOpenAlarm())); alarmLevel.setTenantId(alarmLevelParam.getTenantId()); - alarmLevel.setDeviceType(Long.valueOf(ObjectUtil.isEmpty(alarmLevelParam.getDeviceType()) ? -1: alarmLevelParam.getDeviceType())); - List> levelList = JSONArray.parseObject(alarmLevelParam.getLevelList(),List.class); + alarmLevel.setTs(new Date()); + alarmLevel.setDeviceType(Long.valueOf(ObjectUtil.isEmpty(alarmLevelParam.getDeviceType()) ? -1 : alarmLevelParam.getDeviceType())); + List> levelList = JSONArray.parseObject(alarmLevelParam.getLevelList(), List.class); levelList.forEach( levelMap -> { alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(levelMap.get("level")) ? "-1" : levelMap.get("level"))); - if(levelMap.containsKey("lowValue") &&!StrUtil.isEmpty(levelMap.get("lowValue"))){ - alarmLevel.setLowValue( Float.valueOf(levelMap.get("lowValue"))); + if (levelMap.containsKey("lowValue") && !StrUtil.isEmpty(levelMap.get("lowValue"))) { + alarmLevel.setLowValue(Float.valueOf(levelMap.get("lowValue"))); } - if(levelMap.containsKey("highValue") &&!StrUtil.isEmpty(levelMap.get("highValue"))){ - alarmLevel.setLowValue( Float.valueOf(levelMap.get("highValue"))); + if (levelMap.containsKey("highValue") && !StrUtil.isEmpty(levelMap.get("highValue"))) { + alarmLevel.setHighValue(Float.valueOf(levelMap.get("highValue"))); } this.save(alarmLevel); } ); - this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index da52d0f..542fff2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -23,6 +23,7 @@ import java.nio.channels.AcceptPendingException; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -117,21 +118,22 @@ AlarmLevel alarmLevel = new AlarmLevel(); alarmLevel.setName(alarmLevelParam.getName()); alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setOpenAlarm(String.valueOf(alarmLevelParam.getOpenAlarm())); alarmLevel.setTenantId(alarmLevelParam.getTenantId()); - alarmLevel.setDeviceType(Long.valueOf(ObjectUtil.isEmpty(alarmLevelParam.getDeviceType()) ? -1: alarmLevelParam.getDeviceType())); - List> levelList = JSONArray.parseObject(alarmLevelParam.getLevelList(),List.class); + alarmLevel.setTs(new Date()); + alarmLevel.setDeviceType(Long.valueOf(ObjectUtil.isEmpty(alarmLevelParam.getDeviceType()) ? -1 : alarmLevelParam.getDeviceType())); + List> levelList = JSONArray.parseObject(alarmLevelParam.getLevelList(), List.class); levelList.forEach( levelMap -> { alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(levelMap.get("level")) ? "-1" : levelMap.get("level"))); - if(levelMap.containsKey("lowValue") &&!StrUtil.isEmpty(levelMap.get("lowValue"))){ - alarmLevel.setLowValue( Float.valueOf(levelMap.get("lowValue"))); + if (levelMap.containsKey("lowValue") && !StrUtil.isEmpty(levelMap.get("lowValue"))) { + alarmLevel.setLowValue(Float.valueOf(levelMap.get("lowValue"))); } - if(levelMap.containsKey("highValue") &&!StrUtil.isEmpty(levelMap.get("highValue"))){ - alarmLevel.setLowValue( Float.valueOf(levelMap.get("highValue"))); + if (levelMap.containsKey("highValue") && !StrUtil.isEmpty(levelMap.get("highValue"))) { + alarmLevel.setHighValue(Float.valueOf(levelMap.get("highValue"))); } this.save(alarmLevel); } ); - this.save(alarmLevel); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/LiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/LiquidConfigServiceImpl.java deleted file mode 100644 index 1e6e785..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/LiquidConfigServiceImpl.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.casic.missiles.modular.system.service.impl; - -public class LiquidConfigServiceImpl { -}