diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java index e25392a7b..f3939849d 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java @@ -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; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java index 6273f3ced..ec745b3e1 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java @@ -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 deleteDevReport(String supervisionId) { + String methodDescribe = getMethodDescribe("deleteDevReport"); + Boolean b = supervisionDevMainReportPOService.deleteDevReport(supervisionId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java index 29f845a26..b1e2b8e19 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java @@ -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 deleteQuitRunningDevice(String supervisionId) { + String methodDescribe = getMethodDescribe("deleteQuitRunningDevice"); + Boolean b = quitRunningDeviceService.deleteQuitRunningDevice(supervisionId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java index 31e42eed3..e0f97ba49 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java @@ -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 deleteTempLineRunTestReport(String supervisionId) { + String methodDescribe = getMethodDescribe("deleteTempLineRunTestReport"); + Boolean b = iSupervisionTempLineRunTestService.deleteTempLineRunTestReport(supervisionId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java index 8ad5d42ee..a754812bb 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java @@ -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 deleteTempLineReport(String supervisionId) { + String methodDescribe = getMethodDescribe("deleteDevReport"); + Boolean b = supervisionTempLineReportService.deleteTempLineReport(supervisionId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java index a38752724..17a5e18b2 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java @@ -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 deleteTempLineDebugReport(String supervisionId) { + String methodDescribe = getMethodDescribe("deleteTempLineDebugReport"); + Boolean b = supervisionTempLineDebugPOService.deleteTempLineDebugReport(supervisionId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } + } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java index 3166852e8..326f23194 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java @@ -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 deleteWarningLeaflet(String supervisionId) { + String methodDescribe = getMethodDescribe("deleteWarningLeaflet"); + Boolean b = warningLeafletService.deleteWarningLeaflet(supervisionId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java index 9a5b20651..67588374c 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java @@ -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 deleteSurveyPlan(String supervisionId) { + String methodDescribe = getMethodDescribe("deleteSurveyPlan"); + Boolean b = surveyPlanService.deleteSurveyPlan(supervisionId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java index efa7ccd60..2a7587be2 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java @@ -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 deleteSurveyPlanTest(String supervisionId) { + String methodDescribe = getMethodDescribe("deleteSurveyPlanTest"); + Boolean b = surveyTestService.deleteSurveyPlanTest(supervisionId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java index cfda6a7ed..5840c6003 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java @@ -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 deleteUserReport(String supervisionId) { + String methodDescribe = getMethodDescribe("deleteUserReport"); + Boolean b = userReportPOService.deleteUserReport(supervisionId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java index 61d0bf9bf..07eff9c82 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java @@ -26,4 +26,6 @@ public interface IQuitRunningDeviceService extends IBpmService().set(QuitRunningDevice::getState, DataStateEnum.DELETED.getCode()) + .eq(QuitRunningDevice::getId, supervisionId)); + } + return false; + } + /** * 校验是否已经有在审批的当前设备 */ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index 53729d0bd..82bd50da6 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -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().set(SupervisionDevMainReportPO::getState, DataStateEnum.DELETED.getCode()) + .eq(SupervisionDevMainReportPO::getId, supervisionId)); + } + return false; + } + /** * @Description: 判断设备ip是否重复，如果重复提示 * @Param: supervisionDevMainReportParam终端详情 isExcludeSelf是否排除自己，一般新增不排除，更新时需要排除自己 diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index 51abcb0fc..fdd52de67 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -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().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) { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java index 3100afd7b..62da872f6 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java @@ -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().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())) { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java index 0b0df462a..f710e8402 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java @@ -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().set(SupervisionTempLineRunTestPO::getState, DataStateEnum.DELETED.getCode()) + .eq(SupervisionTempLineRunTestPO::getId, supervisionId)); + } + return false; + } + private String assMsg(List supervisionTempLineReportList, List supervisionTempLineRunTestPOList) { StringBuilder builder = new StringBuilder(); Map map = supervisionTempLineReportList.stream().collect(Collectors.toMap(SupervisionTempLineReport::getId, Function.identity())); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java index 61314126d..e8aee9cb9 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java @@ -54,4 +54,6 @@ public interface IWarningLeafletService extends IBpmService { */ Page allPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam); + Boolean deleteWarningLeaflet(String supervisionId); + } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java index bfab637dd..cabfe9d0f 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java @@ -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().set(WarningLeaflet::getState, DataStateEnum.DELETED.getCode()) + .eq(WarningLeaflet::getId, supervisionId)); + } + return false; + } + private String assembleOverLimitInfo(RMpPartHarmonicDetailDTO rMpPartHarmonicDetailDTO) { String info = ""; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyPlanService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyPlanService.java index a2d866228..0e7f30ee1 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyPlanService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyPlanService.java @@ -26,4 +26,6 @@ public interface ISurveyPlanService extends IBpmService { String cancelSurveyPlan(BpmProcessInstanceCancelParam cancelReqVO); SurveyPlanVO getVOById(String id); + + Boolean deleteSurveyPlan(String supervisionId); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyTestService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyTestService.java index 7c7ead778..d3f7763d2 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyTestService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyTestService.java @@ -31,4 +31,6 @@ public interface ISurveyTestService extends IBpmService { SurveyTestVO getVOById(String id); void initiateWarningLeaflet(WarningAddParam warningAddParam); + + Boolean deleteSurveyPlanTest(String supervisionId); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index 214940346..611f7b7ea 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -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().set(SurveyPlan::getState, DataStateEnum.DELETED.getCode()) + .eq(SurveyPlan::getId, supervisionId)); + } + return false; + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java index 931640782..8ac2f0f16 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java @@ -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(); } } - }//筛选普测负责单位 if (StrUtil.isNotBlank(surveyTestQueryParam.getDeptIndex())) { deptIds = deptFeignClient.getDepSonIdtByDeptId(surveyTestQueryParam.getDeptIndex()).getData(); @@ -124,6 +123,8 @@ public class SurveyTestServiceImpl extends ServiceImpl().set(SurveyTest::getState, DataStateEnum.DELETED.getCode()) + .eq(SurveyTest::getId, supervisionId)); + } + return false; + } + /** * 组装谐波普测的问题 * 格式：planCreateTime发起的planName普测计划，由负责人leader测试后，于planComplateTime完成，其中subName在本次普测计划测试中存在电能质量问题，详细请查看附件 diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java index 283eb929f..51ddf6009 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java @@ -54,4 +54,6 @@ public interface UserReportPOService extends IBpmService { void downloadSensitiveReportTemplate(); void importSensitiveReportData(MultipartFile file, HttpServletResponse response); + + Boolean deleteUserReport(String supervisionId); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index d0512b668..0c3ead961 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -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().set(UserReportPO::getState, DataStateEnum.DELETED.getCode()) + .eq(UserReportPO::getId, supervisionId)); + } + return false; + } + public Map getTreeString(String name, List treeVOS) { Map info = new LinkedHashMap<>(); for (SysDicTreePO sysMenuDtoChild : treeVOS) { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java index d3777de24..aa1611b1a 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java @@ -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 list = Arrays.asList(trimmedString.split(",")); + List 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; + } + } \ No newline at end of file