From 484b5dc2e54ae238ee7c573378330a8caee751ee Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Thu, 9 Mar 2023 15:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E5=88=86=E5=B8=83?=
 =?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

---
 .../device/pq/mapper/mapping/LineMapper.xml   |  2 +-
 .../pq/service/impl/LineServiceImpl.java      | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

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 8992990b2..b9c022deb 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
@@ -280,7 +280,7 @@
         <if test="deviceInfoParam.powerFlag!=2">
             and t2.Power_Flag = #{deviceInfoParam.powerFlag}
         </if>
-        <if test="deviceInfoParam.lineGrade!='' and deviceInfoParam.lineGrade!=''">
+        <if test="deviceInfoParam.lineGrade!='' and deviceInfoParam.lineGrade!=null">
             and t2.line_grade = #{deviceInfoParam.lineGrade}
         </if>
         <if test="deviceInfoParam.loadType!=null  and deviceInfoParam.loadType.size()!=0">
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 3651343c8..e758e05ee 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
@@ -276,20 +276,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
             lineDistributionVO.setValue(generalDeviceDTO.getLineIndexes().size());
             lineDistributionVOList.add(lineDistributionVO);
         }
-
-        List<LineDistributionVO> result = new ArrayList<LineDistributionVO>();
-        Map<String, Integer> map = new HashMap<String, Integer>();
-        for (LineDistributionVO lineDistributionVO : lineDistributionVOList) {
-            if (map.containsKey(lineDistributionVO.getName())) {
-                map.put(lineDistributionVO.getName(), map.get(lineDistributionVO.getName()) + lineDistributionVO.getValue());
-            } else {
-                map.put(lineDistributionVO.getName(), lineDistributionVO.getValue());
-            }
-        }
-        for (Map.Entry<String, Integer> entry : map.entrySet()) {
-            result.add(new LineDistributionVO(entry.getKey(), entry.getValue()));
-        }
-        return result;
+        return  lineDistributionVOList;
     }
 
     @Override
@@ -308,7 +295,9 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
                 //获取监测点新增数
                 QueryWrapper<Line> lineQueryWrapper = new QueryWrapper<>();
                 lineQueryWrapper.in("pq_line.id", generalDeviceDTO.getLineIndexes());
-                lineQueryWrapper.between("pq_line.Create_Time", DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())));
+                lineQueryWrapper.between("pq_line.Create_Time",
+                        DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
+                        DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())));
                 int countNum = lineMapper.selectCount(lineQueryWrapper);
                 lineSaveTail += countNum;
                 lineStatisticsDetail.setAddLineNum(countNum);