From e71448fcd7ae7e79ce64475442ad2bd61a8a0ede Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Tue, 7 Nov 2023 14:44:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CsDevModelServiceImpl.java       |  2 +-
 .../com/njcn/zlevent/utils/SendEventUtils.java    | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
index b33c012..cffa13f 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
@@ -1029,7 +1029,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
         switch (name) {
             //数据集
             case "Ds$Apf$Master$01":
-                showName = "主模块数据";
+                showName = "APF模块数据";
                 break;
             case "Ds$Apf$module$01":
                 showName = "模块1数据";
diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java
index 67832fe..1759706 100644
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java
@@ -1,9 +1,14 @@
 package com.njcn.zlevent.utils;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.njcn.csdevice.api.CsDeviceUserFeignClient;
+import com.njcn.csdevice.api.CsLedgerFeignClient;
 import com.njcn.csdevice.api.EventLogsFeignClient;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.po.CsEventSendMsg;
 import com.njcn.csharmonic.pojo.po.CsEventUserPO;
 import com.njcn.system.api.EpdFeignClient;
@@ -65,6 +70,9 @@ public class SendEventUtils {
     @Resource
     private ICsEventUserService csEventUserService;
 
+    @Resource
+    private CsLedgerFeignClient csLedgerFeignclient;
+
     /**
      * 事件推送给相关用户
      * @param eventType 事件类型 1:事件 2:告警
@@ -135,7 +143,9 @@ public class SendEventUtils {
                 default:
                     break;
             }
-            content = ndid + "于" +eventTime+ "发生" + eventName;
+            //获取台账信息
+            DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
+            content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生" + eventName;
             noticeUserDto.setContent(content);
             payload.setType(Integer.parseInt(type));
             payload.setPath("/pages/message/message?type="+payload.getType());
@@ -177,7 +187,8 @@ public class SendEventUtils {
                     break;
             }
             noticeUserDto.setTitle("告警事件");
-            content = ndid + "于" +eventTime+ "发生告警,告警故障编码为:" + eventName;
+            DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
+            content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生告警,告警故障编码为:" + eventName;
             noticeUserDto.setContent(content);
             payload.setType(3);
             payload.setPath("/pages/message/message?type="+payload.getType());