src/main/java/com/ruoyi/common/utils/ImageToBase64.java
对比新文件 @@ -0,0 +1,48 @@ package com.ruoyi.common.utils; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; import java.util.Base64; public class ImageToBase64 { public static String convertImageToBase64(String imageUrl) { try { // 创建URL对象 URL url = new URL(imageUrl); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); // 设置请求方法和超时时间 connection.setRequestMethod("GET"); connection.setConnectTimeout(5000); connection.setReadTimeout(5000); connection.setDoInput(true); // 获取输入流 InputStream inputStream = connection.getInputStream(); // 读取图片字节数据 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); byte[] buffer = new byte[1024]; int bytesRead; while ((bytesRead = inputStream.read(buffer)) != -1) { byteArrayOutputStream.write(buffer, 0, bytesRead); } byte[] imageBytes = byteArrayOutputStream.toByteArray(); // 关闭流 inputStream.close(); byteArrayOutputStream.close(); // 将图片字节数组编码为 Base64 字符串 return Base64.getEncoder().encodeToString(imageBytes); } catch (Exception e) { e.printStackTrace(); return null; } } } src/main/java/com/ruoyi/doublePrevention/controller/RiskOldInfoController.java
@@ -5,13 +5,11 @@ import com.ruoyi.doublePrevention.entity.dto.resp.RiskOldInfoQueryRespDTO; import com.ruoyi.doublePrevention.enums.ResultCodes; import com.ruoyi.doublePrevention.repository.RiskOldInfoRepository; import com.ruoyi.doublePrevention.scheduls.ZhunDongSchedule; import com.ruoyi.doublePrevention.service.baseService.RiskOldInfoService; import com.ruoyi.doublePrevention.vo.ResultVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; @RestController @@ -38,6 +36,16 @@ return resultVO; // return riskOldInfoService.selectOldRiskInfoPage(queryReqDTO); } // // @Autowired // private ZhunDongSchedule zhunDongSchedule; // @GetMapping("/dataTest") // public ResultVO dataTest() { // zhunDongSchedule.updateHuaidongReportStatus(); // ResultVO resultVO = new ResultVO<>(); // resultVO.setCode(ResultCodes.OK.getCode()); // return resultVO; // } } src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
@@ -67,6 +67,12 @@ * 上报状态 1-待上报;2-已上报;3-不上报 */ private Byte reportStatus; /** * 上报状态 1-待上报;2-已上报;3-不上报 */ private Byte zhunReportStatus; /** * 数据来源 1-本系统排查任务产生;2-同步数据 */ @@ -205,5 +211,12 @@ } public Byte getzhunReportStatus() { return zhunReportStatus; } public void setzhunReportStatus(Byte zhunReportStatus) { this.zhunReportStatus = zhunReportStatus; } } src/main/java/com/ruoyi/doublePrevention/entity/ZDReport/HandlerZDReportParam.java
对比新文件 @@ -0,0 +1,23 @@ package com.ruoyi.doublePrevention.entity.ZDReport; import lombok.Data; import java.util.Date; @Data public class HandlerZDReportParam { /** * 主键 */ private String id; /** * 上报状态 1-待上报;2-已上报;3-不上报;4-变更需上传 */ private Byte zhunReportStatus; /** * 上报时间 */ private Date zhunReportTime; } src/main/java/com/ruoyi/doublePrevention/entity/ZDReport/PreventZDReportRiskAnaUnit.java
对比新文件 @@ -0,0 +1,54 @@ package com.ruoyi.doublePrevention.entity.ZDReport; import lombok.Data; @Data /** * 淮东报告风险分析对象 */ public class PreventZDReportRiskAnaUnit { /** * 风险单元ID */ private String RISKUNIT_ID; /** * 风险分析对象编码 */ private String HAZARD_CODE; /** * 风险分析对象部门 */ private String HAZARD_DEP; /** * 风险分析对象负责人 */ private String HAZARD_LIABLE_PERSON; /** * 风险单元名称 */ private String RISK_UNIT_NAME; /** * 风险等级推送1、2、3、4,分别对应重大风险、较大风险、一般风险、低风险等红橙黄蓝四个等级的风险 */ private String RISK_CLASS; /** * 创建时间 */ private String CREATE_TIME; /** * 创建人 */ private String CREATE_BY; /** * 更新时间 */ private String UPDATE_TIME; /** * 更新人 */ private String UPDATE_BY; /** * 删除标志(正常:0;已删除:1) */ private String DELETE_MARK; } src/main/java/com/ruoyi/doublePrevention/entity/ZDReport/ZDPreventCJReportDangerInfo.java
对比新文件 @@ -0,0 +1,12 @@ package com.ruoyi.doublePrevention.entity.ZDReport; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo; import lombok.Data; @Data public class ZDPreventCJReportDangerInfo extends PreventCJReportDangerInfo { private String preRectifyPhoto; private String rectifyAttachment; private String postRectifyPhoto; } src/main/java/com/ruoyi/doublePrevention/entity/ZDReport/ZDReportCheckRecordFromTaskDTO.java
对比新文件 @@ -0,0 +1,45 @@ package com.ruoyi.doublePrevention.entity.ZDReport; import lombok.Data; @Data public class ZDReportCheckRecordFromTaskDTO { /** * 排查记录ID */ private String RECORD_ID; /** * 排查任务ID */ private String CHECK_TASK_ID; /** * 排查时间 */ private String CHECK_TIME; /** * 排查结果(正常:0;存在隐患:1;未排查:2;其他:3 ) */ private String CHECK_STATUS; /** * 国际移动设备识别码 IMEI。当设备存在多个 IMEI码时,只上传第一个 */ private String MOBILE_ME; /** * 包保任务标志(1是;0 否)默认为否。当排查任务中任务类型为主要负责人任务、技术负责人任务、操作负责人任务时,此项为 1 */ private String IS_DEFEND; /** *创建人手机号 */ private String CREATE_BY_MOBILE; /** *最后修改人手机号 */ private String UPDATE_BY_MOBILE; private String CREATE_TIME; private String CREATE_BY; private String UPDATE_TIME; private String UPDATE_BY; private String DELETE_MARK; } src/main/java/com/ruoyi/doublePrevention/entity/ZDReport/ZDReportCheckTaskFromWorkDTO.java
对比新文件 @@ -0,0 +1,52 @@ package com.ruoyi.doublePrevention.entity.ZDReport; import lombok.Data; @Data public class ZDReportCheckTaskFromWorkDTO { /** * 隐患排查任务ID */ private String CHECKTASK_ID; /** * 风险措施ID */ private String RISK_MEASURE_ID; /** * 隐患排查内容 */ private String TROUBLESHOOT_CONTENT; /** * 工作开始时间 */ private String WORK_START_TIME; /** * 工作结束时间 */ private String WORK_END_TIME; /** * 工作日类型工作日类型(每天:0;法定工作日(除法定放假以为的所有):1;非法定工作 日(除了放假的时候):2) */ private String WORK_DAY_TYPE; /** * 任务类型(日常任务:0;主要负责人任务:1;技术负责人任务:2;操作负责人任务:3)默认为日常任务:0 */ private String WORK_TYPE; /** * 包保任务对应项 */ private String TASK_NUM; /** * 巡检周期 */ private Integer CHECK_CYCLE; /** *巡检周期单位(小时、天、月、年) */ private String CHECK_CYCLE_UNIT; private String CREATE_TIME; private String CREATE_BY; private String UPDATE_TIME; private String UPDATE_BY; private String DELETE_MARK; } src/main/java/com/ruoyi/doublePrevention/entity/ZDReport/ZDReportDangerInfoDTO.java
对比新文件 @@ -0,0 +1,141 @@ package com.ruoyi.doublePrevention.entity.ZDReport; import lombok.Data; @Data public class ZDReportDangerInfoDTO { // 属性定义 /** * 隐患ID */ private String DANGER_ID; /** * 隐患名称 */ private String DANGER_NAME; /** * 风险分析对象编码(危险源编码) */ private String HAZARD_CODE; /** * 管控措施ID */ private String RISK_MEASURE_ID; /** * 隐患排查记录ID */ private String CHECK_RECORD_ID; /** * 隐患等级(一般隐患:0;重大隐患:1) */ private String DANGER_LEVEL; /** * 登记时间 */ private String REGIST_TIME; /** * 登记人姓名 */ private String REGISTRANT; /** *隐患来源(检查来源分类)日常排查:1; * 综合性排查:2; * 专业性排查:3; * 季节性排查:4; * 重点时段及节假日前排查:5; * 事故类比排查:6; * 复产复工前排查:7; * 外聘专家诊断式排查:8; * 管控措施失效:9 * 其他:10 */ private String DANGER_SRC; /** 隐患治理类型( 即查即改:0、 限期整改:1 ) */ private String DANGER_MANAGE_TYPE; /** *隐患类别(其他隐患:0;主要负责人登记隐患:1;技术负责人登记隐患:2;操作负责人登记隐患:3)默认为其他隐患:0 */ private String HAZARD_DANGER_TYPE; /** * 隐患类型(安全:1工艺:2 * 电气:3 * 仪表:4 * 消防:5 * 总图:6 * 设备:7 * 其他:8) */ private String HAZARD_CATEGORY; /** * 隐患描述 */ private String DANGER_DESC; /** * 原因分析 */ private String DANGER_REASON; /**8 *控制措施 */ private String CONTROL_MEASURES; /** * 整改资金 */ private String COST; /** * 责任人 */ private String LIABLE_PERSON; /** * 隐患治理期限 */ private String DANGER_MANAGE_DEADLINE; /** * 验收人姓名 */ private String CHECK_ACCEPT_PERSON; /** * 验收时间 */ private String CHECK_ACCEPT_TIME; /** * 验收情况描述验收结果 */ private String CHECK_ACCEPT_COMMENT; /** * 隐患状态(整改中:0;待验收:1;已验收:9 */ private String DANGER_STATE; /** * 人物管理分类1:人的不安全行为;2:物的不安全状态;3:管理上的缺陷 */ private String MANAGEMENT_CLASSIFICATION; /** * 发生环节1:设计;2:产品质量缺陷;3:仓储;4:项目施工;5:开停车;6:使用操作;7:维护保养;8:维修;9:变更;10:运输等 */ private String OCCURRENCE_LINK; /** * 隐患的相关照片,图片的base64 编码。图片格式为PNG 或JPEG,图片大小不超过5M。 */ private String ATTACHMENTS1; /** * 隐患整改的相关照片,图片的base64 编码。图片格式为PNG 或JPEG,图片大小不超过5M。 */ private String ATTACHMENTS2; /** * 文件路径 */ private String FJ; private String CREATE_TIME; private String CREATE_BY; private String UPDATE_TIME; private String UPDATE_BY; private String DELETE_MARK; } src/main/java/com/ruoyi/doublePrevention/entity/ZDReport/ZDReportRiskControlMeasureDTO.java
对比新文件 @@ -0,0 +1,45 @@ package com.ruoyi.doublePrevention.entity.ZDReport; import lombok.Data; @Data public class ZDReportRiskControlMeasureDTO { /** * 管控措施ID */ private String RISKMEASURE_ID; /** * 风险事件ID */ private String RISK_EVENT_ID; /** * 自动化监控:1;隐患排查:2 */ private String DATA_SRC; /** * 管控措施描述 */ private String RISK_MEASURE_DESC; /** * 管控措施分类(工程技术:1;维护保养:2;操作行为:3;应急措施:4) */ private String CLASSIFY1; /** * 工艺控制:1-1;关键设备/部件:1-2;安全附件:1-3;安全仪表:1-4;其它:1-5;动设备:2-1;静设备:2-2;2-3:其他;人员资质:3-1;操作记录:3-2;交接班:3-3;3-4:其他;应急设施:4-1;个体防护:4-2;消防设施:4-3;应急预案:4-4;其他:4-5 */ private String CLASSIFY2; /** * 管控措施分类3 */ private String CLASSIFY3; /** * 隐患排查内容 */ private String TROUBLESHOOT_CONTENT; private String CREATE_TIME; private String CREATE_BY; private String UPDATE_TIME; private String UPDATE_BY; private String DELETE_MARK; } src/main/java/com/ruoyi/doublePrevention/entity/ZDReport/ZDReportRiskEventDTO.java
对比新文件 @@ -0,0 +1,25 @@ package com.ruoyi.doublePrevention.entity.ZDReport; import lombok.Data; @Data public class ZDReportRiskEventDTO { /** * 风险事件ID */ private String RISKEVENT_ID; /** * 所属风险单元UUID */ private String RISK_UNIT_ID; /** * 风险事件名称 */ private String RISK_EVENT_NAME; private String CREATE_TIME; private String CREATE_BY; private String UPDATE_TIME; private String UPDATE_BY; private String DELETE_MARK; } src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java
@@ -2,9 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; import io.lettuce.core.dynamic.annotation.Param; @@ -45,4 +44,14 @@ int updateTaskReportStatusForRePushV1(@Param("startTime") String startTime, @Param("endTime") String endTime); int updateTaskReportStatusForRePushV2(@Param("startTime") String startTime, @Param("endTime") String endTime); /** * 任务-查询待上报 * */ List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDateHuaiDong(); /** * 任务-待上报状态变更 - 通过id * */ int updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam); } src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
@@ -1,9 +1,8 @@ package com.ruoyi.doublePrevention.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; import org.springframework.stereotype.Repository; @@ -17,6 +16,7 @@ * 任务配置 -查询待上报 * */ List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate(); /** * 任务配置 -待上报状态变更 * */ @@ -41,4 +41,14 @@ List<PreventCJReportCheckTaskFromWork> listWork1(); int updateInfo1(PreventCJReportCheckTaskFromWork work); /** * 任务配置 -查询待上报 * */ List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDateHD(); /** * 任务配置 -待上报状态变更 -通过id * */ int updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam); } src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.entity.ZDReport.ZDPreventCJReportDangerInfo; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; import org.springframework.stereotype.Repository; @@ -37,4 +39,14 @@ List<PreventCJReportDangerInfo> getDangerListForCheckTask(); PreventCJReportDangerInfo getDangerById(String dangerId); /** * 上报数据-待上报数据查询 */ List<ZDPreventCJReportDangerInfo> listReportDangerDateZhunDong(); /** * 上报数据-待上报状态变更-通过id */ int updateZDReportStatusById(HandlerZDReportParam handlerZDReportParam); } src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import org.springframework.stereotype.Repository; @@ -18,6 +19,9 @@ * 上报数据-查询待上报数据 */ List<PreventCJReportRiskAnaUnit> listReportUnitDate(); List<PreventCJReportRiskAnaUnit> listReportUnitDateHuaiDong(); /** * 上报数据-修改待上报 */ @@ -26,6 +30,8 @@ * 上报数据-修改待上报-通过id */ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam); int updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam); /** * 上报数据-插入 */ src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; import org.springframework.stereotype.Repository; @@ -36,4 +37,11 @@ * 插入管控措施上报数据 * */ int insertMeasureList(PreventCJReportRiskControlMeasure cjMeasure); int updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam); /** * 管控措施-上报数据 * */ List<PreventCJReportRiskControlMeasure> listReportMeasureDateHuaiDong(); } src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; import org.springframework.stereotype.Repository; @@ -38,4 +39,9 @@ * 插入风险事件数据 * */ int insertEventLists(PreventCJReportRiskEvent event); List<PreventCJReportRiskEvent> listReportEventDateHuaiDong(); int updateEventReportStatusHuaiDong(HandlerZDReportParam handlerZDReportParam); } src/main/java/com/ruoyi/doublePrevention/scheduls/ZhunDongSchedule.java
对比新文件 @@ -0,0 +1,665 @@ package com.ruoyi.doublePrevention.scheduls; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ImageToBase64; import com.ruoyi.doublePrevention.entity.CJReport.*; import com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO.CJReportDangerInfoDTO; import com.ruoyi.doublePrevention.entity.ZDReport.*; import com.ruoyi.doublePrevention.enums.SyncEnum; import com.ruoyi.doublePrevention.service.baseService.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.*; import static com.ruoyi.common.utils.Threads.sleep; @Slf4j @Component /** * 华东 */ public class ZhunDongSchedule { private static final String TOKEN = "030B6744-EECB-4732-B679-280373E7E575"; private static final String URL = "http://218.31.50.112:8087"; private static final String TOKEN_PRE = "token"; @Autowired private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService; @Autowired private PreventCJReportRiskEventService CJEventService; @Autowired private PreventCJReportRiskControlMeasureService CJMeasureService; @Autowired private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService; @Autowired private PreventCJReportCheckRecordFromTaskService CJTaskRecordService; @Autowired private PreventCJReportDangerInfoService CJDangerInfoService; @Scheduled(cron = "0 0/6 * * * ? ") public void updateHuaidongReportStatus() { log.info("开始推送准东数据..." + DateUtils.dateTimeNow()); //风险单元 riskAnaUnitsWork(); sleep(5000); //风险事件 HDEventsWork(); sleep(5000); //风险管控措施 riskControlMeasure(); //排查任务表 sleep(5000); HDTaskFromWorks(); //排查记录表 // sleep(5000); ZDRecordFromTasks(); sleep(5000); //治理信息表 ZDDangerInfos(); } /** * 安全风险分析单元 */ @Transactional public void riskAnaUnitsWork() { HttpURLConnection con = null; BufferedReader buffer = null; int responseCode = 200; log.info("【A】安全风险分析单元-处理数据..."); List<PreventCJReportRiskAnaUnit> CJRiskAnaUnits = CJRiskAnaUnitService.listReportUnitDateHuaiDong(); if (ObjectUtils.isNotEmpty(CJRiskAnaUnits)) { List<PreventZDReportRiskAnaUnit> list = new ArrayList<>(); //转化数据 for (PreventCJReportRiskAnaUnit cjRiskAnaUnit : CJRiskAnaUnits) { PreventZDReportRiskAnaUnit riskAnaUnit = new PreventZDReportRiskAnaUnit(); riskAnaUnit.setRISKUNIT_ID(cjRiskAnaUnit.getId()); riskAnaUnit.setRISK_UNIT_NAME(cjRiskAnaUnit.getRiskUnitName()); //todo 等级未知 riskAnaUnit.setRISK_CLASS("1"); riskAnaUnit.setHAZARD_DEP(cjRiskAnaUnit.getHazardDep()); riskAnaUnit.setHAZARD_CODE(cjRiskAnaUnit.getHazardCode()); riskAnaUnit.setHAZARD_LIABLE_PERSON(cjRiskAnaUnit.getHazardLiablePerson()); riskAnaUnit.setCREATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjRiskAnaUnit.getCreateDate())); riskAnaUnit.setUPDATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date())); riskAnaUnit.setCREATE_BY(cjRiskAnaUnit.getCreateBy()); riskAnaUnit.setUPDATE_BY(cjRiskAnaUnit.getUpdateBy()); riskAnaUnit.setDELETE_MARK(cjRiskAnaUnit.getDeleted()); list.add(riskAnaUnit); } log.info("【A】安全风险分析单元开始推送数据...原始数据:" + JSON.toJSONString(list)); StringBuffer unitResultBuffer = null; //上报数据 try { URL url = new URL(URL + "/api/wwyt/t_aqfxfxdy_List"); con = (HttpURLConnection) url.openConnection(); // 设置请求方式和参数 con.setRequestMethod("POST"); con.setDoOutput(true); con.setDoInput(true); con.setUseCaches(false); con.setRequestProperty("token", TOKEN); con.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); // 发送请求体 try (OutputStream os = con.getOutputStream()) { os.write(JSON.toJSONString(list).getBytes(StandardCharsets.UTF_8)); } responseCode = con.getResponseCode(); //本段日志,测试成功后,可注释掉 if (responseCode == HttpURLConnection.HTTP_OK) { //得到响应流 InputStream inputStream = con.getInputStream(); //将响应流转换成字符串 unitResultBuffer = new StringBuffer(); String line; buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); while ((line = buffer.readLine()) != null) { unitResultBuffer.append(line); } log.info("【A】安全风险分析单元result:" + unitResultBuffer); JSONObject jsonObject = JSONObject.parseObject(unitResultBuffer.toString()); if (jsonObject.getInteger("status") == 200) { String message = jsonObject.getString("message"); if (message.contains("失效0条")) { //遍历数据,设置数据上报成功 for (PreventCJReportRiskAnaUnit CJRiskAnaUnit : CJRiskAnaUnits) { HandlerZDReportParam handlerZDReportParam = new HandlerZDReportParam(); //封装数据 handlerZDReportParam.setId(CJRiskAnaUnit.getId()); handlerZDReportParam.setZhunReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode()); handlerZDReportParam.setZhunReportTime(new Date()); CJRiskAnaUnitService.updateHDReportStatusById(handlerZDReportParam); } } } else { log.info("【A】安全风险分析单元推送数据失败..." + unitResultBuffer); } } log.info("【A】安全风险分析单元推送数据结束..."); } catch (Exception e) { e.printStackTrace(); } }else { log.info("【A】安全风险分析单元无可推数据"); } } @Transactional public void HDEventsWork() { HttpURLConnection con = null; BufferedReader buffer = null; int responseCode = 200; /** * 2、处理安全风险事件数据 * */ log.info("【B】安全风险事件-处理数据..."); List<PreventCJReportRiskEvent> HDEvents = CJEventService.listReportEventDateHuaiDong(); if (ObjectUtils.isNotEmpty(HDEvents)) { List<ZDReportRiskEventDTO> eventList = new ArrayList<>(); for (PreventCJReportRiskEvent hdEvent : HDEvents) { ZDReportRiskEventDTO ZDReportRiskEventDTO = new ZDReportRiskEventDTO(); ZDReportRiskEventDTO.setRISKEVENT_ID(hdEvent.getId()); ZDReportRiskEventDTO.setRISK_UNIT_ID(hdEvent.getRiskUnitId()); ZDReportRiskEventDTO.setRISK_EVENT_NAME(hdEvent.getRiskEventName()); ZDReportRiskEventDTO.setCREATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, hdEvent.getCreateDate())); ZDReportRiskEventDTO.setUPDATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date())); ZDReportRiskEventDTO.setCREATE_BY(hdEvent.getCreateBy()); ZDReportRiskEventDTO.setUPDATE_BY(hdEvent.getUpdateBy()); ZDReportRiskEventDTO.setDELETE_MARK(hdEvent.getDeleted()); eventList.add(ZDReportRiskEventDTO); } log.info("【【风险事件原始数据】】" + JSONObject.toJSONString(eventList)); //加密数据 StringBuffer eventResultBuffer = null; //上报数据 try { URL url = new URL(URL + "/api/wwyt/t_aqfxsj_List"); //得到连接对象 con = (HttpURLConnection) url.openConnection(); // 设置请求方式和参数 con.setRequestMethod("POST"); con.setDoOutput(true); con.setDoInput(true); con.setUseCaches(false); con.setRequestProperty("token", TOKEN); con.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); // 发送请求体 try (OutputStream os = con.getOutputStream()) { os.write(JSON.toJSONString(eventList).getBytes(StandardCharsets.UTF_8)); } //得到响应码 responseCode = con.getResponseCode(); //确认响应流不为空 if (responseCode == HttpURLConnection.HTTP_OK) { //得到响应流 InputStream inputStream = con.getInputStream(); //将响应流转换成字符串 eventResultBuffer = new StringBuffer(); String line; buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); while ((line = buffer.readLine()) != null) { eventResultBuffer.append(line); } log.info("【B】安全风险事件result:" + eventResultBuffer.toString()); JSONObject jsonObject = JSONObject.parseObject(eventResultBuffer.toString()); if (jsonObject.getInteger("status") == 200) { String message = jsonObject.getString("message"); if (message.contains("失效0条")) { for (PreventCJReportRiskEvent CJEvent : HDEvents) { HandlerZDReportParam handlerZDReportParam = new HandlerZDReportParam(); //封装数据 handlerZDReportParam.setId(CJEvent.getId()); handlerZDReportParam.setZhunReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode()); handlerZDReportParam.setZhunReportTime(new Date()); CJEventService.updateEventReportStatusHuaiDong(handlerZDReportParam); } } } else { log.info("【B】安全风险事件推送数据失败..." + eventResultBuffer); } } } catch (Exception e) { e.printStackTrace(); } log.info("【B】处理安全风险事件数据结束..."); }else { log.info("【B】处理安全风险无可推数据"); } } @Transactional public void riskControlMeasure() { HttpURLConnection con = null; BufferedReader buffer = null; int responseCode = 200; /** * 3、处理风险管控措施数据 * */ log.info("【C】风险管控措施-处理数据..."); List<PreventCJReportRiskControlMeasure> CJMeasures = CJMeasureService.listReportMeasureDateHuaiDong(); //封装上报数据 List<ZDReportRiskControlMeasureDTO> reportMeasureList = new ArrayList<>(); if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(CJMeasures)) { for (PreventCJReportRiskControlMeasure cjMeasure : CJMeasures) { ZDReportRiskControlMeasureDTO ZDReportRiskControlMeasureDTO = new ZDReportRiskControlMeasureDTO(); ZDReportRiskControlMeasureDTO.setRISKMEASURE_ID(cjMeasure.getId()); ZDReportRiskControlMeasureDTO.setRISK_EVENT_ID(cjMeasure.getRiskEventId()); ZDReportRiskControlMeasureDTO.setDATA_SRC(cjMeasure.getDataSrc()); ZDReportRiskControlMeasureDTO.setRISK_MEASURE_DESC(cjMeasure.getRiskMeasureDesc()); ZDReportRiskControlMeasureDTO.setCLASSIFY1(cjMeasure.getClassify1()); ZDReportRiskControlMeasureDTO.setCLASSIFY2(cjMeasure.getClassify2()); //非必传 //ZDReportRiskControlMeasureDTO.setCLASSIFY3(cjMeasure.getClassify3()); ZDReportRiskControlMeasureDTO.setTROUBLESHOOT_CONTENT(cjMeasure.getTroubleshootContent()); ZDReportRiskControlMeasureDTO.setCREATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjMeasure.getCreateDate())); ZDReportRiskControlMeasureDTO.setUPDATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date())); ZDReportRiskControlMeasureDTO.setCREATE_BY(cjMeasure.getCreateBy()); ZDReportRiskControlMeasureDTO.setUPDATE_BY(cjMeasure.getUpdateBy()); ZDReportRiskControlMeasureDTO.setDELETE_MARK(cjMeasure.getDeleted()); reportMeasureList.add(ZDReportRiskControlMeasureDTO); } log.info("【C】风险管控措施-处理数据【原始数据】" + JSONObject.toJSONString(reportMeasureList)); //数据上报 StringBuffer measureResultBuffer = null; //上报数据 try { URL url = new URL(URL + "/api/wwyt/t_aqfxgkcs_List"); //得到连接对象 con = (HttpURLConnection) url.openConnection(); // 设置请求方式和参数 con.setRequestMethod("POST"); con.setDoOutput(true); con.setDoInput(true); con.setUseCaches(false); con.setRequestProperty("token", TOKEN); con.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); // 发送请求体 try (OutputStream os = con.getOutputStream()) { os.write(JSON.toJSONString(reportMeasureList).getBytes(StandardCharsets.UTF_8)); } //得到响应码 responseCode = con.getResponseCode(); //本段日志,测试成功后,可注释掉 if (responseCode == HttpURLConnection.HTTP_OK) { //得到响应流 InputStream inputStream = con.getInputStream(); //将响应流转换成字符串 measureResultBuffer = new StringBuffer(); String line; buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); while ((line = buffer.readLine()) != null) { measureResultBuffer.append(line); } log.info("【C】安全风险管控措施推result:" + measureResultBuffer.toString()); JSONObject jsonObject = JSONObject.parseObject(measureResultBuffer.toString()); if (jsonObject.getInteger("status") == 200) { String message = jsonObject.getString("message"); if (message.contains("失效0条")) { for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasures) { HandlerZDReportParam handlerZDReportParam = new HandlerZDReportParam(); //封装数据 handlerZDReportParam.setId(CJMeasure.getId()); handlerZDReportParam.setZhunReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode()); handlerZDReportParam.setZhunReportTime(new Date()); CJMeasureService.updateHDReportStatusById(handlerZDReportParam); } } } else { log.info("【C】安全风险管控措施推送数据失败..." + measureResultBuffer); } log.info("【C】安全风险管控措施数据结束..."); } } catch (Exception e) { e.printStackTrace(); } }else { log.info("【C】安全风险管控措施无可推数据"); } } @Transactional public void HDTaskFromWorks() { HttpURLConnection con = null; BufferedReader buffer = null; int responseCode = 200; /** * 4、处理 任务-配置 数据 * */ log.info("【D】隐患排查任务-处理数据..."); List<PreventCJReportCheckTaskFromWork> CJTaskFromWorks = CJTaskFromWorkService.listReportTaskFromWorkDateHuaiDong(); if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(CJTaskFromWorks)) { //封装上报数据 List<ZDReportCheckTaskFromWorkDTO> reportCheckTaskFromWorkList = new ArrayList<>(); for (PreventCJReportCheckTaskFromWork cjTaskFromWork : CJTaskFromWorks) { ZDReportCheckTaskFromWorkDTO ZDReportCheckTaskFromWorkDTO = new ZDReportCheckTaskFromWorkDTO(); ZDReportCheckTaskFromWorkDTO.setCHECKTASK_ID(cjTaskFromWork.getId()); ZDReportCheckTaskFromWorkDTO.setRISK_MEASURE_ID(cjTaskFromWork.getRiskMeasureId()); ZDReportCheckTaskFromWorkDTO.setTROUBLESHOOT_CONTENT(cjTaskFromWork.getTroubleshootContent()); ZDReportCheckTaskFromWorkDTO.setWORK_START_TIME(cjTaskFromWork.getWorkStartTime()); ZDReportCheckTaskFromWorkDTO.setWORK_END_TIME(cjTaskFromWork.getWorkEndTime()); ZDReportCheckTaskFromWorkDTO.setWORK_DAY_TYPE(cjTaskFromWork.getWorkDayType()); ZDReportCheckTaskFromWorkDTO.setWORK_TYPE(cjTaskFromWork.getWorkType()); //非必传 if (cjTaskFromWork.getTaskNum() != null){ ZDReportCheckTaskFromWorkDTO.setTASK_NUM(cjTaskFromWork.getTaskNum() + ""); } //ZDReportCheckTaskFromWorkDTO.setTASK_NUM(cjTaskFromWork.getTaskNum() == null ? "0" : cjTaskFromWork.getTaskNum() + ""); ZDReportCheckTaskFromWorkDTO.setCHECK_CYCLE(cjTaskFromWork.getCheckCycle()); ZDReportCheckTaskFromWorkDTO.setCHECK_CYCLE_UNIT(cjTaskFromWork.getCheckCycleUnit()); ZDReportCheckTaskFromWorkDTO.setCREATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjTaskFromWork.getCreateDate())); ZDReportCheckTaskFromWorkDTO.setUPDATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date())); ZDReportCheckTaskFromWorkDTO.setCREATE_BY(cjTaskFromWork.getCreateBy()); ZDReportCheckTaskFromWorkDTO.setUPDATE_BY(cjTaskFromWork.getUpdateBy()); ZDReportCheckTaskFromWorkDTO.setDELETE_MARK(cjTaskFromWork.getDeleted()); reportCheckTaskFromWorkList.add(ZDReportCheckTaskFromWorkDTO); } log.info("【D】隐患排查任务【原始数据】" + JSONObject.toJSONString(reportCheckTaskFromWorkList)); StringBuffer taskFromWorkResultBuffer = null; //上报数据 try { URL url = new URL(URL + "/api/wwyt/t_yhpcrwxx_List"); //得到连接对象 con = (HttpURLConnection) url.openConnection(); // 设置请求方式和参数 con.setRequestMethod("POST"); con.setDoOutput(true); con.setDoInput(true); con.setUseCaches(false); con.setRequestProperty("token", TOKEN); con.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); // 发送请求体 try (OutputStream os = con.getOutputStream()) { os.write(JSON.toJSONString(reportCheckTaskFromWorkList).getBytes(StandardCharsets.UTF_8)); } //得到响应码 responseCode = con.getResponseCode(); //本段日志,测试成功后,可注释掉 if (responseCode == HttpURLConnection.HTTP_OK) { //得到响应流 InputStream inputStream = con.getInputStream(); //将响应流转换成字符串 taskFromWorkResultBuffer = new StringBuffer(); String line; buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); while ((line = buffer.readLine()) != null) { taskFromWorkResultBuffer.append(line); } log.info("【D】隐患排查任务-处理结果:" + taskFromWorkResultBuffer.toString()); JSONObject jsonObject = JSONObject.parseObject(taskFromWorkResultBuffer.toString()); if (jsonObject.getInteger("status") == 200) { String message = jsonObject.getString("message"); if (message.contains("失效0条")) { for (PreventCJReportCheckTaskFromWork CJTaskFromWork : CJTaskFromWorks) { HandlerZDReportParam handlerZDReportParam = new HandlerZDReportParam(); //封装数据 handlerZDReportParam.setId(CJTaskFromWork.getId()); handlerZDReportParam.setZhunReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode()); handlerZDReportParam.setZhunReportTime(new Date()); CJTaskFromWorkService.updateHDReportStatusById(handlerZDReportParam); } } } else if (jsonObject.getInteger("status") == 500) { log.info("【D】隐患排查任务-处理失败:" + taskFromWorkResultBuffer.toString()); } log.info("【D】隐患排查任务数据结束..."); } } catch (Exception e) { e.printStackTrace(); } }else { log.info("【D】隐患排查任务无可推数据"); } } @Transactional public void ZDRecordFromTasks() { HttpURLConnection con = null; BufferedReader buffer = null; int responseCode = 200; /** * 5、处理 任务-记录 数据 * */ log.info("【E】任务记录-处理数据..."); List<PreventCJReportCheckRecordFromTask> CJRecordFromTasks = CJTaskRecordService.listReportTaskRecordDateHuaiDong(); if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(CJRecordFromTasks)){ //封装上报数据 List<ZDReportCheckRecordFromTaskDTO> reportCheckRecordFromTaskDTOS = new ArrayList<>(); for (PreventCJReportCheckRecordFromTask cjRecordFromTask : CJRecordFromTasks) { ZDReportCheckRecordFromTaskDTO reportCheckRecordFromTaskDTO = new ZDReportCheckRecordFromTaskDTO(); reportCheckRecordFromTaskDTO.setRECORD_ID(cjRecordFromTask.getId()); reportCheckRecordFromTaskDTO.setCHECK_TASK_ID(cjRecordFromTask.getCheckTaskId()); reportCheckRecordFromTaskDTO.setCHECK_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjRecordFromTask.getCheckTime())); reportCheckRecordFromTaskDTO.setCHECK_STATUS(cjRecordFromTask.getCheckStatus()); reportCheckRecordFromTaskDTO.setMOBILE_ME(cjRecordFromTask.getMobileCode()); reportCheckRecordFromTaskDTO.setIS_DEFEND(cjRecordFromTask.getDefend()); reportCheckRecordFromTaskDTO.setCREATE_BY_MOBILE(cjRecordFromTask.getCreateByMobile()); reportCheckRecordFromTaskDTO.setUPDATE_BY_MOBILE(cjRecordFromTask.getUpdateByMobile()); reportCheckRecordFromTaskDTO.setCREATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjRecordFromTask.getCreateDate())); reportCheckRecordFromTaskDTO.setUPDATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjRecordFromTask.getUpdateDate())); reportCheckRecordFromTaskDTO.setCREATE_BY(cjRecordFromTask.getCreateBy()); reportCheckRecordFromTaskDTO.setUPDATE_BY(cjRecordFromTask.getUpdateBy()); reportCheckRecordFromTaskDTO.setDELETE_MARK(cjRecordFromTask.getDeleted()); reportCheckRecordFromTaskDTOS.add(reportCheckRecordFromTaskDTO); } //数据上报 log.info("【E】任务记录-处理数据【原始数据】" + JSONObject.toJSONString(reportCheckRecordFromTaskDTOS)); StringBuffer dangerInfoResultBuffer = null; //上报数据 try { URL url = new URL(URL+"/api/wwyt/t_yhpcjl_List"); //得到连接对象 con = (HttpURLConnection) url.openConnection(); // 设置请求方式和参数 con.setRequestMethod("POST"); con.setDoOutput(true); con.setDoInput(true); con.setUseCaches(false); con.setRequestProperty("token", TOKEN); con.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); // 发送请求体 try (OutputStream os = con.getOutputStream()) { os.write(JSON.toJSONString(reportCheckRecordFromTaskDTOS).getBytes(StandardCharsets.UTF_8)); } //得到响应码 responseCode = con.getResponseCode(); //本段日志,测试成功后,可注释掉 if (responseCode == HttpURLConnection.HTTP_OK) { //得到响应流 InputStream inputStream = con.getInputStream(); //将响应流转换成字符串 dangerInfoResultBuffer = new StringBuffer(); String line; buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); while ((line = buffer.readLine()) != null) { dangerInfoResultBuffer.append(line); } log.info("【E】任务记录-处理数据result:" + dangerInfoResultBuffer); JSONObject jsonObject = JSONObject.parseObject(dangerInfoResultBuffer.toString()); if (jsonObject.getInteger("status") == 200) { String message = jsonObject.getString("message"); if (message.contains("失效0条")) { for (PreventCJReportCheckRecordFromTask cjRecordFromTask : CJRecordFromTasks) { HandlerZDReportParam handlerZDReportParam = new HandlerZDReportParam(); handlerZDReportParam.setId(cjRecordFromTask.getId()); handlerZDReportParam.setZhunReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode()); handlerZDReportParam.setZhunReportTime(new Date()); CJTaskRecordService.updateHDReportStatusById(handlerZDReportParam); } } }else { log.error("【E】任务记录-处理数据result:" + dangerInfoResultBuffer); } log.info("【E】任务记录推送数据结束..."); } } catch (Exception e) { e.printStackTrace(); } }else { log.info("【E】任务记录无可推数据"); } } @Transactional public void ZDDangerInfos() { HttpURLConnection con = null; BufferedReader buffer = null; int responseCode = 200; /** * 6、处理隐患信息数据 * */ log.info("【F】隐患信息-处理数据..."); List<ZDPreventCJReportDangerInfo> CJDangerInfos = CJDangerInfoService.listReportDangerDateZhunDong(); if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(CJDangerInfos)){ //封装上报数据 List<ZDReportDangerInfoDTO> reportDangerInfoLists = new ArrayList<>(); for (ZDPreventCJReportDangerInfo cjDangerInfo : CJDangerInfos) { ZDReportDangerInfoDTO cjReportDangerInfoDTO = new ZDReportDangerInfoDTO(); cjReportDangerInfoDTO.setDANGER_ID(cjDangerInfo.getId()); cjReportDangerInfoDTO.setREGIST_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjDangerInfo.getRegistTime())); cjReportDangerInfoDTO.setREGISTRANT(cjDangerInfo.getRegistrant()); cjReportDangerInfoDTO.setDANGER_NAME(cjDangerInfo.getDangerName()); cjReportDangerInfoDTO.setHAZARD_CODE(cjDangerInfo.getHazardCode()); cjReportDangerInfoDTO.setRISK_MEASURE_ID(cjDangerInfo.getRiskMeasureId()); cjReportDangerInfoDTO.setCHECK_RECORD_ID(cjDangerInfo.getCheckRecordId()); cjReportDangerInfoDTO.setDANGER_LEVEL(cjDangerInfo.getDangerLevel()); cjReportDangerInfoDTO.setDANGER_SRC(cjDangerInfo.getDangerSrc()); cjReportDangerInfoDTO.setDANGER_MANAGE_TYPE(cjDangerInfo.getDangerManageType()); cjReportDangerInfoDTO.setHAZARD_DANGER_TYPE(cjDangerInfo.getHazardDangerType() == null ? "0" : cjDangerInfo.getHazardDangerType()); cjReportDangerInfoDTO.setHAZARD_CATEGORY(cjDangerInfo.getHazardCategory()); cjReportDangerInfoDTO.setDANGER_DESC(cjDangerInfo.getDangerDesc()); //非必传 // cjReportDangerInfoDTO.setDANGER_REASON(cjDangerInfo.getDangerReason()); // cjReportDangerInfoDTO.setCONTROL_MEASURES(cjDangerInfo.getControlMeasures()); // cjReportDangerInfoDTO.setCOST(cjDangerInfo.getCost()); cjReportDangerInfoDTO.setLIABLE_PERSON(cjDangerInfo.getLiablePerson()); cjReportDangerInfoDTO.setDANGER_MANAGE_DEADLINE(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjDangerInfo.getDangerManageDeadline())); cjReportDangerInfoDTO.setCHECK_ACCEPT_PERSON(cjDangerInfo.getCheckAcceptPerson()); cjReportDangerInfoDTO.setCHECK_ACCEPT_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjDangerInfo.getCheckAcceptTime())); //非必传 // cjReportDangerInfoDTO.setCHECK_ACCEPT_COMMENT(cjDangerInfo.getCheckAcceptComment()); cjReportDangerInfoDTO.setDANGER_STATE(cjDangerInfo.getDangerState()); //非必传 // cjReportDangerInfoDTO.setMANAGEMENT_CLASSIFICATION(cjDangerInfo.getManagementClassification()); // cjReportDangerInfoDTO.setOCCURRENCE_LINK(cjDangerInfo.getOccurrenceLink()); // cjReportDangerInfoDTO.setATTACHMENTS1(ImageToBase64.convertImageToBase64(cjDangerInfo.getPreRectifyPhoto())); // cjReportDangerInfoDTO.setATTACHMENTS2(ImageToBase64.convertImageToBase64(cjDangerInfo.getPostRectifyPhoto())); // cjReportDangerInfoDTO.setFJ(cjDangerInfo.getRectifyAttachment()); cjReportDangerInfoDTO.setCREATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjDangerInfo.getCreateDate())); cjReportDangerInfoDTO.setUPDATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjDangerInfo.getUpdateDate())); cjReportDangerInfoDTO.setDELETE_MARK(cjDangerInfo.getDeleted()); cjReportDangerInfoDTO.setCREATE_BY(cjDangerInfo.getCreateBy()); cjReportDangerInfoDTO.setUPDATE_BY(cjDangerInfo.getUpdateBy()); reportDangerInfoLists.add(cjReportDangerInfoDTO); } //数据上报 log.info("【F】隐患信息-处理数据【原始数据】" + JSONObject.toJSONString(reportDangerInfoLists)); StringBuffer dangerInfoResultBuffer = null; //上报数据 try { URL url = new URL(URL+"/api/wwyt/t_yhzlxx_List"); //得到连接对象 con = (HttpURLConnection) url.openConnection(); // 设置请求方式和参数 con.setRequestMethod("POST"); con.setDoOutput(true); con.setDoInput(true); con.setUseCaches(false); con.setRequestProperty("token", TOKEN); con.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); // 发送请求体 try (OutputStream os = con.getOutputStream()) { os.write(JSON.toJSONString(reportDangerInfoLists).getBytes(StandardCharsets.UTF_8)); } //得到响应码 responseCode = con.getResponseCode(); //本段日志,测试成功后,可注释掉 if (responseCode == HttpURLConnection.HTTP_OK) { //得到响应流 InputStream inputStream = con.getInputStream(); //将响应流转换成字符串 dangerInfoResultBuffer = new StringBuffer(); String line; buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); while ((line = buffer.readLine()) != null) { dangerInfoResultBuffer.append(line); } log.info("【F】隐患信息-处理数据result:" + dangerInfoResultBuffer.toString()); JSONObject jsonObject = JSONObject.parseObject(dangerInfoResultBuffer.toString()); if (jsonObject.getInteger("status") == 200) { String message = jsonObject.getString("message"); if (message.contains("失效0条")) { for (PreventCJReportDangerInfo dangerInfo : CJDangerInfos) { HandlerZDReportParam handlerCJReportParam = new HandlerZDReportParam(); handlerCJReportParam.setId(dangerInfo.getId()); handlerCJReportParam.setZhunReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode()); handlerCJReportParam.setZhunReportTime(new Date()); CJDangerInfoService.updateZDReportStatusById(handlerCJReportParam); } } }else { log.info("【】隐患信息推送数据失败..."+ dangerInfoResultBuffer); } log.info("【F】隐患信息推送数据结束..."); } } catch (Exception e) { e.printStackTrace(); } }else { log.info("【F】检查任务无可推数据"); } } } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; import io.lettuce.core.dynamic.annotation.Param; @@ -35,4 +36,13 @@ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam); void updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks); /** * 任务-查询待上报 * */ List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDateHuaiDong(); /** * 任务-待上报状态变更 - 通过id * */ int updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; @@ -39,4 +40,12 @@ List<PreventCJReportCheckTaskFromWork> listWork1(); int updateInfo1(PreventCJReportCheckTaskFromWork work); List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDateHuaiDong(); /** * 任务配置 -待上报状态变更 * */ int updateHDReportStatusById(HandlerZDReportParam handlerReportParam); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java
@@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.entity.ZDReport.ZDPreventCJReportDangerInfo; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; @@ -30,4 +32,14 @@ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam); List<PreventCJReportDangerInfo> getDangerListForCheckTask(); /** * 上报数据-待上报数据查询 */ List<ZDPreventCJReportDangerInfo> listReportDangerDateZhunDong(); /** * 上报数据-待上报状态变更-通过id */ int updateZDReportStatusById(HandlerZDReportParam handlerZDReportParam); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; @@ -29,4 +30,12 @@ * 上报数据-修改待上报-通过id */ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam); void updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam); /** * 淮东数据上传 * @return */ List<PreventCJReportRiskAnaUnit> listReportUnitDateHuaiDong(); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; @@ -29,4 +30,9 @@ * 管控措施-修改上报状态-通过id * */ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam); List<PreventCJReportRiskControlMeasure> listReportMeasureDateHuaiDong(); void updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam; import com.ruoyi.doublePrevention.repository.param.HandlerReportParam; @@ -21,6 +22,14 @@ * 上报数据-查询待上报数据 * */ List<PreventCJReportRiskEvent> listReportEventDate(); List<PreventCJReportRiskEvent> listReportEventDateHuaiDong(); /** * 修改上报状态 * */ int updateEventReportStatusHuaiDong(HandlerZDReportParam handlerReportParam); /** * 修改上报状态 * */ src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java
@@ -1,9 +1,8 @@ package com.ruoyi.doublePrevention.service.baseService.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.enums.E; import com.ruoyi.doublePrevention.exception.AusinessException; import com.ruoyi.doublePrevention.repository.PreventCJReportCheckRecordFromTaskRepository; @@ -78,4 +77,18 @@ throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败"); } } @Override public List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDateHuaiDong() { return preventCJReportCheckRecordFromTaskRepository.listReportTaskRecordDateHuaiDong(); } @Override public int updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam) { int result = preventCJReportCheckRecordFromTaskRepository.updateHDReportStatusById(handlerZDReportParam); if (result < 1){ throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败"); } return result; } } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.enums.E; import com.ruoyi.doublePrevention.exception.AusinessException; import com.ruoyi.doublePrevention.repository.PreventCJReportCheckTaskFromWorkRepository; @@ -92,6 +93,20 @@ } @Override public List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDateHuaiDong() { return preventCJReportCheckTaskFromWorkRepository.listReportTaskFromWorkDateHD(); } @Override public int updateHDReportStatusById(HandlerZDReportParam handlerReportParam) { int result = preventCJReportCheckTaskFromWorkRepository.updateHDReportStatusById(handlerReportParam); if (result < 1){ throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败"); } return result; } @Override public int updateInfo(PreventCJReportCheckTaskFromWork work) { return preventCJReportCheckTaskFromWorkRepository.updateInfo(work); } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java
@@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.entity.ZDReport.ZDPreventCJReportDangerInfo; import com.ruoyi.doublePrevention.enums.E; import com.ruoyi.doublePrevention.exception.AusinessException; import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository; @@ -67,4 +69,18 @@ public List<PreventCJReportDangerInfo> getDangerListForCheckTask() { return preventCJReportDangerInfoRepository.getDangerListForCheckTask(); } @Override public List<ZDPreventCJReportDangerInfo> listReportDangerDateZhunDong() { return preventCJReportDangerInfoRepository.listReportDangerDateZhunDong(); } @Override public int updateZDReportStatusById(HandlerZDReportParam handlerZDReportParam) { int result = preventCJReportDangerInfoRepository.updateZDReportStatusById(handlerZDReportParam); if (result < 0){ throw new AusinessException(E.UPDATE_FAIL.getCode(), "隐患信息状态变更失败"); } return result; } } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.enums.E; import com.ruoyi.doublePrevention.exception.AusinessException; import com.ruoyi.doublePrevention.repository.PreventCJReportRiskAnaUnitRepository; @@ -69,4 +70,17 @@ throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败"); } } @Override public void updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam) { int result = preventCJReportRiskAnaUnitRepository.updateHDReportStatusById(handlerZDReportParam); if (result < 1){ throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败"); } } @Override public List<PreventCJReportRiskAnaUnit> listReportUnitDateHuaiDong() { return preventCJReportRiskAnaUnitRepository.listReportUnitDateHuaiDong(); } } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.enums.E; import com.ruoyi.doublePrevention.exception.AusinessException; import com.ruoyi.doublePrevention.repository.PreventCJReportRiskControlMeasureRepository; @@ -67,4 +68,17 @@ throw new AusinessException(E.ADD_FAIL.getCode(), "风险单元状态更新失败"); } } @Override public List<PreventCJReportRiskControlMeasure> listReportMeasureDateHuaiDong() { return preventCJReportRiskControlMeasureRepository.listReportMeasureDateHuaiDong(); } @Override public void updateHDReportStatusById(HandlerZDReportParam handlerZDReportParam) { int result = preventCJReportRiskControlMeasureRepository.updateHDReportStatusById(handlerZDReportParam); if (result < 1){ throw new AusinessException(E.ADD_FAIL.getCode(), "风险单元状态更新失败"); } } } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent; import com.ruoyi.doublePrevention.entity.ZDReport.HandlerZDReportParam; import com.ruoyi.doublePrevention.enums.E; import com.ruoyi.doublePrevention.exception.AusinessException; import com.ruoyi.doublePrevention.repository.PreventCJReportRiskEventRepository; @@ -49,6 +50,20 @@ return preventCJReportRiskEventRepository.listReportEventDate(); } @Override public List<PreventCJReportRiskEvent> listReportEventDateHuaiDong() { return preventCJReportRiskEventRepository.listReportEventDateHuaiDong(); } @Override public int updateEventReportStatusHuaiDong(HandlerZDReportParam handlerReportParam) { int result = preventCJReportRiskEventRepository.updateEventReportStatusHuaiDong(handlerReportParam); if (result < 1){ throw new AusinessException(E.ADD_FAIL.getCode(), "修改上报-事件状态失败"); } return result; } /** * 修改上报状态 * */ src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
@@ -54,6 +54,21 @@ where id = #{id} </update> <select id="listReportTaskRecordDateHuaiDong" resultMap="BaseResultMap"> select * from prevent_cj_report_check_record_from_task where zhun_report_status = 1 and deleted = 0 limit 50 <!-- and create_date >= '2025-06-15 00:00:00' and create_date <= '2025-06-16 23:59:59'--> </select> <update id="updateHDReportStatusById"> update prevent_cj_report_check_record_from_task set zhun_report_status = #{zhunReportStatus}, zhun_report_time = #{zhunReportTime} where id = #{id} </update> <!-- int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);--> <insert id="insertRecord"> insert into prevent_cj_report_check_record_from_task src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
@@ -41,6 +41,19 @@ limit 200 </select> <select id="listReportTaskFromWorkDateHD" resultMap="BaseResultMap"> select * from prevent_cj_report_check_task_from_work where zhun_report_status = 1 and deleted = 0 limit 50 </select> <update id="updateHDReportStatusById"> update prevent_cj_report_check_task_from_work set zhun_report_status = #{zhunReportStatus}, zhun_report_time = #{zhunReportTime} where id = #{id} </update> <select id="listWork" resultMap="BaseResultMap"> select * from prevent_cj_report_check_task_from_work where work_id >= 82 and 94 >= work_id and troubleshoot_content is null src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
@@ -37,6 +37,11 @@ <result column="check_accept_time" property="checkAcceptTime"/> <result column="danger_manager_id" property="dangerManagerId"/> </resultMap> <resultMap id="BaseMapVO" type="com.ruoyi.doublePrevention.entity.ZDReport.ZDPreventCJReportDangerInfo" extends="BaseResultMap"> <result property="postRectifyPhoto" column="post_rectify_photo"/> <result property="rectifyAttachment" column="rectify_attachment"/> <result property="preRectifyPhoto" column="pre_rectify_photo"/> </resultMap> <!--IPage<PreventReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);--> <select id="getReportDangerInfoPage" resultMap="BaseResultMap"> @@ -51,6 +56,27 @@ limit 200 </select> <select id="listReportDangerDateZhunDong" resultMap="BaseMapVO"> <!-- select * from prevent_cj_report_danger_info--> <!-- where zhun_report_status = 1--> <!-- limit 50--> <!--,c.pre_rectify_photo,c.post_rectify_photo,c.rectify_attachment--> select a.* from prevent_cj_report_danger_info a <!-- INNER JOIN prevent_risk_danger_info b on a.id = b.uuid--> <!-- INNER JOIN tr_hidden_danger_check_point c on c.id = b.danger_check_point_id--> where a.zhun_report_status = 1 and a.deleted = 0 <!-- and a.create_date >= '2025-06-15 00:00:00' and a.create_date <= '2025-06-18 23:59:59'--> limit 50 </select> <update id="updateZDReportStatusById"> update prevent_cj_report_danger_info set zhun_report_status = #{zhunReportStatus}, zhun_report_time = #{zhunReportTime} where id = #{id} </update> <!--int updateTaskReportStatus(HandlerReportParam handlerReportParam);--> <update id="updateTaskReportStatus"> update prevent_cj_report_danger_info set src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
@@ -19,6 +19,7 @@ <result column="hazard_dep" property="hazardDep"/> <result column="hazard_liable_person" property="hazardLiablePerson"/> <result column="risk_unit_id" property="riskUnitId"/> <result column="zhun_report_status" property="zhunReportStatus"/> </resultMap> <!--IPage<PreventRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO);--> @@ -46,6 +47,13 @@ limit 200 </select> <select id="listReportUnitDateHuaiDong" resultMap="BaseResultMap"> select * from prevent_cj_report_risk_ana_unit where zhun_report_status = 1 and deleted = 0 and hazard_code is not null and hazard_code LIKE '6523%' limit 50 </select> <!--int updateReportStatus();--> <update id="updateReportStatus"> update prevent_cj_report_risk_ana_unit set @@ -62,6 +70,14 @@ where id = #{id} </update> <update id="updateHDReportStatusById"> update prevent_cj_report_risk_ana_unit set zhun_report_status = #{zhunReportStatus}, zhun_report_time = #{zhunReportTime} where id = #{id} </update> <!-- int insertUnitList(PreventCJReportRiskAnaUnit unit);--> <insert id="insertUnitList"> insert into prevent_cj_report_risk_ana_unit src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
@@ -36,6 +36,13 @@ limit 200 </select> <select id="listReportMeasureDateHuaiDong" resultMap="BaseResultMap"> select a.* from prevent_cj_report_risk_control_measure a INNER JOIN prevent_cj_report_risk_event b on a.risk_event_id = b.id and b.deleted = 0 where a.zhun_report_status = 1 and a.deleted = 0 limit 50 </select> <!--int updateMeasureReportStatus(HandlerReportParam handlerReportParam);--> <update id="updateMeasureReportStatus"> update prevent_cj_report_risk_control_measure set @@ -52,6 +59,12 @@ where id = #{id} </update> <update id="updateHDReportStatusById"> update prevent_cj_report_risk_control_measure set zhun_report_status = #{zhunReportStatus}, zhun_report_time = #{zhunReportTime} where id = #{id} </update> <!-- int insertMeasureList(PreventCJReportRiskControlMeasure cjMeasure);--> <insert id="insertMeasureList"> insert into prevent_cj_report_risk_control_measure src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
@@ -32,6 +32,14 @@ limit 200 </select> <select id="listReportEventDateHuaiDong" resultMap="BaseResultMap"> select a.* from prevent_cj_report_risk_event a inner join prevent_cj_report_risk_ana_unit b on a.risk_unit_id = b.id where a.zhun_report_status = 1 and a.risk_unit_id is not null and a.deleted = 0 and b.deleted = 0 limit 50 </select> <!--int updateEventReportStatus(HandlerReportParam handlerReportParam);--> <update id="updateEventReportStatus"> update prevent_cj_report_risk_event set @@ -40,6 +48,13 @@ where risk_event_id = #{id} </update> <update id="updateEventReportStatusHuaiDong"> update prevent_cj_report_risk_event set zhun_report_status = #{zhunReportStatus}, zhun_report_time = #{zhunReportTime} where id = #{id} </update> <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);--> <update id="updateCJReportStatusById"> update prevent_cj_report_risk_event set src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
@@ -100,9 +100,12 @@ <result property="companyId" column="company_id"/> <result property="checkPerson" column="check_person"/> <result property="findTime" column="find_time"/> </resultMap> <sql id="selectHiddenDangerCheckPointVo"> select a.id,a.check_point_id,a.check_id, a.create_by, a.create_time, a.update_by, a.update_time,a.remark,a.accept_status, @@ -354,6 +357,109 @@ </select> <resultMap type="HiddenDangerCheckPoint" id="HiddenDangerCheckPointResultNew"> <result property="id" column="id"/> <result property="checkPointId" column="check_point_id"/> <result property="checkId" column="check_id"/> <result property="createBy" column="create_by"/> <result property="createTime" column="create_time"/> <result property="updateBy" column="update_by"/> <result property="updateTime" column="update_time"/> <result property="remark" column="remark"/> <result property="planCreateUserId" column="plan_create_user_id"/> <result property="planName" column="plan_name"/> <result property="troubleshootTypeId" column="troubleshoot_type_id"/> <result property="troubleshootTypeName" column="troubleshoot_type_name"/> <result property="organizationDeptId" column="organization_dept_id"/> <result property="organizationDeptName" column="organization_dept_name"/> <result property="riskType" column="risk_type"/> <result property="riskId" column="risk_id"/> <result property="riskName" column="risk_name"/> <result property="checkUserId" column="check_user_id"/> <result property="checkUserName" column="check_user_name"/> <result property="beCheckedDeptId" column="be_checked_dept_id"/> <result property="beCheckedDeptName" column="be_checked_dept_name"/> <result property="checkBeginTime" column="check_begin_time"/> <result property="checkEndTime" column="check_end_time"/> <result property="planFormulateStatus" column="plan_formulate_status"/> <result property="planExecuteStatus" column="plan_execute_status"/> <result property="checkStatus" column="check_status"/> <result property="whetherDanger" column="whether_danger"/> <result property="dangerName" column="danger_name"/> <result property="dangerDescription" column="danger_description"/> <result property="dangerLevel" column="danger_level"/> <result property="troubleTypeId" column="trouble_type_id"/> <result property="troubleTypeName" column="trouble_type_name"/> <result property="dangerDeptId" column="danger_dept_id"/> <result property="dangerDeptName" column="danger_dept_name"/> <result property="dangerPlaceId" column="danger_place_id"/> <result property="dangerPlaceName" column="danger_place_name"/> <result property="checkTime" column="check_time"/> <result property="preRectifyPhoto" column="pre_rectify_photo"/> <result property="registerUserId" column="register_user_id"/> <result property="registerUserName" column="register_user_name"/> <result property="registerCreateTime" column="register_create_time"/> <result property="registerSubmitTime" column="register_submit_time"/> <result property="judgeUserId" column="judge_user_id"/> <result property="judgeUserName" column="judge_user_name"/> <result property="judgeCreateTime" column="judge_create_time"/> <result property="judgeCreateUserId" column="judge_create_user_id"/> <result property="dangerSources" column="danger_sources"/> <result property="reportStatus" column="report_status"/> <result property="examineUserId" column="examine_user_id"/> <result property="examineUserName" column="examine_user_name"/> <result property="examineStatus" column="examine_status"/> <result property="examineOpinion" column="examine_opinion"/> <result property="examineResult" column="examine_result"/> <result property="examineCreateTime" column="examine_create_time"/> <result property="treatMeasure" column="treat_measure"/> <result property="rectifyUserId" column="rectify_user_id"/> <result property="rectifyUserName" column="rectify_user_name"/> <result property="rectifyDeptId" column="rectify_dept_id"/> <result property="rectifyDeptName" column="rectify_dept_name"/> <result property="rectifyDeadlineTime" column="rectify_deadline_time"/> <result property="rectifyType" column="rectify_type"/> <result property="rectifyAttachment" column="rectify_attachment"/> <result property="rectifyMeasure" column="rectify_measure"/> <result property="rectifyCondition" column="rectify_condition"/> <result property="rectifyFund" column="rectify_fund"/> <result property="rectifyCompleteTime" column="rectify_complete_time"/> <result property="rectifyStatus" column="rectify_status"/> <result property="rectifyCreateTime" column="rectify_create_time"/> <result property="acceptUserId" column="accept_user_id"/> <result property="acceptUserName" column="accept_user_name"/> <result property="postRectifyPhoto" column="post_rectify_photo"/> <result property="acceptResult" column="accept_result"/> <result property="acceptOpinion" column="accept_opinion"/> <result property="acceptFile" column="accept_file"/> <result property="acceptCreateTime" column="accept_create_time"/> <result property="acceptStatus" column="accept_status"/> <result property="stage" column="stage"/> <result property="scheduleCreateUserId" column="schedule_create_user_id"/> <result property="scheduleCreateUserName" column="schedule_create_user_name"/> <result property="scheduleCheckUserId" column="schedule_check_user_id"/> <result property="scheduleCheckUserName" column="schedule_check_user_name"/> <result property="scheduleCheckStatus" column="schedule_check_status"/> <result property="jobId" column="job_id"/> <result property="jobName" column="job_name"/> <result property="jobGroup" column="job_group"/> <result property="invokeTarget" column="invoke_target"/> <result property="jobMessage" column="job_message"/> <result property="status" column="status"/> <result property="exceptionInfo" column="exception_info"/> <result property="troubleshootTypeCycleNum" column="type_cycle_num"/> <result property="troubleshootTypeCycleType" column="type_cycle_type"/> <result property="checkType" column="check_type"/> <result property="companyId" column="company_id"/> <result property="checkPerson" column="check_person"/> <result property="findTime" column="find_time"/> <result property="dangerSrc" column="danger_src"/> </resultMap> <sql id="selectHiddenDangerCheckPointVoNewCount"> select a.id,a.check_point_id,a.check_id, a.create_by, a.create_time, a.update_by, a.update_time,a.remark,a.accept_status, c.plan_create_user_id, @@ -379,15 +485,16 @@ c.check_type,a.company_id, b.type_cycle_num,b.type_cycle_type, a.examine_user_id, a.examine_user_name, a.check_person, a.find_time a.check_person, a.find_time,e.danger_src from tr_hidden_danger_check_point a left join tr_hidden_danger_check c on c.check_id = a.check_id left join tr_troubleshoot_type b on c.troubleshoot_type_id = b.type_id left join prevent_risk_danger_info e on e.danger_check_point_id = a.id </sql> <!-- todo 查隐患台账--> <select id="selectHiddenDangerCheckPointListNewCount" parameterType="HiddenDangerCheckPoint" resultMap="HiddenDangerCheckPointResult"> resultMap="HiddenDangerCheckPointResultNew"> <include refid="selectHiddenDangerCheckPointVoNewCount"/> <where> <if test="id != null and id != ''">and a.id = #{id}</if> @@ -396,6 +503,7 @@ <if test="registerUserName != null and registerUserName != ''">and a.register_user_name = #{registerUserName} </if> <if test="dangerSrc != null"> and e.danger_src = #{dangerSrc}</if> <if test="registerCreateTime != null ">and a.register_create_time = #{registerCreateTime}</if> <if test="params.beginRegisterCreateTime != null and params.beginRegisterCreateTime != '' and params.endRegisterCreateTime != null and params.endRegisterCreateTime != ''"> and a.register_create_time between #{params.beginRegisterCreateTime} and src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
@@ -60,6 +60,13 @@ </select> </li> <li> <label>排查类型:</label> <select name="dangerSrc" th:with="type=${@dict.getType('danger_source')}"> <option value="">--请选择排查类型--</option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> </select> </li> <li> <label>日期区间:</label> <select name="dateRangeLedger"> <option value="">所有</option> @@ -78,6 +85,7 @@ <option value="超期改">超期改</option> </select> </li> <li style="display: flex;align-items: center"> <label>整改部门:</label> <div class="input-group" style="width: 200px;position: relative"> @@ -96,6 +104,7 @@ <span class="input-group-addon"><i class="fa fa-search"></i></span> </div> </li> <li> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> @@ -249,6 +258,37 @@ } }, { field: 'dangerSrc', title: '排查类型', formatter: function (value, item, index) { var label = ""; if (value == "1") { label = "日常排查"; } else if (value == "2") { label = "综合性排查"; } else if (value == "3") { label = "专业性排查"; }else if (value == "4") { label = "季节性排查"; } else if (value == "5") { label = "重点时段及节假日前排查"; }else if (value == "6") { label = "事故类比排查"; }else if (value == "7") { label = "复产复工前排查"; } else if (value == "8") { label = "外聘专家诊断式排查"; }else if (value == "9") { label = "管控措施实效"; }else if (value == "10") { label = "其他"; } else if (value == "11") { label = "政府执法检查"; } return label; } }, { field: 'dangerSources', title: '隐患来源', formatter: function (value, item, index) {