| | |
|---|
| | |
|
|---|
| | | @Autowired
|
|---|
| | | private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
|
|---|
| | |
|
|---|
| | | @Autowired
|
|---|
| | | private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
|
|---|
| | |
|
|---|
| | |
|
|---|
| | | @Transactional
|
|---|
| | |
|---|
| | | 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("小时");
|
|---|
| | |
|---|
| | | 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已排查
|
|---|
| | |
|---|
| | | 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-其他
|
|---|
| | |
|---|
| | | 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());
|
|---|
| | |
|---|
| | | 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());
|
|---|
| | |
|
|---|
