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

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlanReturn.java

@@ -0,0 +1,19 @@
+package com.njcn.process.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * pqs
+ * 计划回退
+ * @author cdf
+ * @date 2024/5/30
+ */
+@Data
+@TableName("")
+public class SupvPlanReturn {
+    private String id;
+    private String planId;
+    private String rejectReason;
+    private String rejectComment;
+}

pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPlanReturnController.java

@@ -0,0 +1,45 @@
+package com.njcn.process.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+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.process.mapper.SupvPlanReturnMapper;
+import com.njcn.process.pojo.po.SupvPlanReturn;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2024/5/30
+ */
+@RestController
+@RequestMapping("/WMCenter/powerQuality/supervision")
+@Api(tags = "技术监督计划控制器")
+@RequiredArgsConstructor
+public class SupvPlanReturnController extends BaseController {
+
+    private final SupvPlanReturnMapper supvPlanReturnMapper;
+
+    @PostMapping("reject")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("新增技术监督计划")
+    @ApiImplicitParam(name = "supvPlanParam",value = "请求体",required = true)
+    public HttpResult<Object> reject(@RequestBody @Validated SupvPlanReturn supvPlanReturn){
+        String methodDescribe = getMethodDescribe("reject");
+        supvPlanReturnMapper.insert(supvPlanReturn);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+}

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvPlanReturnMapper.java

@@ -0,0 +1,20 @@
+package com.njcn.process.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.process.pojo.po.SupvPlan;
+import com.njcn.process.pojo.po.SupvPlanReturn;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-06-21
+ */
+public interface SupvPlanReturnMapper extends BaseMapper<SupvPlanReturn> {
+
+
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java

@@ -143,6 +143,16 @@ public class SupervisionDevMainReportParam {
     @ApiModelProperty(value = "流程实例的编号")
     private String processInstanceId;
 
+    @ApiModelProperty(value = "历史流程实例的编号")
+    private String historyInstanceId;
+
+
+    /**
+     * 1:审批中；2：审批通过；3：审批不通过；4：已取消
+     */
+    @ApiModelProperty(value = "审批状态")
+    private Integer status;
+
 
     @ApiModelProperty("发起人自选审批人 Map")
     private Map<String, List<String>> startUserSelectAssignees;
@@ -156,7 +166,7 @@ public class SupervisionDevMainReportParam {
     public  static class SupervisionDevMainReportParamUpdate extends SupervisionDevMainReportParam {
 
         @ApiModelProperty("id")
-        private String Id;
+        private String id;
 
     }
     /**
@@ -170,4 +180,4 @@ public class SupervisionDevMainReportParam {
         private String orgNo;
 
     }
-}
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/17  15:26【需求编号】
  *
@@ -37,6 +37,9 @@ public class SupervisionTempLineDebugParam extends BaseEntity {
     @ApiModelProperty(value="流程实例的编号")
     private String processInstanceId;
 
+    @ApiModelProperty(value = "流程实例的编号")
+    private String historyInstanceId;
+
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
@@ -52,6 +55,15 @@ public class SupervisionTempLineDebugParam extends BaseEntity {
     @ApiModelProperty("发起人自选审批人 Map")
     private Map<String, List<String>> startUserSelectAssignees;
 
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class  SupervisionTempLineDebugUpdateParam extends SupervisionTempLineDebugParam {
+
+        @ApiModelProperty(value = "主键")
+        private String id;
+
+    }
+
     @Data
     @EqualsAndHashCode(callSuper = true)
     public static class  SupervisionTempLineDebugQuery extends BaseParam {

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/11  14:07【需求编号】
  *
@@ -129,14 +129,20 @@ public class SupervisionTempLineReportParam {
     /**
      * CT变比
      */
-    @ApiModelProperty(value="CT变比")
+    @ApiModelProperty(value="CT1")
-    private Float ctRatio;
+    private Integer ct1;
+
+    @ApiModelProperty(value="CT2")
+    private Integer ct2;
 
     /**
      * PT变比
      */
-    @ApiModelProperty(value="PT变比")
+    @ApiModelProperty(value="PT1")
-    private Float ptRatio;
+    private Integer pt1;
+
+    @ApiModelProperty(value="PT2")
+    private Integer pt2;
 
     /**
      * 监测点编号
@@ -227,6 +233,17 @@ public class SupervisionTempLineReportParam {
     private Integer ptType;
 
 
+    /**
+     * 流程实例的编号
+     */
+
+    @ApiModelProperty(value = "流程实例的编号")
+    private String processInstanceId;
+
+    @ApiModelProperty(value = "流程实例的编号")
+    private String historyInstanceId;
+
+
     @ApiModelProperty("发起人自选审批人 Map")
     private Map<String, List<String>> startUserSelectAssignees;
 
@@ -235,7 +252,7 @@ public class SupervisionTempLineReportParam {
     public  static class SupervisionTempLineReportUpdate extends SupervisionTempLineReportParam {
 
         @ApiModelProperty("id")
-        private String Id;
+        private String id;
 
     }
 
@@ -252,4 +269,4 @@ public class SupervisionTempLineReportParam {
         private List<Integer> statueList;
 
     }
-}
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineRunTestParam.java

@@ -1,7 +1,10 @@
 package com.njcn.supervision.pojo.param.device;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
@@ -20,13 +23,17 @@ public class SupervisionTempLineRunTestParam {
 
     private static final long serialVersionUID = 1L;
 
-    private String id;
-
     /**
      * 流程实例的编号
      */
     private String processInstanceId;
 
+
+
+    @ApiModelProperty(value = "历史流程实例的编号")
+    private String historyInstanceId;
+
+
     /**
      * 在线率
      */
@@ -72,4 +79,16 @@ public class SupervisionTempLineRunTestParam {
     private String endTime;
 
 
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class SupervisionTempLineRunTestUpdateParam extends SupervisionTempLineRunTestParam {
+
+        @ApiModelProperty("id")
+        @NotBlank(message = "索引不能为空")
+        private String id;
+
+    }
+
+
+
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportNormalParam.java

@@ -58,4 +58,5 @@ public class UserReportNormalParam extends BaseParam {
 
 
 
+
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java

@@ -121,12 +121,14 @@ public class UserReportParam extends BaseEntity {
     private UserReportSubstationPO userReportSubstationPO;
 
 
+
+
     @Data
     @EqualsAndHashCode(callSuper = true)
     public  static class UserReportUpdate extends UserReportParam {
 
         @ApiModelProperty("id")
-        private String Id;
+        private String id;
 
     }
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java

@@ -134,6 +134,12 @@ public class SupervisionDevMainReportPO extends BaseEntity {
     @TableField(value = "process_instance_id")
     private String processInstanceId;
 
+    /**
+     * 流程实例的编号
+     */
+    @TableField(value = "history_instance_id")
+    private String historyInstanceId;
+
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
@@ -146,4 +152,4 @@ public class SupervisionDevMainReportPO extends BaseEntity {
      */
     @TableField(value = "`State`")
     private Integer state;
-}
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineDebugPO.java

@@ -11,7 +11,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/17  15:26【需求编号】
  *
@@ -40,6 +40,10 @@ public class SupervisionTempLineDebugPO extends BaseEntity {
     @ApiModelProperty(value="流程实例的编号")
     private String processInstanceId;
 
+
+    @ApiModelProperty(value = "历史流程实例的编号")
+    private String historyInstanceId;
+
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
@@ -53,4 +57,4 @@ public class SupervisionTempLineDebugPO extends BaseEntity {
     @TableField(value = "`State`")
     @ApiModelProperty(value="状态：0-删除 1-正常")
     private Integer state;
-}
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -11,7 +12,7 @@ import lombok.NoArgsConstructor;
 import java.time.LocalDate;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/11  14:07【需求编号】
  *
@@ -117,14 +118,21 @@ public class SupervisionTempLineReport  extends BaseEntity {
     /**
      * CT变比
      */
-    @TableField(value = "ct_ratio")
+    @ApiModelProperty(value="CT1")
-    private Float ctRatio;
+    private Integer ct1;
+
+    @ApiModelProperty(value="CT2")
+    private Integer ct2;
 
     /**
      * PT变比
      */
-    @TableField(value = "pt_ratio")
+    @ApiModelProperty(value="PT1")
-    private Float ptRatio;
+    private Integer pt1;
+
+    @ApiModelProperty(value="PT2")
+    private Integer pt2;
+
 
     /**
      * 监测点编号
@@ -232,6 +240,10 @@ public class SupervisionTempLineReport  extends BaseEntity {
     @TableField(value = "process_instance_id")
     private String processInstanceId;
 
+
+    @TableField(value = "history_instance_id")
+    private String historyInstanceId;
+
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
@@ -243,4 +255,4 @@ public class SupervisionTempLineReport  extends BaseEntity {
      */
     @TableField(value = "`State`")
     private Integer state;
-}
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineRunTestPO.java

@@ -34,6 +34,11 @@ public class SupervisionTempLineRunTestPO extends BaseEntity {
      */
     private String processInstanceId;
 
+    /**
+     * 历史流程实例的编号
+     */
+    private String historyInstanceId;
+
     /**
      * 在线率
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/plan/SupervisionPlanPO.java

@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
 import java.time.LocalDateTime;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/20  17:49【需求编号】
  *
@@ -221,6 +221,9 @@ public class SupervisionPlanPO  extends BaseEntity {
     @TableField(value = "process_instance_id")
     private String processInstanceId;
 
+    @TableField(value = "history_instance_id")
+    private String historyInstanceId;
+
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */
@@ -233,4 +236,4 @@ public class SupervisionPlanPO  extends BaseEntity {
      */
     @TableField(value = "`State`")
     private Integer state;
-}
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportNormalPO.java

@@ -39,6 +39,8 @@ public class UserReportNormalPO extends BaseEntity {
 
     private String processInstanceId;
 
+    private String historyInstanceId;
+
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java

@@ -114,6 +114,10 @@ public class UserReportPO extends BaseEntity {
     @TableField(value = "process_instance_id")
     private String processInstanceId;
 
+
+    @TableField(value = "history_instance_id")
+    private String historyInstanceId;
+
     /**
      * 数据来源类型 0.正常流程审核入库 1.批量导入
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java

@@ -146,6 +146,13 @@ public class SupervisionDevMainReportVO {
     @ApiModelProperty(value = "流程实例的编号")
     private String processInstanceId;
 
+    /**
+     * 历史流程实例的编号
+     */
+
+    @ApiModelProperty(value = "流程实例的编号")
+    private String historyInstanceId;
+
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java

@@ -32,6 +32,10 @@ public class SupervisionTempLineDebugVO extends BaseEntity {
      private String reason;
      private String processInstanceId;
 
+
+     @ApiModelProperty(value = "流程实例的编号")
+     private String historyInstanceId;
+
      private Integer status;
      /**
       * 0:未试运行 1：试运行中 2.试运行成功 3.试运行异常

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 import java.time.LocalDate;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/11  14:07【需求编号】
  *
@@ -128,14 +128,20 @@ public class SupervisionTempLineReportVO {
     /**
      * CT变比
      */
-    @ApiModelProperty(value="CT变比")
+    @ApiModelProperty(value="CT1")
-    private Float ctRatio;
+    private Integer ct1;
+
+    @ApiModelProperty(value="CT2")
+    private Integer ct2;
 
     /**
      * PT变比
      */
-    @ApiModelProperty(value="PT变比")
+    @ApiModelProperty(value="PT1")
-    private Float ptRatio;
+    private Integer pt1;
+
+    @ApiModelProperty(value="PT2")
+    private Integer pt2;
 
     /**
      * 监测点编号
@@ -242,4 +248,4 @@ public class SupervisionTempLineReportVO {
     private Integer status;
 
 
-}
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineRunTestVO.java

@@ -3,6 +3,7 @@ package com.njcn.supervision.pojo.vo.device;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -34,6 +35,9 @@ public class SupervisionTempLineRunTestVO extends BaseEntity{
      */
     private String processInstanceId;
 
+    @ApiModelProperty(value = "历史流程实例的编号")
+    private String historyInstanceId;
+
     /**
      * 在线率
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java

@@ -124,6 +124,9 @@ public class UserReportVO {
     @ApiModelProperty(value = "流程实例的编号")
     private String processInstanceId;
 
+    @ApiModelProperty(value = "历史流程实例的编号")
+    private String historyInstanceId;
+
 
     /**
      * 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消

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("修改电能质量监测装置设备")

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);
+    }
+
+
 
 }
 

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");

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)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
-//    @PostMapping("/cancel")
+    @PostMapping("/cancel")
-//    @ApiOperation("取消设备录入")
+    @ApiOperation("取消监测点调试申请")
-//    @ApiImplicitParam(name = "cancelReqVO", value = "取消原因", required = true)
+    @ApiImplicitParam(name = "cancelReqVO", value = "取消原因", required = true)
-//    public HttpResult<String> cancelTempLineReport(@Validated @RequestBody BpmProcessInstanceCancelParam cancelReqVO) {
+    public HttpResult<String> cancelTempLineReport(@Validated @RequestBody BpmProcessInstanceCancelParam cancelReqVO) {
-//        String methodDescribe = getMethodDescribe("cancelTempLineReport");
+        String methodDescribe = getMethodDescribe("cancelTempLineReport");
-//        String id = supervisionTempLineReportService.cancelTempLineReport(cancelReqVO);
+        String id = supervisionTempLineDebugPOService.cancel(cancelReqVO);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
-//    }
+    }
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/ledgerSync")
     @ApiOperation("台账同步")

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("分页查询监督计划")

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("取消")

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);
+    }
 }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml

@@ -26,8 +26,8 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, reporter, report_date, org_id, expected_production_date, user_type, city, responsible_department, 
+    id, reporter, report_date, org_id, expected_production_date, user_type, city, responsible_department,
-    user_status, substation, voltage_level, project_name, evaluation_dept, evaluation_conclusion, 
+    user_status, substation, voltage_level, project_name, evaluation_dept, evaluation_conclusion,
     Create_By, Create_Time, Update_By, Update_Time, `State`
   </sql>
 
@@ -48,9 +48,10 @@
       supervision_user_report.evaluation_dept,
       supervision_user_report.evaluation_conclusion,
       supervision_user_report.process_instance_id,
+      supervision_user_report.history_instance_id,
       supervision_user_report.create_time,
       supervision_user_report.status
     FROM supervision_user_report supervision_user_report
     WHERE ${ew.sqlSegment}
   </select>
-</mapper>
+</mapper>

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

@@ -2,6 +2,7 @@ package com.njcn.supervision.service.device;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineRunTestParam;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTestPO;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineRunTestVO;
@@ -18,6 +19,8 @@ public interface ISupervisionTempLineRunTestService extends IService<Supervision
 
     Boolean addRunTest(SupervisionTempLineRunTestParam supervisionTempLineRunTestParam);
 
+    String updateRunTest(SupervisionTempLineRunTestParam.SupervisionTempLineRunTestUpdateParam supervisionTempLineRunTestParam);
+
     void isTestRunStartOrEnd();
 
 
@@ -27,5 +30,8 @@ public interface ISupervisionTempLineRunTestService extends IService<Supervision
     SupervisionTempLineRunTestVO getRunTestById(String id);
 
 
+    String cancel(BpmProcessInstanceCancelParam cancelReqVO);
+
+
 
 }

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

@@ -23,6 +23,8 @@ public interface SupervisionDevMainReportPOService extends IService<SupervisionD
 
     String addDevReport(SupervisionDevMainReportParam supervisionDevMainReportParam);
 
+    String updateDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParam);
+
     boolean auditDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParamUpdate);
 
     Boolean removeDevReport(List<String> ids);

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

@@ -2,6 +2,7 @@ package com.njcn.supervision.service.device;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineDebugParam;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO;
@@ -18,6 +19,8 @@ public interface SupervisionTempLineDebugPOService extends IService<SupervisionT
 
     String addTempLineDebug(SupervisionTempLineDebugParam supervisionTempLineReportParam);
 
+    String updateTempLineDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugUpdateParam supervisionTempLineReportParam);
+
     Page<SupervisionTempLineDebugVO> getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery);
 
     Page<SupervisionTempLineDebugVO> pageHasDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery);
@@ -27,4 +30,6 @@ public interface SupervisionTempLineDebugPOService extends IService<SupervisionT
     void updateStatus(String businessKey, Integer status);
 
     String ledgerSync(String id);
+
+    String cancel(BpmProcessInstanceCancelParam cancelReqVO);
 }

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

@@ -8,19 +8,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO;
 
 /**
- * 
  * Description:
  * Date: 2024/5/11  14:07【需求编号】
  *
  * @author clam
  * @version V1.0.0
  */
-public interface SupervisionTempLineReportService extends IService<SupervisionTempLineReport>{
+public interface SupervisionTempLineReportService extends IService<SupervisionTempLineReport> {
 
 
-        String addTempLineReport(SupervisionTempLineReportParam supervisionTempLineReportParam);
+    String addTempLineReport(SupervisionTempLineReportParam supervisionTempLineReportParam);
 
-        Page<SupervisionTempLineReportVO> getTempLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportQuery supervisionTempLineReportQuery);
+    String updateLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportUpdate supervisionTempLineReportParam);
+
+    Page<SupervisionTempLineReportVO> getTempLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportQuery supervisionTempLineReportQuery);
 
     void updateStatus(String businessKey, Integer status);
 

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

@@ -19,11 +19,13 @@ import com.njcn.supervision.enums.FlowStatusEnum;
 import com.njcn.supervision.mapper.device.SupervisionDevMainReportPOMapper;
 import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
 import com.njcn.supervision.pojo.param.device.SupervisionTempDeviceReportParam;
+import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
 import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 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.supervision.service.device.SupervisionTempDeviceReportService;
+import com.njcn.supervision.utils.InstanceUtil;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.vo.UserVO;
@@ -41,7 +43,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/10  18:10【需求编号】
  *
@@ -104,6 +106,37 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         return id;
     }
 
+    @Override
+    public String updateDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParam) {
+        SupervisionDevMainReportPO supervisionDevMainReportPO = this.baseMapper.selectById(supervisionDevMainReportParam.getId());
+        //判断是否有权限操作
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),supervisionDevMainReportPO.getCreateBy());
+        supervisionDevMainReportParam.setProcessInstanceId(supervisionDevMainReportPO.getProcessInstanceId());
+        supervisionDevMainReportParam.setHistoryInstanceId(supervisionDevMainReportPO.getHistoryInstanceId());
+        BeanUtils.copyProperties(supervisionDevMainReportParam,supervisionDevMainReportPO);
+        supervisionDevMainReportPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        supervisionDevMainReportPO.setState(DataStateEnum.ENABLE.getCode());
+        //处理历史流程id列表
+        String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionDevMainReportPO.getProcessInstanceId(), supervisionDevMainReportPO.getHistoryInstanceId());
+        // 发起 BPM 流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
+        bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
+        bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionDevMainReportPO.getId());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionDevMainReportParam.getStartUserSelectAssignees());
+        bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
+        String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionDevMainReportPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
+        // 将工作流的编号，更新到流程单中
+        supervisionDevMainReportPO.setProcessInstanceId(processInstanceId);
+        //保存历史流程id列表
+        supervisionDevMainReportPO.setHistoryInstanceId(historyInstanceIds);
+        this.baseMapper.updateById(supervisionDevMainReportPO);
+        return supervisionDevMainReportPO.getId();
+    }
+
+
+
+
     @Override
     public boolean auditDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParamUpdate) {
         return true;
@@ -200,10 +233,10 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
     /**
     * @Description: 判断设备ip是否重复，如果重复提示
     * @Param: supervisionDevMainReportParam终端详情 isExcludeSelf是否排除自己，一般新增不排除，更新时需要排除自己
-    * @return: void 
+    * @return: void
     * @Author: clam
-    * @Date: 2024/5/11 
+    * @Date: 2024/5/11
-    */ 
+    */
     private void checkIp(SupervisionDevMainReportParam supervisionDevMainReportParam, boolean isExcludeSelf) {
 
         LambdaQueryWrapper<SupervisionTempDeviceReport> lambdaQueryWrapper = new LambdaQueryWrapper<>();

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

@@ -8,8 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.BpmTaskStatusEnum;
 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.pq.api.DeptLineFeignClient;
@@ -19,6 +21,7 @@ import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineDebugParam;
+import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
 import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
@@ -28,6 +31,7 @@ import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
 import com.njcn.supervision.service.device.SupervisionTempDeviceReportService;
 import com.njcn.supervision.service.device.SupervisionTempLineDebugPOService;
 import com.njcn.supervision.service.device.SupervisionTempLineReportService;
+import com.njcn.supervision.utils.InstanceUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -106,6 +110,34 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         return id;
     }
 
+    @Override
+    public String updateTempLineDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugUpdateParam supervisionTempLineReportParam) {
+        SupervisionTempLineDebugPO supervisionTempLineDebugPO = this.baseMapper.selectById(supervisionTempLineReportParam.getId());
+        //判断是否有权限操作
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),supervisionTempLineDebugPO.getCreateBy());
+        supervisionTempLineReportParam.setProcessInstanceId(supervisionTempLineDebugPO.getProcessInstanceId());
+        supervisionTempLineReportParam.setHistoryInstanceId(supervisionTempLineDebugPO.getHistoryInstanceId());
+        BeanUtils.copyProperties(supervisionTempLineReportParam,supervisionTempLineDebugPO);
+        supervisionTempLineDebugPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        supervisionTempLineDebugPO.setState(DataStateEnum.ENABLE.getCode());
+        //处理历史流程id列表
+        String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionTempLineDebugPO.getProcessInstanceId(), supervisionTempLineDebugPO.getHistoryInstanceId());
+        // 发起 BPM 流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
+        bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
+        bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineDebugPO.getId());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees());
+        bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
+        String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineDebugPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
+        // 将工作流的编号，更新到流程单中
+        supervisionTempLineDebugPO.setProcessInstanceId(processInstanceId);
+        //保存历史流程id列表
+        supervisionTempLineDebugPO.setHistoryInstanceId(historyInstanceIds);
+        this.baseMapper.updateById(supervisionTempLineDebugPO);
+        return supervisionTempLineDebugPO.getId();
+    }
+
     @Override
     public Page<SupervisionTempLineDebugVO> getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) {
         QueryWrapper<SupervisionDevMainReportVO> queryWrapper = new QueryWrapper<>();
@@ -183,13 +215,13 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         this.lambdaUpdate().set(SupervisionTempLineDebugPO::getStatus,status).eq(SupervisionTempLineDebugPO::getId,businessKey).update();
 
     }
