From 592615691cfe8ba7aebcb4ce71c89fbe1a2f9f68 Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Wed, 19 Apr 2023 15:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=BC=82=E5=B8=B8=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E6=85=A2=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pq/mapper/mapping/TopMagMapper.xml |  5 ++--
 .../pq/service/impl/LineServiceImpl.java      |  4 +++
 .../impl/EventTemplateServiceImpl.java        | 30 ++++++++++++++-----
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml
index 922ec093b..feb86b3d7 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml
@@ -5,14 +5,12 @@
     <select id="getTopMsg" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
         SELECT
                 ptm.Time_Id AS time,
-                IFNULL(COUNT(ptm.Dev_Id),3.14159)AS deviceAbnormalNum,
-                GROUP_CONCAT(sdd.Name) AS lineGrade
+                IFNULL(COUNT(ptm.Dev_Id),3.14159)AS deviceAbnormalNum
         FROM pq_line line
         INNER JOIN pq_line vol ON line.pid=vol.id
         INNER JOIN pq_line device ON vol.pid=device.id
         LEFT JOIN pqs_top_msg ptm ON ptm.Dev_Id = device.Id
         LEFT JOIN pq_line_detail pld ON pld.Id=line.Id
-        LEFT JOIN sys_dict_data sdd ON sdd.Id=pld.Line_Grade
         WHERE
             ptm.State=1
         AND
@@ -21,6 +19,7 @@
             AND pld.Line_Grade=#{lineGrade}
         </if>
         GROUP BY ptm.Time_Id
+
     </select>
 
     <select id="getTopMsgDetail" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
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 aee95534a..058359af8 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,8 +392,12 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
 
     @Override
     public Page<TopMsgPO> dailyDeviceAbnormalStatistics(PqsParam param) {
+        long start = System.currentTimeMillis();
         Page topMsg = topMsgMapper.getTopMsg(new Page(param.getPageNum(), param.getPageSize()), param.getLineGrade(), DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
                 DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())));
+        long end = System.currentTimeMillis();
+        System.out.println("====================================");
+        System.out.println(end-start);
         return topMsg;
     }
 
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
index 228afa996..ba11c7a50 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
@@ -23,6 +23,8 @@ import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -68,7 +70,7 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
             Map<String, List<TemplateRel>> temMap = templateRels.stream().collect(Collectors.groupingBy(TemplateRel::getRtId));
             for (EventTemplateVO record : page.getRecords()) {
                 if (Objects.nonNull(temMap.get(record.getId()))) {
-                    record.setRdIds(temMap.get(record.getId()).stream().map(TemplateRel::getRtId).collect(Collectors.toList()));
+                    record.setRdIds(temMap.get(record.getId()).stream().map(TemplateRel::getRdId).collect(Collectors.toList()));
                 }
 
             }
@@ -101,14 +103,14 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
         eventTemplate.setState(DataStateEnum.ENABLE.getCode());
         boolean flag= this.save(eventTemplate);
         String id = eventTemplate.getId();
-        TemplateRel relevancy = new TemplateRel();
+
         List<TemplateRel> list = new ArrayList<>();
-        relevancy.setRdId(id);
-        eventTemplateParam.getIds().forEach(rtId -> {
+
+        eventTemplateParam.getIds().forEach(rdId -> {
+            TemplateRel relevancy = new TemplateRel();
             // 字典表id
-            relevancy.setRdId(rtId);
-            // 模版id
             relevancy.setRtId(id);
+            relevancy.setRdId(rdId);
             list.add(relevancy);
         });
         flag = templateRelMapper.batchInsert(list);
@@ -120,10 +122,22 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
     @Override
     public boolean update(EventTemplateParam.EventTemplateUpdateParam eventTemplateUpdateParam) {
         checkName(eventTemplateUpdateParam,false);
+        String id = eventTemplateUpdateParam.getId();
         EventTemplate eventTemplate = new EventTemplate();
         BeanUtils.copyProperties(eventTemplateUpdateParam,eventTemplate);
-        return this.updateById(eventTemplate);
-
+        boolean flag = this.updateById(eventTemplate);
+        // 先删除字典表
+        templateRelMapper.deleteById(id);
+        List<TemplateRel> list = new ArrayList<>();
+        eventTemplateUpdateParam.getIds().forEach(rdId -> {
+            TemplateRel relevancy = new TemplateRel();
+            // 模版id
+            relevancy.setRtId(id);
+            relevancy.setRdId(rdId);
+            list.add(relevancy);
+        });
+        flag = templateRelMapper.batchInsert(list);
+        return flag;
     }
 
     /**