From bb5c1ddfafb7048edb7a206cdb3325fb483a89c5 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Tue, 31 Oct 2023 10:58:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CsDeviceUserPOServiceImpl.java       |  2 +-
 .../impl/CsEquipmentDeliveryServiceImpl.java  | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
index 46061fa..d750c56 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
@@ -302,7 +302,7 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
         CsEquipmentDeliveryPO temp = csEquipmentDeliveryMapper.selectById(eid);
         mqttUserService.deleteUser(temp.getNdid());
         List<CsLedger> list1 = iCsLedgerService.lambdaQuery().eq(CsLedger::getPid, eid).list();
-        if(!com.alibaba.nacos.client.naming.utils.CollectionUtils.isEmpty(list1)){
+        if(!CollectionUtils.isEmpty(list1)){
             List<String> collect = list1.stream().map(CsLedger::getId).collect(Collectors.toList());
             LambdaQueryWrapper<CsLinePO> csLinePOLambdaQueryWrapper = new LambdaQueryWrapper<>();
             csLinePOLambdaQueryWrapper.in(CsLinePO::getLineId,collect);
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 1c5b40d..d2125c0 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
@@ -125,10 +125,10 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     @Override
 //    @Transactional(rollbackFor = {Exception.class}, propagation = Propagation.REQUIRED)
     public Boolean AuditEquipmentDelivery(String id) {
-        UpdateWrapper<CsEquipmentDeliveryPO> wrapper = new UpdateWrapper();
+        //物理删除
+        QueryWrapper<CsEquipmentDeliveryPO> wrapper = new QueryWrapper();
         wrapper.eq ("id", id);
-        wrapper.set ("run_status", "0");
-        boolean update = this.update (wrapper);
+        boolean update = this.remove (wrapper);
         //删除deviceuser表里的设备，游客数据设备,删除监测点相关数据
         List<CsLedger> list = csLedgerService.lambdaQuery().eq(CsLedger::getPid, id).list();
         if(!CollectionUtils.isEmpty(list)){
@@ -153,9 +153,9 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         QueryWrapper<CsTouristDataPO> queryWrap = new QueryWrapper<>();
         queryWrap.eq("device_id",id);
         csTouristDataPOService.getBaseMapper().delete(queryWrap);
-
-        CsEquipmentDeliveryPO csEquipmentDeliveryPO = this.getBaseMapper().selectById(id);
-        mqttUserService.deleteUser(csEquipmentDeliveryPO.getNdid());
+        /*后续徐那边做处理*/
+//        CsEquipmentDeliveryPO csEquipmentDeliveryPO = this.getBaseMapper().selectById(id);
+//        mqttUserService.deleteUser(csEquipmentDeliveryPO.getNdid());
 
 
         csDevModelRelationService.lambdaUpdate().eq(CsDevModelRelationPO::getDevId,id).set(CsDevModelRelationPO::getStatus,0).update();
@@ -496,8 +496,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,1).
+//                set(CsEquipmentDeliveryPO::getStatus,1).
+//                set(CsEquipmentDeliveryPO::getRunStatus,2).
                 set(CsEquipmentDeliveryPO::getProcess,type+1).update();
         this.delete(deviceId);
         List<CsEquipmentProcessPO> list = csEquipmentProcessPOService.lambdaQuery().eq(CsEquipmentProcessPO::getDevId, one.getNdid()).
@@ -516,8 +516,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId, deviceId).one();
 
         this.lambdaUpdate().eq(CsEquipmentDeliveryPO::getId,deviceId).
-                set(CsEquipmentDeliveryPO::getStatus,1).
-                set(CsEquipmentDeliveryPO::getRunStatus,1).
+//                set(CsEquipmentDeliveryPO::getStatus,1).
+//                set(CsEquipmentDeliveryPO::getRunStatus,1).
                 set(CsEquipmentDeliveryPO::getProcess,type).update();
         this.delete(deviceId);
         List<CsEquipmentProcessPO> list = csEquipmentProcessPOService.lambdaQuery().eq(CsEquipmentProcessPO::getDevId, one.getNdid()).