-    /** 
+    /**
     * @Description: 临时表台账数据同步到实际表中
-    * @Param:  
+    * @Param:
-    * @return: java.lang.String 
+    * @return: java.lang.String
     * @Author: clam
-    * @Date: 2024/5/29 
+    * @Date: 2024/5/29
-    */ 
+    */
     @Override
     public String ledgerSync(String id) {
         SupervisionTempLineDebugPO byId = this.getById(id);
@@ -255,6 +287,22 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         return null;
     }
 
+    @Override
+    public String cancel(BpmProcessInstanceCancelParam cancelReqVO) {
+        //准备取消该流程，需要远程调用接口
+        SupervisionTempLineDebugPO supervisionTempLineDebugPO = this.baseMapper.selectById(cancelReqVO.getId());
+        //判断是否有权限操作
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),supervisionTempLineDebugPO.getCreateBy());
+        //取消流程
+        bpmProcessFeignClient.cancelProcessInstanceByStartUser(cancelReqVO);
+        //更新状态
+        supervisionTempLineDebugPO.setStatus(BpmProcessInstanceStatusEnum.CANCEL.getStatus());
+        this.updateById(supervisionTempLineDebugPO);
+        return supervisionTempLineDebugPO.getId();
+    }
+
+
+
     private void assembleSyncTerminalParam(DeviceParam deviceParam, SupervisionTempDeviceReport tempDevice,SubVoltageParam subVoltageParam,LineParam lineParam ,SupervisionTempLineReport tempLine) {
         //包装device
         deviceParam.setDevIndex(tempDevice.getId());
@@ -293,10 +341,10 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         //包装lineParam
         lineParam.setLineIndex(tempLine.getId());
         lineParam.setName(tempLine.getLineName());
-        lineParam.setPt1(tempLine.getPtRatio()*100);
+        lineParam.setPt1(Float.valueOf(tempLine.getPt1()));
-        lineParam.setPt2(100.00f);
+        lineParam.setPt2(Float.valueOf(tempLine.getPt2()));
-        lineParam.setCt1(tempLine.getCtRatio());
+        lineParam.setCt1(Float.valueOf(tempLine.getCt1()));
-        lineParam.setCt2(1.00f);
+        lineParam.setCt2(Float.valueOf(tempLine.getCt2()));
         lineParam.setDevCapacity(tempLine.getDevCapacity());
         lineParam.setShortCapacity(tempLine.getShortCapacity());
         lineParam.setDealCapacity(tempLine.getDealCapacity());
@@ -354,5 +402,5 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
 
     }
 
