From 34f748374db393d3627c0c15a04fb51b91d98180 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Thu, 12 Oct 2023 09:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CsEquipmentDeliveryServiceImpl.java   |  3 +--
 .../java/com/njcn/csharmonic/pojo/po/CsEventPO.java    | 10 ++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index 7b6ae6e..14e737b 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -42,7 +42,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -334,7 +333,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
     @Override
     public CsEquipmentDeliveryPO findDevByNDid(String nDid) {
-        return this.lambdaQuery().eq(CsEquipmentDeliveryPO::getNdid,nDid).one();
+        return this.lambdaQuery().eq(CsEquipmentDeliveryPO::getNdid,nDid).ne(CsEquipmentDeliveryPO::getRunStatus,0).one();
     }
 
     @Override
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
index 8a69b2b..09fee8d 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
@@ -97,10 +97,16 @@ public class CsEventPO extends BaseEntity {
      */
     @TableField(value = "location")
     private String location;
+
     /**
-     * 用于数据控制 1:设备登记，2：功能调试，3：出厂调试 4：设备投运)
+     * 流程信息（用于数据控制 1:设备登记，2：功能调试，3：出厂调试 4：设备投运)
      */
     @TableField(value = "process")
-    private String process;
+    private Integer process;
 
+    /**
+     * 告警故障编码（一般显示为Hex）
+     */
+    @TableField(value = "code")
+    private String code;
 }
\ No newline at end of file