diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java index d88ba5ab5..0db83f8b3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java @@ -68,7 +68,7 @@ public class MonitorSendServiceImpl implements MonitorSendService { @Override public String sendType(MonitorParam.Info param) { - SysDicTreePO dicTree = null; + SysDicTreePO dicTree; List objTypeIds=new ArrayList<>(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); if(param.getObjType().equals("987654321")){ diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/ThsSuperviseClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/ThsSuperviseClient.java deleted file mode 100644 index a0dfe2e18..000000000 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/ThsSuperviseClient.java +++ /dev/null @@ -1,36 +0,0 @@ -//package com.njcn.prepare.harmonic.api.line; -// -//import com.njcn.common.pojo.constant.ServerInfo; -//import com.njcn.common.pojo.response.HttpResult; -//import com.njcn.prepare.harmonic.api.line.fallback.ThsSuperviseClientFallbackFactory; -//import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; -//import org.springframework.cloud.openfeign.FeignClient; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestBody; -// -//@FeignClient( -// value = ServerInfo.PREPARE_BOOT,//对应模块名 -// path = "/thsSupervise",//对应controller请求类 -// fallbackFactory = ThsSuperviseClientFallbackFactory.class//服务降级处理类 -//) -//public interface ThsSuperviseClient { -// /** -// * 预警/告警事务的初始化 -// * -// * @param superviseParam -// * @return -// */ -// @PostMapping("/initSupervise") -// HttpResult initSupervise(@RequestBody @Validated SuperviseParam superviseParam); -// -// -// /** -// * 预警/告警事务的生成 -// * -// * @param superviseParam -// * @return -// */ -// @PostMapping("/creatSupervise") -// HttpResult creatSupervise(@RequestBody @Validated SuperviseParam superviseParam); -//} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/ROperatingIndexDPOMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/ROperatingIndexDPOMapper.java index 41c297b0d..08807f8b9 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/ROperatingIndexDPOMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/ROperatingIndexDPOMapper.java @@ -5,7 +5,7 @@ import com.njcn.harmonic.pojo.po.ROperatingIndexDPO; import org.apache.ibatis.annotations.Mapper; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/25 10:01【需求编号】 @@ -14,6 +14,7 @@ import org.apache.ibatis.annotations.Mapper; * @version V1.0.0 */ @Mapper +@Deprecated public interface ROperatingIndexDPOMapper extends MppBaseMapper { -} \ No newline at end of file +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml index 55855248e..066c3fb52 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml @@ -10,15 +10,15 @@ city_name cityName, county_id countyId, county_name countyName, - round(avg(run_terminal_num)) runTerminalNum, - round(avg(online_monitor_num)) onlineMonitorNum, - round(avg(run_monitor_num)) runMonitorNum, - case when avg(online_monitor_num) = 0 then 0 else round(avg(run_monitor_num)/avg(online_monitor_num)*100,8) end onlineMonitorRate, + round(max(run_terminal_num)) runTerminalNum, + round(max(online_monitor_num)) onlineMonitorNum, + round(max(run_monitor_num)) runMonitorNum, + case when max(run_monitor_num) = 0 then 0 else round(max(online_monitor_num)/max(run_monitor_num)*100,8) end onlineMonitorRate, sum(expect_collect_num) expectCollectNum, sum(actual_collect_num) actualCollectNum, case when sum(expect_collect_num) = 0 then 0 else round(sum(actual_collect_num)/sum(expect_collect_num)*100,8) end dataFullRate, station_type stationType, - round(avg(station_monitor_num)) stationMonitorNum, + round(max(station_monitor_num)) stationMonitorNum, #{monthDate} statisticalDate, statistical_level statisticalLevel, #{type} statisticalType, @@ -43,4 +43,4 @@ - \ No newline at end of file + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/ROperatingIndexDPOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/ROperatingIndexDPOServiceImpl.java index 0bd60fb39..8d8c1adfc 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/ROperatingIndexDPOServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/ROperatingIndexDPOServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/25 10:01【需求编号】 @@ -20,6 +20,7 @@ import java.util.List; * @version V1.0.0 */ @Service +@Deprecated public class ROperatingIndexDPOServiceImpl extends MppServiceImpl implements ROperatingIndexDPOService{ @@ -27,7 +28,6 @@ public class ROperatingIndexDPOServiceImpl extends MppServiceImpl diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java index bd6b0732f..ef7823475 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java @@ -78,35 +78,35 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl temTreeList = sysDicTreePOList.stream().filter(item -> Objects.equals(item.getCode(), DicTreeEnum.Trans_Sub.getCode()) || Objects.equals(item.getCode(), DicTreeEnum.Converter.getCode()) || Objects.equals(item.getCode(), DicTreeEnum.Ele_Railways.getCode()) || Objects.equals(item.getCode(), DicTreeEnum.Wind_Farms.getCode()) || Objects.equals(item.getCode(), DicTreeEnum.Power_Station.getCode()) - || Objects.equals(item.getCode(), DicTreeEnum.Smelting_Load.getCode())|| Objects.equals(item.getCode(), DicTreeEnum.Imp_Users.getCode()) + || Objects.equals(item.getCode(), DicTreeEnum.Smelting_Load.getCode()) || Objects.equals(item.getCode(), DicTreeEnum.Imp_Users.getCode()) ).collect(Collectors.toList()); - Map> mapKey = new HashMap<>(); + Map> mapKey = new HashMap<>(); List otherIds = new ArrayList<>(); - for(SysDicTreePO sysDicTreePO : temTreeList){ + for (SysDicTreePO sysDicTreePO : temTreeList) { List temList; - if(Objects.equals(sysDicTreePO.getCode(), DicTreeEnum.Smelting_Load.getCode())){ - temList = sysDicTreePOList.stream() - .filter(item->Objects.equals(item.getCode(), DicTreeEnum.Electric_Heating_Load.getCode())|| - Objects.equals(item.getCode(), DicTreeEnum.Rolling_Mill.getCode())|| - Objects.equals(item.getCode(), DicTreeEnum.Welding_Load.getCode())|| - Objects.equals(item.getCode(), DicTreeEnum.Lifting_Load.getCode())|| - Objects.equals(item.getCode(), DicTreeEnum.Electrolytic_Load.getCode()) - ) - .collect(Collectors.toList()); - }else{ - temList = sysDicTreePOList.stream().filter(item->item.getPid().equals(sysDicTreePO.getId())|| + if (Objects.equals(sysDicTreePO.getCode(), DicTreeEnum.Smelting_Load.getCode())) { + temList = sysDicTreePOList.stream() + .filter(item -> Objects.equals(item.getCode(), DicTreeEnum.Electric_Heating_Load.getCode()) || + Objects.equals(item.getCode(), DicTreeEnum.Rolling_Mill.getCode()) || + Objects.equals(item.getCode(), DicTreeEnum.Welding_Load.getCode()) || + Objects.equals(item.getCode(), DicTreeEnum.Lifting_Load.getCode()) || + Objects.equals(item.getCode(), DicTreeEnum.Electrolytic_Load.getCode()) + ) + .collect(Collectors.toList()); + } else { + temList = sysDicTreePOList.stream().filter(item -> item.getPid().equals(sysDicTreePO.getId()) || item.getId().equals(sysDicTreePO.getId()) ).collect(Collectors.toList()); } List ids = temList.stream().map(SysDicTreePO::getId).distinct().collect(Collectors.toList()); - mapKey.put(sysDicTreePO.getCode(),ids); + mapKey.put(sysDicTreePO.getCode(), ids); otherIds.addAll(ids); } List dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.Station_Type.getCode()).getData(); - Map dictDataMap = dictDataList.stream().collect(Collectors.toMap(DictData::getCode,Function.identity())); + Map dictDataMap = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity())); //获取所有单位 @@ -124,23 +124,18 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl newList = item.getLineBaseList().stream().filter(o -> Objects.equals(o.getIsUpToGrid(), 1)).collect(Collectors.toList()); - item.setLineBaseList(newList); + List newBaseList = item.getLineBaseList().stream().filter(o -> Objects.equals(o.getIsUpToGrid(), 1)).collect(Collectors.toList()); - List otherMonitor = item.getLineBaseList().stream().filter(me->!otherIds.contains(me.getObjType())).collect(Collectors.toList()); - List temBaseList = item.getLineBaseList(); - long monitorCount = temBaseList.stream().map(LineDevGetDTO::getPointId).distinct().count(); - long devCount = temBaseList.stream().map(LineDevGetDTO::getDevId).distinct().count(); + List upMonitorIds = newBaseList.stream().map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList()); + List upDevIds = newBaseList.stream().map(LineDevGetDTO::getDevId).distinct().collect(Collectors.toList()); mapKey.forEach((key, val) -> { - - - List keyItem = temBaseList.stream().filter(o -> val.contains(o.getObjType())).collect(Collectors.toList()); + List keyItem = newBaseList.stream().filter(o -> val.contains(o.getObjType())).collect(Collectors.toList()); RUploadPointStatisticalDataD rUploadPointStatisticalDataD = new RUploadPointStatisticalDataD(); - switch (key){ + switch (key) { case "2100": rUploadPointStatisticalDataD.setStationType(dictDataMap.get(DicDataEnum.Trans_Sub.getCode()).getId()); break; @@ -177,33 +172,31 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl l3 = dataList.stream().filter(it -> temBaseList.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList()); - int due = l3.stream().mapToInt(RStatIntegrityD::getDueTime).sum(); - int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum(); - rUploadPointStatisticalDataD.setExpectCollectNum(due); - rUploadPointStatisticalDataD.setActualCollectNum(real); + List l3 = dataList.stream().filter(it -> upMonitorIds.contains(it.getLineIndex())).collect(Collectors.toList()); + int due = l3.stream().mapToInt(RStatIntegrityD::getDueTime).sum(); + int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum(); + rUploadPointStatisticalDataD.setExpectCollectNum(due); + rUploadPointStatisticalDataD.setActualCollectNum(real); - if (due == 0 || real == 0) { - rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(0).setScale(4, RoundingMode.HALF_UP).doubleValue()); - } else { - rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real * 100.0 / due).setScale(4, RoundingMode.HALF_UP).doubleValue()); - } - rUploadPointStatisticalDataD.setStationMonitorNum((int)pointCount); + long onlineCount = l3.stream().filter(me -> me.getRealTime() > 0).count(); + rUploadPointStatisticalDataD.setOnlineMonitorNum((int) onlineCount); + rUploadPointStatisticalDataD.setOnlineMonitorRate(upMonitorIds.size() == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue()); + if (due == 0 || real == 0) { + rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(0).setScale(4, RoundingMode.HALF_UP).doubleValue()); + } else { + rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real * 100.0 / due).setScale(4, RoundingMode.HALF_UP).doubleValue()); + } + rUploadPointStatisticalDataD.setStationMonitorNum((int) pointCount); result.add(rUploadPointStatisticalDataD); - - }); @@ -223,33 +216,31 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl otherMonitor = newBaseList.stream().filter(me -> !otherIds.contains(me.getObjType())).collect(Collectors.toList()); long pointCount = otherMonitor.stream().map(LineDevGetDTO::getPointId).distinct().count(); - //long devCount = otherMonitor.stream().map(LineDevGetDTO::getDevId).distinct().count(); - rUploadPointStatisticalDataD.setRunTerminalNum((int) devCount); - rUploadPointStatisticalDataD.setOnlineMonitorNum((int) monitorCount); - rUploadPointStatisticalDataD.setRunMonitorNum((int) monitorCount); - rUploadPointStatisticalDataD.setOnlineMonitorRate(monitorCount == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue()); + rUploadPointStatisticalDataD.setRunTerminalNum(upDevIds.size()); + rUploadPointStatisticalDataD.setRunMonitorNum(upMonitorIds.size()); - List l3 = dataList.stream().filter(it -> temBaseList.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList()); - int due = l3.stream().mapToInt(RStatIntegrityD::getDueTime).sum(); - int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum(); - rUploadPointStatisticalDataD.setExpectCollectNum(due); - rUploadPointStatisticalDataD.setActualCollectNum(real); + List l3 = dataList.stream().filter(it -> newBaseList.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList()); + int due = l3.stream().mapToInt(RStatIntegrityD::getDueTime).sum(); + int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum(); + rUploadPointStatisticalDataD.setExpectCollectNum(due); + rUploadPointStatisticalDataD.setActualCollectNum(real); - if (due == 0 || real == 0) { - rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(0).setScale(4, RoundingMode.HALF_UP).doubleValue()); - } else { - rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real * 100.0 / due).setScale(4, RoundingMode.HALF_UP).doubleValue()); - } - rUploadPointStatisticalDataD.setStationMonitorNum((int)pointCount); + long onlineCount = l3.stream().filter(me -> me.getRealTime() > 0).count(); + rUploadPointStatisticalDataD.setOnlineMonitorNum((int) onlineCount); + rUploadPointStatisticalDataD.setOnlineMonitorRate(upMonitorIds.size() == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue()); + if (due == 0 || real == 0) { + rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(0).setScale(4, RoundingMode.HALF_UP).doubleValue()); + } else { + rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real * 100.0 / due).setScale(4, RoundingMode.HALF_UP).doubleValue()); + } + rUploadPointStatisticalDataD.setStationMonitorNum((int) pointCount); result.add(rUploadPointStatisticalDataD); - - }); if (CollectionUtil.isNotEmpty(result)) { @@ -260,16 +251,6 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl it.setId(null)); } - //fixme 数据完成率先造假，后期删除 -// result.forEach(item->{ -// if (item.getExpectCollectNum() > 0){ -// Random random = new Random(); -// double randomValue = 99 + random.nextDouble() * (100 - 99); -// item.setDataFullRate(randomValue); -// item.setActualCollectNum((int) Math.ceil(randomValue * item.getExpectCollectNum() / 100)); -// } -// }); - //fixme over this.saveOrUpdateBatchByMultiId(result); } } @@ -283,8 +264,8 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl list = this.baseMapper.pointStatisticalMonthData(beginMonth,startTime,endTime,"02"); - dataProcessing(calculatedParam,list); + List list = this.baseMapper.pointStatisticalMonthData(beginMonth, startTime, endTime, "02"); + dataProcessing(calculatedParam, list); } @Override @@ -296,18 +277,17 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl list = this.baseMapper.pointStatisticalMonthData(beginMonth,startTime,endTime,"01"); - dataProcessing(calculatedParam,list); + List list = this.baseMapper.pointStatisticalMonthData(beginMonth, startTime, endTime, "01"); + dataProcessing(calculatedParam, list); } /** - * * @param calculatedParam - * @param list 数据处理 + * @param list 数据处理 */ - private void dataProcessing(CalculatedParam calculatedParam,List list) { + private void dataProcessing(CalculatedParam calculatedParam, List list) { - //数据分组 + /* //数据分组 Map> listMap = list.stream().collect(Collectors.groupingBy(x -> x.getProvinceId() + x.getCityId() + x.getCountyId())); //获取省级单位id Dept root = deptFeignClient.getRootDept().getData(); @@ -327,28 +307,28 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.Station_Type.getCode()).getData(); - Map dictDataMap = dictDataList.stream().collect(Collectors.toMap(DictData::getCode,Function.identity())); + Map dictDataMap = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity())); //获取对象类型下字类型 - Map> mapKey = new HashMap<>(); + Map> mapKey = new HashMap<>(); List otherIds = new ArrayList<>(); - for(SysDicTreePO sysDicTreePO : temTreeList){ + for (SysDicTreePO sysDicTreePO : temTreeList) { List temList; - if(Objects.equals(sysDicTreePO.getCode(), DicTreeEnum.Smelting_Load.getCode())){ + if (Objects.equals(sysDicTreePO.getCode(), DicTreeEnum.Smelting_Load.getCode())) { temList = sysDicTreePOList.stream() - .filter(item->Objects.equals(item.getCode(), DicTreeEnum.Electric_Heating_Load.getCode())|| - Objects.equals(item.getCode(), DicTreeEnum.Rolling_Mill.getCode())|| - Objects.equals(item.getCode(), DicTreeEnum.Welding_Load.getCode())|| - Objects.equals(item.getCode(), DicTreeEnum.Lifting_Load.getCode())|| + .filter(item -> Objects.equals(item.getCode(), DicTreeEnum.Electric_Heating_Load.getCode()) || + Objects.equals(item.getCode(), DicTreeEnum.Rolling_Mill.getCode()) || + Objects.equals(item.getCode(), DicTreeEnum.Welding_Load.getCode()) || + Objects.equals(item.getCode(), DicTreeEnum.Lifting_Load.getCode()) || Objects.equals(item.getCode(), DicTreeEnum.Electrolytic_Load.getCode()) ) .collect(Collectors.toList()); - }else{ - temList = sysDicTreePOList.stream().filter(item->item.getPid().equals(sysDicTreePO.getId())|| + } else { + temList = sysDicTreePOList.stream().filter(item -> item.getPid().equals(sysDicTreePO.getId()) || item.getId().equals(sysDicTreePO.getId()) ).collect(Collectors.toList()); } List ids = temList.stream().map(SysDicTreePO::getId).distinct().collect(Collectors.toList()); - mapKey.put(sysDicTreePO.getCode(),ids); + mapKey.put(sysDicTreePO.getCode(), ids); otherIds.addAll(ids); } RUploadPointStatisticalDataD data; @@ -358,80 +338,76 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl otherMonitor = item.getLineBaseList().stream().filter(me->!otherIds.contains(me.getObjType())).collect(Collectors.toList()); - data=new RUploadPointStatisticalDataD(); + data = new RUploadPointStatisticalDataD(); data.setProvinceId(dept.getCode()); data.setProvinceName(dept.getName()); judgeLevel(item.getDeptLevel(), data, item.getUnitId(), item.getUnitName(), deptList, deptMap); - if(listMap.containsKey(data.getProvinceId() + data.getCityId() + data.getCountyId())){ + if (listMap.containsKey(data.getProvinceId() + data.getCityId() + data.getCountyId())) { List orgData = listMap.get(data.getProvinceId() + data.getCityId() + data.getCountyId()); //根据所属站别进行分类 Map stationTypeMap = orgData.stream().collect(Collectors.toMap(x -> x.getStationType(), Function.identity())); mapKey.forEach((key, val) -> { List keyItem = temBaseList.stream().filter(o -> val.contains(o.getObjType())).collect(Collectors.toList()); String stationType = ""; - switch (key){ + switch (key) { case "2100": - stationType=dictDataMap.get(DicDataEnum.Trans_Sub.getCode()).getId(); + stationType = dictDataMap.get(DicDataEnum.Trans_Sub.getCode()).getId(); break; case "1200": - stationType=dictDataMap.get(DicDataEnum.Converter.getCode()).getId(); + stationType = dictDataMap.get(DicDataEnum.Converter.getCode()).getId(); break; case "1300": - stationType=dictDataMap.get(DicDataEnum.Ele_Railways.getCode()).getId(); + stationType = dictDataMap.get(DicDataEnum.Ele_Railways.getCode()).getId(); break; case "1401": - stationType=dictDataMap.get(DicDataEnum.Wind_Farms.getCode()).getId(); + stationType = dictDataMap.get(DicDataEnum.Wind_Farms.getCode()).getId(); break; case "1402": - stationType=dictDataMap.get(DicDataEnum.Power_Station.getCode()).getId(); + stationType = dictDataMap.get(DicDataEnum.Power_Station.getCode()).getId(); break; case "2300": - stationType=dictDataMap.get(DicDataEnum.Smelting_Load.getCode()).getId(); + stationType = dictDataMap.get(DicDataEnum.Smelting_Load.getCode()).getId(); break; case "2400": - stationType=dictDataMap.get(DicDataEnum.Imp_Users.getCode()).getId(); + stationType = dictDataMap.get(DicDataEnum.Imp_Users.getCode()).getId(); break; } - if(stationTypeMap.containsKey(stationType)){ + if (stationTypeMap.containsKey(stationType)) { long pointCount = keyItem.stream().map(LineDevGetDTO::getPointId).distinct().count(); RUploadPointStatisticalDataD rUploadPointStatisticalDataD = stationTypeMap.get(stationType); - if(ObjectUtil.isNull(devCount)){ - System.out.println(); - } - rUploadPointStatisticalDataD.setRunTerminalNum((int) devCount); - rUploadPointStatisticalDataD.setOnlineMonitorNum((int) monitorCount); - rUploadPointStatisticalDataD.setRunMonitorNum((int) monitorCount); - rUploadPointStatisticalDataD.setStationMonitorNum((int)pointCount); + rUploadPointStatisticalDataD.setStationMonitorNum((int) pointCount); } }); + //其他类型 - if(stationTypeMap.containsKey(dictDataMap.get(DicDataEnum.Station_Other.getCode()).getId())){ + if (stationTypeMap.containsKey(dictDataMap.get(DicDataEnum.Station_Other.getCode()).getId())) { + List otherMonitor = item.getLineBaseList().stream().filter(me -> !otherIds.contains(me.getObjType())).collect(Collectors.toList()); long pointCount = otherMonitor.stream().map(LineDevGetDTO::getPointId).distinct().count(); RUploadPointStatisticalDataD rUploadPointStatisticalDataD = stationTypeMap.get(dictDataMap.get(DicDataEnum.Station_Other.getCode()).getId()); rUploadPointStatisticalDataD.setRunTerminalNum((int) devCount); rUploadPointStatisticalDataD.setOnlineMonitorNum((int) monitorCount); rUploadPointStatisticalDataD.setRunMonitorNum((int) monitorCount); - rUploadPointStatisticalDataD.setStationMonitorNum((int)pointCount); + rUploadPointStatisticalDataD.setStationMonitorNum((int) pointCount); } } - } - if (CollUtil.isNotEmpty(list)){ - list.forEach(item->{ + }*/ + if (CollUtil.isNotEmpty(list)) { + list.forEach(item -> { item.setId(IdUtil.simpleUUID()); item.setComputeDate(calculatedParam.getDataDate()); + if(item.getOnlineMonitorNum()>item.getRunMonitorNum()){ + item.setOnlineMonitorRate(100.0); + item.setOnlineMonitorNum(item.getRunMonitorNum()); + } }); - this.saveOrUpdateBatchByMultiId(list,1000); + this.saveOrUpdateBatchByMultiId(list, 1000); } } - - - /** * r_stat_integrity_d表中获取数据应收数、实收数 */ diff --git a/pqs-process/process-boot/src/main/resources/bootstrap.yml b/pqs-process/process-boot/src/main/resources/bootstrap.yml index 671b3c721..9135cbc3f 100644 --- a/pqs-process/process-boot/src/main/resources/bootstrap.yml +++ b/pqs-process/process-boot/src/main/resources/bootstrap.yml @@ -40,7 +40,10 @@ spring: max-request-size: 100MB flowable: - #关闭定时任务JOB + database-schema-update: false + db-history-used: true # flowable6 默认 true 生成信息表，无需手动设置 + check-process-definitions: false # 设置为 false，禁用 /resources/processes 自动部署 BPMN XML 流程 + history-level: full # full：保存历史数据的最高级别，可保存全部流程相关细节，包括流程流转各节点参数 async-executor-activate: false #项目日志的配置