From 35ede662dc729d06bcf63edc4433de7de8e4d396 Mon Sep 17 00:00:00 2001
From: zhangbaojian <1065122561@qq.com>
Date: Tue, 23 May 2023 10:06:51 +0800
Subject: [PATCH] =?UTF-8?q?zbj//1.=E5=8A=9F=E7=8E=87=E8=B4=9F=E8=8D=B7?=
 =?UTF-8?q?=E6=8E=92=E5=90=8D=E6=A0=B9=E6=8D=AE=E4=BC=A0=E5=85=A5=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9Fid=E8=BF=9B=E8=A1=8C=E7=AD=9B=E9=80=89=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../majornetwork/LargeScreenController.java   |  2 +-
 .../majornetwork/LargeScreenMapper.java       |  2 +-
 .../mapping/LargeScreenMapper.xml             | 24 ++++++++++++-------
 .../impl/LargeScreenServiceImpl.java          | 19 ++++++++++++++-
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java
index 48024d26d..a46c03de7 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java
@@ -71,7 +71,7 @@ public class LargeScreenController extends BaseController {
     @ApiOperation("功率负荷排名")
     @ApiImplicitParam(name = "largeScreenParam", value = "功率负荷排名", required = true)
     public HttpResult<List<PowerOrderVO>> getPowerOrder(@RequestBody @Validated LargeScreenParam largeScreenParam) {
-        String methodDescribe = getMethodDescribe("getHomeostasisLoad");
+        String methodDescribe = getMethodDescribe("getPowerOrder");
         List<PowerOrderVO> result = largeScreenService.getPowerOrder(largeScreenParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java
index 6a1e76828..7676b42c9 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java
@@ -18,6 +18,6 @@ public interface LargeScreenMapper {
 
     List<Map<String,Object>> getHomeostasisLoad (@Param("indexIds") List<String> indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<PowerOrderVO> getPowerOrder (LargeScreenParam largeScreenParam);
+    List<PowerOrderVO> getPowerOrder (@Param("lineIds") List<String> lineIds,@Param("largeScreenParam") LargeScreenParam largeScreenParam);
 
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml
index e1ace2e13..fe2f757d0 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml
@@ -45,15 +45,21 @@
     <select id="getPowerOrder" resultType="com.njcn.device.pq.pojo.vo.PowerOrderVO">
         select t.*, pl.`Name` "name"
         from (
-                 SELECT rsdhpd.line_id "id", round(max(rsdhpd.p), 0) "max"
-                 FROM r_stat_data_harmpower_p_d rsdhpd
-                 where rsdhpd.value_type = 'MAX'
-                   AND rsdhpd.time BETWEEN date_format(#{searchBeginTime}, '%y%m%d')
-                     AND date_format(#{searchEndTime}, '%y%m%d')
-                 group by rsdhpd.line_id
-             ) t
-                 left join pq_line pl on pl.Id = t.id
-        ORDER BY t.max desc limit #{limit}
+        SELECT rsdhpd.line_id "id", round(max(rsdhpd.p), 0) "max"
+        FROM r_stat_data_harmpower_p_d rsdhpd
+        <where>
+        rsdhpd.line_id in
+        <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and rsdhpd.value_type = 'MAX'
+        AND rsdhpd.time BETWEEN date_format(#{largeScreenParam.searchBeginTime}, '%y%m%d')
+        AND date_format(#{largeScreenParam.searchEndTime}, '%y%m%d')
+        </where>
+        group by rsdhpd.line_id
+        ) t
+        left join pq_line pl on pl.Id = t.id
+        ORDER BY t.max desc limit #{largeScreenParam.limit}
     </select>
 
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java
index d0789b3d8..06dc39a0a 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java
@@ -141,6 +141,23 @@ public class LargeScreenServiceImpl implements LargeScreenService {
      */
     @Override
     public List<PowerOrderVO> getPowerOrder(LargeScreenParam largeScreenParam) {
-        return largeScreenMapper.getPowerOrder(largeScreenParam);
+        DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
+        //部门索引
+        deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
+        //统计类型
+        SimpleDTO simpleDTO = new SimpleDTO();
+        simpleDTO.setCode(String.valueOf(StatisticsEnum.POWER_NETWORK));
+        deviceInfoParam.setStatisticalType(simpleDTO);
+        //添加时间
+        deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime());
+        deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime());
+
+        // 获取所有数据
+        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
+
+        //获取所有监测点集合
+        List<String> lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
+
+        return largeScreenMapper.getPowerOrder(lineIds,largeScreenParam);
     }
 }