From 1582d55a5ce6eed1cbe169f8adc947dc88c04a6c Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Mon, 9 Oct 2023 13:37:21 +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/CsEquipmentDeliveryServiceImpl.java       | 14 ++++++++++----
 .../service/impl/CsEventUserPOServiceImpl.java     |  8 +++++---
 2 files changed, 15 insertions(+), 7 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 72328f2..0d3d0cd 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
@@ -482,8 +482,11 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 set(CsEquipmentDeliveryPO::getRunStatus,1).
                 set(CsEquipmentDeliveryPO::getProcess,type+1).update();
         this.delete(deviceId);
-        csEquipmentProcessPOService.lambdaUpdate().eq(CsEquipmentProcessPO::getDevId,one.getNdid()).
-                eq(CsEquipmentProcessPO::getProcess,type).
+        List<CsEquipmentProcessPO> list = csEquipmentProcessPOService.lambdaQuery().eq(CsEquipmentProcessPO::getDevId, one.getNdid()).
+                eq(CsEquipmentProcessPO::getProcess, type).orderByDesc(CsEquipmentProcessPO::getStartTime).list();
+        //获取最新一条数据；
+        CsEquipmentProcessPO csEquipmentProcessPO = list.get(0);
+        csEquipmentProcessPOService.lambdaUpdate().eq(CsEquipmentProcessPO::getId,csEquipmentProcessPO.getId()).
                 set(CsEquipmentProcessPO::getStatus,1).
                 set(CsEquipmentProcessPO::getEndTime,LocalDateTime.now()).
                 set(CsEquipmentProcessPO::getRemark,remark).
@@ -499,8 +502,11 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 set(CsEquipmentDeliveryPO::getRunStatus,1).
                 set(CsEquipmentDeliveryPO::getProcess,type).update();
         this.delete(deviceId);
-        csEquipmentProcessPOService.lambdaUpdate().eq(CsEquipmentProcessPO::getDevId,one.getNdid()).
-                eq(CsEquipmentProcessPO::getProcess,type).
+        List<CsEquipmentProcessPO> list = csEquipmentProcessPOService.lambdaQuery().eq(CsEquipmentProcessPO::getDevId, one.getNdid()).
+                eq(CsEquipmentProcessPO::getProcess, type).orderByDesc(CsEquipmentProcessPO::getStartTime).list();
+        //获取最新一条数据；
+        CsEquipmentProcessPO csEquipmentProcessPO = list.get(0);
+        csEquipmentProcessPOService.lambdaUpdate().eq(CsEquipmentProcessPO::getId,csEquipmentProcessPO.getId()).
                 set(CsEquipmentProcessPO::getStatus,0).
                 set(CsEquipmentProcessPO::getEndTime,LocalDateTime.now()).
                 set(CsEquipmentProcessPO::getRemark,remark).
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
index 9dfe3c7..550af5b 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
@@ -169,10 +169,12 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
 
     @Override
     public void updateStatus(CsEventUserQueryParam csEventUserQueryParam) {
-        if(CollectionUtil.isEmpty(csEventUserQueryParam.getEventIds())){
-            return;
-        }
         csEventUserQueryParam.setUserId(RequestUtil.getUserIndex());
+        //getEventIds传空一键已读
+        if(CollectionUtil.isEmpty(csEventUserQueryParam.getEventIds())){
+            this.lambdaUpdate().eq(CsEventUserPO::getUserId,csEventUserQueryParam.getUserId()).
+                    set(CsEventUserPO::getStatus,1).update();
+        }
         this.lambdaUpdate().in(CsEventUserPO::getEventId,csEventUserQueryParam.getEventIds()).
                 eq(CsEventUserPO::getUserId,csEventUserQueryParam.getUserId()).
                 set(CsEventUserPO::getStatus,1).update();