From a5119bbec0d29d174e5485cd137095b9d87a7130 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 2 Feb 2024 10:23:10 +0800 Subject: [PATCH] =?UTF-8?q?1.pms3.0=E7=A8=B3=E6=80=81=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=92=8C=E6=9A=82=E6=80=81=E6=8C=87=E6=A0=87=E4=B8=AD=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=83=A8=E9=97=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/event/pojo/vo/RStatEventMVO.java | 3 ++ .../njcn/event/pojo/vo/RStatSubstationVO.java | 3 ++ .../majornetwork/RStatEventController.java | 7 ++--- .../mapping/RStatEventYMapper.xml | 5 ++-- .../Impl/RStatEventYServiceImpl.java | 17 +++++++---- ...ticsOfTransientIndicatorssServiceImpl.java | 29 +++++++++++++------ .../harmonic/pojo/vo/RStatOrgIndexVO.java | 3 ++ .../majornetwork/mapping/RStatOrgMMapper.xml | 6 ++-- .../majornetwork/mapping/RStatOrgQMapper.xml | 6 ++-- .../majornetwork/mapping/RStatOrgYMapper.xml | 6 ++-- .../impl/RStatOrgYServiceImpl.java | 6 ++++ 11 files changed, 59 insertions(+), 32 deletions(-) diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java index 2dd44d257..ce00aedc4 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java @@ -49,6 +49,9 @@ public class RStatEventMVO { @ApiModelProperty(value = "单位名称") private String orgName; + @ApiModelProperty("排序") + private Integer sort; + @ApiModelProperty(value = "指标类型") private String eventType; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatSubstationVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatSubstationVO.java index 2620880ed..1af645183 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatSubstationVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatSubstationVO.java @@ -2,6 +2,7 @@ package com.njcn.event.pojo.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; import lombok.Data; import java.io.Serializable; @@ -30,6 +31,8 @@ public class RStatSubstationVO implements Serializable { @ApiModelProperty(name = "deptName",value = "单位名称") private String deptName; + @ApiModelProperty(value = "单位排序") + private Integer sort; /** * 变电站id */ diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventController.java b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventController.java index 540a6987c..664843c21 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventController.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventController.java @@ -18,10 +18,7 @@ import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -104,7 +101,7 @@ public class RStatEventController extends BaseController { @PostMapping("/getEventBenchmarkLevelList") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("区域暂态电能质量水平评估") - public HttpResult> getEventBenchmarkLevelList(StatSubstationBizBaseParam param) { + public HttpResult> getEventBenchmarkLevelList(@RequestBody StatSubstationBizBaseParam param) { String methodDescribe = getMethodDescribe("getEventBenchmarkLevelList"); List eventBenchmarkLevelList = rStatEventYService.getEventBenchmarkLevelList(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventBenchmarkLevelList, methodDescribe); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml index b75889e86..248619921 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml @@ -50,7 +50,7 @@ diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java index 60a1925f3..e57c5cbc0 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java @@ -230,12 +230,17 @@ public class RStatEventYServiceImpl extends ServiceImpl vos = this.baseMapper.selectEventBenchmarkLevel(ids, param, map, data.getId()); - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, DeptDTO::getName)); - vos.forEach(vo -> { - if (deptDTOMap.containsKey(vo.getOrgId())) { - vo.setOrgName(deptDTOMap.get(vo.getOrgId())); - } - }); + if(CollUtil.isNotEmpty(vos)){ + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); + vos.forEach(vo -> { + if (deptDTOMap.containsKey(vo.getOrgId())) { + DeptDTO deptDTO = deptDTOMap.get(vo.getOrgId()); + vo.setOrgName(deptDTO.getName()); + vo.setSort(deptDTO.getSort()); + } + }); + vos.sort(Comparator.comparing(RStatEventMVO.Vo::getSort).reversed()); + } return vos; } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java index bcd5d0331..f671f7029 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.event.service.majornetwork.Impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.NumberUtil; import com.njcn.common.pojo.constant.BizParamConstant; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; @@ -29,6 +30,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -106,14 +108,18 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf } for (RStatOrgVO rStatOrgVO : result) { if(rStatOrgVO.getEventMeasurementAverage()!=0&&rStatOrgVO.getEffectiveMeasurementAverage()!=0){ - rStatOrgVO.setEventMeasurementRatioAverage(String.valueOf(Double.parseDouble( - df.format(((rStatOrgVO.getEventMeasurementAverage() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100)))); + double v = Double.parseDouble( + df.format(((rStatOrgVO.getEventMeasurementAverage() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100)); + BigDecimal round = NumberUtil.round(v, 2); + rStatOrgVO.setEventMeasurementRatioAverage(round.toString()); }else{ rStatOrgVO.setEventMeasurementRatioAverage("0"); } if(rStatOrgVO.getEventMeasurementAccrued()!=0&&rStatOrgVO.getEffectiveMeasurementAccrued()!=0){ - rStatOrgVO.setEventMeasurementRatioAccrued(String.valueOf(Double.parseDouble( - df.format(((rStatOrgVO.getEventMeasurementAccrued() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100)))); + double v = Double.parseDouble( + df.format(((rStatOrgVO.getEventMeasurementAccrued() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100)); + BigDecimal round = NumberUtil.round(v, 2); + rStatOrgVO.setEventMeasurementRatioAccrued(round.toString()); }else{ rStatOrgVO.setEventMeasurementRatioAccrued("0"); } @@ -124,7 +130,7 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf return result.stream().peek(vo -> { vo.setOrgName(deptDTOMap.get(vo.getOrgNo()).getName()); vo.setSort(deptDTOMap.get(vo.getOrgNo()).getSort()); - }).sorted(Comparator.comparing(RStatOrgVO::getSort)).collect(Collectors.toList()); + }).sorted(Comparator.comparing(RStatOrgVO::getSort).reversed()).collect(Collectors.toList()); } @@ -252,8 +258,7 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf * @return 变电站暂态指标分类统计表 */ @Override - public List getRStatSubstation - (UniversalFrontEndParam param) { + public List getRStatSubstation(UniversalFrontEndParam param) { //获取所有子部门信息 List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); if (CollectionUtil.isEmpty(deptDTOList)) { @@ -304,19 +309,25 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf // 将变电站信息根据变电站id转换成map集合 Map powerMap = powerInfo.stream().collect(Collectors.toMap(StatationStat::getPowerId, StatationStat -> StatationStat)); // 属性赋值 - return result.stream().peek(vo -> { + List collect = result.stream().peek(vo -> { String substationId = vo.getSubstationId(); vo.setDeptId(powerMap.get(substationId).getOrgId()); vo.setSubstationName(powerMap.get(substationId).getPowerName()); String deptId = vo.getDeptId(); for (DeptDTO deptDTO : deptDTOList) { - if (deptId.equals(deptDTO.getCode())){ + if (deptId.equals(deptDTO.getCode())) { vo.setDeptName(deptDTO.getName()); + vo.setSort(deptDTO.getSort()); } } }).collect(Collectors.toList()); + if (CollUtil.isEmpty(collect)){ + collect.sort(Comparator.comparing(RStatSubstationVO::getSort).reversed()); + } + return collect; } + /** * 获取主网的id * diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java index f4614763d..f12967eea 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java @@ -24,6 +24,9 @@ public class RStatOrgIndexVO { @ApiModelProperty(value = "单位名称") private String orgName; + @ApiModelProperty(value = "单位排序") + private Integer sort; + @ApiModelProperty(value = "监测点ID") private String measurementPointId; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml index 9a08d9745..d1bc62303 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml @@ -151,9 +151,9 @@ select org_no, sum(effective_measurement_accrued) as allCount, - avg(freq_pass_rate) freq_pass_rate, - avg(v_dev_pass_rate) v_dev_pass_rate, - avg(flicker_pass_rate) flicker_pass_rate + TRUNCATE(avg(freq_pass_rate),2) freq_pass_rate, + TRUNCATE(avg(v_dev_pass_rate),2) v_dev_pass_rate, + TRUNCATE(avg(flicker_pass_rate),2) flicker_pass_rate from r_stat_org_m rso diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml index 510c6310f..09493462f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml @@ -150,9 +150,9 @@ select org_no, sum(effective_measurement_accrued) as allCount, - avg(freq_pass_rate) freq_pass_rate, - avg(v_dev_pass_rate) v_dev_pass_rate, - avg(flicker_pass_rate) flicker_pass_rate + TRUNCATE(avg(freq_pass_rate),2) freq_pass_rate, + TRUNCATE(avg(v_dev_pass_rate),2) v_dev_pass_rate, + TRUNCATE(avg(flicker_pass_rate),2) flicker_pass_rate from r_stat_org_q rso diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml index b98b981d2..e68f4a1bd 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml @@ -151,9 +151,9 @@ select org_no, sum(effective_measurement_accrued) as allCount, - avg(freq_pass_rate) freq_pass_rate, - avg(v_dev_pass_rate) v_dev_pass_rate, - avg(flicker_pass_rate) flicker_pass_rate + TRUNCATE(avg(freq_pass_rate),2) freq_pass_rate, + TRUNCATE(avg(v_dev_pass_rate),2) v_dev_pass_rate, + TRUNCATE( avg(flicker_pass_rate),2) flicker_pass_rate from r_stat_org_y rso diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java index e4c0230e6..cab07999c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java @@ -39,6 +39,7 @@ import org.springframework.stereotype.Service; import java.text.DecimalFormat; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -368,6 +369,7 @@ public class RStatOrgYServiceImpl extends ServiceImplx.getCityName()+";"+x.getSubstationName())); } return rSubstationInfoVOS; } @@ -412,9 +414,13 @@ public class RStatOrgYServiceImpl extends ServiceImpl