-   
+
 }

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

@@ -18,10 +18,12 @@ import com.njcn.supervision.enums.FlowStatusEnum;
 import com.njcn.supervision.enums.SupervisionUserStatusEnum;
 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.SupervisionTempLineReport;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO;
 import com.njcn.supervision.service.device.SupervisionTempLineReportService;
 import com.njcn.supervision.service.user.UserReportPOService;
+import com.njcn.supervision.utils.InstanceUtil;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.api.UserFeignClient;
@@ -39,7 +41,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/11  14:07【需求编号】
  *
@@ -91,6 +93,34 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
         return id;
     }
 
+    @Override
+    public String updateLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportUpdate supervisionTempLineReportParam) {
+        SupervisionTempLineReport supervisionTempLineReport = this.baseMapper.selectById(supervisionTempLineReportParam.getId());
+        //判断是否有权限操作
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),supervisionTempLineReport.getCreateBy());
+        supervisionTempLineReportParam.setProcessInstanceId(supervisionTempLineReport.getProcessInstanceId());
+        supervisionTempLineReportParam.setHistoryInstanceId(supervisionTempLineReport.getHistoryInstanceId());
+        BeanUtils.copyProperties(supervisionTempLineReportParam,supervisionTempLineReport);
+        supervisionTempLineReport.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        supervisionTempLineReport.setState(DataStateEnum.ENABLE.getCode());
+        //处理历史流程id列表
+        String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionTempLineReport.getProcessInstanceId(), supervisionTempLineReport.getHistoryInstanceId());
+        // 发起 BPM 流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
+        bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
+        bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineReport.getId());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionTempLineReportParam.getStartUserSelectAssignees());
+        bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
+        String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineReport.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
+        // 将工作流的编号，更新到流程单中
+        supervisionTempLineReport.setProcessInstanceId(processInstanceId);
+        //保存历史流程id列表
+        supervisionTempLineReport.setHistoryInstanceId(historyInstanceIds);
+        this.baseMapper.updateById(supervisionTempLineReport);
+        return supervisionTempLineReport.getId();
+    }
+
     @Override
     public Page<SupervisionTempLineReportVO> getTempLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportQuery supervisionTempLineReportQuery) {
         QueryWrapper<SupervisionTempLineReport> queryWrapper = new QueryWrapper<>();

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

@@ -1,13 +1,16 @@
 package com.njcn.supervision.service.device.impl;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.BpmTaskStatusEnum;
 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;
@@ -20,11 +23,14 @@ import com.njcn.supervision.enums.SupervisionUserStatusEnum;
 import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper;
 import com.njcn.supervision.mapper.device.SupervisionTempLineRunTestMapper;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineRunTestParam;
+import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTestPO;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineRunTestVO;
 import com.njcn.supervision.service.device.ISupervisionTempLineRunTestService;
 import com.njcn.supervision.service.user.UserReportPOService;
+import com.njcn.supervision.utils.InstanceUtil;
+import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -102,6 +108,34 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
         return true;
     }
 
