From b9696e957d6658b3df1bed9d7cdc4b09c50bf7b5 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Sat, 13 Dec 2025 23:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/pollution/PowerFlagPollution.java   |  6 +++++
 .../excel/pollution/SubstationPollution.java  |  3 +++
 .../impl/PollutionSubstationServiceImpl.java  | 22 ++++++++++++++-----
 .../user/UserReportManageController.java      |  2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/PowerFlagPollution.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/PowerFlagPollution.java
index a71438cad..9bf359bad 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/PowerFlagPollution.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/PowerFlagPollution.java
@@ -72,4 +72,10 @@ public class PowerFlagPollution implements Serializable {
     @ApiModelProperty("谐波污染值")
     private Double vHarmonicValue;
 
+    @ApiModelProperty("干扰源类型")
+    private String loadType;
+
+    @ApiModelProperty("监测对象")
+    private String objName;
+
 }
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/SubstationPollution.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/SubstationPollution.java
index 832cf33d2..882e359fb 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/SubstationPollution.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/SubstationPollution.java
@@ -42,6 +42,9 @@ public class SubstationPollution implements Serializable {
     @ApiModelProperty("项目名称")
     private String projectName;
 
+    @ApiModelProperty("污染值")
+    private Double subValue;
+
 
     /**
      * 电网侧&非电网侧
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 72e980ed0..a98d27bb8 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
@@ -1152,6 +1152,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                 PowerFlagPollution lineItemPollution = new PowerFlagPollution();
                 BeanUtil.copyProperties(linePollution, lineItemPollution, true);
                 lineItemPollution.setVHarmonicValue(linePollution.getHarmonicValue());
+                lineItemPollution.setSubName(linePollution.getSubStationName());
                 lineItemPollutionList.add(lineItemPollution);
             }
             substationPollution.setPowerFlagPollutionList(lineItemPollutionList);
@@ -1227,6 +1228,8 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                         pollution1.setLoginTime(lineDetail.getLoginTime());
                         pollution1.setInterval(lineDetail.getTimeInterval());
                         pollution1.setPowerFlag(lineDetail.getPowerFlag());
+                        pollution1.setLoadType(lineDetail.getLoadType());
+                        pollution1.setObjName(lineDetail.getObjName());
                         pollution1.setVHarmonicValue(pollutionMap.containsKey(lineDetail.getLineId())?NumberUtil.round(pollutionMap.get(lineDetail.getLineId()),2).doubleValue():0.0);
                         linePollutionList.add(pollution1);
                     }
@@ -1264,7 +1267,6 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
         if (CollectionUtil.isNotEmpty(userReportPOList)) {
             userReportPOList.forEach(item -> {
                 if (ObjectUtil.isNotNull(item.getSubstation()) && !Objects.equals(item.getSubstation(), "")) {
-
                     List<BigDecimal> value = new ArrayList<>();
                     List<PowerFlagPollution> ll = new ArrayList<>();
                     String[] parts = item.getSubstation().split("、");
@@ -1280,6 +1282,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                                     PowerFlagPollution lineItemPollution = new PowerFlagPollution();
                                     BeanUtil.copyProperties(pojo, lineItemPollution, true);
                                     lineItemPollution.setVHarmonicValue(pojo.getHarmonicValue());
+                                    lineItemPollution.setSubName(pojo.getSubStationName());
                                     ll.add(lineItemPollution);
                                 }
                             }
@@ -1289,15 +1292,22 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                     linePollution.setGdName(item.getCity());
                     linePollution.setSubStationName(item.getSubstation());
                     linePollution.setProjectName(item.getProjectName());
-                    linePollution.setSubVStationValue(String.valueOf(BigDecimal.valueOf(value.stream()
-                            .mapToDouble(BigDecimal::doubleValue)
-                            .average()
-                            .orElse(0.0)).setScale(2, RoundingMode.HALF_UP).doubleValue()));
+                    if (CollectionUtil.isEmpty(ll)) {
+                        linePollution.setSubValue(null);
+                    } else {
+                        linePollution.setSubValue(BigDecimal.valueOf(value.stream()
+                                .mapToDouble(BigDecimal::doubleValue)
+                                .average()
+                                .orElse(0.0)).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        linePollution.setPowerFlagPollutionList(ll);
+                    }
                     result.add(linePollution);
-                    linePollution.setPowerFlagPollutionList(ll);
                 }
             });
         }
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.sort(Comparator.comparing(SubstationPollution::getSubValue,Comparator.nullsLast(Comparator.reverseOrder())));
+        }
         return result;
     }
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
index 2470f2068..bbabc84b2 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
@@ -297,7 +297,7 @@ public class UserReportManageController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getSensitiveUserByDept")
     @ApiOperation("根据部门获取敏感用户信息")
-    @ApiImplicitParam(name = "userReportQueryParam", value = "参数", required = true)
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
     public HttpResult<List<UserReportPO>> getSensitiveUserByDept(@RequestBody @Validated SensitiveUserParam param) {
         String methodDescribe = getMethodDescribe("getSensitiveUserByDept");
         List<UserReportPO> list = userReportPOService.getSensitiveUserByDept(param);