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

1.解决技术监督申报人问题

Browse Source 
2.技术监督全流程删除
This commit is contained in:
wr
2024-09-02 11:53:27 +08:00
parent e13b1f156e
commit e93f8b4da8
29 changed files with 314 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java
View File

@@ -24,6 +24,7 @@ public enum SupervisionResponseEnum {
NO_USER_REPORT_UPDATE("A00550","常态化干扰源用户管理信息更新失败，不存在该条信息"),
NO_DEPT_POWER("A00550","不能操作非自己部门创建的任务"),
IMPORT_DEV_ERROR("A00550","导入终端检测失败"),
DELETE_TO_BE_SUBMITTED("A00550","流程删除失败，只有待提交信息可删除!"),
;
private final String code;

9
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java
View File

@@ -154,4 +154,13 @@ public class DeVReportManageController extends BaseController {
supervisionDevMainReportPOService.importDevData(file, response);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@GetMapping(value = "/deleteDevReport")
@ApiOperation("终端入网检测删除流程")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
public HttpResult<Boolean> deleteDevReport(String supervisionId) {
String methodDescribe = getMethodDescribe("deleteDevReport");
Boolean b = supervisionDevMainReportPOService.deleteDevReport(supervisionId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
}

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java
View File

@@ -96,6 +96,14 @@ public class QuitRunningDeviceController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, quitRunningDeviceVO, methodDescribe);
}
@GetMapping(value = "/deleteQuitRunningDevice")
@ApiOperation("试运行评估删除流程")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
public HttpResult<Boolean> deleteQuitRunningDevice(String supervisionId) {
String methodDescribe = getMethodDescribe("deleteQuitRunningDevice");
Boolean b = quitRunningDeviceService.deleteQuitRunningDevice(supervisionId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
}

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java
View File

@@ -103,5 +103,13 @@ public class SupervisionTempLineRunTestController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
}
@GetMapping(value = "/deleteTempLineRunTestReport")
@ApiOperation("试运行评估删除流程")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
public HttpResult<Boolean> deleteTempLineRunTestReport(String supervisionId) {
String methodDescribe = getMethodDescribe("deleteTempLineRunTestReport");
Boolean b = iSupervisionTempLineRunTestService.deleteTempLineRunTestReport(supervisionId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
}

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java
View File

@@ -104,4 +104,12 @@ public class TempLineController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
}
@GetMapping(value = "/deleteTempLineReport")
@ApiOperation("监测点台账录入删除流程")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
public HttpResult<Boolean> deleteTempLineReport(String supervisionId) {
String methodDescribe = getMethodDescribe("deleteDevReport");
Boolean b = supervisionTempLineReportService.deleteTempLineReport(supervisionId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
}

9
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java
View File

@@ -116,4 +116,13 @@ public class TempLineDebugController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
}
@GetMapping(value = "/deleteTempLineDebugReport")
@ApiOperation("监测点联调列表删除流程")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
public HttpResult<Boolean> deleteTempLineDebugReport(String supervisionId) {
String methodDescribe = getMethodDescribe("deleteTempLineDebugReport");
Boolean b = supervisionTempLineDebugPOService.deleteTempLineDebugReport(supervisionId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
}

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java
View File

@@ -138,6 +138,14 @@ public class WarningLeafletController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, warningLeafletId, methodDescribe);
}
@GetMapping(value = "/deleteWarningLeaflet")
@ApiOperation("预告警单删除流程")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
public HttpResult<Boolean> deleteWarningLeaflet(String supervisionId) {
String methodDescribe = getMethodDescribe("deleteWarningLeaflet");
Boolean b = warningLeafletService.deleteWarningLeaflet(supervisionId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
}

9
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java
View File

@@ -97,6 +97,13 @@ public class SurveyPlanController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, surveyPlanVO, methodDescribe);
}
@GetMapping(value = "/deleteSurveyPlan")
@ApiOperation("技术监督计划管理删除流程")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
public HttpResult<Boolean> deleteSurveyPlan(String supervisionId) {
String methodDescribe = getMethodDescribe("deleteSurveyPlan");
Boolean b = surveyPlanService.deleteSurveyPlan(supervisionId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
}

9
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java
View File

@@ -117,6 +117,15 @@ public class SurveyTestController extends BaseController {
surveyTestService.initiateWarningLeaflet(warningAddParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, Boolean.TRUE, methodDescribe);
}
@GetMapping(value = "/deleteSurveyPlanTest")
@ApiOperation("技术监督测试管理删除流程")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
public HttpResult<Boolean> deleteSurveyPlanTest(String supervisionId) {
String methodDescribe = getMethodDescribe("deleteSurveyPlanTest");
Boolean b = surveyTestService.deleteSurveyPlanTest(supervisionId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
}

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
View File

@@ -206,5 +206,13 @@ public class UserReportManageController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@GetMapping(value = "/deleteUserReport")
@ApiOperation("干扰源接入功能删除流程")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
public HttpResult<Boolean> deleteUserReport(String supervisionId) {
String methodDescribe = getMethodDescribe("deleteUserReport");
Boolean b = userReportPOService.deleteUserReport(supervisionId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
}

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

@@ -26,4 +26,6 @@ public interface IQuitRunningDeviceService extends IBpmService<QuitRunningDevice
QuitRunningDeviceVO getVOById(String id);
String cancelQuitRunningDevice(BpmProcessInstanceCancelParam cancelReqVO);
Boolean deleteQuitRunningDevice(String supervisionId);
}

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

@@ -29,4 +29,5 @@ public interface ISupervisionTempLineRunTestService extends IBpmReasonService<Su
String cancel(BpmProcessInstanceCancelParam cancelReqVO);
Boolean deleteTempLineRunTestReport(String supervisionId);
}

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

@@ -43,4 +43,7 @@ public interface SupervisionDevMainReportPOService extends IBpmService<Supervisi
void downloadDevTemplate();
void importDevData(MultipartFile file, HttpServletResponse response);
Boolean deleteDevReport(String supervisionId);
}

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

