From 0bee5096219840bc4ff290c702e45807cf0bb0db Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 19 Feb 2024 15:02:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PmsStatationStatController.java | 6 +----- .../impl/RMpDevEvaluateDetailServiceImpl.java | 21 ++++++++++++++++--- .../njcn/harmonic/pojo/vo/PollutionVO.java | 7 +++++++ .../impl/PollutionSubstationServiceImpl.java | 5 +++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java index 76d50895f..bbba325bf 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java @@ -164,11 +164,7 @@ public class PmsStatationStatController extends BaseController { public HttpResult> getPowerInfo(@RequestBody PmsStatationStatInfoParam param) { String methodDescribe = getMethodDescribe("getStatationStatInfo"); List powerInfo = statationStatService.getPowerInfo(param); - if (CollectionUtil.isEmpty(powerInfo)) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerInfo, methodDescribe); - } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerInfo, methodDescribe); } /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java index 9e0a62d65..d6fa6b78f 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.dto.SimpleDTO; @@ -104,10 +105,11 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl resultList = new ArrayList<>(); + String time = time(startTime, rMpDevEvaluateDetailParam.getType()); terminalListMapByOrgId.forEach((key, terminalListByOrg) -> { RMpDevEvaluateDetailVO rMpDevEvaluateDetailVO = new RMpDevEvaluateDetailVO(); - rMpDevEvaluateDetailVO.setDataDate(startTime); //日期(前端传递的时间) + rMpDevEvaluateDetailVO.setDataDate(time); //日期(前端传递的时间) rMpDevEvaluateDetailVO.setOrgId(key); //单位id(字段是id实际数据是单位code) rMpDevEvaluateDetailVO.setOrgName(terminalListByOrg.get(0).getOrgName()); //单位名称 @@ -179,10 +181,11 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl resultList = new ArrayList<>(); + String time = time(startTime, rMpDevEvaluateDetailParam.getType()); terminalListMapByManufacture.forEach((key, terminalListByManufacture) -> { RMpDevEvaluateDetailVO rMpDevEvaluateDetailVO = new RMpDevEvaluateDetailVO(); - rMpDevEvaluateDetailVO.setDataDate(startTime); //日期(前端传递的时间) + rMpDevEvaluateDetailVO.setDataDate(time); //日期(前端传递的时间) rMpDevEvaluateDetailVO.setManufactureId(key); //厂商id //终端有效接入率 @@ -248,10 +251,11 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl resultList = new ArrayList<>(); + String time = time(startTime, rMpDevEvaluateDetailParam.getType()); terminalListMapByModel.forEach((key, terminalListByModel) -> { RMpDevEvaluateDetailVO rMpDevEvaluateDetailVO = new RMpDevEvaluateDetailVO(); - rMpDevEvaluateDetailVO.setDataDate(startTime); //日期(前端传递的时间) + rMpDevEvaluateDetailVO.setDataDate(time); //日期(前端传递的时间) rMpDevEvaluateDetailVO.setDeviceModel(key); //终端型号 //终端有效接入率 @@ -277,6 +281,17 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl children; + public void setChildren(List children) { + List listSort = children.stream().filter(x -> x.getData() != 3.14159).sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList()); + listSort.addAll(children.stream().filter(x -> x.getData() == 3.14159).collect(Collectors.toList())); + this.children = listSort; + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java index e707999f2..de74f5a83 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java @@ -254,12 +254,13 @@ public class PollutionSubstationServiceImpl extends ServiceImpl listSort = list.stream().filter(x -> x.getData() != 3.14159).sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList()); + listSort.addAll(list.stream().filter(x -> x.getData() == 3.14159).collect(Collectors.toList())); + return listSort; } return list; }