From 6b7dfdb6f741e4c5e4fed72e62241712b9be2b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Fri, 19 May 2023 08:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E8=BF=90=E8=A1=8C=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pq/mapper/SubstationMapper.java    |  3 +++
 .../device/pq/mapper/mapping/LineMapper.xml   | 26 ++++++++-----------
 .../pq/mapper/mapping/SubstationMapper.xml    | 16 +++++++++++-
 .../pq/service/impl/LineServiceImpl.java      |  2 +-
 .../service/impl/NormLimitServiceImpl.java    |  2 +-
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/SubstationMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/SubstationMapper.java
index 3d66dd0d4..3b79ada5c 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/SubstationMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/SubstationMapper.java
@@ -32,4 +32,7 @@ public interface SubstationMapper extends BaseMapper<Substation> {
      * @return 变电站信息
      */
     List<SubstationDTO> getSubstationById(@Param("id")List<String> subId);
+
+
+    List<Substation> test();
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index 69033d0f8..51e21bef9 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -803,40 +803,36 @@
 
 
     <select id="getNewDeviceRunStatistics" resultType="LineFlowMealDetailVO">
-        select t.*
-        from (SELECT
+        select id,pid,pids,name,level,updateTime,runFlag,comFlag,deviceId,substation,flowMeal,round(statisValue,2) statisValue,statisValue/flowMeal as flowProportion from
+        (
+        select
         a.id,
         a.pid,
         a.pids,
         a.NAME name,
         a.level,
-        a.update_Time updateTime,
+        b.update_Time updateTime,
         b.run_flag runFlag,
         b.com_flag comFlag,
         b.id deviceId,
-        dev.name deviceName,
         sub.name substation,
-        elc.name electricPowerCompany,
         ifnull(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal,
-        ifnull(m.Actual_Value,0) statisValue
+        ifnull(m.Actual_Value/1024/1024,0) statisValue
         FROM pq_line a
-        INNER JOIN pq_line vol ON a.pid = vol.id
-        INNER JOIN pq_line dev ON vol.pid = dev.id
-        INNER JOIN pq_device b ON vol.pid = b.id
-        INNER JOIN pq_line sub ON dev.pid = sub.id
-        INNER JOIN pq_line elc ON sub.pid = elc.id
-        LEFT JOIN  cld_month_flow  m ON b.id = m.Dev_Id
+        INNER JOIN pq_device b ON a.id = b.id
+        INNER JOIN pq_line sub ON a.pid = sub.id
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
-        LEFT JOIN sys_dict_data e ON b.dev_type = e.id
+        LEFT JOIN  cld_month_flow m ON b.id = m.Dev_Id and m.time_id between #{startTime} and #{endTime}
         where a.id in
         <foreach item="item" collection="devs" separator="," open="(" close=")">
             #{item}
         </foreach>
-        and
-        a.Create_Time between #{startTime} and #{endTime}
         ) t
+        order by flowProportion desc
+
+
     </select>
 
     <select id="getNewDeviceFlowStatistics" resultType="LineFlowMealDetailVO">
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SubstationMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SubstationMapper.xml
index 3ce46dbed..38bd31bae 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SubstationMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SubstationMapper.xml
@@ -29,7 +29,7 @@
             line.id ,
             line.NAME ,
             line.sort ,
-            sub.Lng scale,
+            sub.scale scale,
             sub.Lng Lng,
             sub.Lat Lat
         FROM
@@ -43,4 +43,18 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="test" resultType="Substation">
+        SELECT
+        line.id ,
+        line.NAME scale,
+        sub.Lng Lng,
+        sub.Lat Lat
+        FROM
+        pq_line line,
+        pq_substation sub
+        WHERE
+        line.Id = sub.Id
+
+    </select>
 </mapper>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
index 5ba959e87..c65701aee 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
@@ -436,7 +436,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         List<String> deviceIndexes = new ArrayList<>();
         List<GeneralDeviceDTO> deviceInfoList = generalDeviceService.getDeviceInfo(deviceInfoParam, null, Stream.of(1).collect(Collectors.toList()));
         deviceInfoList.stream().map(GeneralDeviceDTO::getDeviceIndexes).forEach(deviceIndexes::addAll);
-        Page<LineFlowMealDetailVO> page = lineMapper.getNewDeviceFlowStatistics(
+        Page<LineFlowMealDetailVO> page = lineMapper.getNewDeviceRunStatistics(
                 new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()),
                 deviceIndexes,
                 DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/NormLimitServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/NormLimitServiceImpl.java
index 9938f7f7f..bc591a5e3 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/NormLimitServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/NormLimitServiceImpl.java
@@ -56,7 +56,7 @@ public class NormLimitServiceImpl implements NormLimitService {
             simpleDTO.setCode("Power_Network");
             deviceInfoParam.setStatisticalType(simpleDTO);
             //处理监测点
-            List<GeneralDeviceDTO> deviceDataList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
+            List<GeneralDeviceDTO> deviceDataList = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();
             for (GeneralDeviceDTO generalDeviceDTO : deviceDataList) {
                 lineIds.addAll(generalDeviceDTO.getLineIndexes());
             }