@@ -30,4 +30,6 @@ public interface SupervisionTempLineDebugPOService extends IBpmService<Supervisi
String ledgerSync(String id);
String cancel(BpmProcessInstanceCancelParam cancelReqVO);
Boolean deleteTempLineDebugReport(String supervisionId);
}

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

@@ -26,4 +26,7 @@ public interface SupervisionTempLineReportService extends IBpmService<Supervisio
String cancelTempLineReport(BpmProcessInstanceCancelParam cancelReqVO);
SupervisionTempLineReportVO getDetailTempLine(String id);
Boolean deleteTempLineReport(String supervisionId);
}

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

@@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
@@ -24,10 +26,12 @@ import com.njcn.device.pq.pojo.po.line.LineInfoVO;
import com.njcn.device.pq.pojo.vo.DeviceVO;
import com.njcn.device.pq.pojo.vo.LineDetailVO;
import com.njcn.supervision.enums.SupervisionKeyEnum;
import com.njcn.supervision.enums.SupervisionResponseEnum;
import com.njcn.supervision.enums.SupervisionUserStatusEnum;
import com.njcn.supervision.mapper.device.QuitRunningDeviceMapper;
import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO;
import com.njcn.supervision.service.device.IQuitRunningDeviceService;
import com.njcn.supervision.service.user.UserReportPOService;
@@ -304,6 +308,24 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
return quitRunningDevice.getId();
}
@Override
public Boolean deleteQuitRunningDevice(String supervisionId) {
QuitRunningDevice byId = this.getById(supervisionId);
//判断是否有权限操作
Boolean deleteRole = InstanceUtil.deleteRole(RequestUtil.getUserIndex(), byId.getCreateBy());
if(ObjectUtil.isNotEmpty(byId)) {
//是否删除管理管理员权限
if(!deleteRole){
if(byId.getStatus() != BpmTaskStatusEnum.WAIT.getStatus()){
throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
}
}
return this.update(new LambdaUpdateWrapper<QuitRunningDevice>().set(QuitRunningDevice::getState, DataStateEnum.DELETED.getCode())
.eq(QuitRunningDevice::getId, supervisionId));
}
return false;
}
/**
* 校验是否已经有在审批的当前设备
*/

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

