冀北试运行接口调整

修改技术监督其他bug

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java

@@ -66,7 +66,7 @@ public class RStatIntegrityDServiceImpl extends ServiceImpl<RStatIntegrityDMappe
         onlineQuery.select("dev_index,avg(online_min/offline_min+online_min) as onlineRate")
                 .lambda()
                 .in(RStatOnlinerateD::getDevIndex,devIds)
-                .between(RStatOnlinerateD::getTimeId, DateUtil.parse(lineDataQualityParam.getBeginTime(), DatePattern.NORM_DATETIME_FORMATTER),DateUtil.parse(lineDataQualityParam.getEndTime(), DatePattern.NORM_DATETIME_FORMATTER))
+                .between(RStatOnlinerateD::getTimeId, DateUtil.parse(lineDataQualityParam.getBeginTime(), DatePattern.NORM_DATE_PATTERN),DateUtil.parse(lineDataQualityParam.getEndTime(), DatePattern.NORM_DATE_PATTERN))
                 .groupBy(RStatOnlinerateD::getDevIndex);
         List<RStatOnlinerateD> rStatOnlinerateDList = onlineRateMapper.selectList(onlineQuery);
         Map<String,RStatOnlinerateD> onlineMap = rStatOnlinerateDList.stream().collect(Collectors.toMap(RStatOnlinerateD::getDevIndex, Function.identity()));
@@ -76,7 +76,7 @@ public class RStatIntegrityDServiceImpl extends ServiceImpl<RStatIntegrityDMappe
         integrityQuery.select("line_index,avg(real_time/due_time) as integrityData")
                 .lambda()
                 .in(RStatIntegrityD::getLineIndex,lineIds)
-                .between(RStatIntegrityD::getTimeId, DateUtil.parse(lineDataQualityParam.getBeginTime(), DatePattern.NORM_DATETIME_FORMATTER),DateUtil.parse(lineDataQualityParam.getEndTime(), DatePattern.NORM_DATETIME_FORMATTER))
+                .between(RStatIntegrityD::getTimeId, DateUtil.parse(lineDataQualityParam.getBeginTime(), DatePattern.NORM_DATE_PATTERN),DateUtil.parse(lineDataQualityParam.getEndTime(), DatePattern.NORM_DATE_PATTERN))
                 .groupBy(RStatIntegrityD::getLineIndex);
         List<RStatIntegrityD> rStatIntegrityDList = rStatIntegrityDMapper.selectList(integrityQuery);
         Map<String,RStatIntegrityD> integrityMap = rStatIntegrityDList.stream().collect(Collectors.toMap(RStatIntegrityD::getLineIndex,Function.identity()));

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

