src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
@@ -37,4 +37,6 @@ * 插入数据 * */ int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork); PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId); } src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java
@@ -3,6 +3,8 @@ import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure; import org.springframework.stereotype.Repository; import java.util.List; @Repository public interface PreventRiskDangerCheckAndMeasureRepository { @@ -10,4 +12,6 @@ * 写入核查任务检查点与管控措施信息 * */ int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure); List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId); } src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
@@ -36,4 +36,5 @@ * 修改上报状态 */ int updateWorkReportStatus(HandlerReportParam handlerReportParam); } src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
@@ -87,7 +87,7 @@ @Transactional // @Scheduled(cron = "0 0/1 * * * ?") @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次 //@Scheduled(cron = "0/30 * * * * ?") public void execReportDateSchedule() throws UnsupportedEncodingException { logger.info("【####】上报数据开始..."); src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -92,7 +92,8 @@ @Autowired private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表 @Autowired private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表 @Transactional @@ -342,7 +343,7 @@ HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId()); //获取数据对象 PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork(); //转换时间周期单位 //转换时间周期单位 (1小时,2日,3周,4月,5年) if (jobById.getTroubleshootTypeCycleType() == 1){ CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum())); CJTaskFromWork.setCheckCycleUnit("小时"); @@ -432,11 +433,7 @@ HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId()); //获取任务附属表信息 PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(task.getJobId()); //获取上报数据对象 PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask(); //转换检查结果 /** * examineUserName，checkTime 任务执行后，不为空 不使用; * tr_hidden_danger_check 的 scheduleCheckStatus 0 未排查， 1已排查 @@ -462,7 +459,8 @@ logger.info("【双重预防】排查任务记录CJ：异常，无检查点..."); }else { for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) { //获取上报数据对象 PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask(); CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他 if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){ CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他 @@ -471,8 +469,9 @@ User createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy()); User updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy()); //封装上报昌吉州的任务数据 CJRecordFromTask.setId(task.getUuid()); //封装上报昌吉州的任务数据 todo taskUUid // String taskUuid = UUID.randomUUID().toString(); CJRecordFromTask.setId(UUID.randomUUID().toString()); CJRecordFromTask.setCompanyCode(companyCode); CJRecordFromTask.setCreateBy(createUser.getUserName()); CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime()); @@ -495,7 +494,17 @@ CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); CJRecordFromTask.setReportTime(null); CJRecordFromTask.setDataSource((byte) 1); CJRecordFromTask.setCheckTaskId(jobAndMeasureByJobId.getJobUuid()); List<PreventRiskDangerCheckAndMeasure> baseCheckPointAndMeasure = riskDangerCheckAndMeasureService.getByBaseCheckPointId(hiddenDangerCheckPoint.getCheckPointId()); //获取该条记录对应的管控措施id， Long controlMeasureId = 1L; for (PreventRiskDangerCheckAndMeasure checkAndMeasure : baseCheckPointAndMeasure) { controlMeasureId = checkAndMeasure.getControlMeasureId(); } //获取该条记录对应的管控措施uuid PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId); //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId()); CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId()); CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime()); CJRecordFromTask.setTaskId(task.getCheckId());
@@ -29,4 +29,6 @@ * 任务配置 -待上报状态变更 -通过id * */ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam); PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String uuid, Long jobId); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java
@@ -2,10 +2,14 @@ import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure; import java.util.List; public interface PreventRiskDangerCheckAndMeasureService { /** * 写入核查任务检查点与管控措施信息 * */ int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure); List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
@@ -33,4 +33,5 @@ * 修改上报状态 */ int updateWorkReportStatus(HandlerReportParam handlerReportParam); } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
@@ -68,4 +68,9 @@ throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败"); } } @Override public PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId) { return preventCJReportCheckTaskFromWorkRepository.geByMeasureUUidAndJobId(measureUuid, jobId); } } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java
@@ -6,6 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service("PreventRiskDangerCheckAndMeasureService") public class PreventRiskDangerCheckAndMeasureServiceImpl implements PreventRiskDangerCheckAndMeasureService { @@ -19,4 +21,9 @@ public int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure) { return preventRiskDangerCheckAndMeasureRepository.insertCheckAndMeasure(checkAndMeasure); } @Override public List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId) { return preventRiskDangerCheckAndMeasureRepository.getByBaseCheckPointId(checkPointId); } } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
@@ -67,4 +67,6 @@ } return result; } } src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
@@ -57,8 +57,11 @@ , #{reportStatus}, #{reportTime}, #{dataSource}, #{workId}) </insert> <!-- PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);--> <select id="geByMeasureUUidAndJobId" resultMap="BaseResultMap"> select * from prevent_cj_report_check_task_from_work where work_id = #{jobId} and risk_measure_id = #{measureUuid} </select> <!-- int insertList(taskFromWorkLists);--> src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckAndMeasureMapper.xml
@@ -18,4 +18,9 @@ (null, #{checkId}, #{dangerCheckPointId}, #{baseCheckPointId}, #{controlMeasureId}, #{checkContent}, #{checkResult}) </insert> <!-- List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);--> <select id="getByBaseCheckPointId" resultMap="BaseResultMap"> select * from prevent_risk_danger_check_and_measure where base_check_point_id = #{checkPointId} </select> </mapper> src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
@@ -54,5 +54,8 @@ report_time = #{reportTime} where id = #{id} </update> <!-- PreventRiskJobAndMeasure geByMeasureUUidAndJobId(String measureUuid, Long jobId);--> </mapper>
