diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index c91f067..7f32013 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -18,6 +18,7 @@ import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -65,59 +66,19 @@ return levelList; } for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) { - String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString()); - if (deviceTypeName == null) { + Long deviceTypeNum = Long.valueOf(deviceType.toString()); + if (ObjectUtils.isEmpty(deviceTypeNum)) { continue; } - List names = new ArrayList<>(); - if (deviceTypeName.contains("液位")) { - names.add("液位"); - } - if (deviceTypeName.contains("有害气体")) { - names.add("一氧化碳"); - names.add("硫化氢"); - names.add("甲烷"); - names.add("氧气"); - } - if (deviceTypeName.contains("燃气")) { - names.add("燃气"); - } - if (deviceTypeName.contains("温湿度")) { - names.add("温度"); - names.add("湿度"); - } - if (deviceTypeName.contains("开挖")) { - names.add("开挖"); - } - for (String name : names) { - Map levelMap = new HashMap<>(); - Map level = alarmLevelService.selectByNameAndTenGroup(tenantId, name); - levelMap.put("name", name); - levelMap.put("deviceType", deviceType); - levelMap.put("deviceTypeName", deviceTypeName); - if(level == null){ - continue; - } - if (ObjectUtil.isEmpty(level.get("openAlarm"))) { - levelMap.put("openAlarm", ""); - } else { - levelMap.put("openAlarm", level.get("openAlarm").toString()); - } - - if (ObjectUtil.isEmpty(level.get("openJob"))) { - levelMap.put("openJob", ""); - } else { - levelMap.put("openJob", level.get("openJob").toString()); - } - - if (ObjectUtil.isEmpty(level.get("ts"))) { - levelMap.put("ts", ""); - } else { - levelMap.put("ts", level.get("ts").toString()); - } - - levelList.add(levelMap); - } + String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + levels.forEach( + levelMap -> { + levelMap.put("deviceType", deviceType); + levelMap.put("deviceTypeName", deviceTypeName); + levelList.add(levelMap); + } + ); } return ResponseData.success(levelList); } @@ -179,7 +140,7 @@ @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { + public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { return alarmLevelService.updateAlarmLevel(alarmLevelParam); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index c91f067..7f32013 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -18,6 +18,7 @@ import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -65,59 +66,19 @@ return levelList; } for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) { - String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString()); - if (deviceTypeName == null) { + Long deviceTypeNum = Long.valueOf(deviceType.toString()); + if (ObjectUtils.isEmpty(deviceTypeNum)) { continue; } - List names = new ArrayList<>(); - if (deviceTypeName.contains("液位")) { - names.add("液位"); - } - if (deviceTypeName.contains("有害气体")) { - names.add("一氧化碳"); - names.add("硫化氢"); - names.add("甲烷"); - names.add("氧气"); - } - if (deviceTypeName.contains("燃气")) { - names.add("燃气"); - } - if (deviceTypeName.contains("温湿度")) { - names.add("温度"); - names.add("湿度"); - } - if (deviceTypeName.contains("开挖")) { - names.add("开挖"); - } - for (String name : names) { - Map levelMap = new HashMap<>(); - Map level = alarmLevelService.selectByNameAndTenGroup(tenantId, name); - levelMap.put("name", name); - levelMap.put("deviceType", deviceType); - levelMap.put("deviceTypeName", deviceTypeName); - if(level == null){ - continue; - } - if (ObjectUtil.isEmpty(level.get("openAlarm"))) { - levelMap.put("openAlarm", ""); - } else { - levelMap.put("openAlarm", level.get("openAlarm").toString()); - } - - if (ObjectUtil.isEmpty(level.get("openJob"))) { - levelMap.put("openJob", ""); - } else { - levelMap.put("openJob", level.get("openJob").toString()); - } - - if (ObjectUtil.isEmpty(level.get("ts"))) { - levelMap.put("ts", ""); - } else { - levelMap.put("ts", level.get("ts").toString()); - } - - levelList.add(levelMap); - } + String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + levels.forEach( + levelMap -> { + levelMap.put("deviceType", deviceType); + levelMap.put("deviceTypeName", deviceTypeName); + levelList.add(levelMap); + } + ); } return ResponseData.success(levelList); } @@ -179,7 +140,7 @@ @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { + public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { return alarmLevelService.updateAlarmLevel(alarmLevelParam); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index c80433c..ad75d61 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; +import com.casic.missiles.modular.system.util.LevelNameEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -77,6 +78,7 @@ dataScope.setScopeName("bwi.DEPTID"); List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); retList.forEach(this::alarmRecordWrapper); + page.setRecords(retList); return ResponseData.success(super.packForBT(page)); } @@ -108,7 +110,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); - +// map.put("level",map.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(map.get("alarmLevel"))))); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { String alarmValue = map.get("alarmValue").toString(); @@ -168,8 +170,10 @@ List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( alarmExp -> { + RecordExcelDto recordExcelDto = mapToObjcet(alarmExp); recordExcelDtoList.add(recordExcelDto); + } ); super.exportExcel(RecordExcelDto.class, recordExcelDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -182,10 +186,10 @@ recordExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString()); recordExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString()); recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); - recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); + recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(alarmExp.get("alarmLevel"))))); return recordExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index c91f067..7f32013 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -18,6 +18,7 @@ import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -65,59 +66,19 @@ return levelList; } for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) { - String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString()); - if (deviceTypeName == null) { + Long deviceTypeNum = Long.valueOf(deviceType.toString()); + if (ObjectUtils.isEmpty(deviceTypeNum)) { continue; } - List names = new ArrayList<>(); - if (deviceTypeName.contains("液位")) { - names.add("液位"); - } - if (deviceTypeName.contains("有害气体")) { - names.add("一氧化碳"); - names.add("硫化氢"); - names.add("甲烷"); - names.add("氧气"); - } - if (deviceTypeName.contains("燃气")) { - names.add("燃气"); - } - if (deviceTypeName.contains("温湿度")) { - names.add("温度"); - names.add("湿度"); - } - if (deviceTypeName.contains("开挖")) { - names.add("开挖"); - } - for (String name : names) { - Map levelMap = new HashMap<>(); - Map level = alarmLevelService.selectByNameAndTenGroup(tenantId, name); - levelMap.put("name", name); - levelMap.put("deviceType", deviceType); - levelMap.put("deviceTypeName", deviceTypeName); - if(level == null){ - continue; - } - if (ObjectUtil.isEmpty(level.get("openAlarm"))) { - levelMap.put("openAlarm", ""); - } else { - levelMap.put("openAlarm", level.get("openAlarm").toString()); - } - - if (ObjectUtil.isEmpty(level.get("openJob"))) { - levelMap.put("openJob", ""); - } else { - levelMap.put("openJob", level.get("openJob").toString()); - } - - if (ObjectUtil.isEmpty(level.get("ts"))) { - levelMap.put("ts", ""); - } else { - levelMap.put("ts", level.get("ts").toString()); - } - - levelList.add(levelMap); - } + String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + levels.forEach( + levelMap -> { + levelMap.put("deviceType", deviceType); + levelMap.put("deviceTypeName", deviceTypeName); + levelList.add(levelMap); + } + ); } return ResponseData.success(levelList); } @@ -179,7 +140,7 @@ @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { + public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { return alarmLevelService.updateAlarmLevel(alarmLevelParam); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index c80433c..ad75d61 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; +import com.casic.missiles.modular.system.util.LevelNameEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -77,6 +78,7 @@ dataScope.setScopeName("bwi.DEPTID"); List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); retList.forEach(this::alarmRecordWrapper); + page.setRecords(retList); return ResponseData.success(super.packForBT(page)); } @@ -108,7 +110,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); - +// map.put("level",map.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(map.get("alarmLevel"))))); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { String alarmValue = map.get("alarmValue").toString(); @@ -168,8 +170,10 @@ List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( alarmExp -> { + RecordExcelDto recordExcelDto = mapToObjcet(alarmExp); recordExcelDtoList.add(recordExcelDto); + } ); super.exportExcel(RecordExcelDto.class, recordExcelDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -182,10 +186,10 @@ recordExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString()); recordExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString()); recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); - recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); + recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(alarmExp.get("alarmLevel"))))); return recordExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 0a16aa8..8a9e3d6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -80,7 +80,8 @@ private void alarmRuleWrapper(Map map) { String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString(); long deptid = Long.parseLong(map.get("deptid").toString()); - map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType)); + Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType); + map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index c91f067..7f32013 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -18,6 +18,7 @@ import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -65,59 +66,19 @@ return levelList; } for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) { - String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString()); - if (deviceTypeName == null) { + Long deviceTypeNum = Long.valueOf(deviceType.toString()); + if (ObjectUtils.isEmpty(deviceTypeNum)) { continue; } - List names = new ArrayList<>(); - if (deviceTypeName.contains("液位")) { - names.add("液位"); - } - if (deviceTypeName.contains("有害气体")) { - names.add("一氧化碳"); - names.add("硫化氢"); - names.add("甲烷"); - names.add("氧气"); - } - if (deviceTypeName.contains("燃气")) { - names.add("燃气"); - } - if (deviceTypeName.contains("温湿度")) { - names.add("温度"); - names.add("湿度"); - } - if (deviceTypeName.contains("开挖")) { - names.add("开挖"); - } - for (String name : names) { - Map levelMap = new HashMap<>(); - Map level = alarmLevelService.selectByNameAndTenGroup(tenantId, name); - levelMap.put("name", name); - levelMap.put("deviceType", deviceType); - levelMap.put("deviceTypeName", deviceTypeName); - if(level == null){ - continue; - } - if (ObjectUtil.isEmpty(level.get("openAlarm"))) { - levelMap.put("openAlarm", ""); - } else { - levelMap.put("openAlarm", level.get("openAlarm").toString()); - } - - if (ObjectUtil.isEmpty(level.get("openJob"))) { - levelMap.put("openJob", ""); - } else { - levelMap.put("openJob", level.get("openJob").toString()); - } - - if (ObjectUtil.isEmpty(level.get("ts"))) { - levelMap.put("ts", ""); - } else { - levelMap.put("ts", level.get("ts").toString()); - } - - levelList.add(levelMap); - } + String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + levels.forEach( + levelMap -> { + levelMap.put("deviceType", deviceType); + levelMap.put("deviceTypeName", deviceTypeName); + levelList.add(levelMap); + } + ); } return ResponseData.success(levelList); } @@ -179,7 +140,7 @@ @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { + public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { return alarmLevelService.updateAlarmLevel(alarmLevelParam); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index c80433c..ad75d61 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; +import com.casic.missiles.modular.system.util.LevelNameEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -77,6 +78,7 @@ dataScope.setScopeName("bwi.DEPTID"); List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); retList.forEach(this::alarmRecordWrapper); + page.setRecords(retList); return ResponseData.success(super.packForBT(page)); } @@ -108,7 +110,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); - +// map.put("level",map.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(map.get("alarmLevel"))))); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { String alarmValue = map.get("alarmValue").toString(); @@ -168,8 +170,10 @@ List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( alarmExp -> { + RecordExcelDto recordExcelDto = mapToObjcet(alarmExp); recordExcelDtoList.add(recordExcelDto); + } ); super.exportExcel(RecordExcelDto.class, recordExcelDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -182,10 +186,10 @@ recordExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString()); recordExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString()); recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); - recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); + recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(alarmExp.get("alarmLevel"))))); return recordExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 0a16aa8..8a9e3d6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -80,7 +80,8 @@ private void alarmRuleWrapper(Map map) { String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString(); long deptid = Long.parseLong(map.get("deptid").toString()); - map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType)); + Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType); + map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 330be63..85617c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -18,7 +19,8 @@ * @since 2019-10-15 */ public interface IAlarmLevelService extends IService { - Map selectByNameAndTenGroup(Long tenantId, String name); + + List> getLevelList(Long tenantId,Long deviceType); List selectByNameAndTenList(Long tenantId, String name); diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index c91f067..7f32013 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -18,6 +18,7 @@ import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -65,59 +66,19 @@ return levelList; } for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) { - String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString()); - if (deviceTypeName == null) { + Long deviceTypeNum = Long.valueOf(deviceType.toString()); + if (ObjectUtils.isEmpty(deviceTypeNum)) { continue; } - List names = new ArrayList<>(); - if (deviceTypeName.contains("液位")) { - names.add("液位"); - } - if (deviceTypeName.contains("有害气体")) { - names.add("一氧化碳"); - names.add("硫化氢"); - names.add("甲烷"); - names.add("氧气"); - } - if (deviceTypeName.contains("燃气")) { - names.add("燃气"); - } - if (deviceTypeName.contains("温湿度")) { - names.add("温度"); - names.add("湿度"); - } - if (deviceTypeName.contains("开挖")) { - names.add("开挖"); - } - for (String name : names) { - Map levelMap = new HashMap<>(); - Map level = alarmLevelService.selectByNameAndTenGroup(tenantId, name); - levelMap.put("name", name); - levelMap.put("deviceType", deviceType); - levelMap.put("deviceTypeName", deviceTypeName); - if(level == null){ - continue; - } - if (ObjectUtil.isEmpty(level.get("openAlarm"))) { - levelMap.put("openAlarm", ""); - } else { - levelMap.put("openAlarm", level.get("openAlarm").toString()); - } - - if (ObjectUtil.isEmpty(level.get("openJob"))) { - levelMap.put("openJob", ""); - } else { - levelMap.put("openJob", level.get("openJob").toString()); - } - - if (ObjectUtil.isEmpty(level.get("ts"))) { - levelMap.put("ts", ""); - } else { - levelMap.put("ts", level.get("ts").toString()); - } - - levelList.add(levelMap); - } + String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + levels.forEach( + levelMap -> { + levelMap.put("deviceType", deviceType); + levelMap.put("deviceTypeName", deviceTypeName); + levelList.add(levelMap); + } + ); } return ResponseData.success(levelList); } @@ -179,7 +140,7 @@ @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { + public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { return alarmLevelService.updateAlarmLevel(alarmLevelParam); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index c80433c..ad75d61 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; +import com.casic.missiles.modular.system.util.LevelNameEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -77,6 +78,7 @@ dataScope.setScopeName("bwi.DEPTID"); List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); retList.forEach(this::alarmRecordWrapper); + page.setRecords(retList); return ResponseData.success(super.packForBT(page)); } @@ -108,7 +110,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); - +// map.put("level",map.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(map.get("alarmLevel"))))); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { String alarmValue = map.get("alarmValue").toString(); @@ -168,8 +170,10 @@ List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( alarmExp -> { + RecordExcelDto recordExcelDto = mapToObjcet(alarmExp); recordExcelDtoList.add(recordExcelDto); + } ); super.exportExcel(RecordExcelDto.class, recordExcelDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -182,10 +186,10 @@ recordExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString()); recordExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString()); recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); - recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); + recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(alarmExp.get("alarmLevel"))))); return recordExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 0a16aa8..8a9e3d6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -80,7 +80,8 @@ private void alarmRuleWrapper(Map map) { String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString(); long deptid = Long.parseLong(map.get("deptid").toString()); - map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType)); + Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType); + map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 330be63..85617c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -18,7 +19,8 @@ * @since 2019-10-15 */ public interface IAlarmLevelService extends IService { - Map selectByNameAndTenGroup(Long tenantId, String name); + + List> getLevelList(Long tenantId,Long deviceType); List selectByNameAndTenList(Long tenantId, String name); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 66df59f..0e885d9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -83,7 +83,8 @@ alarmContentTypeList.forEach( alarmType -> { alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString())); - alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString())); + Long deviceTypeNum = StrUtil.isEmpty(alarmType.get("deviceType").toString()) ? 0 : Long.valueOf(alarmType.get("deviceType").toString()); + alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); } ); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index c91f067..7f32013 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -18,6 +18,7 @@ import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -65,59 +66,19 @@ return levelList; } for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) { - String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString()); - if (deviceTypeName == null) { + Long deviceTypeNum = Long.valueOf(deviceType.toString()); + if (ObjectUtils.isEmpty(deviceTypeNum)) { continue; } - List names = new ArrayList<>(); - if (deviceTypeName.contains("液位")) { - names.add("液位"); - } - if (deviceTypeName.contains("有害气体")) { - names.add("一氧化碳"); - names.add("硫化氢"); - names.add("甲烷"); - names.add("氧气"); - } - if (deviceTypeName.contains("燃气")) { - names.add("燃气"); - } - if (deviceTypeName.contains("温湿度")) { - names.add("温度"); - names.add("湿度"); - } - if (deviceTypeName.contains("开挖")) { - names.add("开挖"); - } - for (String name : names) { - Map levelMap = new HashMap<>(); - Map level = alarmLevelService.selectByNameAndTenGroup(tenantId, name); - levelMap.put("name", name); - levelMap.put("deviceType", deviceType); - levelMap.put("deviceTypeName", deviceTypeName); - if(level == null){ - continue; - } - if (ObjectUtil.isEmpty(level.get("openAlarm"))) { - levelMap.put("openAlarm", ""); - } else { - levelMap.put("openAlarm", level.get("openAlarm").toString()); - } - - if (ObjectUtil.isEmpty(level.get("openJob"))) { - levelMap.put("openJob", ""); - } else { - levelMap.put("openJob", level.get("openJob").toString()); - } - - if (ObjectUtil.isEmpty(level.get("ts"))) { - levelMap.put("ts", ""); - } else { - levelMap.put("ts", level.get("ts").toString()); - } - - levelList.add(levelMap); - } + String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + levels.forEach( + levelMap -> { + levelMap.put("deviceType", deviceType); + levelMap.put("deviceTypeName", deviceTypeName); + levelList.add(levelMap); + } + ); } return ResponseData.success(levelList); } @@ -179,7 +140,7 @@ @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { + public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { return alarmLevelService.updateAlarmLevel(alarmLevelParam); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index c80433c..ad75d61 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; +import com.casic.missiles.modular.system.util.LevelNameEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -77,6 +78,7 @@ dataScope.setScopeName("bwi.DEPTID"); List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); retList.forEach(this::alarmRecordWrapper); + page.setRecords(retList); return ResponseData.success(super.packForBT(page)); } @@ -108,7 +110,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); - +// map.put("level",map.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(map.get("alarmLevel"))))); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { String alarmValue = map.get("alarmValue").toString(); @@ -168,8 +170,10 @@ List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( alarmExp -> { + RecordExcelDto recordExcelDto = mapToObjcet(alarmExp); recordExcelDtoList.add(recordExcelDto); + } ); super.exportExcel(RecordExcelDto.class, recordExcelDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -182,10 +186,10 @@ recordExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString()); recordExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString()); recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); - recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); + recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(alarmExp.get("alarmLevel"))))); return recordExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 0a16aa8..8a9e3d6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -80,7 +80,8 @@ private void alarmRuleWrapper(Map map) { String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString(); long deptid = Long.parseLong(map.get("deptid").toString()); - map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType)); + Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType); + map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 330be63..85617c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -18,7 +19,8 @@ * @since 2019-10-15 */ public interface IAlarmLevelService extends IService { - Map selectByNameAndTenGroup(Long tenantId, String name); + + List> getLevelList(Long tenantId,Long deviceType); List selectByNameAndTenList(Long tenantId, String name); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 66df59f..0e885d9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -83,7 +83,8 @@ alarmContentTypeList.forEach( alarmType -> { alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString())); - alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString())); + Long deviceTypeNum = StrUtil.isEmpty(alarmType.get("deviceType").toString()) ? 0 : Long.valueOf(alarmType.get("deviceType").toString()); + alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); } ); } 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 44c994b..bf0181c 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 @@ -31,8 +31,8 @@ @Service public class AlarmLevelServiceImpl extends ServiceImpl implements IAlarmLevelService { @Override - public Map selectByNameAndTenGroup(Long tenantId, String name) { - return this.baseMapper.selectByNameAndTenGroup(tenantId, name); + public List> getLevelList(Long tenantId, Long deviceType) { + return this.baseMapper.getLevelList(tenantId, deviceType); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index c91f067..7f32013 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -18,6 +18,7 @@ import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -65,59 +66,19 @@ return levelList; } for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) { - String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString()); - if (deviceTypeName == null) { + Long deviceTypeNum = Long.valueOf(deviceType.toString()); + if (ObjectUtils.isEmpty(deviceTypeNum)) { continue; } - List names = new ArrayList<>(); - if (deviceTypeName.contains("液位")) { - names.add("液位"); - } - if (deviceTypeName.contains("有害气体")) { - names.add("一氧化碳"); - names.add("硫化氢"); - names.add("甲烷"); - names.add("氧气"); - } - if (deviceTypeName.contains("燃气")) { - names.add("燃气"); - } - if (deviceTypeName.contains("温湿度")) { - names.add("温度"); - names.add("湿度"); - } - if (deviceTypeName.contains("开挖")) { - names.add("开挖"); - } - for (String name : names) { - Map levelMap = new HashMap<>(); - Map level = alarmLevelService.selectByNameAndTenGroup(tenantId, name); - levelMap.put("name", name); - levelMap.put("deviceType", deviceType); - levelMap.put("deviceTypeName", deviceTypeName); - if(level == null){ - continue; - } - if (ObjectUtil.isEmpty(level.get("openAlarm"))) { - levelMap.put("openAlarm", ""); - } else { - levelMap.put("openAlarm", level.get("openAlarm").toString()); - } - - if (ObjectUtil.isEmpty(level.get("openJob"))) { - levelMap.put("openJob", ""); - } else { - levelMap.put("openJob", level.get("openJob").toString()); - } - - if (ObjectUtil.isEmpty(level.get("ts"))) { - levelMap.put("ts", ""); - } else { - levelMap.put("ts", level.get("ts").toString()); - } - - levelList.add(levelMap); - } + String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + levels.forEach( + levelMap -> { + levelMap.put("deviceType", deviceType); + levelMap.put("deviceTypeName", deviceTypeName); + levelList.add(levelMap); + } + ); } return ResponseData.success(levelList); } @@ -179,7 +140,7 @@ @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { + public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { return alarmLevelService.updateAlarmLevel(alarmLevelParam); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index c80433c..ad75d61 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; +import com.casic.missiles.modular.system.util.LevelNameEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -77,6 +78,7 @@ dataScope.setScopeName("bwi.DEPTID"); List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); retList.forEach(this::alarmRecordWrapper); + page.setRecords(retList); return ResponseData.success(super.packForBT(page)); } @@ -108,7 +110,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); - +// map.put("level",map.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(map.get("alarmLevel"))))); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { String alarmValue = map.get("alarmValue").toString(); @@ -168,8 +170,10 @@ List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( alarmExp -> { + RecordExcelDto recordExcelDto = mapToObjcet(alarmExp); recordExcelDtoList.add(recordExcelDto); + } ); super.exportExcel(RecordExcelDto.class, recordExcelDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -182,10 +186,10 @@ recordExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString()); recordExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString()); recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); - recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); + recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(alarmExp.get("alarmLevel"))))); return recordExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 0a16aa8..8a9e3d6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -80,7 +80,8 @@ private void alarmRuleWrapper(Map map) { String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString(); long deptid = Long.parseLong(map.get("deptid").toString()); - map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType)); + Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType); + map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 330be63..85617c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -18,7 +19,8 @@ * @since 2019-10-15 */ public interface IAlarmLevelService extends IService { - Map selectByNameAndTenGroup(Long tenantId, String name); + + List> getLevelList(Long tenantId,Long deviceType); List selectByNameAndTenList(Long tenantId, String name); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 66df59f..0e885d9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -83,7 +83,8 @@ alarmContentTypeList.forEach( alarmType -> { alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString())); - alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString())); + Long deviceTypeNum = StrUtil.isEmpty(alarmType.get("deviceType").toString()) ? 0 : Long.valueOf(alarmType.get("deviceType").toString()); + alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); } ); } 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 44c994b..bf0181c 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 @@ -31,8 +31,8 @@ @Service public class AlarmLevelServiceImpl extends ServiceImpl implements IAlarmLevelService { @Override - public Map selectByNameAndTenGroup(Long tenantId, String name) { - return this.baseMapper.selectByNameAndTenGroup(tenantId, name); + public List> getLevelList(Long tenantId, Long deviceType) { + return this.baseMapper.getLevelList(tenantId, deviceType); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index dfc4bee..c54211e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -17,7 +17,7 @@ * @since 2019-10-15 */ public interface AlarmLevelMapper extends BaseMapper { - Map selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name); + List> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType); List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index c91f067..7f32013 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -18,6 +18,7 @@ import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -65,59 +66,19 @@ return levelList; } for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) { - String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString()); - if (deviceTypeName == null) { + Long deviceTypeNum = Long.valueOf(deviceType.toString()); + if (ObjectUtils.isEmpty(deviceTypeNum)) { continue; } - List names = new ArrayList<>(); - if (deviceTypeName.contains("液位")) { - names.add("液位"); - } - if (deviceTypeName.contains("有害气体")) { - names.add("一氧化碳"); - names.add("硫化氢"); - names.add("甲烷"); - names.add("氧气"); - } - if (deviceTypeName.contains("燃气")) { - names.add("燃气"); - } - if (deviceTypeName.contains("温湿度")) { - names.add("温度"); - names.add("湿度"); - } - if (deviceTypeName.contains("开挖")) { - names.add("开挖"); - } - for (String name : names) { - Map levelMap = new HashMap<>(); - Map level = alarmLevelService.selectByNameAndTenGroup(tenantId, name); - levelMap.put("name", name); - levelMap.put("deviceType", deviceType); - levelMap.put("deviceTypeName", deviceTypeName); - if(level == null){ - continue; - } - if (ObjectUtil.isEmpty(level.get("openAlarm"))) { - levelMap.put("openAlarm", ""); - } else { - levelMap.put("openAlarm", level.get("openAlarm").toString()); - } - - if (ObjectUtil.isEmpty(level.get("openJob"))) { - levelMap.put("openJob", ""); - } else { - levelMap.put("openJob", level.get("openJob").toString()); - } - - if (ObjectUtil.isEmpty(level.get("ts"))) { - levelMap.put("ts", ""); - } else { - levelMap.put("ts", level.get("ts").toString()); - } - - levelList.add(levelMap); - } + String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + levels.forEach( + levelMap -> { + levelMap.put("deviceType", deviceType); + levelMap.put("deviceTypeName", deviceTypeName); + levelList.add(levelMap); + } + ); } return ResponseData.success(levelList); } @@ -179,7 +140,7 @@ @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { + public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { return alarmLevelService.updateAlarmLevel(alarmLevelParam); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index c80433c..ad75d61 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; +import com.casic.missiles.modular.system.util.LevelNameEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -77,6 +78,7 @@ dataScope.setScopeName("bwi.DEPTID"); List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); retList.forEach(this::alarmRecordWrapper); + page.setRecords(retList); return ResponseData.success(super.packForBT(page)); } @@ -108,7 +110,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); - +// map.put("level",map.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(map.get("alarmLevel"))))); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { String alarmValue = map.get("alarmValue").toString(); @@ -168,8 +170,10 @@ List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( alarmExp -> { + RecordExcelDto recordExcelDto = mapToObjcet(alarmExp); recordExcelDtoList.add(recordExcelDto); + } ); super.exportExcel(RecordExcelDto.class, recordExcelDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -182,10 +186,10 @@ recordExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString()); recordExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString()); recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); - recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); + recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(alarmExp.get("alarmLevel"))))); return recordExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 0a16aa8..8a9e3d6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -80,7 +80,8 @@ private void alarmRuleWrapper(Map map) { String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString(); long deptid = Long.parseLong(map.get("deptid").toString()); - map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType)); + Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType); + map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 330be63..85617c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -18,7 +19,8 @@ * @since 2019-10-15 */ public interface IAlarmLevelService extends IService { - Map selectByNameAndTenGroup(Long tenantId, String name); + + List> getLevelList(Long tenantId,Long deviceType); List selectByNameAndTenList(Long tenantId, String name); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 66df59f..0e885d9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -83,7 +83,8 @@ alarmContentTypeList.forEach( alarmType -> { alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString())); - alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString())); + Long deviceTypeNum = StrUtil.isEmpty(alarmType.get("deviceType").toString()) ? 0 : Long.valueOf(alarmType.get("deviceType").toString()); + alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); } ); } 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 44c994b..bf0181c 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 @@ -31,8 +31,8 @@ @Service public class AlarmLevelServiceImpl extends ServiceImpl implements IAlarmLevelService { @Override - public Map selectByNameAndTenGroup(Long tenantId, String name) { - return this.baseMapper.selectByNameAndTenGroup(tenantId, name); + public List> getLevelList(Long tenantId, Long deviceType) { + return this.baseMapper.getLevelList(tenantId, deviceType); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index dfc4bee..c54211e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -17,7 +17,7 @@ * @since 2019-10-15 */ public interface AlarmLevelMapper extends BaseMapper { - Map selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name); + List> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType); List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index 6286a05..48ae812 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -23,15 +23,18 @@ OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - SELECT + level, + name, OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TS AS ts FROM alarm_level WHERE TENANT_ID = #{tenantId} - AND NAME = #{name} - LIMIT 1 + + AND DEVICE_TYPE = #{deviceType} + + + + + + + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java index 1594697..cc153cb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java +++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java @@ -24,9 +24,9 @@ return SpringContextHolder.getBean("ehcacheConstant");} @Cacheable(value = "CONSTANT", key = "'deviceType-'+#deviceTypeId") - public String getDeviceTypeNameById ( String deviceTypeId) + public String getDeviceTypeNameById ( Long deviceTypeId) { - String retStr = sysDictMapper.getDeviceTypeNameById(StrUtil.isEmpty(deviceTypeId)?0:Long.valueOf(deviceTypeId)); + String retStr = sysDictMapper.getDeviceTypeNameById(deviceTypeId); return retStr; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index c91f067..7f32013 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -18,6 +18,7 @@ import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -65,59 +66,19 @@ return levelList; } for (Object deviceType : JSON.parseObject(deptPermission.getDeviceType(), List.class)) { - String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceType.toString()); - if (deviceTypeName == null) { + Long deviceTypeNum = Long.valueOf(deviceType.toString()); + if (ObjectUtils.isEmpty(deviceTypeNum)) { continue; } - List names = new ArrayList<>(); - if (deviceTypeName.contains("液位")) { - names.add("液位"); - } - if (deviceTypeName.contains("有害气体")) { - names.add("一氧化碳"); - names.add("硫化氢"); - names.add("甲烷"); - names.add("氧气"); - } - if (deviceTypeName.contains("燃气")) { - names.add("燃气"); - } - if (deviceTypeName.contains("温湿度")) { - names.add("温度"); - names.add("湿度"); - } - if (deviceTypeName.contains("开挖")) { - names.add("开挖"); - } - for (String name : names) { - Map levelMap = new HashMap<>(); - Map level = alarmLevelService.selectByNameAndTenGroup(tenantId, name); - levelMap.put("name", name); - levelMap.put("deviceType", deviceType); - levelMap.put("deviceTypeName", deviceTypeName); - if(level == null){ - continue; - } - if (ObjectUtil.isEmpty(level.get("openAlarm"))) { - levelMap.put("openAlarm", ""); - } else { - levelMap.put("openAlarm", level.get("openAlarm").toString()); - } - - if (ObjectUtil.isEmpty(level.get("openJob"))) { - levelMap.put("openJob", ""); - } else { - levelMap.put("openJob", level.get("openJob").toString()); - } - - if (ObjectUtil.isEmpty(level.get("ts"))) { - levelMap.put("ts", ""); - } else { - levelMap.put("ts", level.get("ts").toString()); - } - - levelList.add(levelMap); - } + String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum); + List> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum); + levels.forEach( + levelMap -> { + levelMap.put("deviceType", deviceType); + levelMap.put("deviceTypeName", deviceTypeName); + levelList.add(levelMap); + } + ); } return ResponseData.success(levelList); } @@ -179,7 +140,7 @@ @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { + public Object update(@RequestBody AlarmLevelParam alarmLevelParam) { return alarmLevelService.updateAlarmLevel(alarmLevelParam); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index c80433c..ad75d61 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -14,6 +14,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; +import com.casic.missiles.modular.system.util.LevelNameEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -77,6 +78,7 @@ dataScope.setScopeName("bwi.DEPTID"); List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); retList.forEach(this::alarmRecordWrapper); + page.setRecords(retList); return ResponseData.success(super.packForBT(page)); } @@ -108,7 +110,7 @@ // 告警内容 String alarmContentNameStr = map.get("alarmContentName").toString(); map.put("alarmContent", EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); - +// map.put("level",map.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(map.get("alarmLevel"))))); // 告警值加单位 if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) { String alarmValue = map.get("alarmValue").toString(); @@ -168,8 +170,10 @@ List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( alarmExp -> { + RecordExcelDto recordExcelDto = mapToObjcet(alarmExp); recordExcelDtoList.add(recordExcelDto); + } ); super.exportExcel(RecordExcelDto.class, recordExcelDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName()); @@ -182,10 +186,10 @@ recordExcelDto.setPosition(alarmExp.get("position") == null ? "" : alarmExp.get("position").toString()); recordExcelDto.setAlarmTypeName(alarmExp.get("alarmTypeName") == null ? "" : alarmExp.get("alarmTypeName").toString()); recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); - recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); + recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : LevelNameEnum.LEVEL_NAME.getLevelNameMap().get(Integer.valueOf(String.valueOf(alarmExp.get("alarmLevel"))))); return recordExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 0a16aa8..8a9e3d6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -80,7 +80,8 @@ private void alarmRuleWrapper(Map map) { String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString(); long deptid = Long.parseLong(map.get("deptid").toString()); - map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceType)); + Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType); + map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 330be63..85617c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -5,6 +5,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -18,7 +19,8 @@ * @since 2019-10-15 */ public interface IAlarmLevelService extends IService { - Map selectByNameAndTenGroup(Long tenantId, String name); + + List> getLevelList(Long tenantId,Long deviceType); List selectByNameAndTenList(Long tenantId, String name); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 66df59f..0e885d9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -83,7 +83,8 @@ alarmContentTypeList.forEach( alarmType -> { alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString())); - alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString())); + Long deviceTypeNum = StrUtil.isEmpty(alarmType.get("deviceType").toString()) ? 0 : Long.valueOf(alarmType.get("deviceType").toString()); + alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum)); } ); } 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 44c994b..bf0181c 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 @@ -31,8 +31,8 @@ @Service public class AlarmLevelServiceImpl extends ServiceImpl implements IAlarmLevelService { @Override - public Map selectByNameAndTenGroup(Long tenantId, String name) { - return this.baseMapper.selectByNameAndTenGroup(tenantId, name); + public List> getLevelList(Long tenantId, Long deviceType) { + return this.baseMapper.getLevelList(tenantId, deviceType); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index dfc4bee..c54211e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -17,7 +17,7 @@ * @since 2019-10-15 */ public interface AlarmLevelMapper extends BaseMapper { - Map selectByNameAndTenGroup(@Param("tenantId")Long tenantId, @Param("name")String name); + List> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType); List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index 6286a05..48ae812 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -23,15 +23,18 @@ OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - SELECT + level, + name, OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TS AS ts FROM alarm_level WHERE TENANT_ID = #{tenantId} - AND NAME = #{name} - LIMIT 1 + + AND DEVICE_TYPE = #{deviceType} + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@ + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@ + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@ + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@ + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@ + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@ + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@ + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@ + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@ + - SELECT count(*) as count,bd.DEVICE_TYPE as "deviceType" - FROM alarm_records ar - INNER JOIN bus_device bd ON ar.devcode=bd.DEVCODE - GROUP BY bd.DEVICE_TYPE - - - - - - - - \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml index c96cc65..a61dcee 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml @@ -37,10 +37,7 @@