@@ -12,6 +12,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
@@ -41,6 +42,7 @@ import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
import com.njcn.supervision.pojo.param.device.SupervisionTempDeviceReportParam;
import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
import com.njcn.supervision.pojo.po.user.UserReportPO;
import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO;
import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
import com.njcn.supervision.service.device.SupervisionTempDeviceReportService;
@@ -689,6 +691,24 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
}
}
@Override
public Boolean deleteDevReport(String supervisionId) {
SupervisionDevMainReportPO byId = this.getById(supervisionId);
//判断是否有权限操作
Boolean deleteRole = InstanceUtil.deleteRole(RequestUtil.getUserIndex(), byId.getCreateBy());
if(ObjectUtil.isNotEmpty(byId)) {
//是否删除管理管理员权限
if(!deleteRole){
if(byId.getStatus() != BpmTaskStatusEnum.WAIT.getStatus()){
throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
}
}
return this.update(new LambdaUpdateWrapper<SupervisionDevMainReportPO>().set(SupervisionDevMainReportPO::getState, DataStateEnum.DELETED.getCode())
.eq(SupervisionDevMainReportPO::getId, supervisionId));
}
return false;
}
/**
* @Description: 判断设备ip是否重复，如果重复提示
* @Param: supervisionDevMainReportParam终端详情 isExcludeSelf是否排除自己，一般新增不排除，更新时需要排除自己

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

@@ -10,6 +10,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
@@ -26,6 +27,7 @@ import com.njcn.device.pq.api.TerminalBaseClient;
import com.njcn.device.pq.pojo.param.*;
import com.njcn.device.pq.pojo.po.Line;
import com.njcn.supervision.enums.SupervisionKeyEnum;
import com.njcn.supervision.enums.SupervisionResponseEnum;
import com.njcn.supervision.enums.UserNatureEnum;
import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper;
import com.njcn.supervision.mapper.user.UserReportNormalMapper;
@@ -411,6 +413,23 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
return supervisionTempLineDebugPO.getId();
}
@Override
public Boolean deleteTempLineDebugReport(String supervisionId) {
SupervisionTempLineDebugPO byId = this.getById(supervisionId);
//判断是否有权限操作
Boolean deleteRole = InstanceUtil.deleteRole(RequestUtil.getUserIndex(), byId.getCreateBy());
if(ObjectUtil.isNotEmpty(byId)) {
//是否删除管理管理员权限
if(!deleteRole){
if(byId.getStatus() != BpmTaskStatusEnum.WAIT.getStatus()){
throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
}
}
return this.update(new LambdaUpdateWrapper<SupervisionTempLineDebugPO>().set(SupervisionTempLineDebugPO::getState, DataStateEnum.DELETED.getCode())
.eq(SupervisionTempLineDebugPO::getId, supervisionId));
}
return false;
}
private void assembleSyncTerminalParam(DeviceParam deviceParam, SupervisionTempDeviceReport tempDevice,SubVoltageParam subVoltageParam,LineParam lineParam ,SupervisionTempLineReport tempLine) {

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

@@ -8,6 +8,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
@@ -20,10 +21,12 @@ import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.supervision.enums.FlowStatusEnum;
import com.njcn.supervision.enums.SupervisionKeyEnum;
import com.njcn.supervision.enums.SupervisionResponseEnum;
import com.njcn.supervision.enums.SupervisionUserStatusEnum;
import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper;
import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper;
import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO;
@@ -263,6 +266,24 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
return vo;
}
@Override
public Boolean deleteTempLineReport(String supervisionId) {
SupervisionTempLineReport byId = this.getById(supervisionId);
//判断是否有权限操作
Boolean deleteRole = InstanceUtil.deleteRole(RequestUtil.getUserIndex(), byId.getCreateBy());
if(ObjectUtil.isNotEmpty(byId)) {
//是否删除管理管理员权限
if(!deleteRole){
if(byId.getStatus() != BpmTaskStatusEnum.WAIT.getStatus()){
throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
}
}
return this.update(new LambdaUpdateWrapper<SupervisionTempLineReport>().set(SupervisionTempLineReport::getState, DataStateEnum.DELETED.getCode())
.eq(SupervisionTempLineReport::getId, supervisionId));
}
return false;
}
private void checkLineId(SupervisionTempLineReportParam supervisionTempLineReportParam, boolean isExcludeSelf) {
//保存时不为空则不校验
if(Objects.nonNull(supervisionTempLineReportParam.getNum())||Objects.nonNull(supervisionTempLineReportParam.getLineName())) {

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

@@ -10,6 +10,7 @@ import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
@@ -31,6 +32,7 @@ import com.njcn.harmonic.api.ReportFeignClient;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.supervision.enums.FlowStatusEnum;
import com.njcn.supervision.enums.SupervisionKeyEnum;
import com.njcn.supervision.enums.SupervisionResponseEnum;
import com.njcn.supervision.enums.SupervisionUserStatusEnum;
import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper;
import com.njcn.supervision.mapper.device.SupervisionTempLineRunTestMapper;
@@ -378,6 +380,24 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
return supervisionTempLineRunTestPO.getId();
}
@Override
public Boolean deleteTempLineRunTestReport(String supervisionId) {
SupervisionTempLineRunTestPO byId = this.getById(supervisionId);
//判断是否有权限操作
Boolean deleteRole = InstanceUtil.deleteRole(RequestUtil.getUserIndex(), byId.getCreateBy());
if(ObjectUtil.isNotEmpty(byId)) {
//是否删除管理管理员权限
if(!deleteRole){
if(byId.getStatus() != BpmTaskStatusEnum.WAIT.getStatus()){
throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
}
}
return this.update(new LambdaUpdateWrapper<SupervisionTempLineRunTestPO>().set(SupervisionTempLineRunTestPO::getState, DataStateEnum.DELETED.getCode())
.eq(SupervisionTempLineRunTestPO::getId, supervisionId));
}
return false;
}
private String assMsg(List<SupervisionTempLineReport> supervisionTempLineReportList, List<SupervisionTempLineRunTestPO> supervisionTempLineRunTestPOList) {
StringBuilder builder = new StringBuilder();
Map<String, SupervisionTempLineReport> map = supervisionTempLineReportList.stream().collect(Collectors.toMap(SupervisionTempLineReport::getId, Function.identity()));

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java
View File

@@ -54,4 +54,6 @@ public interface IWarningLeafletService extends IBpmService<WarningLeaflet> {
*/
Page<WarningLeafletVO> allPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam);
Boolean deleteWarningLeaflet(String supervisionId);
}