@@ -89,6 +89,7 @@ public class QuitRunningDeviceParam  implements Serializable {
     private Integer devOriginalStatus;
 
 
+
     @Data
     @EqualsAndHashCode(callSuper = true)
     public static class QuitRunningDeviceUpdateParam extends QuitRunningDeviceParam {

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

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/11  14:07【需求编号】
  *
@@ -237,5 +237,8 @@ public class SupervisionTempDeviceReportParam {
 
     private String frontType;
 
+    @ApiModelProperty(value = "审核状态")
+    private Integer status;
 
-}
+
+}

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

@@ -22,7 +22,7 @@ import java.util.Map;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class SupervisionTempLineDebugParam extends BaseEntity {
+public class SupervisionTempLineDebugParam {
     private String id;
 
     /**

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

@@ -243,6 +243,9 @@ public class SupervisionTempLineReportParam {
     @ApiModelProperty(value = "流程实例的编号")
     private String historyInstanceId;
 
+    @ApiModelProperty(value = "审核状态")
+    private Integer status;
+
 
     @ApiModelProperty("发起人自选审批人 Map")
     private Map<String, List<String>> startUserSelectAssignees;

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

@@ -79,6 +79,12 @@ public class SupervisionTempLineRunTestParam {
     private String endTime;
 
 
+    /**
+     * 用于标识第几次发起
+     */
+    private Integer operateType;
+
+
     @Data
     @EqualsAndHashCode(callSuper = true)
     public static class SupervisionTempLineRunTestUpdateParam extends SupervisionTempLineRunTestParam {

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/plan/SupervisionPlanParam.java

@@ -150,6 +150,10 @@ public class SupervisionPlanParam extends BaseParam {
     @ApiModelProperty(value = "计划状态")
     private String planStatus;
 
+
+    @ApiModelProperty(value = "审核状态")
+    private Integer status;
+
     @EqualsAndHashCode(callSuper = true)
     @Data
     public static class UpdateSupvPlanParam extends SupervisionPlanParam{

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java

@@ -56,6 +56,9 @@ public class SupervisionUserComplaintParam {
     @ApiModelProperty(value = "状态：0-删除 1-正常")
     private Integer state;
 
+    @ApiModelProperty(value = "审核状态")
+    private Integer status;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SupervisionGeneralSurveyPlanParm.java

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
+ *
  * Description:
  * Date: 2024/5/13  18:35【需求编号】
  *
@@ -22,6 +22,7 @@ import java.util.Map;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@Deprecated
 public class SupervisionGeneralSurveyPlanParm  {
 
 
@@ -124,4 +125,4 @@ public class SupervisionGeneralSurveyPlanParm  {
         private String orgNo;
 
     }
-}
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java

@@ -19,7 +19,7 @@ import java.time.LocalDate;
  * @since 2024-05-30
  */
 @Data
-public class SurveyTestParam extends BaseEntity implements Serializable {
+public class SurveyTestParam implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -27,7 +27,7 @@ import java.util.Map;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class UserReportParam extends BaseEntity {
+public class UserReportParam {
 
 
     /**
@@ -134,6 +134,8 @@ public class UserReportParam extends BaseEntity {
 
 
 
+
+
     @Data
     @EqualsAndHashCode(callSuper = true)
     public  static class UserReportUpdate extends UserReportParam {
@@ -160,6 +162,9 @@ public class UserReportParam extends BaseEntity {
         @ApiModelProperty(value="数据来源类型 0：正常审核流程 1：批量导入")
         private Integer dataType;
 
+        @ApiModelProperty(value = "审核状态")
+        private Integer status;
+
     }
 
 

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

@@ -12,6 +12,7 @@ import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
 import com.njcn.supervision.pojo.param.device.SupervisionTempLineRunTestParam;
 import com.njcn.supervision.pojo.vo.device.SupervisionTempLineRunTestVO;
 import com.njcn.supervision.service.device.ISupervisionTempLineRunTestService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,6 +32,7 @@ import com.njcn.web.controller.BaseController;
 @RestController
 @RequestMapping("/supervisionTempLineRunTest")
 @RequiredArgsConstructor
+@Api(tags = "监测点联调后的试运行")
 public class SupervisionTempLineRunTestController extends BaseController {
 
     private final ISupervisionTempLineRunTestService iSupervisionTempLineRunTestService;

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

@@ -54,7 +54,7 @@ public class TempLineController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改电能质量监测装置设备")
-    @ApiImplicitParam(name = "supervisionDevMainReportParam", value = "实体参数", required = true)
+    @ApiImplicitParam(name = "supervisionTempLineReportParam", value = "实体参数", required = true)
     public HttpResult<String> updateLineReport(@RequestBody @Validated SupervisionTempLineReportParam.SupervisionTempLineReportUpdate supervisionTempLineReportParam){
         String methodDescribe = getMethodDescribe("updateLineReport");
         String devReportId = supervisionTempLineReportService.updateLineReport(supervisionTempLineReportParam);

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml

@@ -36,11 +36,12 @@
     supervision_temp_line_report.Power_Substation_Name,
     supervision_temp_line_debug.reason reason,
     supervision_temp_line_debug.process_instance_id process_instanceId,
+    supervision_temp_line_debug.history_instance_id,
     supervision_temp_line_debug.`status` `Status`,
     supervision_temp_line_debug.create_by
     FROM
-    supervision_temp_line_report left
+    supervision_temp_line_report
-    JOIN supervision_temp_line_debug ON supervision_temp_line_report.id = supervision_temp_line_debug.id
+    left JOIN supervision_temp_line_debug ON supervision_temp_line_report.id = supervision_temp_line_debug.id
     where supervision_temp_line_report.`status`=2
     and ${ew.sqlSegment}
   </select>
@@ -58,6 +59,7 @@
     supervision_temp_line_report.line_name lineName,
     supervision_temp_line_debug.reason reason,
     supervision_temp_line_run_test.process_instance_id process_instanceId,
+    supervision_temp_line_run_test.history_instance_id,
     supervision_temp_line_run_test.`status` `Status`,
     IFNULL(supervision_temp_line_run_test.`test_run_state`,0) `testRunState`,
     supervision_temp_line_run_test.test_run_time,

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

@@ -104,7 +104,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionTempLineDebugPO.getCreateBy(),bpmProcessInstanceCreateReqDTO).getData();
         // 将工作流的编号，更新到流程单中
         supervisionTempLineDebugPO.setProcessInstanceId(processInstanceId);
-        this.baseMapper.updateById(supervisionTempLineDebugPO);
+        this.updateById(supervisionTempLineDebugPO);
 
 
         return id;

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

@@ -35,12 +35,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -83,10 +81,10 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
         }
 
         //校验
-        List<SupervisionTempLineRunTestPO> supervisionTempLineRunTestPOList = this.list(new LambdaQueryWrapper<SupervisionTempLineRunTestPO>().in(SupervisionTempLineRunTestPO::getId,ids));
+        List<SupervisionTempLineRunTestPO> supervisionTempLineRunTestPOList = this.list(new LambdaQueryWrapper<SupervisionTempLineRunTestPO>().in(SupervisionTempLineRunTestPO::getId,ids).ne(SupervisionTempLineRunTestPO::getStatus,BpmTaskStatusEnum.REJECT.getStatus()));
         if(CollUtil.isNotEmpty(supervisionTempLineRunTestPOList)){
             String msg = assMsg(supervisionTempLineReportList,supervisionTempLineRunTestPOList);
-            throw new BusinessException(msg);
+            throw new BusinessException(CommonResponseEnum.FAIL,msg);
         }
 
         List<SupervisionTempLineRunTestPO> poList = new ArrayList<>();
@@ -102,9 +100,16 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
             supervisionTempLineRunTestPO.setIntegrityRate(0.00);
             supervisionTempLineRunTestPO.setTestRunTime(supervisionTempLineRunTestParam.getStartTime()+"--"+supervisionTempLineRunTestParam.getEndTime());
             supervisionTempLineRunTestPO.setProcessInstanceId("tem暂无");
+            if(Objects.nonNull(supervisionTempLineRunTestParam.getOperateType()) && supervisionTempLineRunTestParam.getOperateType()==1){
+
+                SupervisionTempLineRunTestPO testPo = this.getById(item.getId());
+                String historyInstanceIds = InstanceUtil.dealHistoryId(testPo.getProcessInstanceId(), testPo.getHistoryInstanceId());
+
+                supervisionTempLineRunTestPO.setHistoryInstanceId(historyInstanceIds);
+            }
             poList.add(supervisionTempLineRunTestPO);
         }
-        this.saveBatch(poList);
+        this.saveOrUpdateBatch(poList);
         return true;
     }
 
@@ -146,7 +151,7 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
         List<SupervisionTempLineRunTestPO> usePoList = new ArrayList<>();
         for(SupervisionTempLineRunTestPO item : supervisionTempLineRunTestPOList){
          String endTime = item.getTestRunTime().split("--")[1];
-         LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN));
+         LocalDateTime end = LocalDate.parse(endTime, DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)).atTime(23,59,59);
          if(end.isBefore(time)){
              //结束时间在当前时间之前，则已经执行完试运行，开始组装审核条件
              usePoList.add(item);
@@ -158,12 +163,15 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
             map.forEach((key,val)->{
                 String startTime = key.split("--")[0];
                 String endTime = key.split("--")[1];
-                List<String> ids =  val.stream().map(SupervisionTempLineRunTestPO::getLineId).collect(Collectors.toList());
+                List<String> ids =  val.stream().map(SupervisionTempLineRunTestPO::getId).collect(Collectors.toList());
                 LineDataQualityParam lineDataQualityParam = LineDataQualityParam.builder().lineIds(ids).beginTime(startTime).endTime(endTime).build();
                 List<LineDataQualityDTO> lineDataQualityDTOList = lineIntegrityClient.getLineDataQuality(lineDataQualityParam).getData();
                 Map<String,LineDataQualityDTO> qualityDTOMap = lineDataQualityDTOList.stream().collect(Collectors.toMap(LineDataQualityDTO::getLineId,Function.identity()));
 
                 for(SupervisionTempLineRunTestPO supervisionTempLineRunTestPO : val){
+
+
+
                     // 发起 BPM 流程
                     Map<String, Object> processInstanceVariables = new HashMap<>();
                     BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();

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

@@ -268,6 +268,9 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
                 //查询所有区域下的数据
                 userReportVOQueryWrapper.in("supervision_user_report.city", userReportQueryParam.getCity());
             }
+            if(Objects.nonNull(userReportQueryParam.getStatus())){
+                userReportVOQueryWrapper.eq("supervision_user_report.status", userReportQueryParam.getStatus());
+            }
             userReportVOQueryWrapper.like(StringUtils.isNotBlank(userReportQueryParam.getProjectName()), "supervision_user_report.project_name", userReportQueryParam.getProjectName());
             //添加上时间范围
 //            userReportVOQueryWrapper.between("supervision_user_report.Create_Time",