冀北试运行接口调整

修改技术监督其他bug
2024-06-05 14:05:44 +08:00
parent 8a511e2906
commit 8b45195615
17 changed files with 63 additions and 22 deletions
--- 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
@@ -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;
--- 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
@@ -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);
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml
+++ b/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
-    JOIN supervision_temp_line_debug ON supervision_temp_line_report.id = supervision_temp_line_debug.id
+    supervision_temp_line_report
+    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,
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
@@ -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;
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java
@@ -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.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 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();
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
@@ -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",