From 59f803733a688e58eecdde6e5ab29306452d4a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 7 Mar 2023 13:55:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pms/pojo/po/DistributionMonitor.java | 2 ++ .../service/majornetwork/impl/MonitorServiceImpl.java | 4 +++- .../majornetwork/impl/PowerClientServiceImpl.java | 6 ++++++ .../impl/PowerDistributionareaServiceImpl.java | 10 ++++++---- .../impl/PowerGenerationUserServiceImpl.java | 6 ++++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java index b2f7155f3..028066482 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.pojo.po; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import lombok.Data; @@ -30,6 +31,7 @@ public class DistributionMonitor extends BaseEntity { /** * 监测点ID */ + @TableId private String monitorId; /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index fe1640194..1946ddf71 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -226,8 +226,10 @@ public class MonitorServiceImpl extends ServiceImpl impl } @Override + @Transactional(rollbackFor = RuntimeException.class) public boolean delMonitor(List monitorIds) { - + //需要先判断配网表中是否存在此监测点 + iDistributionMonitorService.removeByIds(monitorIds); this.removeByIds(monitorIds); specialMonitorMapper.deleteBatchIds(monitorIds); return true; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java index e756a5d46..71b2a0fa7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java @@ -14,6 +14,7 @@ import com.njcn.device.pms.pojo.param.PowerUserParam; import com.njcn.device.pms.pojo.po.PowerClient; import com.njcn.device.pms.pojo.po.PowerGenerationUser; import com.njcn.device.pms.pojo.vo.PowerClientVO; +import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; import com.njcn.device.pms.service.majornetwork.IPowerClientService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.user.api.DeptFeignClient; @@ -22,6 +23,7 @@ import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -41,6 +43,8 @@ public class PowerClientServiceImpl extends ServiceImpl che = new LambdaQueryWrapper<>(); @@ -69,7 +73,9 @@ public class PowerClientServiceImpl extends ServiceImpl powerClientIds) { + iDistributionMonitorService.removeByIds(powerClientIds); return this.removeByIds(powerClientIds); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java index af3f19fc2..3cfbe7e4c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java @@ -16,6 +16,7 @@ import com.njcn.device.pms.pojo.po.PowerDistributionarea; import com.njcn.device.pms.pojo.po.PowerGenerationUser; import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO; +import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -28,6 +29,7 @@ import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Objects; @@ -48,9 +50,7 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl getList(BaseParam baseParam) { @@ -157,8 +157,10 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl ids) { - return this.lambdaUpdate().set(PowerDistributionarea::getStatus, DataStateEnum.DELETED.getCode()).in(PowerDistributionarea::getId, ids).update(); + iDistributionMonitorService.removeByIds(ids); + return this.removeByIds(ids); } /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java index 76e81697d..265d2c716 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java @@ -14,6 +14,7 @@ import com.njcn.device.pms.pojo.param.PowerUserParam; import com.njcn.device.pms.pojo.po.PowerClient; import com.njcn.device.pms.pojo.po.PowerGenerationUser; import com.njcn.device.pms.pojo.vo.PowerGenerationUserVO; +import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.user.api.DeptFeignClient; @@ -22,6 +23,7 @@ import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.util.ArrayList; @@ -42,6 +44,8 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl che = new LambdaQueryWrapper<>(); @@ -71,7 +75,9 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl powerGenerationUserIds) { + iDistributionMonitorService.removeByIds(powerGenerationUserIds); return this.removeByIds(powerGenerationUserIds); }