Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

冀北监测点试运行功能调整

Browse Source
This commit is contained in:
cdf
2024-05-22 19:52:19 +08:00
parent af3d231352
commit 8e83a6b35e
9 changed files with 65 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,11 +54,8 @@ public class SupervisionTempLineRunTestController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/isTestRunStartOrEnd")
@ApiOperation("每日判断试运行是否结束")
public HttpResult<Object> isTestRunStartOrEnd(){
String methodDescribe = getMethodDescribe("isTestRunStartOrEnd");
public void isTestRunStartOrEnd(){
iSupervisionTempLineRunTestService.isTestRunStartOrEnd();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
}

14
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml
View File

@@ -29,18 +29,20 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
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`
</sql>
<select id="page" resultType="com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO">
SELECT
*
supervision_dev_main_report.*,station.name substation,dev.monitoring_terminal_code,dev.monitoring_terminal_name
FROM supervision_dev_main_report supervision_dev_main_report
left join supervision_temp_device_report dev on supervision_dev_main_report.id = dev.id
left join pq_Line station on dev.substation = station.id
WHERE ${ew.sqlSegment}
</select>
</mapper>
</mapper>

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

@@ -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`

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

@@ -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<Supervisi
List<LineDTO> 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<Supervisi
@Override
public void isTestRunStartOrEnd() {
LocalDateTime time = LocalDateTime.now();
LambdaQueryWrapper<SupervisionTempLineRunTestPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(SupervisionTempLineRunTestPO::getTestRunState,1).eq(SupervisionTempLineRunTestPO::getState,DataStateEnum.ENABLE.getCode());
List<SupervisionTempLineRunTestPO> supervisionTempLineRunTestPOList = this.list(lambdaQueryWrapper);