+    @Override
+    public String updateRunTest(SupervisionTempLineRunTestParam.SupervisionTempLineRunTestUpdateParam supervisionTempLineRunTestParam) {
+        SupervisionTempLineRunTestPO supervisionTempLineRunTestPO = this.baseMapper.selectById(supervisionTempLineRunTestParam.getId());
+
+        supervisionTempLineRunTestParam.setProcessInstanceId(supervisionTempLineRunTestPO.getProcessInstanceId());
+        supervisionTempLineRunTestParam.setHistoryInstanceId(supervisionTempLineRunTestPO.getHistoryInstanceId());
+        BeanUtil.copyProperties(supervisionTempLineRunTestParam,supervisionTempLineRunTestPO);
+        supervisionTempLineRunTestPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        supervisionTempLineRunTestPO.setState(DataStateEnum.ENABLE.getCode());
+
+        //处理历史流程id列表
+        String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionTempLineRunTestPO.getProcessInstanceId(), supervisionTempLineRunTestPO.getHistoryInstanceId());
+        // 发起 BPM 流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
+        bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
+        bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionTempLineRunTestPO.getId());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>());
+        bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
+        String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineRunTestPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
+        // 将工作流的编号，更新到流程单中
+        supervisionTempLineRunTestPO.setProcessInstanceId(processInstanceId);
+        //保存历史流程id列表
+        supervisionTempLineRunTestPO.setHistoryInstanceId(historyInstanceIds);
+        this.baseMapper.updateById(supervisionTempLineRunTestPO);
+        return supervisionTempLineRunTestPO.getId();
+    }
+
     @Override
     public void isTestRunStartOrEnd() {
         LocalDateTime time = LocalDateTime.now();
@@ -181,6 +215,20 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
        return this.baseMapper.getRunTestInfo(id);
     }
 
