From 50107edbe9efbb8c4d383eb09deff8441e539343 Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Wed, 22 Mar 2023 20:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/mapper/LineMapper.java |  1 +
 .../device/pq/mapper/mapping/LineMapper.xml   | 32 +++++++++++++++++--
 .../pq/service/impl/LineServiceImpl.java      | 28 ++++------------
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
index 282a2a29d..5d4b63284 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
@@ -416,4 +416,5 @@ public interface LineMapper extends BaseMapper<Line> {
     List<LineFlowMealDetailVO> getDeviceRunStatistics(@Param("list") List<String> list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
 
     Page<LineFlowMealDetailVO> getNewDeviceRunStatistics(Page<LineFlowMealDetailVO> page,@Param("devs") List<String> list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
+    Page<LineFlowMealDetailVO> getNewDeviceFlowStatistics(Page<LineFlowMealDetailVO> page,@Param("devs") List<String> list, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
 }
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 97ddce45a..55653e41d 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
@@ -798,7 +798,7 @@
             #{item}
         </foreach>
         and
-        m.Create_Time between #{startTime} and #{endTime}
+        a.Create_Time between #{startTime} and #{endTime}
         ) t
     </select>
 
@@ -836,10 +836,38 @@
             #{item}
         </foreach>
         and
-        m.Create_Time between #{startTime} and #{endTime}
+        a.Create_Time between #{startTime} and #{endTime}
         ) t
     </select>
 
+    <select id="getNewDeviceFlowStatistics" resultType="LineFlowMealDetailVO">
+        select t.*,
+        (t.statisValue)/t.flowMeal flowProportion
+        from (SELECT
+        a.id,
+        a.Name name,
+        a.level,
+        a.update_Time updateTime,
+        b.run_flag runFlag,
+        b.com_flag comFlag,
+        b.id deviceId,
+        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
+        FROM pq_line a
+        INNER JOIN pq_device b ON a.id = b.id
+        LEFT JOIN  pqs_month_flow m ON b.id = m.Dev_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
+        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="getFlowLineInfoByTableList" resultType="LineFlowMealDetailVO">
         SELECT
         Id,
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 cacba3110..976d908ff 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
@@ -392,29 +392,15 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
 
     @Override
     public Page<LineFlowMealDetailVO> getNewDeviceRunStatistics( PqsParam deviceInfoParam) {
-        List<LineFlowMealDetailVO> deviceList = new ArrayList<>();
+        List<String> deviceIndexes = new ArrayList<>();
         Page<LineFlowMealDetailVO> page = new Page();
         List<GeneralDeviceDTO> deviceInfoList = generalDeviceService.getDeviceInfo(deviceInfoParam, null, Stream.of(1).collect(Collectors.toList()));
-        for (GeneralDeviceDTO generalDeviceDTO : deviceInfoList) {
-            List<String> lineIndexes = generalDeviceDTO.getLineIndexes();
-            List<String> deviceIndexes = generalDeviceDTO.getDeviceIndexes();
-            if (CollectionUtils.isEmpty(deviceIndexes)) {
-                continue;
-            }
-
-            page = lineMapper.getNewDeviceRunStatistics(
-                    new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()),
-                    lineIndexes,
-                    DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
-                    DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())));
-            if (CollectionUtil.isNotEmpty(page.getRecords())){
-                for (LineFlowMealDetailVO device : page.getRecords()) {
-                    BigDecimal b = new BigDecimal((device.getFlowMeal()-device.getStatisValue())/device.getFlowMeal()*100);
-                    device.setFlowProportion(b.setScale(2, BigDecimal.ROUND_HALF_UP).floatValue());
-                }
-            }
-
-        }
+        deviceInfoList.stream().map(GeneralDeviceDTO::getDeviceIndexes).forEach(deviceIndexes::addAll);
+        page = lineMapper.getNewDeviceFlowStatistics(
+                new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()),
+                deviceIndexes,
+                DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
+                DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())));
         return page;
     }