From 9ebbc1a04aea615b7614793e2a6e7e2d9135d272 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期四, 13 七月 2023 15:09:47 +0800 Subject: [PATCH] 临时提交 --- src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 160 ++++++++++++++++++++++++++++------------------------- 1 files changed, 84 insertions(+), 76 deletions(-) diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java index bb9958f..63b2dec 100644 --- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java +++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java @@ -644,11 +644,12 @@ CJDangerInfo.setRiskMeasureId(null);//管控措施uuid } - if (dangerManage.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){ - CJDangerInfo.setDeleted("2");//数据更新状态标识,目前仅昌吉州需要 2022-08-10 - }else { - CJDangerInfo.setDeleted("0"); - } +// if (dangerManage.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){ +// CJDangerInfo.setDeleted("2");//数据更新状态标识,目前仅昌吉州需要 2022-08-10 +// }else { +// CJDangerInfo.setDeleted("0"); +// } + CJDangerInfo.setDeleted("0"); CJDangerInfo.setId(dangerManage.getUuid()); CJDangerInfo.setCompanyCode(companyCode); CJDangerInfo.setHazardCode(dangerManage.getHazardCode());//风险分析对象编码 @@ -674,7 +675,11 @@ CJDangerInfo.setDangerName(hiddenDanger.getDangerName()); CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());//隐患等级 CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());//隐患来源 - CJDangerInfo.setDangerManageType(hiddenDanger.getRectifyType());//隐患治理类型 + if (hiddenDanger.getRectifyType().equals("1")){ + CJDangerInfo.setDangerManageType("0");//隐患治理类型 + }else { + CJDangerInfo.setDangerManageType("1");//隐患治理类型 + } CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述 CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因 CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金 @@ -682,9 +687,12 @@ if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){ CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态 } - if (ObjectUtils.isNotEmpty(dangerManage.getHazardDangerType())){ - CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());//隐患类型 + if (hiddenDanger.getRectifyType().equals("1")){ + CJDangerInfo.setHazardDangerType("0");//隐患类型 + }else { + CJDangerInfo.setHazardDangerType("1");//隐患类型 } + CJDangerInfo.setDangerManagerId(dangerManage.getId()); //封装数据 CJDangerInfoLists.add(CJDangerInfo); @@ -715,74 +723,74 @@ - /** - * 7、检索检修记录数据 - * */ - //读取风险分析单元数据上报主配置信息 - PreventReportConfig overhaulReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.OVERHAUL_LOG_DANGER_INFO.getCode()); - //如果风险事件主配置开启上报 - if (overhaulReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){ - - //logger.info("【##】2.检索检修记录..."); - //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime) - List<PreventOverhaulLog> preventOverhaulLogList = overhaulLogService.listReportOverhaulLog(); - //获取上报数据对象与list - List<PreventCJReportOverhaulLog> CJOverhaulLogLists = new ArrayList<>(); - if (ObjectUtils.isNotEmpty(preventOverhaulLogList)){ - //遍历,封装数据 - for (PreventOverhaulLog preventOverhaulLog : preventOverhaulLogList) { - HandlerReportParam handlerReportParam = new HandlerReportParam(); - PreventCJReportOverhaulLog CJOverhaulLog = new PreventCJReportOverhaulLog(); - - //封装上报昌吉州检修记录数据 - CJOverhaulLog.setId(preventOverhaulLog.getUuid()); - if (preventOverhaulLog.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){ - CJOverhaulLog.setDeleted("2");//数据更新状态标识,目前仅昌吉州需要 2022-08-10 - }else { - CJOverhaulLog.setDeleted("0"); - } - CJOverhaulLog.setCompanyCode(companyCode); - CJOverhaulLog.setHazardCode(preventOverhaulLog.getHazardCode()); - CJOverhaulLog.setRiskUnitId(preventOverhaulLog.getRiskUnitUuid()); - CJOverhaulLog.setStopStartTime(preventOverhaulLog.getStopStartTime()); - CJOverhaulLog.setStopEndTime(preventOverhaulLog.getStopEndTime()); - CJOverhaulLog.setStopReason(preventOverhaulLog.getStopReason()); - CJOverhaulLog.setCreateBy(preventOverhaulLog.getCreateByUserName()); - CJOverhaulLog.setCreateDate(preventOverhaulLog.getGmtCreate()); - CJOverhaulLog.setUpdateBy(preventOverhaulLog.getCreateByUserName()); - CJOverhaulLog.setUpdateDate(preventOverhaulLog.getGmtModitify()); - CJOverhaulLog.setReportTime(null); - CJOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); - CJOverhaulLog.setDataSource((byte) 1); - - //封装数据 - CJOverhaulLogLists.add(CJOverhaulLog); - //设置原始数据上报状态 - handlerReportParam.setId(preventOverhaulLog.getId()); - handlerReportParam.setReportTime(new Date()); - handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); - int result = overhaulLogService.updateOverhaulReportStatus(handlerReportParam); - if (result < 1){ - throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败"); - } - } - }else { - logger.info("【检修记录】当前无检修记录数据需要处理"); - } - //写入昌吉州转换表 - for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogLists) { - int result = reportOverhaulLogService.insertCJOverhaulLists(cjOverhaulLog); - if (result < 1){ - throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败"); - } - logger.info("【检修记录】2.检修记录CJ:数据处理..."); - } - step = 3; - }else { - step = 3; - logger.info("检修记录数据上报已关闭"); - } - +// /** +// * 7、检索检修记录数据 +// * */ +// //读取风险分析单元数据上报主配置信息 +// PreventReportConfig overhaulReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.OVERHAUL_LOG_DANGER_INFO.getCode()); +// //如果风险事件主配置开启上报 +// if (overhaulReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){ +// +// //logger.info("【##】2.检索检修记录..."); +// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime) +// List<PreventOverhaulLog> preventOverhaulLogList = overhaulLogService.listReportOverhaulLog(); +// //获取上报数据对象与list +// List<PreventCJReportOverhaulLog> CJOverhaulLogLists = new ArrayList<>(); +// if (ObjectUtils.isNotEmpty(preventOverhaulLogList)){ +// //遍历,封装数据 +// for (PreventOverhaulLog preventOverhaulLog : preventOverhaulLogList) { +// HandlerReportParam handlerReportParam = new HandlerReportParam(); +// PreventCJReportOverhaulLog CJOverhaulLog = new PreventCJReportOverhaulLog(); +// +// //封装上报昌吉州检修记录数据 +// CJOverhaulLog.setId(preventOverhaulLog.getUuid()); +// if (preventOverhaulLog.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){ +// CJOverhaulLog.setDeleted("2");//数据更新状态标识,目前仅昌吉州需要 2022-08-10 +// }else { +// CJOverhaulLog.setDeleted("0"); +// } +// CJOverhaulLog.setCompanyCode(companyCode); +// CJOverhaulLog.setHazardCode(preventOverhaulLog.getHazardCode()); +// CJOverhaulLog.setRiskUnitId(preventOverhaulLog.getRiskUnitUuid()); +// CJOverhaulLog.setStopStartTime(preventOverhaulLog.getStopStartTime()); +// CJOverhaulLog.setStopEndTime(preventOverhaulLog.getStopEndTime()); +// CJOverhaulLog.setStopReason(preventOverhaulLog.getStopReason()); +// CJOverhaulLog.setCreateBy(preventOverhaulLog.getCreateByUserName()); +// CJOverhaulLog.setCreateDate(preventOverhaulLog.getGmtCreate()); +// CJOverhaulLog.setUpdateBy(preventOverhaulLog.getCreateByUserName()); +// CJOverhaulLog.setUpdateDate(preventOverhaulLog.getGmtModitify()); +// CJOverhaulLog.setReportTime(null); +// CJOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); +// CJOverhaulLog.setDataSource((byte) 1); +// +// //封装数据 +// CJOverhaulLogLists.add(CJOverhaulLog); +// //设置原始数据上报状态 +// handlerReportParam.setId(preventOverhaulLog.getId()); +// handlerReportParam.setReportTime(new Date()); +// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode()); +// int result = overhaulLogService.updateOverhaulReportStatus(handlerReportParam); +// if (result < 1){ +// throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败"); +// } +// } +// }else { +// logger.info("【检修记录】当前无检修记录数据需要处理"); +// } +// //写入昌吉州转换表 +// for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogLists) { +// int result = reportOverhaulLogService.insertCJOverhaulLists(cjOverhaulLog); +// if (result < 1){ +// throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败"); +// } +// logger.info("【检修记录】2.检修记录CJ:数据处理..."); +// } +// step = 3; +// }else { +// step = 3; +// logger.info("检修记录数据上报已关闭"); +// } +// -- Gitblit v1.9.2