+    @Override
+    public String cancel(BpmProcessInstanceCancelParam cancelReqVO) {
+        //准备取消该流程，需要远程调用接口
+        SupervisionTempLineRunTestPO supervisionTempLineRunTestPO = this.baseMapper.selectById(cancelReqVO.getId());
+        //判断是否有权限操作
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),supervisionTempLineRunTestPO.getCreateBy());
+        //取消流程
+        bpmProcessFeignClient.cancelProcessInstanceByStartUser(cancelReqVO);
+        //更新状态
+        supervisionTempLineRunTestPO.setStatus(BpmProcessInstanceStatusEnum.CANCEL.getStatus());
+        this.updateById(supervisionTempLineRunTestPO);
+        return supervisionTempLineRunTestPO.getId();
+    }
+
     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()));

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/SupervisionPlanPOService.java

@@ -8,19 +8,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.supervision.pojo.vo.plan.SupervisionPlanVO;
 
 /**
- * 
  * Description:
  * Date: 2024/5/20  17:49【需求编号】
  *
  * @author clam
  * @version V1.0.0
  */
-public interface SupervisionPlanPOService extends IService<SupervisionPlanPO>{
+public interface SupervisionPlanPOService extends IService<SupervisionPlanPO> {
 
 
-        String addPlan(SupervisionPlanParam supvPlanParam);
+    String addPlan(SupervisionPlanParam supvPlanParam);
 
-        Page<SupervisionPlanVO> pagePlan(SupervisionPlanParam supvPlanParam);
+    String updatePlan(SupervisionPlanParam.UpdateSupvPlanParam supvPlanParam);
+
+    Page<SupervisionPlanVO> pagePlan(SupervisionPlanParam supvPlanParam);
 
     String initiateAudit(String id);
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java

@@ -34,6 +34,7 @@ import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
+import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
@@ -50,7 +51,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/20  17:49【需求编号】
  *
@@ -117,6 +118,78 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
         return supvPlan.getPlanId();
     }
 
+    @Override
+    public String updatePlan(SupervisionPlanParam.UpdateSupvPlanParam supvPlanParam) {
+        SupervisionPlanPO supervisionPlanPO = this.baseMapper.selectById(supvPlanParam.getPlanId());
+
+        //判断是否有权限操作
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),supervisionPlanPO.getCreateBy());
+
+        //处理历史流程id列表
+        String historyInstanceIds = InstanceUtil.dealHistoryId(supervisionPlanPO.getProcessInstanceId(), supervisionPlanPO.getHistoryInstanceId());
+
+        checkParam(supvPlanParam, true);
+
+        BeanUtil.copyProperties(supvPlanParam, supervisionPlanPO);
+        supervisionPlanPO.setPlanSupvDate(LocalDateTimeUtil.parse(supvPlanParam.getPlanSupvDate(), DatePattern.NORM_DATETIME_PATTERN));
+
+        if(StrUtil.isNotBlank(supvPlanParam.getEffectEndTime())) {
+            supervisionPlanPO.setEffectEndTime(PubUtils.localDateTimeFormat(supvPlanParam.getEffectEndTime()));
+        }
+        if(StrUtil.isNotBlank(supvPlanParam.getEffectStartTime())) {
+            supervisionPlanPO.setEffectStartTime(PubUtils.localDateTimeFormat(supvPlanParam.getEffectStartTime()));
+        }
+        if(StrUtil.isNotBlank(supvPlanParam.getProblemOcTime())) {
+            supervisionPlanPO.setProblemOcTime(PubUtils.localDateTimeFormat(supvPlanParam.getProblemOcTime()));
+        }
+        if(StrUtil.isNotBlank(supvPlanParam.getReportIssueTime())) {
+            supervisionPlanPO.setReportIssueTime(PubUtils.localDateTimeFormat(supvPlanParam.getReportIssueTime()));
+        }
+
+
+
+        if(!"01".equals(supervisionPlanPO.getEffectStatus())){
+            if(Objects.isNull(supervisionPlanPO.getEffectStartTime()) ){
+                throw new BusinessException("开始实施时间不可为空！");
+            }
+        }
+
+        if("04".equals(supervisionPlanPO.getEffectStatus())){
+            if(Objects.isNull(supervisionPlanPO.getEffectEndTime()) ){
+                throw new BusinessException("结束实施时间不可为空！");
+            }
+        }
+
+
+        if(StrUtil.isNotBlank(supervisionPlanPO.getEffectUserId())){
+            UserVO user = userFeignClient.getUserById(supervisionPlanPO.getEffectUserId()).getData();
+            if(Objects.nonNull(user)){
+                supervisionPlanPO.setEffectUserName(user.getName());
+            }
+        }
+        supervisionPlanPO.setState(DataStateEnum.ENABLE.getCode());
+        supervisionPlanPO.setIsUploadHead(0);
+        supervisionPlanPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+
+
+
+        // 发起 BPM 流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
+        bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
+        bpmProcessInstanceCreateReqDTO.setBusinessKey(supervisionPlanPO.getPlanId());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(new HashMap<>());
+        bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
+        String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionPlanPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
+        // 将工作流的编号，更新到流程单中
+        supervisionPlanPO.setProcessInstanceId(processInstanceId);
+        //保存历史流程id列表
+        supervisionPlanPO.setHistoryInstanceId(historyInstanceIds);
+        this.baseMapper.updateById(supervisionPlanPO);
+        return supervisionPlanPO.getPlanId();
+
+    }
+
     @Override
     public Page<SupervisionPlanVO> pagePlan(SupervisionPlanParam supvPlanParam) {
         LambdaQueryWrapper<SupervisionPlanPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportNormalService.java

@@ -3,7 +3,9 @@ package com.njcn.supervision.service.user;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.supervision.pojo.param.user.UserReportNormalParam;
+import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.po.user.UserReportNormalPO;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -20,6 +22,8 @@ public interface IUserReportNormalService extends IService<UserReportNormalPO> {
 
     String addUserNormal(UserReportNormalParam userReportNormalParam);
 
+    String updateUserNormal(UserReportParam.UserReportUpdate userReportParam);
+
 
     Page<UserReportVO.UserReportGoNetVO> userReportGoNetPage(UserReportNormalParam userReportNormalParam);
 
@@ -29,4 +33,7 @@ public interface IUserReportNormalService extends IService<UserReportNormalPO> {
 
     void updateUserReportNormalStatus(String businessKey,Integer status);
 
+
+    String cancelUserReport(BpmProcessInstanceCancelParam cancelReqVO);
+
 }

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

@@ -24,6 +24,8 @@ public interface UserReportPOService extends IService<UserReportPO> {
 
     String addUserReport(UserReportParam userReportParam);
 
+    String updateUserReport(UserReportParam.UserReportUpdate userReportParam);
+
     boolean auditUserReport(UserReportParam.UserReportUpdate userReportUpdate);
 
     Page<UserReportVO> getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam);

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

@@ -8,22 +8,29 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.BpmTaskStatusEnum;
 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.supervision.enums.FlowStatusEnum;
 import com.njcn.supervision.mapper.user.UserReportNormalMapper;
 import com.njcn.supervision.pojo.param.user.UserReportNormalParam;
+import com.njcn.supervision.pojo.param.user.UserReportParam;
+import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.po.user.UserReportNormalPO;
 import com.njcn.supervision.pojo.po.user.UserReportPO;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.supervision.service.user.IUserReportNormalService;
 import com.njcn.supervision.service.user.UserReportPOService;
+import com.njcn.supervision.utils.InstanceUtil;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.User;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -90,6 +97,33 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
         return userReportNormalPO.getId();
     }
 
+    @Override
+    public String updateUserNormal(UserReportParam.UserReportUpdate userReportParam) {
+        UserReportNormalPO userReportNormalPO = this.baseMapper.selectById(userReportParam.getId());
+        //判断是否有权限操作
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),userReportNormalPO.getCreateBy());
+
+        BeanUtils.copyProperties(userReportParam, userReportNormalPO);
+        userReportNormalPO.setState(DataStateEnum.ENABLE.getCode());
+        userReportNormalPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        //处理历史流程id列表
+        String historyInstanceIds = InstanceUtil.dealHistoryId(userReportNormalPO.getProcessInstanceId(), userReportNormalPO.getHistoryInstanceId());
+        // 发起 BPM 流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
+        bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
+        bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportNormalPO.getId());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportParam.getStartUserSelectAssignees());
+        bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
+        String processInstanceId = bpmProcessFeignClient.createProcessInstance(userReportNormalPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
+        // 将工作流的编号，更新到流程单中
+        userReportNormalPO.setProcessInstanceId(processInstanceId);
+        //保存历史流程id列表
+        userReportNormalPO.setHistoryInstanceId(historyInstanceIds);
+        this.baseMapper.updateById(userReportNormalPO);
+        return userReportNormalPO.getId();
+    }
+
     @Override
     public Page<UserReportVO.UserReportGoNetVO> userReportGoNetPage(UserReportNormalParam userReportNormalParam) {
         Page<UserReportVO.UserReportGoNetVO> pageResult = new Page<>();
@@ -146,4 +180,18 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
     public void updateUserReportNormalStatus(String businessKey, Integer status) {
         this.update(new UpdateWrapper<UserReportNormalPO>().lambda().set(UserReportNormalPO::getStatus,status).eq(UserReportNormalPO::getId,businessKey));
     }
+
+    @Override
+    public String cancelUserReport(BpmProcessInstanceCancelParam cancelReqVO) {
+        //准备取消该流程，需要远程调用接口
+        UserReportNormalPO userReportNormalPO = this.baseMapper.selectById(cancelReqVO.getId());
+        //判断是否有权限操作
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),userReportNormalPO.getCreateBy());
+        //取消流程
+        bpmProcessFeignClient.cancelProcessInstanceByStartUser(cancelReqVO);
+        //更新状态
+        userReportNormalPO.setStatus(BpmProcessInstanceStatusEnum.CANCEL.getStatus());
+        this.updateById(userReportNormalPO);
+        return userReportNormalPO.getId();
+    }
 }

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