27
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
View File

@@ -6,8 +6,10 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
@@ -17,14 +19,13 @@ 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.exception.BusinessException;
import com.njcn.harmonic.pojo.dto.RMpPartHarmonicDetailDTO;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.supervision.enums.FlowStatusEnum;
import com.njcn.supervision.enums.LeafletTypeEnum;
import com.njcn.supervision.enums.ProblemTypeEnum;
import com.njcn.supervision.enums.SupervisionKeyEnum;
import com.njcn.supervision.enums.*;
import com.njcn.supervision.mapper.leaflet.WarningLeafletMapper;
import com.njcn.supervision.pojo.param.leaflet.WarningLeafletParam;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
import com.njcn.supervision.pojo.po.device.TempLineRunTestWarning;
import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet;
import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO;
@@ -396,6 +397,24 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
return warningLeafletVOPage;
}
@Override
public Boolean deleteWarningLeaflet(String supervisionId) {
WarningLeaflet byId = this.getById(supervisionId);
//判断是否有权限操作
Boolean deleteRole = InstanceUtil.deleteRole(RequestUtil.getUserIndex(), byId.getCreateBy());
if(ObjectUtil.isNotEmpty(byId)) {
//是否删除管理管理员权限
if(!deleteRole){
if(byId.getStatus() != BpmTaskStatusEnum.WAIT.getStatus()){
throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
}
}
return this.update(new LambdaUpdateWrapper<WarningLeaflet>().set(WarningLeaflet::getState, DataStateEnum.DELETED.getCode())
.eq(WarningLeaflet::getId, supervisionId));
}
return false;
}
private String assembleOverLimitInfo(RMpPartHarmonicDetailDTO rMpPartHarmonicDetailDTO) {
String info = "";

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

@@ -26,4 +26,6 @@ public interface ISurveyPlanService extends IBpmService<SurveyPlan> {
String cancelSurveyPlan(BpmProcessInstanceCancelParam cancelReqVO);
SurveyPlanVO getVOById(String id);
Boolean deleteSurveyPlan(String supervisionId);
}

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

@@ -31,4 +31,6 @@ public interface ISurveyTestService extends IBpmService<SurveyTest> {
SurveyTestVO getVOById(String id);
void initiateWarningLeaflet(WarningAddParam warningAddParam);
Boolean deleteSurveyPlanTest(String supervisionId);
}

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

@@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
@@ -23,6 +25,7 @@ import com.njcn.supervision.enums.SupervisionKeyEnum;
import com.njcn.supervision.enums.SupervisionResponseEnum;
import com.njcn.supervision.mapper.survey.SurveyPlanMapper;
import com.njcn.supervision.pojo.param.survey.SurveyPlanParam;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTestPO;
import com.njcn.supervision.pojo.po.survey.SurveyPlan;
import com.njcn.supervision.pojo.po.survey.SurveyTest;
import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO;
@@ -305,4 +308,22 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
surveyPlanVO.setSurveySubstationList(surveySubstationList);
return surveyPlanVO;
}
@Override
public Boolean deleteSurveyPlan(String supervisionId) {
SurveyPlan byId = this.getById(supervisionId);
//判断是否有权限操作
Boolean deleteRole = InstanceUtil.deleteRole(RequestUtil.getUserIndex(), byId.getCreateBy());
if(ObjectUtil.isNotEmpty(byId)) {
//是否删除管理管理员权限
if(!deleteRole){
if(byId.getStatus() != BpmTaskStatusEnum.WAIT.getStatus()){
throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
}
}
return this.update(new LambdaUpdateWrapper<SurveyPlan>().set(SurveyPlan::getState, DataStateEnum.DELETED.getCode())
.eq(SurveyPlan::getId, supervisionId));
}
return false;
}
}

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

