Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

台账bug修改

Browse Source
This commit is contained in:
雨木c
2023-03-07 13:55:39 +08:00
parent dbdd68be8f
commit 59f803733a
5 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java
View File

@@ -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;
/**

4
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
View File

@@ -226,8 +226,10 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
}
@Override
@Transactional(rollbackFor = RuntimeException.class)
public boolean delMonitor(List<String> monitorIds) {
//需要先判断配网表中是否存在此监测点
iDistributionMonitorService.removeByIds(monitorIds);
this.removeByIds(monitorIds);
specialMonitorMapper.deleteBatchIds(monitorIds);
return true;

6
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java
View File

@@ -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<PowerClientMapper, Power
private final DeptFeignClient deptFeignClient;
private final IDistributionMonitorService iDistributionMonitorService;
@Override
public boolean addPowerClient(PowerClientParam powerClientParam) {
LambdaQueryWrapper<PowerClient> che = new LambdaQueryWrapper<>();
@@ -69,7 +73,9 @@ public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, Power
}
@Override
@Transactional(rollbackFor = RuntimeException.class)
public boolean delPowerClient(List<String> powerClientIds) {
iDistributionMonitorService.removeByIds(powerClientIds);
return this.removeByIds(powerClientIds);
}

10
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java
View File

@@ -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<PowerDistribut
private final IStatationStatService iStatationStatService;
private final IGeneratrixWireService iGeneratrixWireService;
private DicDataFeignClient dicDataFeignClient;
private final IDistributionMonitorService iDistributionMonitorService;
@Override
public Page<PowerDistributionarea> getList(BaseParam baseParam) {
@@ -157,8 +157,10 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
* @param ids
*/
@Override
@Transactional(rollbackFor=RuntimeException.class)
public boolean delete(List<String> ids) {
return this.lambdaUpdate().set(PowerDistributionarea::getStatus, DataStateEnum.DELETED.getCode()).in(PowerDistributionarea::getId, ids).update();
iDistributionMonitorService.removeByIds(ids);
return this.removeByIds(ids);
}
/**

6
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java
View File

@@ -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<PowerGenerationU
private final DeptFeignClient deptFeignClient;
private final IDistributionMonitorService iDistributionMonitorService;
@Override
public boolean addPowerGenerationUser(PowerGenerationUserParam powerGenerationUserParam) {
LambdaQueryWrapper<PowerGenerationUser> che = new LambdaQueryWrapper<>();
@@ -71,7 +75,9 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationU
}
@Override
@Transactional(rollbackFor = RuntimeException.class)
public boolean delPowerGenerationUser(List<String> powerGenerationUserIds) {
iDistributionMonitorService.removeByIds(powerGenerationUserIds);
return this.removeByIds(powerGenerationUserIds);
}