冀北重新发起，取消发起接口

2024-06-03 20:41:51 +08:00
parent 188c0515d7
commit e22e5d7d86
43 changed files with 753 additions and 72 deletions
--- 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
@@ -13,6 +13,7 @@ import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
 import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO;
 import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
 import com.njcn.web.controller.BaseController;
+import com.njcn.web.utils.RequestUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -22,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+import javax.validation.Valid;
 import java.util.List;

 /**
@@ -45,12 +47,26 @@ public class DeVReportManageController extends BaseController {
    @ApiOperation("新增电能质量监测装置设备")
    @ApiImplicitParam(name = "supervisionDevMainReportParam", value = "实体参数", required = true)
    public HttpResult<String> addDevReport(@RequestBody @Validated SupervisionDevMainReportParam supervisionDevMainReportParam){
-        String methodDescribe = getMethodDescribe("userReportParam");
+        String methodDescribe = getMethodDescribe("addDevReport");
        String devReportId = supervisionDevMainReportPOService.addDevReport(supervisionDevMainReportParam);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, devReportId, methodDescribe);

    }

+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改电能质量监测装置设备")
+    @ApiImplicitParam(name = "supervisionDevMainReportParam", value = "实体参数", required = true)
+    public HttpResult<String> updateDevReport(@RequestBody @Validated SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParam){
+        String methodDescribe = getMethodDescribe("updateDevReport");
+        String devReportId = supervisionDevMainReportPOService.updateDevReport(supervisionDevMainReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, devReportId, methodDescribe);
+
+    }
+
+
+
    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
    @PostMapping("/auditDevReport")
    @ApiOperation("修改电能质量监测装置设备")
--- 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
@@ -1,6 +1,7 @@
 package com.njcn.supervision.controller.device;


+import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -43,7 +44,17 @@ public class SupervisionTempLineRunTestController extends BaseController {
        String methodDescribe = getMethodDescribe("addTempLineReport");
        iSupervisionTempLineRunTestService.addRunTest(supervisionTempLineRunTestParam);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+    }

+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("新增监测点试运行")
+    @ApiImplicitParam(name = "supervisionTempLineRunTestParam", value = "实体参数", required = true)
+    public HttpResult<Object> updateRunTest(@RequestBody @Validated SupervisionTempLineRunTestParam.SupervisionTempLineRunTestUpdateParam supervisionTempLineRunTestParam){
+        String methodDescribe = getMethodDescribe("updateRunTest");
+        iSupervisionTempLineRunTestService.updateRunTest(supervisionTempLineRunTestParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
    }

    /**
@@ -79,6 +90,17 @@ public class SupervisionTempLineRunTestController extends BaseController {
    }


+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/cancel")
+    @ApiOperation("取消监测点试运行申请")
+    @ApiImplicitParam(name = "cancelReqVO", value = "取消原因", required = true)
+    public HttpResult<String> cancel(@Validated @RequestBody BpmProcessInstanceCancelParam cancelReqVO) {
+        String methodDescribe = getMethodDescribe("cancel");
+        String id = iSupervisionTempLineRunTestService.cancel(cancelReqVO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
+    }
+
+

 }

--- 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
@@ -8,6 +8,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO;
 import com.njcn.supervision.service.device.SupervisionTempLineReportService;
@@ -50,6 +51,18 @@ public class TempLineController extends BaseController {
    }


+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改电能质量监测装置设备")
+    @ApiImplicitParam(name = "supervisionDevMainReportParam", value = "实体参数", required = true)
+    public HttpResult<String> updateLineReport(@RequestBody @Validated SupervisionTempLineReportParam.SupervisionTempLineReportUpdate supervisionTempLineReportParam){
+        String methodDescribe = getMethodDescribe("updateLineReport");
+        String devReportId = supervisionTempLineReportService.updateLineReport(supervisionTempLineReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, devReportId, methodDescribe);
+
+    }
+
+
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/list")
    @ApiOperation("分页查询当前用户能看到的接入监测装置设备")
@@ -79,7 +92,7 @@ public class TempLineController extends BaseController {

    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
    @PostMapping("/cancel")
-    @ApiOperation("取消设备录入")
+    @ApiOperation("取消监测点录入申请")
    @ApiImplicitParam(name = "cancelReqVO", value = "取消原因", required = true)
    public HttpResult<String> cancelTempLineReport(@Validated @RequestBody BpmProcessInstanceCancelParam cancelReqVO) {
        String methodDescribe = getMethodDescribe("cancelTempLineReport");
--- 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
@@ -1,6 +1,7 @@
 package com.njcn.supervision.controller.device;

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -45,7 +46,17 @@ public class TempLineDebugController extends BaseController {
        String methodDescribe = getMethodDescribe("addTempLineDebug");
        String tempLineId = supervisionTempLineDebugPOService.addTempLineDebug(supervisionTempLineReportParam);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tempLineId, methodDescribe);
+    }

+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("新增临时监测点调试管理")
+    @ApiImplicitParam(name = "supervisionTempLineReportParam", value = "实体参数", required = true)
+    public HttpResult<String> updateTempLineDebug(@RequestBody @Validated SupervisionTempLineDebugParam.SupervisionTempLineDebugUpdateParam supervisionTempLineReportParam){
+        String methodDescribe = getMethodDescribe("updateTempLineDebug");
+        String tempLineId = supervisionTempLineDebugPOService.updateTempLineDebug(supervisionTempLineReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tempLineId, methodDescribe);
    }


@@ -86,16 +97,16 @@ public class TempLineDebugController extends BaseController {
        supervisionTempLineDebugPOService.updateStatus(businessKey,status);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
    }
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
-//    @PostMapping("/cancel")
-//    @ApiOperation("取消设备录入")
-//    @ApiImplicitParam(name = "cancelReqVO", value = "取消原因", required = true)
-//    public HttpResult<String> cancelTempLineReport(@Validated @RequestBody BpmProcessInstanceCancelParam cancelReqVO) {
-//        String methodDescribe = getMethodDescribe("cancelTempLineReport");
-//        String id = supervisionTempLineReportService.cancelTempLineReport(cancelReqVO);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
-//    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/cancel")
+    @ApiOperation("取消监测点调试申请")
+    @ApiImplicitParam(name = "cancelReqVO", value = "取消原因", required = true)
+    public HttpResult<String> cancelTempLineReport(@Validated @RequestBody BpmProcessInstanceCancelParam cancelReqVO) {
+        String methodDescribe = getMethodDescribe("cancelTempLineReport");
+        String id = supervisionTempLineDebugPOService.cancel(cancelReqVO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
+    }
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/ledgerSync")
    @ApiOperation("台账同步")
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java
@@ -49,6 +49,17 @@ public class SupervisionPlanController extends BaseController {
    }


+    @PostMapping("update")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
+    @ApiOperation("新增技术监督计划")
+    @ApiImplicitParam(name = "supvPlanParam",value = "请求体",required = true)
+    public HttpResult<Object> updatePlan(@RequestBody @Validated SupervisionPlanParam.UpdateSupvPlanParam supvPlanParam){
+        String methodDescribe = getMethodDescribe("updatePlan");
+        String id = supervisionPlanPOService.updatePlan(supvPlanParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
+    }
+
+
    @PostMapping("pagePlan")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("分页查询监督计划")
--- 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
@@ -1,8 +1,5 @@
 package com.njcn.supervision.controller.user;

-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -60,6 +57,18 @@ public class UserReportManageController extends BaseController {
    }

    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/update")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE)
+    @Operation(summary = "重新发起")
+    @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true)
+    public HttpResult<Object> updateUserReport(@RequestBody @Validated UserReportParam.UserReportUpdate userReportParam) {
+        String methodDescribe = getMethodDescribe("updateUserReport");
+        String userReportId = userReportPOService.updateUserReport(userReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportId, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
    @PostMapping("/auditUserReport")
    @ApiOperation("修改干扰源用户")
    @ApiImplicitParam(name = "userReportUpdate", value = "实体参数", required = true)
@@ -147,6 +156,10 @@ public class UserReportManageController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
    }

+
+
+
+
    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
    @PostMapping("/cancel")
    @ApiOperation("取消")
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportNormalController.java
@@ -2,6 +2,7 @@ package com.njcn.supervision.controller.user;


 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -9,11 +10,13 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.supervision.pojo.param.user.UserReportNormalParam;
+import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.supervision.service.user.IUserReportNormalService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -45,6 +48,16 @@ public class UserReportNormalController extends BaseController {
    }


+    @PostMapping("/update")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE)
+    @Operation(summary = "重新发起")
+    @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true)
+    public HttpResult<Object> updateUserReport(@RequestBody @Validated UserReportParam.UserReportUpdate userReportParam) {
+        String methodDescribe = getMethodDescribe("updateUserReport");
+        String userReportId = iUserReportNormalService.updateUserNormal(userReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportId, methodDescribe);
+    }
+

    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/userReportGoNetPage")
@@ -73,5 +86,15 @@ public class UserReportNormalController extends BaseController {
        iUserReportNormalService.updateUserReportNormalStatus(businessKey,status);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/cancel")
+    @ApiOperation("取消")
+    @ApiImplicitParam(name = "cancelReqVO", value = "取消原因", required = true)
+    public HttpResult<String> cancelUserReport(@Validated @RequestBody BpmProcessInstanceCancelParam cancelReqVO) {
+        String methodDescribe = getMethodDescribe("cancelUserReport");
+        String userReportId = iUserReportNormalService.cancelUserReport(cancelReqVO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportId, methodDescribe);
+    }
 }