@@ -6,9 +6,11 @@ import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,13 +21,11 @@ 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.exception.BusinessException;
import com.njcn.device.pms.pojo.po.PmsNewEnergy;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
import com.njcn.supervision.enums.FlowStatusEnum;
import com.njcn.supervision.enums.LeafletTypeEnum;
import com.njcn.supervision.enums.ProblemTypeEnum;
import com.njcn.supervision.enums.SupervisionKeyEnum;
import com.njcn.supervision.enums.*;
import com.njcn.supervision.mapper.survey.SurveyTestMapper;
import com.njcn.supervision.pojo.param.leaflet.WarningAddParam;
import com.njcn.supervision.pojo.param.survey.SurveyTestParam;
@@ -115,7 +115,6 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
return new Page<>();
}
}
}//筛选普测负责单位
if (StrUtil.isNotBlank(surveyTestQueryParam.getDeptIndex())) {
deptIds = deptFeignClient.getDepSonIdtByDeptId(surveyTestQueryParam.getDeptIndex()).getData();
@@ -124,6 +123,8 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
if (Objects.nonNull(surveyTestQueryParam.getStatus())) {
surveyTestVOQueryWrapper.eq("supervision_survey_test.status", surveyTestQueryParam.getStatus());
}
surveyTestVOQueryWrapper.eq(StringUtils.isNotBlank(surveyTestQueryParam.getSupvType()),"supervision_survey_plan.supv_type",surveyTestQueryParam.getSupvType());
//获取当前用户部门所有同事的id，查看该部门下所有的数据
surveyTestVOQueryWrapper
.eq("supervision_survey_test.state", DataStateEnum.ENABLE.getCode())
@@ -384,6 +385,24 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
this.lambdaUpdate().eq(SurveyTest::getId,warningAddParam.getId()).set(SurveyTest::getInitiateWarningFlag,1).update();
}
@Override
public Boolean deleteSurveyPlanTest(String supervisionId) {
SurveyTest byId = this.getById(supervisionId);
//判断是否有权限操作
Boolean deleteRole = InstanceUtil.deleteRole(RequestUtil.getUserIndex(), byId.getCreateBy());
if(ObjectUtil.isNotEmpty(byId)) {
//是否删除管理管理员权限
if(!deleteRole){
if(byId.getStatus() != BpmTaskStatusEnum.WAIT.getStatus()){
throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
}
}
return this.update(new LambdaUpdateWrapper<SurveyTest>().set(SurveyTest::getState, DataStateEnum.DELETED.getCode())
.eq(SurveyTest::getId, supervisionId));
}
return false;
}
/**
* 组装谐波普测的问题
* 格式：planCreateTime发起的planName普测计划，由负责人leader测试后，于planComplateTime完成，其中subName在本次普测计划测试中存在电能质量问题，详细请查看附件

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java
View File

@@ -54,4 +54,6 @@ public interface UserReportPOService extends IBpmService<UserReportPO> {
void downloadSensitiveReportTemplate();
void importSensitiveReportData(MultipartFile file, HttpServletResponse response);
Boolean deleteUserReport(String supervisionId);
}

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

@@ -12,10 +12,12 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
import com.njcn.bpm.enums.BpmProcessInstanceStatusEnum;
import com.njcn.bpm.enums.BpmResponseEnum;
import com.njcn.bpm.enums.BpmTaskStatusEnum;
import com.njcn.bpm.pojo.dto.BpmInstanceInfo;
import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
@@ -1053,6 +1055,24 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
}
}
@Override
public Boolean deleteUserReport(String supervisionId) {
UserReportPO byId = this.getById(supervisionId);
//判断是否有权限操作
Boolean deleteRole = InstanceUtil.deleteRole(RequestUtil.getUserIndex(), byId.getCreateBy());
if(ObjectUtil.isNotEmpty(byId)) {
//是否删除管理管理员权限
if(!deleteRole){
if(byId.getStatus() != BpmTaskStatusEnum.WAIT.getStatus()){
throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
}
}
return this.update(new LambdaUpdateWrapper<UserReportPO>().set(UserReportPO::getState, DataStateEnum.DELETED.getCode())
.eq(UserReportPO::getId, supervisionId));
}
return false;
}
public Map<String, String> getTreeString(String name, List<SysDicTreePO> treeVOS) {
Map<String, String> info = new LinkedHashMap<>();
for (SysDicTreePO sysMenuDtoChild : treeVOS) {

29
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java
View File

@@ -1,9 +1,15 @@
package com.njcn.supervision.utils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.StrUtil;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.supervision.enums.SupervisionResponseEnum;
import com.njcn.web.utils.RequestUtil;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* 处理流程实例的工具类
@@ -49,4 +55,27 @@ public class InstanceUtil {
}
/**
* 判断用户是否有删除管理员权限操作
*
* @param userId 当前用户部门id
* @param createBy 数据创建负责单位id
*/
public static Boolean deleteRole(String userId, String createBy) {
//先判断是否是删除管理员，如果是就有全部删除权限，否则就只能删除带提交审批的
String userRole = RequestUtil.getUserRole();
String trimmedString = userRole.substring(1, userRole.length() - 1).replace("\"","");
List<String> list = Arrays.asList(trimmedString.split(","));
List<String> delete = list.stream().filter(x -> "delete_info".equals(x)).collect(Collectors.toList());
//false 表示不是删除管理员
if(CollUtil.isNotEmpty(delete)){
return true;
}else{
if (!userId.equalsIgnoreCase(createBy)) {
throw new BusinessException(SupervisionResponseEnum.NO_POWER);
}
}
return false;
}
}