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:
hzj
2024-06-27 18:13:10 +08:00
parent 80dceeb0be
commit b146da4867
7 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
View File

@@ -88,6 +88,8 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
// quitRunningDevice.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
this.saveOrUpdate(quitRunningDevice);
quitRunningDevice = this.baseMapper.selectById(quitRunningDevice.getId());
// 发起 BPM 流程
if(Objects.equals(quitRunningDeviceParam.getSaveOrCheckflag(),"2")) {

3
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
View File

@@ -93,12 +93,15 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
supervisionDevMainReportPO.setState(DataStateEnum.ENABLE.getCode());
this.saveOrUpdate(supervisionDevMainReportPO);
String id = supervisionDevMainReportPO.getId();
supervisionDevMainReportPO = this.baseMapper.selectById(id);
//存储临时终端信息
SupervisionTempDeviceReportParam supervisionTempDeviceReportParam = supervisionDevMainReportParam.getSupervisionTempDeviceReportParam();
SupervisionTempDeviceReport supervisionTempDeviceReportPO = new SupervisionTempDeviceReport();
BeanUtils.copyProperties(supervisionTempDeviceReportParam, supervisionTempDeviceReportPO);
supervisionTempDeviceReportPO.setId(id);
supervisionTempDeviceReportService.saveOrUpdate(supervisionTempDeviceReportPO);
//存储临时监测点信息
// SupervisionTempLineReportParam supervisionTempLineReportParam = supervisionDevMainReportParam.getSupervisionTempLineReportParam();
// SupervisionTempLineReport supervisionTempLineReport = new SupervisionTempLineReport();

1
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
View File

@@ -103,6 +103,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
supervisionTempLineDebugPO.setState(DataStateEnum.ENABLE.getCode());
this.saveOrUpdate(supervisionTempLineDebugPO);
String id = supervisionTempLineDebugPO.getId();
supervisionTempLineDebugPO = this.baseMapper.selectById(id);
if(Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(),"2")) {
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
View File

@@ -97,6 +97,8 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
this.saveOrUpdate(supervisionTempLineReport);
String id = supervisionTempLineReport.getId();
supervisionTempLineReport = this.baseMapper.selectById(id);
if(Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(),"2")) {
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
View File

@@ -146,6 +146,8 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
}
surveyPlan.setState(DataStateEnum.ENABLE.getCode());
this.saveOrUpdate(surveyPlan);
surveyPlan = this.baseMapper.selectById(surveyPlan.getId());
// 发起 BPM 流程
if(Objects.equals(surveyPlanParam.getSaveOrCheckflag(),"2")){
Map<String, Object> processInstanceVariables = new HashMap<>();

1
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java
View File

@@ -72,6 +72,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
}
this.saveOrUpdate(userReportNormalPO);
userReportNormalPO =this.getById(userReportNormalPO.getId());
if(Objects.equals(userReportNormalParam.getSaveOrCheckflag(),"2")){
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -21,7 +21,6 @@ import com.njcn.bpm.pojo.dto.BpmInstanceInfo;
import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.utils.PubUtil;
import com.njcn.device.pq.api.LineFeignClient;
@@ -29,11 +28,13 @@ import com.njcn.device.pq.pojo.po.LineDetail;
import com.njcn.poi.excel.ExcelUtil;
import com.njcn.poi.excel.PullDown;
import com.njcn.poi.util.PoiUtil;
import com.njcn.supervision.enums.*;
import com.njcn.supervision.enums.FlowStatusEnum;
import com.njcn.supervision.enums.SupervisionKeyEnum;
import com.njcn.supervision.enums.SupervisionResponseEnum;
import com.njcn.supervision.enums.UserNatureEnum;
import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper;
import com.njcn.supervision.mapper.user.UserReportPOMapper;
import com.njcn.supervision.pojo.dto.SensitiveReportExcel;
import com.njcn.supervision.pojo.dto.SensitiveUserExcel;
import com.njcn.supervision.pojo.dto.SensitiveUserSExcel;
import com.njcn.supervision.pojo.param.user.UserReportParam;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
@@ -129,6 +130,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
userReportPO.setDataType(0);
}
this.saveOrUpdate(userReportPO);
userReportPO = this.getById(userReportPO.getId());
if (
CollectionUtil.newArrayList(
UserNatureEnum.BUILD_POWER_GRID.getCode(),