From 7277299c6646c3a86ba05189bc3bc4799dec573e Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 24 Jun 2025 11:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java
index 1a979a6..04045d8 100644
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java
@@ -49,16 +49,18 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsEventMapper, CsEventPO> im
     public void analysis(AppEventMessage appEventMessage) {
         List<CsEventPO> list1 = new ArrayList<>();
         LocalDateTime eventTime = null;
-        String tag = null;
+        String tag = null, lineId = null;
         String id = IdUtil.fastSimpleUUID();
         //获取装置id
         CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(appEventMessage.getId()).getData();
         try {
+            lineId = appEventMessage.getId() + appEventMessage.getMsg().getClDid();
             List<AppEventMessage.DataArray> dataArray = appEventMessage.getMsg().getDataArray();
             for (AppEventMessage.DataArray item : dataArray) {
                 eventTime = eventService.timeFormat(item.getDataTimeSec(),item.getDataTimeUSec());
                 //事件入库
                 CsEventPO csEvent = new CsEventPO();
+                csEvent.setLineId(lineId);
                 csEvent.setId(id);
                 csEvent.setDeviceId(po.getId());
                 csEvent.setProcess(po.getProcess());
@@ -91,6 +93,7 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsEventMapper, CsEventPO> im
             }
         } catch (Exception e) {
             CsEventLogs csEventLogs = new CsEventLogs();
+            csEventLogs.setLineId(lineId);
             csEventLogs.setDeviceId(po.getId());
             csEventLogs.setStartTime(eventTime);
             csEventLogs.setTag(tag);