diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java index d4847dad9..b227161ac 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java @@ -20,4 +20,7 @@ public interface TempLineRunTestFeignClient { @GetMapping("/updateStatus") HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); + @GetMapping("/isTestRunStartOrEnd") + void isTestRunStartOrEnd(); + } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java index 737f190f6..f9f9a3918 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java @@ -33,6 +33,12 @@ public class TempLineRunTestFeignClientFallbackFactory implements FallbackFactor log.error("{}异常，降级处理，异常为：{}", "更新流程状态", throwable.toString()); throw new BusinessException(finalExceptionEnum); } + + @Override + public void isTestRunStartOrEnd() { + log.error("{}异常，降级处理，异常为：{}", "定时判断试运行是否结束", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java index c8fd4618e..6e0c8b966 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java @@ -160,4 +160,12 @@ public class SupervisionDevMainReportVO { -} \ No newline at end of file + private String substation; + + private String monitoringTerminalCode; + + private String monitoringTerminalName; + + + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java index 162eae637..46f6b134b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java @@ -54,11 +54,8 @@ public class SupervisionTempLineRunTestController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @GetMapping("/isTestRunStartOrEnd") @ApiOperation("每日判断试运行是否结束") - public HttpResult isTestRunStartOrEnd(){ - String methodDescribe = getMethodDescribe("isTestRunStartOrEnd"); + public void isTestRunStartOrEnd(){ iSupervisionTempLineRunTestService.isTestRunStartOrEnd(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); - } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml index c20d009ea..f173f9e0d 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml @@ -29,18 +29,20 @@ - id, reporter, report_date, org_id, expected_production_date, city, user_status, user_name, - acceptance_inspection_report, acceptance_inspection_report_single, type_experiment_report, - factory_inspection_report, performance_test_report, information_security_test_report, - other_attachments, process_instance_id, `status`, Create_By, Create_Time, Update_By, + id, reporter, report_date, org_id, expected_production_date, city, user_status, user_name, + acceptance_inspection_report, acceptance_inspection_report_single, type_experiment_report, + factory_inspection_report, performance_test_report, information_security_test_report, + other_attachments, process_instance_id, `status`, Create_By, Create_Time, Update_By, Update_Time, `State` - \ No newline at end of file + diff --git 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 index c98b1c6e0..3980e4803 100644 --- 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 @@ -30,6 +30,10 @@ supervision_temp_line_report.Power_Substation_Name, supervision_temp_line_report.line_id lineId, supervision_temp_line_report.line_name lineName, + supervision_temp_line_report.connected_bus, + supervision_temp_line_report.monitoring_terminal_code, + supervision_temp_line_report.monitoring_terminal_name, + 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.`status` `Status` diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java index e60291146..587ad97f7 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java @@ -11,6 +11,7 @@ import com.njcn.bpm.api.BpmProcessFeignClient; import com.njcn.bpm.enums.BpmProcessInstanceStatusEnum; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.biz.commApi.CommLineClient; import com.njcn.device.biz.enums.RunFlagEnum; @@ -71,7 +72,7 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl lineDTOList = commLineClient.getLineDetailBatch(lineIds).getData(); if(lineIds.size()!=lineDTOList.size()){ - throw new BusinessException("请联系管理员检查监测点唯一编号是否匹配"); + throw new BusinessException(CommonResponseEnum.FAIL,"请联系管理员检查监测点唯一编号是否匹配"); } //校验 @@ -103,7 +104,6 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(SupervisionTempLineRunTestPO::getTestRunState,1).eq(SupervisionTempLineRunTestPO::getState,DataStateEnum.ENABLE.getCode()); List supervisionTempLineRunTestPOList = this.list(lambdaQueryWrapper); diff --git a/pqs-system/system-boot/pom.xml b/pqs-system/system-boot/pom.xml index b1ed591d9..fa0467979 100644 --- a/pqs-system/system-boot/pom.xml +++ b/pqs-system/system-boot/pom.xml @@ -31,6 +31,12 @@ user-api ${project.version} + + + com.njcn + supervision-api + ${project.version} + com.njcn common-web @@ -128,4 +134,4 @@ - \ No newline at end of file + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SupervisionLineRunTestTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SupervisionLineRunTestTaskRunner.java new file mode 100644 index 000000000..a4aa1124b --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SupervisionLineRunTestTaskRunner.java @@ -0,0 +1,25 @@ +package com.njcn.system.timer.tasks; + +import com.njcn.supervision.api.TempLineRunTestFeignClient; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * pqs + * 冀北技术监督监测点试运行，每日扫描 + * @author cdf + * @date 2024/5/22 + */ +@Component +@RequiredArgsConstructor +public class SupervisionLineRunTestTaskRunner implements TimerTaskRunner { + + + private final TempLineRunTestFeignClient tempLineRunTestFeignClient; + + @Override + public void action(String date) { + tempLineRunTestFeignClient.isTestRunStartOrEnd(); + } +}