From 1e5f1561895b274c5a8a71d558db36b6a278814c Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Thu, 26 Oct 2023 13:56:18 +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 --- .../service/impl/CsDeviceUserPOServiceImpl.java | 16 +++++++++++++--- .../impl/CsEquipmentDeliveryServiceImpl.java | 13 ++++++++++--- 2 files changed, 23 insertions(+), 6 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 ca18a3e..a7d2885 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 @@ -2,6 +2,7 @@ package com.njcn.csdevice.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -288,12 +289,21 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl list1 = iCsLedgerService.lambdaQuery().eq(CsLedger::getPid, eid).list(); if(!com.alibaba.nacos.client.naming.utils.CollectionUtils.isEmpty(list1)){ List collect = list1.stream().map(CsLedger::getId).collect(Collectors.toList()); - csLinePOService.lambdaUpdate().in(CsLinePO::getLineId,collect).set(CsLinePO::getStatus,0).update(); + LambdaQueryWrapper csLinePOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + csLinePOLambdaQueryWrapper.in(CsLinePO::getLineId,collect); + csLinePOService.remove(csLinePOLambdaQueryWrapper); appLineTopologyDiagramService.lambdaUpdate().in(AppLineTopologyDiagramPO::getLineId,collect).set(AppLineTopologyDiagramPO::getStatus,0).update(); } //删除监测点，设备 - iCsLedgerService.lambdaUpdate().eq(CsLedger::getId,eid).set(CsLedger::getState,0).update(); - iCsLedgerService.lambdaUpdate().eq(CsLedger::getPid,eid).set(CsLedger::getState,0).update(); + LambdaQueryWrapper csLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>(); + csLedgerLambdaQueryWrapper.clear(); + csLedgerLambdaQueryWrapper.eq(CsLedger::getId,eid); + iCsLedgerService.remove(csLedgerLambdaQueryWrapper); + csLedgerLambdaQueryWrapper.clear(); + csLedgerLambdaQueryWrapper.eq(CsLedger::getPid,eid); + iCsLedgerService.remove(csLedgerLambdaQueryWrapper); +// iCsLedgerService.lambdaUpdate().eq(CsLedger::getId,eid).set(CsLedger::getState,0).update(); +// iCsLedgerService.lambdaUpdate().eq(CsLedger::getPid,eid).set(CsLedger::getState,0).update(); QueryWrapper queryWrap = new QueryWrapper<>(); queryWrap.eq("device_id",eid); csTouristDataPOService.getBaseMapper().delete(queryWrap); 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 b1b716e..e3b676d 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 @@ -131,11 +131,18 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl list = csLedgerService.lambdaQuery().eq(CsLedger::getPid, id).list(); if(!CollectionUtils.isEmpty(list)){ List collect = list.stream().map(CsLedger::getId).collect(Collectors.toList()); - csLinePOService.lambdaUpdate().in(CsLinePO::getLineId,collect).set(CsLinePO::getStatus,0).update(); + LambdaQueryWrapper csLinePOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + csLinePOLambdaQueryWrapper.in(CsLinePO::getLineId,collect); + csLinePOService.remove(csLinePOLambdaQueryWrapper); appLineTopologyDiagramService.lambdaUpdate().in(AppLineTopologyDiagramPO::getLineId,collect).set(AppLineTopologyDiagramPO::getStatus,0).update(); } - csLedgerService.lambdaUpdate().eq(CsLedger::getId,id).set(CsLedger::getState,0).update(); - csLedgerService.lambdaUpdate().eq(CsLedger::getPid,id).set(CsLedger::getState,0).update(); + LambdaQueryWrapper csLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>(); + csLedgerLambdaQueryWrapper.clear(); + csLedgerLambdaQueryWrapper.eq(CsLedger::getId,id); + csLedgerService.remove(csLedgerLambdaQueryWrapper); + csLedgerLambdaQueryWrapper.clear(); + csLedgerLambdaQueryWrapper.eq(CsLedger::getPid,id); + csLedgerService.remove(csLedgerLambdaQueryWrapper); csDeviceUserPOService.lambdaUpdate().eq(CsDeviceUserPO::getDeviceId,id).set(CsDeviceUserPO::getStatus,0).update(); QueryWrapper queryWrap = new QueryWrapper<>(); queryWrap.eq("device_id",id);