From 703a145bb3697fc6f99b5c2ba85ef87a6a6fa486 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 13 Aug 2024 10:53:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java  | 2 +-
 .../service/impl/CsEquipmentDeliveryServiceImpl.java      | 8 ++++----
 .../njcn/csdevice/service/impl/CsLedgerServiceImpl.java   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
index a5b25da..8af5634 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
@@ -76,7 +76,7 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
      * 接入状态(1:未注册 2:注册 3:接入)
      */
     @TableField(value = "status")
-    private String status;
+    private Integer status;
 
     /**
      * 设备状态(0:删除 1:离线 2:在线)
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 f6698a3..5689bf8 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
@@ -107,7 +107,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         }
         CsEquipmentDeliveryPO csEquipmentDeliveryPo = new CsEquipmentDeliveryPO();
         BeanUtils.copyProperties (csEquipmentDeliveryAddParm,csEquipmentDeliveryPo);
-        csEquipmentDeliveryPo.setStatus ("1");
+        csEquipmentDeliveryPo.setStatus (1);
         csEquipmentDeliveryPo.setRunStatus(1);
         String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
         if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
@@ -471,7 +471,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     String path = this.createPath(temp.getNdid());
                     csEquipmentDeliveryPO.setMac(path);
                     csEquipmentDeliveryPO.setRunStatus(1);
-                    csEquipmentDeliveryPO.setStatus("1");
+                    csEquipmentDeliveryPO.setStatus(1);
                     csEquipmentDeliveryPO.setProcess(2);
 
                     CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
@@ -546,8 +546,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     public void testCompletion(String deviceId,Integer type,String remark) {
         CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId, deviceId).one();
         this.lambdaUpdate().eq(CsEquipmentDeliveryPO::getId,deviceId).
-//                set(CsEquipmentDeliveryPO::getStatus,1).
-//                set(CsEquipmentDeliveryPO::getRunStatus,2).
+                set(CsEquipmentDeliveryPO::getStatus,1).
+                set(CsEquipmentDeliveryPO::getRunStatus,1).
                 set(CsEquipmentDeliveryPO::getProcess,type+1).update();
         this.delete(deviceId);
         List<CsEquipmentProcessPO> list = csEquipmentProcessPOService.lambdaQuery().eq(CsEquipmentProcessPO::getDevId, one.getNdid()).
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
index 13bc0b0..f4f50bd 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
@@ -126,7 +126,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         for(CsLedgerVO c : portables){
             c.setPid(portable.getId());
             CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId());
-            c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus()));
+            c.setComFlag(csEquipmentDeliveryPO.getStatus());
             c.setChildren(wlRecordMapper.getAllLine(c.getId()));
             for(CsLedgerVO cs : c.getChildren()){
                 cs.setPid(c.getId());
@@ -208,7 +208,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         for(CsLedgerVO c : portables){
             c.setPid(portable.getId());
             CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId());
-            c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus()));
+            c.setComFlag(csEquipmentDeliveryPO.getStatus());
         }
         portable.setChildren(portables);