diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index 1a5e4e5..f70d25e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -9,10 +9,9 @@ @AllArgsConstructor @RequestMapping("/whale/eye") public class ScreenDataController { + private final ScreenDataService screenDataService; - - /** * 以道路的维度来统计燃气管线监控中的报警情况 */ @@ -29,7 +28,6 @@ return screenDataService.getKindsAlarmRate(beginTime, endTime); } - /** * 道路管网健康指标：从道路的维度来判断，每条道路燃气管线的健康指数，（按照设备的总数和设备的报警数来计算） */ @@ -38,7 +36,6 @@ return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); } - /** *7日报警统计、曲线趋势 */ @@ -47,7 +44,6 @@ return screenDataService.getAlarmNum(); } - /** * 各类设备的工单信息 */ @@ -56,5 +52,4 @@ return screenDataService.getJobByDay(beginTime, endTime); } - } diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index 1a5e4e5..f70d25e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -9,10 +9,9 @@ @AllArgsConstructor @RequestMapping("/whale/eye") public class ScreenDataController { + private final ScreenDataService screenDataService; - - /** * 以道路的维度来统计燃气管线监控中的报警情况 */ @@ -29,7 +28,6 @@ return screenDataService.getKindsAlarmRate(beginTime, endTime); } - /** * 道路管网健康指标：从道路的维度来判断，每条道路燃气管线的健康指数，（按照设备的总数和设备的报警数来计算） */ @@ -38,7 +36,6 @@ return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); } - /** *7日报警统计、曲线趋势 */ @@ -47,7 +44,6 @@ return screenDataService.getAlarmNum(); } - /** * 各类设备的工单信息 */ @@ -56,5 +52,4 @@ return screenDataService.getJobByDay(beginTime, endTime); } - } diff --git a/src/main/java/com/casic/controller/ScreenDeviceController.java b/src/main/java/com/casic/controller/ScreenDeviceController.java index 479685d..4c3424f 100644 --- a/src/main/java/com/casic/controller/ScreenDeviceController.java +++ b/src/main/java/com/casic/controller/ScreenDeviceController.java @@ -26,7 +26,6 @@ return screenDataService.getDeviceNum(beginTime, endTime); } - /** * 云台监控 */ @@ -35,9 +34,6 @@ return screenDataService.getAlarmRecordsByStation(beginTime, endTime); } - - - /** * 管网健康指数 * 场站健康指数 diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index 1a5e4e5..f70d25e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -9,10 +9,9 @@ @AllArgsConstructor @RequestMapping("/whale/eye") public class ScreenDataController { + private final ScreenDataService screenDataService; - - /** * 以道路的维度来统计燃气管线监控中的报警情况 */ @@ -29,7 +28,6 @@ return screenDataService.getKindsAlarmRate(beginTime, endTime); } - /** * 道路管网健康指标：从道路的维度来判断，每条道路燃气管线的健康指数，（按照设备的总数和设备的报警数来计算） */ @@ -38,7 +36,6 @@ return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); } - /** *7日报警统计、曲线趋势 */ @@ -47,7 +44,6 @@ return screenDataService.getAlarmNum(); } - /** * 各类设备的工单信息 */ @@ -56,5 +52,4 @@ return screenDataService.getJobByDay(beginTime, endTime); } - } diff --git a/src/main/java/com/casic/controller/ScreenDeviceController.java b/src/main/java/com/casic/controller/ScreenDeviceController.java index 479685d..4c3424f 100644 --- a/src/main/java/com/casic/controller/ScreenDeviceController.java +++ b/src/main/java/com/casic/controller/ScreenDeviceController.java @@ -26,7 +26,6 @@ return screenDataService.getDeviceNum(beginTime, endTime); } - /** * 云台监控 */ @@ -35,9 +34,6 @@ return screenDataService.getAlarmRecordsByStation(beginTime, endTime); } - - - /** * 管网健康指数 * 场站健康指数 diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java index 35db535..100d79a 100644 --- a/src/main/java/com/casic/service/impl/AlarmBulider.java +++ b/src/main/java/com/casic/service/impl/AlarmBulider.java @@ -117,10 +117,9 @@ return; } Map map = new HashMap<>(); - map.put("deptId", deptId); map.put("deptName", deptMap.get("name")); - if (jobDeptMap.containsKey(deptMap.get("id"))) { - map.putAll(jobDeptMap.get(deptMap.get("id"))); + if (jobDeptMap.containsKey(String.valueOf(deptMap.get("id")))) { + map.putAll(jobDeptMap.get(String.valueOf(deptMap.get("id")))); } else { map.put("beforeGet", 0); map.put("beforeConfirm", 0); diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index 1a5e4e5..f70d25e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -9,10 +9,9 @@ @AllArgsConstructor @RequestMapping("/whale/eye") public class ScreenDataController { + private final ScreenDataService screenDataService; - - /** * 以道路的维度来统计燃气管线监控中的报警情况 */ @@ -29,7 +28,6 @@ return screenDataService.getKindsAlarmRate(beginTime, endTime); } - /** * 道路管网健康指标：从道路的维度来判断，每条道路燃气管线的健康指数，（按照设备的总数和设备的报警数来计算） */ @@ -38,7 +36,6 @@ return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); } - /** *7日报警统计、曲线趋势 */ @@ -47,7 +44,6 @@ return screenDataService.getAlarmNum(); } - /** * 各类设备的工单信息 */ @@ -56,5 +52,4 @@ return screenDataService.getJobByDay(beginTime, endTime); } - } diff --git a/src/main/java/com/casic/controller/ScreenDeviceController.java b/src/main/java/com/casic/controller/ScreenDeviceController.java index 479685d..4c3424f 100644 --- a/src/main/java/com/casic/controller/ScreenDeviceController.java +++ b/src/main/java/com/casic/controller/ScreenDeviceController.java @@ -26,7 +26,6 @@ return screenDataService.getDeviceNum(beginTime, endTime); } - /** * 云台监控 */ @@ -35,9 +34,6 @@ return screenDataService.getAlarmRecordsByStation(beginTime, endTime); } - - - /** * 管网健康指数 * 场站健康指数 diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java index 35db535..100d79a 100644 --- a/src/main/java/com/casic/service/impl/AlarmBulider.java +++ b/src/main/java/com/casic/service/impl/AlarmBulider.java @@ -117,10 +117,9 @@ return; } Map map = new HashMap<>(); - map.put("deptId", deptId); map.put("deptName", deptMap.get("name")); - if (jobDeptMap.containsKey(deptMap.get("id"))) { - map.putAll(jobDeptMap.get(deptMap.get("id"))); + if (jobDeptMap.containsKey(String.valueOf(deptMap.get("id")))) { + map.putAll(jobDeptMap.get(String.valueOf(deptMap.get("id")))); } else { map.put("beforeGet", 0); map.put("beforeConfirm", 0); diff --git a/src/main/java/com/casic/service/impl/DeviceBuilder.java b/src/main/java/com/casic/service/impl/DeviceBuilder.java index 9a5b3cc..587402a 100644 --- a/src/main/java/com/casic/service/impl/DeviceBuilder.java +++ b/src/main/java/com/casic/service/impl/DeviceBuilder.java @@ -94,7 +94,7 @@ private void tiltInstalledDevice(List> installedDeviceList) { Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", tiltDataMapper.countColudDevice()); + installedDeviceMap.put("count", deviceTypesConfig.getDeviceYT()); installedDeviceMap.put("typeName", "云台"); installedDeviceList.add(installedDeviceMap); } diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index 1a5e4e5..f70d25e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -9,10 +9,9 @@ @AllArgsConstructor @RequestMapping("/whale/eye") public class ScreenDataController { + private final ScreenDataService screenDataService; - - /** * 以道路的维度来统计燃气管线监控中的报警情况 */ @@ -29,7 +28,6 @@ return screenDataService.getKindsAlarmRate(beginTime, endTime); } - /** * 道路管网健康指标：从道路的维度来判断，每条道路燃气管线的健康指数，（按照设备的总数和设备的报警数来计算） */ @@ -38,7 +36,6 @@ return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); } - /** *7日报警统计、曲线趋势 */ @@ -47,7 +44,6 @@ return screenDataService.getAlarmNum(); } - /** * 各类设备的工单信息 */ @@ -56,5 +52,4 @@ return screenDataService.getJobByDay(beginTime, endTime); } - } diff --git a/src/main/java/com/casic/controller/ScreenDeviceController.java b/src/main/java/com/casic/controller/ScreenDeviceController.java index 479685d..4c3424f 100644 --- a/src/main/java/com/casic/controller/ScreenDeviceController.java +++ b/src/main/java/com/casic/controller/ScreenDeviceController.java @@ -26,7 +26,6 @@ return screenDataService.getDeviceNum(beginTime, endTime); } - /** * 云台监控 */ @@ -35,9 +34,6 @@ return screenDataService.getAlarmRecordsByStation(beginTime, endTime); } - - - /** * 管网健康指数 * 场站健康指数 diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java index 35db535..100d79a 100644 --- a/src/main/java/com/casic/service/impl/AlarmBulider.java +++ b/src/main/java/com/casic/service/impl/AlarmBulider.java @@ -117,10 +117,9 @@ return; } Map map = new HashMap<>(); - map.put("deptId", deptId); map.put("deptName", deptMap.get("name")); - if (jobDeptMap.containsKey(deptMap.get("id"))) { - map.putAll(jobDeptMap.get(deptMap.get("id"))); + if (jobDeptMap.containsKey(String.valueOf(deptMap.get("id")))) { + map.putAll(jobDeptMap.get(String.valueOf(deptMap.get("id")))); } else { map.put("beforeGet", 0); map.put("beforeConfirm", 0); diff --git a/src/main/java/com/casic/service/impl/DeviceBuilder.java b/src/main/java/com/casic/service/impl/DeviceBuilder.java index 9a5b3cc..587402a 100644 --- a/src/main/java/com/casic/service/impl/DeviceBuilder.java +++ b/src/main/java/com/casic/service/impl/DeviceBuilder.java @@ -94,7 +94,7 @@ private void tiltInstalledDevice(List> installedDeviceList) { Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", tiltDataMapper.countColudDevice()); + installedDeviceMap.put("count", deviceTypesConfig.getDeviceYT()); installedDeviceMap.put("typeName", "云台"); installedDeviceList.add(installedDeviceMap); } diff --git a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java index 4f49392..5b9a7aa 100644 --- a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java +++ b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java @@ -5,6 +5,7 @@ import com.casic.dao.spantilt.TiltDataMapper; import com.casic.util.FormatUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -15,6 +16,7 @@ @Service @AllArgsConstructor +@Slf4j public class HealthIndexBuilder { private final SmartwellDataMapper smartwellDataMapper; @@ -62,8 +64,18 @@ List> smartwellHealthList = new ArrayList(); List> roadNumberList = this.smartwellDataMapper.countRoadNumber(); List> alarmRoadList = this.smartwellDataMapper.countAlarmRoad(beginTime, endTime); + Integer count=0; + for (Map alarmMap :roadNumberList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("设备总数量"+count); + for (Map alarmMap :alarmRoadList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("报警总数量"+count); Map alarmRoadMap = alarmRoadList.stream() .collect(Collectors.toMap( e->String.valueOf(e.get("road")),e ->String.valueOf(e.get("count")))); + roadNumberList.forEach( roadMap->{ Map wellHealthMap = new HashMap(); @@ -74,9 +86,16 @@ smartwellHealthList.add(wellHealthMap); } ); + if (!StringUtils.isEmpty(isSort)) { - List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> - Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> +// Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); + roadNumberList.forEach( + roadMap-> roadMap.put("count", alarmRoadMap.containsKey(roadMap.get("road"))?alarmRoadMap.get(roadMap.get("road")):0) + ); + List> sortlist=roadNumberList.stream().sorted(( + e1,e2)->Double.valueOf(String.valueOf(e2.get("count"))).compareTo(Double.valueOf(String.valueOf(e1.get("count"))))).collect(Collectors.toList()); List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); return limitSortlist; } else { diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index 1a5e4e5..f70d25e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -9,10 +9,9 @@ @AllArgsConstructor @RequestMapping("/whale/eye") public class ScreenDataController { + private final ScreenDataService screenDataService; - - /** * 以道路的维度来统计燃气管线监控中的报警情况 */ @@ -29,7 +28,6 @@ return screenDataService.getKindsAlarmRate(beginTime, endTime); } - /** * 道路管网健康指标：从道路的维度来判断，每条道路燃气管线的健康指数，（按照设备的总数和设备的报警数来计算） */ @@ -38,7 +36,6 @@ return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); } - /** *7日报警统计、曲线趋势 */ @@ -47,7 +44,6 @@ return screenDataService.getAlarmNum(); } - /** * 各类设备的工单信息 */ @@ -56,5 +52,4 @@ return screenDataService.getJobByDay(beginTime, endTime); } - } diff --git a/src/main/java/com/casic/controller/ScreenDeviceController.java b/src/main/java/com/casic/controller/ScreenDeviceController.java index 479685d..4c3424f 100644 --- a/src/main/java/com/casic/controller/ScreenDeviceController.java +++ b/src/main/java/com/casic/controller/ScreenDeviceController.java @@ -26,7 +26,6 @@ return screenDataService.getDeviceNum(beginTime, endTime); } - /** * 云台监控 */ @@ -35,9 +34,6 @@ return screenDataService.getAlarmRecordsByStation(beginTime, endTime); } - - - /** * 管网健康指数 * 场站健康指数 diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java index 35db535..100d79a 100644 --- a/src/main/java/com/casic/service/impl/AlarmBulider.java +++ b/src/main/java/com/casic/service/impl/AlarmBulider.java @@ -117,10 +117,9 @@ return; } Map map = new HashMap<>(); - map.put("deptId", deptId); map.put("deptName", deptMap.get("name")); - if (jobDeptMap.containsKey(deptMap.get("id"))) { - map.putAll(jobDeptMap.get(deptMap.get("id"))); + if (jobDeptMap.containsKey(String.valueOf(deptMap.get("id")))) { + map.putAll(jobDeptMap.get(String.valueOf(deptMap.get("id")))); } else { map.put("beforeGet", 0); map.put("beforeConfirm", 0); diff --git a/src/main/java/com/casic/service/impl/DeviceBuilder.java b/src/main/java/com/casic/service/impl/DeviceBuilder.java index 9a5b3cc..587402a 100644 --- a/src/main/java/com/casic/service/impl/DeviceBuilder.java +++ b/src/main/java/com/casic/service/impl/DeviceBuilder.java @@ -94,7 +94,7 @@ private void tiltInstalledDevice(List> installedDeviceList) { Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", tiltDataMapper.countColudDevice()); + installedDeviceMap.put("count", deviceTypesConfig.getDeviceYT()); installedDeviceMap.put("typeName", "云台"); installedDeviceList.add(installedDeviceMap); } diff --git a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java index 4f49392..5b9a7aa 100644 --- a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java +++ b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java @@ -5,6 +5,7 @@ import com.casic.dao.spantilt.TiltDataMapper; import com.casic.util.FormatUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -15,6 +16,7 @@ @Service @AllArgsConstructor +@Slf4j public class HealthIndexBuilder { private final SmartwellDataMapper smartwellDataMapper; @@ -62,8 +64,18 @@ List> smartwellHealthList = new ArrayList(); List> roadNumberList = this.smartwellDataMapper.countRoadNumber(); List> alarmRoadList = this.smartwellDataMapper.countAlarmRoad(beginTime, endTime); + Integer count=0; + for (Map alarmMap :roadNumberList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("设备总数量"+count); + for (Map alarmMap :alarmRoadList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("报警总数量"+count); Map alarmRoadMap = alarmRoadList.stream() .collect(Collectors.toMap( e->String.valueOf(e.get("road")),e ->String.valueOf(e.get("count")))); + roadNumberList.forEach( roadMap->{ Map wellHealthMap = new HashMap(); @@ -74,9 +86,16 @@ smartwellHealthList.add(wellHealthMap); } ); + if (!StringUtils.isEmpty(isSort)) { - List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> - Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> +// Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); + roadNumberList.forEach( + roadMap-> roadMap.put("count", alarmRoadMap.containsKey(roadMap.get("road"))?alarmRoadMap.get(roadMap.get("road")):0) + ); + List> sortlist=roadNumberList.stream().sorted(( + e1,e2)->Double.valueOf(String.valueOf(e2.get("count"))).compareTo(Double.valueOf(String.valueOf(e1.get("count"))))).collect(Collectors.toList()); List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); return limitSortlist; } else { diff --git a/src/main/java/com/casic/service/impl/ScreenDataManger.java b/src/main/java/com/casic/service/impl/ScreenDataManger.java index a4239a6..c83053e 100644 --- a/src/main/java/com/casic/service/impl/ScreenDataManger.java +++ b/src/main/java/com/casic/service/impl/ScreenDataManger.java @@ -28,6 +28,7 @@ private final CmsDataMapper cmsDataMapper; private final TiltDataMapper tiltDataMapper; + public Object getInstalledDevice(String beginTime, String endTime) { List> installedDeviceList = null; try { diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index 1a5e4e5..f70d25e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -9,10 +9,9 @@ @AllArgsConstructor @RequestMapping("/whale/eye") public class ScreenDataController { + private final ScreenDataService screenDataService; - - /** * 以道路的维度来统计燃气管线监控中的报警情况 */ @@ -29,7 +28,6 @@ return screenDataService.getKindsAlarmRate(beginTime, endTime); } - /** * 道路管网健康指标：从道路的维度来判断，每条道路燃气管线的健康指数，（按照设备的总数和设备的报警数来计算） */ @@ -38,7 +36,6 @@ return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); } - /** *7日报警统计、曲线趋势 */ @@ -47,7 +44,6 @@ return screenDataService.getAlarmNum(); } - /** * 各类设备的工单信息 */ @@ -56,5 +52,4 @@ return screenDataService.getJobByDay(beginTime, endTime); } - } diff --git a/src/main/java/com/casic/controller/ScreenDeviceController.java b/src/main/java/com/casic/controller/ScreenDeviceController.java index 479685d..4c3424f 100644 --- a/src/main/java/com/casic/controller/ScreenDeviceController.java +++ b/src/main/java/com/casic/controller/ScreenDeviceController.java @@ -26,7 +26,6 @@ return screenDataService.getDeviceNum(beginTime, endTime); } - /** * 云台监控 */ @@ -35,9 +34,6 @@ return screenDataService.getAlarmRecordsByStation(beginTime, endTime); } - - - /** * 管网健康指数 * 场站健康指数 diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java index 35db535..100d79a 100644 --- a/src/main/java/com/casic/service/impl/AlarmBulider.java +++ b/src/main/java/com/casic/service/impl/AlarmBulider.java @@ -117,10 +117,9 @@ return; } Map map = new HashMap<>(); - map.put("deptId", deptId); map.put("deptName", deptMap.get("name")); - if (jobDeptMap.containsKey(deptMap.get("id"))) { - map.putAll(jobDeptMap.get(deptMap.get("id"))); + if (jobDeptMap.containsKey(String.valueOf(deptMap.get("id")))) { + map.putAll(jobDeptMap.get(String.valueOf(deptMap.get("id")))); } else { map.put("beforeGet", 0); map.put("beforeConfirm", 0); diff --git a/src/main/java/com/casic/service/impl/DeviceBuilder.java b/src/main/java/com/casic/service/impl/DeviceBuilder.java index 9a5b3cc..587402a 100644 --- a/src/main/java/com/casic/service/impl/DeviceBuilder.java +++ b/src/main/java/com/casic/service/impl/DeviceBuilder.java @@ -94,7 +94,7 @@ private void tiltInstalledDevice(List> installedDeviceList) { Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", tiltDataMapper.countColudDevice()); + installedDeviceMap.put("count", deviceTypesConfig.getDeviceYT()); installedDeviceMap.put("typeName", "云台"); installedDeviceList.add(installedDeviceMap); } diff --git a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java index 4f49392..5b9a7aa 100644 --- a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java +++ b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java @@ -5,6 +5,7 @@ import com.casic.dao.spantilt.TiltDataMapper; import com.casic.util.FormatUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -15,6 +16,7 @@ @Service @AllArgsConstructor +@Slf4j public class HealthIndexBuilder { private final SmartwellDataMapper smartwellDataMapper; @@ -62,8 +64,18 @@ List> smartwellHealthList = new ArrayList(); List> roadNumberList = this.smartwellDataMapper.countRoadNumber(); List> alarmRoadList = this.smartwellDataMapper.countAlarmRoad(beginTime, endTime); + Integer count=0; + for (Map alarmMap :roadNumberList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("设备总数量"+count); + for (Map alarmMap :alarmRoadList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("报警总数量"+count); Map alarmRoadMap = alarmRoadList.stream() .collect(Collectors.toMap( e->String.valueOf(e.get("road")),e ->String.valueOf(e.get("count")))); + roadNumberList.forEach( roadMap->{ Map wellHealthMap = new HashMap(); @@ -74,9 +86,16 @@ smartwellHealthList.add(wellHealthMap); } ); + if (!StringUtils.isEmpty(isSort)) { - List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> - Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> +// Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); + roadNumberList.forEach( + roadMap-> roadMap.put("count", alarmRoadMap.containsKey(roadMap.get("road"))?alarmRoadMap.get(roadMap.get("road")):0) + ); + List> sortlist=roadNumberList.stream().sorted(( + e1,e2)->Double.valueOf(String.valueOf(e2.get("count"))).compareTo(Double.valueOf(String.valueOf(e1.get("count"))))).collect(Collectors.toList()); List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); return limitSortlist; } else { diff --git a/src/main/java/com/casic/service/impl/ScreenDataManger.java b/src/main/java/com/casic/service/impl/ScreenDataManger.java index a4239a6..c83053e 100644 --- a/src/main/java/com/casic/service/impl/ScreenDataManger.java +++ b/src/main/java/com/casic/service/impl/ScreenDataManger.java @@ -28,6 +28,7 @@ private final CmsDataMapper cmsDataMapper; private final TiltDataMapper tiltDataMapper; + public Object getInstalledDevice(String beginTime, String endTime) { List> installedDeviceList = null; try { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6d28b27..165aabd 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -37,7 +37,7 @@ spring-session-open: false #开启spring session logging: level.root: error - level.com.casic: error + level.com.casic: info file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index 1a5e4e5..f70d25e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -9,10 +9,9 @@ @AllArgsConstructor @RequestMapping("/whale/eye") public class ScreenDataController { + private final ScreenDataService screenDataService; - - /** * 以道路的维度来统计燃气管线监控中的报警情况 */ @@ -29,7 +28,6 @@ return screenDataService.getKindsAlarmRate(beginTime, endTime); } - /** * 道路管网健康指标：从道路的维度来判断，每条道路燃气管线的健康指数，（按照设备的总数和设备的报警数来计算） */ @@ -38,7 +36,6 @@ return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); } - /** *7日报警统计、曲线趋势 */ @@ -47,7 +44,6 @@ return screenDataService.getAlarmNum(); } - /** * 各类设备的工单信息 */ @@ -56,5 +52,4 @@ return screenDataService.getJobByDay(beginTime, endTime); } - } diff --git a/src/main/java/com/casic/controller/ScreenDeviceController.java b/src/main/java/com/casic/controller/ScreenDeviceController.java index 479685d..4c3424f 100644 --- a/src/main/java/com/casic/controller/ScreenDeviceController.java +++ b/src/main/java/com/casic/controller/ScreenDeviceController.java @@ -26,7 +26,6 @@ return screenDataService.getDeviceNum(beginTime, endTime); } - /** * 云台监控 */ @@ -35,9 +34,6 @@ return screenDataService.getAlarmRecordsByStation(beginTime, endTime); } - - - /** * 管网健康指数 * 场站健康指数 diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java index 35db535..100d79a 100644 --- a/src/main/java/com/casic/service/impl/AlarmBulider.java +++ b/src/main/java/com/casic/service/impl/AlarmBulider.java @@ -117,10 +117,9 @@ return; } Map map = new HashMap<>(); - map.put("deptId", deptId); map.put("deptName", deptMap.get("name")); - if (jobDeptMap.containsKey(deptMap.get("id"))) { - map.putAll(jobDeptMap.get(deptMap.get("id"))); + if (jobDeptMap.containsKey(String.valueOf(deptMap.get("id")))) { + map.putAll(jobDeptMap.get(String.valueOf(deptMap.get("id")))); } else { map.put("beforeGet", 0); map.put("beforeConfirm", 0); diff --git a/src/main/java/com/casic/service/impl/DeviceBuilder.java b/src/main/java/com/casic/service/impl/DeviceBuilder.java index 9a5b3cc..587402a 100644 --- a/src/main/java/com/casic/service/impl/DeviceBuilder.java +++ b/src/main/java/com/casic/service/impl/DeviceBuilder.java @@ -94,7 +94,7 @@ private void tiltInstalledDevice(List> installedDeviceList) { Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", tiltDataMapper.countColudDevice()); + installedDeviceMap.put("count", deviceTypesConfig.getDeviceYT()); installedDeviceMap.put("typeName", "云台"); installedDeviceList.add(installedDeviceMap); } diff --git a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java index 4f49392..5b9a7aa 100644 --- a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java +++ b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java @@ -5,6 +5,7 @@ import com.casic.dao.spantilt.TiltDataMapper; import com.casic.util.FormatUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -15,6 +16,7 @@ @Service @AllArgsConstructor +@Slf4j public class HealthIndexBuilder { private final SmartwellDataMapper smartwellDataMapper; @@ -62,8 +64,18 @@ List> smartwellHealthList = new ArrayList(); List> roadNumberList = this.smartwellDataMapper.countRoadNumber(); List> alarmRoadList = this.smartwellDataMapper.countAlarmRoad(beginTime, endTime); + Integer count=0; + for (Map alarmMap :roadNumberList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("设备总数量"+count); + for (Map alarmMap :alarmRoadList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("报警总数量"+count); Map alarmRoadMap = alarmRoadList.stream() .collect(Collectors.toMap( e->String.valueOf(e.get("road")),e ->String.valueOf(e.get("count")))); + roadNumberList.forEach( roadMap->{ Map wellHealthMap = new HashMap(); @@ -74,9 +86,16 @@ smartwellHealthList.add(wellHealthMap); } ); + if (!StringUtils.isEmpty(isSort)) { - List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> - Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> +// Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); + roadNumberList.forEach( + roadMap-> roadMap.put("count", alarmRoadMap.containsKey(roadMap.get("road"))?alarmRoadMap.get(roadMap.get("road")):0) + ); + List> sortlist=roadNumberList.stream().sorted(( + e1,e2)->Double.valueOf(String.valueOf(e2.get("count"))).compareTo(Double.valueOf(String.valueOf(e1.get("count"))))).collect(Collectors.toList()); List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); return limitSortlist; } else { diff --git a/src/main/java/com/casic/service/impl/ScreenDataManger.java b/src/main/java/com/casic/service/impl/ScreenDataManger.java index a4239a6..c83053e 100644 --- a/src/main/java/com/casic/service/impl/ScreenDataManger.java +++ b/src/main/java/com/casic/service/impl/ScreenDataManger.java @@ -28,6 +28,7 @@ private final CmsDataMapper cmsDataMapper; private final TiltDataMapper tiltDataMapper; + public Object getInstalledDevice(String beginTime, String endTime) { List> installedDeviceList = null; try { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6d28b27..165aabd 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -37,7 +37,7 @@ spring-session-open: false #开启spring session logging: level.root: error - level.com.casic: error + level.com.casic: info file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f5397df..e6ba9cb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -26,4 +26,5 @@ config: device-types: 1,4,101,12 deptId: 1559096734123003906 - alarmDay: 3 \ No newline at end of file + alarmDay: 3 + deviceYT: 13 \ No newline at end of file diff --git a/mountain-sea-whale-share.iml b/mountain-sea-whale-share.iml new file mode 100644 index 0000000..b101b9a --- /dev/null +++ b/mountain-sea-whale-share.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java index 4b7cdb1..50931a7 100644 --- a/src/main/java/com/casic/config/DeviceTypesConfig.java +++ b/src/main/java/com/casic/config/DeviceTypesConfig.java @@ -16,4 +16,7 @@ @Value("${casic.config.alarmDay}") private Integer alarmDay; + + @Value("${casic.config.deviceYT}") + private Integer deviceYT; } diff --git a/src/main/java/com/casic/controller/MapDataController.java b/src/main/java/com/casic/controller/MapDataController.java index b897b95..0a13d64 100644 --- a/src/main/java/com/casic/controller/MapDataController.java +++ b/src/main/java/com/casic/controller/MapDataController.java @@ -44,4 +44,5 @@ @RequestParam(value = "deviceType", required = true) String deviceType) { return mapDataService.getWellInfo(devcode,deviceType); } + } diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index 1a5e4e5..f70d25e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -9,10 +9,9 @@ @AllArgsConstructor @RequestMapping("/whale/eye") public class ScreenDataController { + private final ScreenDataService screenDataService; - - /** * 以道路的维度来统计燃气管线监控中的报警情况 */ @@ -29,7 +28,6 @@ return screenDataService.getKindsAlarmRate(beginTime, endTime); } - /** * 道路管网健康指标：从道路的维度来判断，每条道路燃气管线的健康指数，（按照设备的总数和设备的报警数来计算） */ @@ -38,7 +36,6 @@ return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); } - /** *7日报警统计、曲线趋势 */ @@ -47,7 +44,6 @@ return screenDataService.getAlarmNum(); } - /** * 各类设备的工单信息 */ @@ -56,5 +52,4 @@ return screenDataService.getJobByDay(beginTime, endTime); } - } diff --git a/src/main/java/com/casic/controller/ScreenDeviceController.java b/src/main/java/com/casic/controller/ScreenDeviceController.java index 479685d..4c3424f 100644 --- a/src/main/java/com/casic/controller/ScreenDeviceController.java +++ b/src/main/java/com/casic/controller/ScreenDeviceController.java @@ -26,7 +26,6 @@ return screenDataService.getDeviceNum(beginTime, endTime); } - /** * 云台监控 */ @@ -35,9 +34,6 @@ return screenDataService.getAlarmRecordsByStation(beginTime, endTime); } - - - /** * 管网健康指数 * 场站健康指数 diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java index 35db535..100d79a 100644 --- a/src/main/java/com/casic/service/impl/AlarmBulider.java +++ b/src/main/java/com/casic/service/impl/AlarmBulider.java @@ -117,10 +117,9 @@ return; } Map map = new HashMap<>(); - map.put("deptId", deptId); map.put("deptName", deptMap.get("name")); - if (jobDeptMap.containsKey(deptMap.get("id"))) { - map.putAll(jobDeptMap.get(deptMap.get("id"))); + if (jobDeptMap.containsKey(String.valueOf(deptMap.get("id")))) { + map.putAll(jobDeptMap.get(String.valueOf(deptMap.get("id")))); } else { map.put("beforeGet", 0); map.put("beforeConfirm", 0); diff --git a/src/main/java/com/casic/service/impl/DeviceBuilder.java b/src/main/java/com/casic/service/impl/DeviceBuilder.java index 9a5b3cc..587402a 100644 --- a/src/main/java/com/casic/service/impl/DeviceBuilder.java +++ b/src/main/java/com/casic/service/impl/DeviceBuilder.java @@ -94,7 +94,7 @@ private void tiltInstalledDevice(List> installedDeviceList) { Map installedDeviceMap = new HashMap<>(); - installedDeviceMap.put("count", tiltDataMapper.countColudDevice()); + installedDeviceMap.put("count", deviceTypesConfig.getDeviceYT()); installedDeviceMap.put("typeName", "云台"); installedDeviceList.add(installedDeviceMap); } diff --git a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java index 4f49392..5b9a7aa 100644 --- a/src/main/java/com/casic/service/impl/HealthIndexBuilder.java +++ b/src/main/java/com/casic/service/impl/HealthIndexBuilder.java @@ -5,6 +5,7 @@ import com.casic.dao.spantilt.TiltDataMapper; import com.casic.util.FormatUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -15,6 +16,7 @@ @Service @AllArgsConstructor +@Slf4j public class HealthIndexBuilder { private final SmartwellDataMapper smartwellDataMapper; @@ -62,8 +64,18 @@ List> smartwellHealthList = new ArrayList(); List> roadNumberList = this.smartwellDataMapper.countRoadNumber(); List> alarmRoadList = this.smartwellDataMapper.countAlarmRoad(beginTime, endTime); + Integer count=0; + for (Map alarmMap :roadNumberList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("设备总数量"+count); + for (Map alarmMap :alarmRoadList) { + count+=Integer.valueOf(String.valueOf(alarmMap.get("count"))); + } + log.info("报警总数量"+count); Map alarmRoadMap = alarmRoadList.stream() .collect(Collectors.toMap( e->String.valueOf(e.get("road")),e ->String.valueOf(e.get("count")))); + roadNumberList.forEach( roadMap->{ Map wellHealthMap = new HashMap(); @@ -74,9 +86,16 @@ smartwellHealthList.add(wellHealthMap); } ); + if (!StringUtils.isEmpty(isSort)) { - List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> - Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> sortlist = smartwellHealthList.stream().sorted((e1, e2) -> +// Double.valueOf(String.valueOf(e1.get("count"))).compareTo(Double.valueOf(String.valueOf(e2.get("count"))))).collect(Collectors.toList()); +// List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); + roadNumberList.forEach( + roadMap-> roadMap.put("count", alarmRoadMap.containsKey(roadMap.get("road"))?alarmRoadMap.get(roadMap.get("road")):0) + ); + List> sortlist=roadNumberList.stream().sorted(( + e1,e2)->Double.valueOf(String.valueOf(e2.get("count"))).compareTo(Double.valueOf(String.valueOf(e1.get("count"))))).collect(Collectors.toList()); List> limitSortlist = sortlist.subList(0, StringUtils.isEmpty(limitNum) ? sortlist.size() : Integer.valueOf(limitNum)); return limitSortlist; } else { diff --git a/src/main/java/com/casic/service/impl/ScreenDataManger.java b/src/main/java/com/casic/service/impl/ScreenDataManger.java index a4239a6..c83053e 100644 --- a/src/main/java/com/casic/service/impl/ScreenDataManger.java +++ b/src/main/java/com/casic/service/impl/ScreenDataManger.java @@ -28,6 +28,7 @@ private final CmsDataMapper cmsDataMapper; private final TiltDataMapper tiltDataMapper; + public Object getInstalledDevice(String beginTime, String endTime) { List> installedDeviceList = null; try { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6d28b27..165aabd 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -37,7 +37,7 @@ spring-session-open: false #开启spring session logging: level.root: error - level.com.casic: error + level.com.casic: info file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f5397df..e6ba9cb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -26,4 +26,5 @@ config: device-types: 1,4,101,12 deptId: 1559096734123003906 - alarmDay: 3 \ No newline at end of file + alarmDay: 3 + deviceYT: 13 \ No newline at end of file diff --git a/src/main/resources/mapper/smartwell/SmartwellDataMapper.xml b/src/main/resources/mapper/smartwell/SmartwellDataMapper.xml index da9a860..4ee7fa8 100644 --- a/src/main/resources/mapper/smartwell/SmartwellDataMapper.xml +++ b/src/main/resources/mapper/smartwell/SmartwellDataMapper.xml @@ -38,7 +38,9 @@ @@ -112,12 +114,12 @@