@@ -150,6 +150,68 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         return userReportPO.getId();
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String updateUserReport(UserReportParam.UserReportUpdate userReportParam) {
+        UserReportPO userReportPO = this.baseMapper.selectById(userReportParam.getId());
+        //判断是否有权限操作
+        InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(),userReportPO.getCreateBy());
+        if(!Objects.equals(userReportPO.getStatus(), BpmTaskStatusEnum.REJECT.getStatus())){
+            throw new BusinessException("当前流程以完成审批,无法重新发起");
+        }
+
+        if (
+                CollectionUtil.newArrayList(
+                        UserNatureEnum.BUILD_POWER_GRID.getCode(),
+                        UserNatureEnum.EXTEND_POWER_GRID.getCode()
+                ).contains(userReportPO.getUserType())) {
+            //电网工程类用户额外数据
+            UserReportProjectPO userReportProjectPO = userReportParam.getUserReportProjectPO();
+            userReportProjectPO.setId(userReportPO.getId());
+            userReportProjectPO.setState(DataStateEnum.ENABLE.getCode());
+            userReportProjectPOService.saveOrUpdate(userReportProjectPO);
+        } else if (
+                CollectionUtil.newArrayList(
+                        UserNatureEnum.BUILD_NON_LINEAR_LOAD.getCode(),
+                        UserNatureEnum.EXTEND_NON_LINEAR_LOAD.getCode(),
+                        UserNatureEnum.BUILD_NEW_ENERGY_POWER_STATION.getCode(),
+                        UserNatureEnum.EXTEND_NEW_ENERGY_POWER_STATION.getCode()
+                ).contains(userReportPO.getUserType())) {
+            //非线性负荷用户 & 新能源发电站用户
+            UserReportSubstationPO userReportSubstationPO = userReportParam.getUserReportSubstationPO();
+            userReportSubstationPO.setId(userReportPO.getId());
+            userReportSubstationPO.setState(DataStateEnum.ENABLE.getCode());
+            userReportSubstationPOService.updateById(userReportSubstationPO);
+        } else if (UserNatureEnum.SENSITIVE_USER.getCode().equals(userReportPO.getUserType())) {
+            // 敏感及重要用户
+            UserReportSensitivePO userReportSensitivePO = userReportParam.getUserReportSensitivePO();
+            userReportSensitivePO.setId(userReportPO.getId());
+            userReportSensitivePO.setState(DataStateEnum.ENABLE.getCode());
+            userReportSensitivePOService.updateById(userReportSensitivePO);
+        }
+
+        //处理历史流程id列表
+        String historyInstanceIds = InstanceUtil.dealHistoryId(userReportPO.getProcessInstanceId(), userReportPO.getHistoryInstanceId());
+
+        // 发起 BPM 流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
+        bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
+        bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportPO.getId());
+        bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportParam.getStartUserSelectAssignees());
+        bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
+        String processInstanceId = bpmProcessFeignClient.createProcessInstance(userReportPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData();
+        // 将工作流的编号，更新到流程单中
+        userReportPO.setProcessInstanceId(processInstanceId);
+        userReportPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        userReportPO.setState(DataStateEnum.ENABLE.getCode());
+        //保存历史流程id列表
+        userReportPO.setHistoryInstanceId(historyInstanceIds);
+        this.baseMapper.updateById(userReportPO);
+        return userReportPO.getId();
+
+    }
+
 
     @Override
     public boolean auditUserReport(UserReportParam.UserReportUpdate userReportUpdate) {