| | |
| | | package com.ruoyi.doublePrevention.service.impl;
|
| | |
|
| | | import com.baomidou.mybatisplus.core.metadata.IPage;
|
| | | import com.github.pagehelper.Page;
|
| | | import com.github.pagehelper.PageHelper;
|
| | | import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;
|
| | | import com.ruoyi.common.utils.StringUtils;
|
| | | import com.ruoyi.common.utils.text.Convert;
|
| | | import com.ruoyi.doublePrevention.entity.*;
|
| | | import com.ruoyi.doublePrevention.entity.dto.req.*;
|
| | | import com.ruoyi.doublePrevention.entity.dto.resp.*;
|
| | | import com.ruoyi.doublePrevention.enums.ErrorCodes;
|
| | | import com.ruoyi.doublePrevention.enums.ResultCodes;
|
| | | import com.ruoyi.doublePrevention.enums.StatusEnum;
|
| | | import com.ruoyi.doublePrevention.enums.SyncEnum;
|
| | | import com.ruoyi.doublePrevention.enums.*;
|
| | | import com.ruoyi.doublePrevention.exception.AusinessException;
|
| | | import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
|
| | | import com.ruoyi.doublePrevention.service.RiskService;
|
| | | import com.ruoyi.doublePrevention.service.baseService.*;
|
| | |
| | | import com.ruoyi.project.tr.HiddenDangerCheckJob.mapper.HiddenDangerCheckJobMapper;
|
| | | import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
|
| | | import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
|
| | | import org.apache.commons.lang3.ObjectUtils;
|
| | | import org.springframework.beans.BeanUtils;
|
| | | import org.springframework.beans.factory.annotation.Autowired;
|
| | | import org.springframework.stereotype.Service;
|
| | |
| | | resultVO.setMsg("安全风险分析单元名称不能为空");
|
| | | return resultVO;
|
| | | }
|
| | | PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
|
| | | if (riskUnit == null){
|
| | | resultVO.setMsg("安全风险分析单元名称不存在");
|
| | | return resultVO;
|
| | | }
|
| | | // PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
|
| | | // if (riskUnit == null){
|
| | | // resultVO.setMsg("安全风险分析单元名称不存在");
|
| | | // return resultVO;
|
| | | // }
|
| | | if (StringUtils.isEmpty(riskEventName)){
|
| | | resultVO.setMsg("安全风险事件名称不能为空");
|
| | | return resultVO;
|
| | |
| | | riskEvent.setEventResult(eventResult);
|
| | | riskEvent.setRiskEventName(riskEventName);
|
| | | riskEvent.setRiskUnitId(riskUnitId);
|
| | | riskEvent.setRiskUnitUuid(riskUnit.getRiskUnitUuid());
|
| | | // riskEvent.setRiskUnitUuid(riskUnit.getRiskUnitUuid());
|
| | | riskEvent.setDeleteStatus(StatusEnum.DELETE_STATUS_USE.getCode());
|
| | | riskEvent.setGmtCreate(date);
|
| | | riskEvent.setGmtModitify(date);
|
| | |
| | | resultVO.setMsg("安全风险分析单元名称不能为空");
|
| | | return resultVO;
|
| | | }
|
| | | PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
|
| | | if (riskUnit == null){
|
| | | resultVO.setMsg("安全风险分析单元名称不存在");
|
| | | return resultVO;
|
| | | }
|
| | | // PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
|
| | | // if (riskUnit == null){
|
| | | // resultVO.setMsg("安全风险分析单元名称不存在");
|
| | | // return resultVO;
|
| | | // }
|
| | | if (StringUtils.isEmpty(riskEventName)){
|
| | | resultVO.setMsg("安全风险事件名称不能为空");
|
| | | return resultVO;
|
| | |
| | | */
|
| | | @Override
|
| | | public ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO) {
|
| | | Integer pageIndex = riskEventQueryReqDTO.getPageIndex();
|
| | | Integer pageIndex = riskEventQueryReqDTO.getPageNum();
|
| | | Integer pageSize = riskEventQueryReqDTO.getPageSize();
|
| | | if (pageIndex == 0 || pageSize == 0){
|
| | | return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
|
| | |
| | | resultVO.setCode(ResultCodes.OK.getCode());
|
| | | resultVO.setMsg(ResultCodes.OK.getDesc());
|
| | | resultVO.setData(dto);
|
| | |
|
| | | return resultVO;
|
| | | }
|
| | |
|
| | |
| | | */
|
| | | @Override
|
| | | public ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) {
|
| | | Integer pageIndex = measureQueryReqDTO.getPageIndex();
|
| | | Integer pageIndex = measureQueryReqDTO.getPageNum();
|
| | | Integer pageSize = measureQueryReqDTO.getPageSize();
|
| | | if (pageIndex == 0 || pageSize == 0){
|
| | | return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
|
| | |
| | | Long riskEventId = measureQueryReqDTO.getRiskEventId();
|
| | |
|
| | | Page<PreventRiskControlMeasure> page = PageHelper.startPage(pageIndex, pageSize);
|
| | | riskControlMeasureService.listRiskEvenByCondition(controlType,riskEventId);
|
| | | riskControlMeasureService.listRiskControlMeasureByCondition(controlType,riskEventId);
|
| | |
|
| | | List<PreventRiskControlMeasure> result = page.getResult();
|
| | | Long total = page.getTotal();
|
| | |
| | | @Override
|
| | | public int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams) {
|
| | |
|
| | | //参数校验-管控措施id
|
| | | if (pointAndMeasureParams.getControlMeasureId() == null){
|
| | | throw new RuntimeException("管控措施不能为空");
|
| | | }
|
| | | PreventRiskControlMeasure preventRiskControlMeasureById
|
| | | = riskControlMeasureService.getPreventRiskControlMeasureById(pointAndMeasureParams.getControlMeasureId());
|
| | | if (preventRiskControlMeasureById == null){
|
| | | throw new RuntimeException("管控措施不存在");
|
| | | }
|
| | | if (pointAndMeasureParams.getBaseCheckPointId() == null){
|
| | | throw new RuntimeException("检查点添加失败");
|
| | | }
|
| | |
|
| | | String uuid = UUID.randomUUID().toString();
|
| | | PreventRiskCheckUnit checkUnit = new PreventRiskCheckUnit();
|
| | | //封装数据
|
| | |
| | | * 保存job管控措施的附属表
|
| | | */
|
| | | @Override
|
| | | public int insertJobAndMeasure(Long jobId) {
|
| | | public int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob) {
|
| | |
|
| | | String jobUuid = UUID.randomUUID().toString();
|
| | |
|
| | | PreventRiskJobAndMeasure jobAndMeasure = new PreventRiskJobAndMeasure();
|
| | | //根据jobId查询对应的基础排查清单
|
| | | HiddenDangerCheckJob jobById = hiddenDangerCheckJobMapper.getJobById(jobId);
|
| | |
|
| | | //根据RiskId查询对应的管控措施
|
| | | List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(jobById.getRiskId());
|
| | | List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(hiddenDangerCheckJob.getRiskId());
|
| | |
|
| | | //遍历管控措施集合
|
| | | for (PreventRiskCheckUnit checkUnit : unitByRiskId) {
|
| | | String jobUuid = UUID.randomUUID().toString();
|
| | | PreventRiskControlMeasure preventRiskControlMeasureById = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
|
| | | //封装数据
|
| | | jobAndMeasure.setJobId(jobId);
|
| | |
| | | @Transactional
|
| | | @Override
|
| | | public int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob) {
|
| | |
|
| | | // 2、若有变更,需要预先读取jobAndMeasure的uuid,保存下来
|
| | | PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(hiddenDangerCheckJob.getJobId());
|
| | | String jobUuid = jobAndMeasureByJobId.getJobUuid();
|
| | |
| | | PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();
|
| | |
|
| | | dangerCheck.setUuid(dangerCheckUuid);
|
| | | dangerCheck.setCheckStatus(null);
|
| | | dangerCheck.setCheckStatus((byte) 2);//
|
| | | dangerCheck.setCheckId(checkId);
|
| | | dangerCheck.setJobId(hdc.getJobId());
|
| | | //获取上报主配置信息
|
| | |
| | | * 插入检查点附属表
|
| | | */
|
| | | @Override
|
| | | public void insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp) {
|
| | |
|
| | | public int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp) {
|
| | | System.out.println("进入核查点保存方法");
|
| | | PreventRiskDangerCheckAndMeasure checkAndMeasure = new PreventRiskDangerCheckAndMeasure();
|
| | |
|
| | | //根据检查点信息,查询对应管控措施
|
| | |
| | | if (checkUnit == null){
|
| | | throw new RuntimeException("基础检查点不存在");
|
| | | }
|
| | |
|
| | | System.out.println("通过一次检验");
|
| | | PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
|
| | | if (controlMeasure == null){
|
| | | throw new RuntimeException("管控措施已经被删除");
|
| | | }
|
| | |
|
| | | System.out.println("通过二次检验");
|
| | | //封装数据
|
| | | checkAndMeasure.setCheckId(hdcp.getCheckId());
|
| | | checkAndMeasure.setDangerCheckPointId(id);
|
| | | checkAndMeasure.setBaseCheckPointId(hdcp.getCheckPointId());
|
| | | checkAndMeasure.setControlMeasureId(controlMeasure.getId());
|
| | | checkAndMeasure.setCheckContent(controlMeasure.getCheckContent());
|
| | | checkAndMeasure.setCheckResult(null);
|
| | |
|
| | | checkAndMeasure.setCheckResult((byte) 4);
|
| | | System.out.println("数据封装完成");
|
| | | //写入核查任务检查点与管控措施信息
|
| | | preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
|
| | |
|
| | | int result = preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
|
| | | if (result <1){
|
| | | return StatusEnum.EXEC_FAIL.getCode();
|
| | | }
|
| | | return StatusEnum.EXEC_SUCCESS.getCode();
|
| | | }
|
| | | /**
|
| | | * todo-2022 填报时的操作
|
| | | */
|
| | |
|
| | | /**
|
| | | * 删除定时核查任务
|
| | |
| | | return StatusEnum.EXEC_FAIL.getCode();
|
| | | }
|
| | | }
|
| | |
|
| | | //2、删除核查任务-检查点的附属表----老代码未删除检查点信息,此处暂不做处理
|
| | |
|
| | | return StatusEnum.EXEC_SUCCESS.getCode();
|
| | |
| | | dangerInfo.setDangerCheckPointId(id);
|
| | | dangerInfo.setHazardCode(hdcp.getHazardCode());
|
| | | dangerInfo.setDangerSrc(hdcp.getDangerSrc());
|
| | | dangerInfo.setDangerDesc(hdcp.getDangerDesc());
|
| | | dangerInfo.setDangerDesc(hdcp.getDangerDescription());
|
| | | dangerInfo.setDangerReason(hdcp.getDangerReason());
|
| | | dangerInfo.setDangerResult(hdcp.getDangerResult());
|
| | | dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
|
| | | dangerInfo.setDangerState(hdcp.getDangerState());
|
| | | //隐患状态 0未验收 1验收通过 2验收未通过
|
| | | if (hdcp.getAcceptStatus() == null){
|
| | | //设置为 空
|
| | | dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
|
| | | } else if (hdcp.getAcceptStatus().equals(0)){
|
| | | //设置为整改中
|
| | | dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
|
| | | } else if (hdcp.getAcceptStatus().equals(1)) {
|
| | | //设置为已验收
|
| | | dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
|
| | | }else if (hdcp.getAcceptStatus().equals(2)){
|
| | | //设置为超期未整改
|
| | | dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
|
| | | }
|
| | | // dangerInfo.setDangerState(null); //设置为 空
|
| | | dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能,先设为空
|
| | | //获取上报主配置信息
|
| | | PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
|
| | |
| | | dangerInfo.setDangerCheckPointId(hdcp.getId());
|
| | | dangerInfo.setHazardCode(hdcp.getHazardCode());
|
| | | dangerInfo.setDangerSrc(hdcp.getDangerSrc());
|
| | | dangerInfo.setDangerDesc(hdcp.getDangerDesc());
|
| | | dangerInfo.setDangerDesc(hdcp.getDangerDescription());
|
| | | dangerInfo.setDangerReason(hdcp.getDangerReason());
|
| | | dangerInfo.setDangerResult(hdcp.getDangerResult());
|
| | | dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
|
| | | dangerInfo.setDangerState(hdcp.getDangerState());
|
| | | //隐患状态 0未验收 1验收通过 2验收未通过 ,新建时为空
|
| | | if (hdcp.getAcceptStatus() == null){
|
| | | //设置为 空
|
| | | dangerInfo.setDangerState(null);
|
| | | } else if (hdcp.getAcceptStatus().equals(0)){
|
| | | //设置为整改中
|
| | | dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
|
| | | } else if (hdcp.getAcceptStatus().equals(1)) {
|
| | | //设置为已验收
|
| | | dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
|
| | | }else if (hdcp.getAcceptStatus().equals(2)){
|
| | | //设置为超期未整改
|
| | | dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
|
| | | }
|
| | | dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能,先设为空
|
| | | //获取上报主配置信息
|
| | | PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
|
| | |
| | | }
|
| | |
|
| | | /**
|
| | | * 隐患整改信息 - 修改
|
| | | * 隐患判定,如果是隐患,修改为整改中
|
| | | */
|
| | | @Override
|
| | | public int updateDangerInfoRectify(HiddenDangerCheckPoint hdcp) {
|
| | | public int updateDangerInfoJudge(HiddenDangerCheckPoint hdcp) {
|
| | |
|
| | | //封装修改数据
|
| | | PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
|
| | |
|
| | | dangerInfo.setDangerCheckPointId(hdcp.getId());
|
| | | //需要根据条件,判断附属表隐患状态。
|
| | | // 目前想法:认定后的隐患-0整改中;整改后的隐患-1待验收;整改后的隐患-9已验收。2,3状态暂时未使用
|
| | |
|
| | | dangerInfo.setDangerState(hdcp.getDangerState());
|
| | | dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能,先设为空
|
| | | //目前想法:认定后的隐患-0整改中;整改后的隐患-1待验收;验收后的隐患-9已验收。2,3状态暂时未使用
|
| | | //设置为整改中
|
| | | dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
|
| | | //获取上报主配置信息
|
| | | PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
|
| | | //设置本条数据上报更新时间
|
| | |
| | | dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
|
| | | }
|
| | |
|
| | | return 0;
|
| | | return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);
|
| | | }
|
| | |
|
| | | /**
|
| | | * 隐患整改信息 - 修改
|
| | | */
|
| | | @Override
|
| | | public int updateDangerInfoRectify(HiddenDangerCheckPoint hdcp) {
|
| | |
|
| | | //封装修改数据
|
| | | PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
|
| | |
|
| | | dangerInfo.setDangerCheckPointId(hdcp.getId());
|
| | | //需要根据条件,判断附属表隐患状态。
|
| | | //目前想法:认定后的隐患-0整改中;整改后的隐患-1待验收;验收后的隐患-9已验收。2,3状态暂时未使用
|
| | | //待验收验收
|
| | | dangerInfo.setDangerState(StatusEnum.RECTIFY_WAIT_ACCEPT.getCode());
|
| | |
|
| | | //获取上报主配置信息
|
| | | PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
|
| | | //设置本条数据上报更新时间
|
| | | dangerInfo.setUpdateReportDataTime(new Date());
|
| | | //读取上报主配置,进行任务记录上报配置,如果开启上报功能,且设置为自动上报,开启上报相关配置
|
| | | if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
|
| | | && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
|
| | | //设置上报状态为-等待上报
|
| | | dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
|
| | | //设置本条数据上报开关为-开启
|
| | | dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
|
| | | //其他情况默认不开启上报数据,如果是手动上报,可对单条数据进行操作
|
| | | }else {
|
| | | //设置上报状态为-不上报
|
| | | dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
|
| | | //设置本条数据上报开关为-关闭
|
| | | dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
|
| | | }
|
| | |
|
| | | return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);
|
| | | }
|
| | |
|
| | | /**
|
| | | * 隐患验收 - 保存验收信息
|
| | | */
|
| | | @Override
|
| | | public int updateDangerInfoAccept(HiddenDangerCheckPoint hdcp) {
|
| | |
|
| | | //封装修改数据
|
| | | PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
|
| | |
|
| | | dangerInfo.setDangerCheckPointId(hdcp.getId());
|
| | | int acceptStatus = Integer.parseInt(hdcp.getAcceptStatus());
|
| | | //如果验收通过,设置为验收成功;验收失败,打回上一级进行整改,设置为整改中
|
| | | if (acceptStatus == 0){
|
| | | dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
|
| | | }else if (acceptStatus == 1){
|
| | | dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
|
| | | }
|
| | |
|
| | | //获取上报主配置信息
|
| | | PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
|
| | | //设置本条数据上报更新时间
|
| | | dangerInfo.setUpdateReportDataTime(new Date());
|
| | | //读取上报主配置,进行任务记录上报配置,如果开启上报功能,且设置为自动上报,开启上报相关配置
|
| | | if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
|
| | | && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
|
| | | //设置上报状态为-等待上报
|
| | | dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
|
| | | //设置本条数据上报开关为-开启
|
| | | dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
|
| | | //其他情况默认不开启上报数据,如果是手动上报,可对单条数据进行操作
|
| | | }else {
|
| | | //设置上报状态为-不上报
|
| | | dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
|
| | | //设置本条数据上报开关为-关闭
|
| | | dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
|
| | | }
|
| | | return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);
|
| | | }
|
| | |
|
| | | /**
|
| | | * @description 获取所有的风险分析单元的编码和姓名
|
| | | */
|
| | | @Override
|
| | | public List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName() {
|
| | | List<PreventRiskList> riskLists = preventRiskListService.listRiskUnitCodeAndName();
|
| | | if (riskLists == null){
|
| | | return null;
|
| | | }
|
| | | List<PreventRiskUnitCodeAndNameListQueryRespDTO> listQueryRespDTOs= riskLists.stream().map((riskList)->{
|
| | | PreventRiskUnitCodeAndNameListQueryRespDTO listQueryRespDTO = new PreventRiskUnitCodeAndNameListQueryRespDTO();
|
| | | BeanUtils.copyProperties(riskList,listQueryRespDTO);
|
| | | return listQueryRespDTO;
|
| | | }).collect(Collectors.toList());
|
| | | return listQueryRespDTOs;
|
| | | }
|
| | |
|
| | |
|
| | | /**
|
| | | * 管控措施-不分页查询
|
| | | */
|
| | | @Override
|
| | | public ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure() {
|
| | |
|
| | | List<PreventRiskControlMeasure> controlMeasures = riskControlMeasureService.listRiskControlMeasure();
|
| | | List<PreventRiskControlMeasureListQueryRespDTO> pageResult = null;
|
| | | if (controlMeasures != null) {
|
| | | pageResult = controlMeasures.stream().map((preventRiskControlMeasure) -> {
|
| | | PreventRiskControlMeasureListQueryRespDTO dto = new PreventRiskControlMeasureListQueryRespDTO();
|
| | | BeanUtils.copyProperties(preventRiskControlMeasure, dto);
|
| | | return dto;
|
| | | }).collect(Collectors.toList());
|
| | | }
|
| | |
|
| | | ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
|
| | | return resultVO;
|
| | | }
|
| | | /**
|
| | | * 通过排查点,查找管控措施id
|
| | | */
|
| | | @Override
|
| | | public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {
|
| | | return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
|
| | | }
|
| | | /**
|
| | | * 查询管控措施信息
|
| | | */
|
| | | @Override
|
| | | public PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId) {
|
| | |
|
| | | PreventRiskCheckUnit unitByBaseCheckPointId = preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
|
| | | // if (ObjectUtils.isEmpty(unitByBaseCheckPointId)){
|
| | | // throw new AusinessException(E.DATA_DATABASE_DUPLICATED, "数据不存在或已被删除");
|
| | | // }
|
| | | return riskControlMeasureService.getPreventRiskControlMeasureById(unitByBaseCheckPointId.getControlMeasureId());
|
| | | }
|
| | |
|
| | | /**
|
| | | * 查询隐患附属表信息
|
| | | */
|
| | | @Override
|
| | | public PreventRiskDangerInfo getDangerInfoById(Long id) {
|
| | | PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id);
|
| | | return dangerInfobyHiddenDangerId;
|
| | | }
|
| | |
|
| | | @Override
|
| | | public int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp) {
|
| | | return preventRiskDangerCheckLogService.updateCheckLog(checkId, hdcp.getMobileCode());
|
| | | }
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | | // /**
|
| | | // * 全流程隐患上报-附属表信息插入
|
| | | // * */
|
| | | // @Override
|
| | | // public int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp) {
|
| | | //
|
| | | // String dangerInfoUuid = UUID.randomUUID().toString();
|
| | | // PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
|
| | | //
|
| | | // dangerInfo.setUuid(dangerInfoUuid);
|
| | | // dangerInfo.setDangerCheckPointId(id);
|
| | | // dangerInfo.setHazardCode(hdcp.getHazardCode());
|
| | | // dangerInfo.setDangerSrc(hdcp.getDangerSrc());
|
| | | // dangerInfo.setDangerDesc(hdcp.getDangerDesc());
|
| | | // dangerInfo.setDangerReason(hdcp.getDangerReason());
|
| | | // dangerInfo.setDangerResult(hdcp.getDangerResult());
|
| | | // dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
|
| | | // dangerInfo.setDangerState(hdcp.getDangerState());
|
| | | // dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能,先设为空
|
| | | //
|
| | | // //获取上报主配置信息
|
| | | // PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
|
| | | // //设置上报时间为空
|
| | | // dangerInfo.setReportTime(null);
|
| | | // //设置本条数据上报更新时间
|
| | | // dangerInfo.setUpdateReportDataTime(new Date());
|
| | | // //读取上报主配置,进行任务记录上报配置,如果开启上报功能,且设置为自动上报,开启上报相关配置
|
| | | // if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
|
| | | // && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
|
| | | // //设置上报状态为-等待上报
|
| | | // dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
|
| | | // //设置本条数据上报开关为-开启
|
| | | // dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
|
| | | // //其他情况默认不开启上报数据,如果是手动上报,可对单条数据进行操作
|
| | | // }else {
|
| | | // //设置上报状态为-不上报
|
| | | // dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
|
| | | // //设置本条数据上报开关为-关闭
|
| | | // dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
|
| | | // }
|
| | | //
|
| | | // return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
|
| | | // }
|
| | |
|
| | |
|
| | | } |