src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckAndMeasure.java
@@ -3,9 +3,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data @TableName("prevent_risk_danger_check_and_measure") public class PreventRiskDangerCheckAndMeasure { @@ -38,60 +39,9 @@ * 排查结果：0-正常，1-存在隐患，2-未处理，3其他 * */ private Byte checkResult; /** * 排查上报信息 * */ private String checkDesc; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public Long getDangerCheckPointId() { return dangerCheckPointId; } public void setDangerCheckPointId(Long dangerCheckPointId) { this.dangerCheckPointId = dangerCheckPointId; } public Long getCheckId() { return checkId; } public void setCheckId(Long checkId) { this.checkId = checkId; } public Long getBaseCheckPointId() { return baseCheckPointId; } public void setBaseCheckPointId(Long baseCheckPointId) { this.baseCheckPointId = baseCheckPointId; } public Long getControlMeasureId() { return controlMeasureId; } public void setControlMeasureId(Long controlMeasureId) { this.controlMeasureId = controlMeasureId; } public String getCheckContent() { return checkContent; } public void setCheckContent(String checkContent) { this.checkContent = checkContent; } public Byte getCheckResult() { return checkResult; } public void setCheckResult(Byte checkResult) { this.checkResult = checkResult; } } src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java
@@ -1,6 +1,7 @@ package com.ruoyi.doublePrevention.repository; import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure; import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint; import org.springframework.stereotype.Repository; import java.util.List; @@ -16,4 +17,8 @@ List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId); PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId); int updateCheckDesc(HiddenDangerCheckPoint hdcp); List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java
@@ -1,6 +1,7 @@ package com.ruoyi.doublePrevention.service.baseService; import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure; import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint; import java.util.List; @@ -14,4 +15,8 @@ List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId); PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId); int updateCheckDesc(HiddenDangerCheckPoint hdcp); List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId); } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java
@@ -3,6 +3,7 @@ import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure; import com.ruoyi.doublePrevention.repository.PreventRiskDangerCheckAndMeasureRepository; import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService; import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,4 +32,14 @@ public PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId) { return preventRiskDangerCheckAndMeasureRepository.getByDangerCheckPointId(dangerCheckPointId); } @Override public int updateCheckDesc(HiddenDangerCheckPoint hdcp) { return preventRiskDangerCheckAndMeasureRepository.updateCheckDesc(hdcp); } @Override public List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId) { return preventRiskDangerCheckAndMeasureRepository.getByCheckId(checkId); } } src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -1037,12 +1037,12 @@ String dangerInfoUuid = UUID.randomUUID().toString(); PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo(); if (ObjectUtils.isEmpty(hdcp.getDangerSrc())){ throw new RuntimeException("隐患来源为空"); } if (ObjectUtils.isEmpty(hdcp.getHazardDangerType())){ throw new RuntimeException("隐患类型为空"); } // if (ObjectUtils.isEmpty(hdcp.getDangerSrc())){ // throw new RuntimeException("隐患来源为空"); // } // if (ObjectUtils.isEmpty(hdcp.getHazardDangerType())){ // throw new RuntimeException("隐患类型为空"); // } dangerInfo.setUuid(dangerInfoUuid); dangerInfo.setDangerCheckPointId(id); @@ -1089,8 +1089,8 @@ //设置本条数据上报开关为-关闭 dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode()); } return preventRiskDangerInfoService.insertDangerInfo(dangerInfo); int result = preventRiskDangerInfoService.insertDangerInfo(dangerInfo); return result; } /** src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
@@ -51,6 +51,9 @@ private RiskService riskService; @Autowired private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//隐患检查点Service @Autowired private PreventRiskDangerCheckAndMeasureService preventRiskDangerCheckAndMeasureService; /** * 获取定时任务隐患列表 @@ -157,7 +160,7 @@ /** * 设置为记录正常 * 设置为记录正常 todo */ public ApiResult editPointScheduleSetNormal(String str, ApiRequestHeader header) { //验证userId,loginName,token,deviceType,deviceId,appType 是否一致 @@ -179,6 +182,11 @@ return ApiResult.error("隐患排查记录附属表：写入手机识别码错误"); } //添加检查说明信息 int result1 = riskDangerCheckAndMeasureService.updateCheckDesc(hdcp); if (result1 < 1){ throw new RuntimeException("登记检查上报结果失败"); } hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送 return ApiResult.success("定时隐患排查--设置为正常--成功"); @@ -245,8 +253,8 @@ throw new RuntimeException("添加隐患附属信息失败"); } PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId()); riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp); // PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId()); // riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp); }else{ hdcp.setUpdateBy(user.getLoginName()); src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
@@ -8,6 +8,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.security.ShiroUtils; import com.ruoyi.doublePrevention.service.RiskService; import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService; import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.project.mobile.domain.ApiRequestHeader; @@ -47,6 +48,9 @@ @Autowired IHiddenDangerCheckPointService hdcpService;//隐患检查点Service @Autowired private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//隐患检查点Service @Autowired IUserService userService;//用户Service @@ -374,7 +378,7 @@ /** * 隐患计划执行中---设置为记录正常 // todo * 隐患计划执行中---设置为记录正常 */ public ApiResult editPointSetNormal(String str, ApiRequestHeader header) { //验证userId,loginName,token,deviceType,deviceId,appType 是否一致 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerBaseController.java
@@ -3,6 +3,8 @@ import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure; import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.page.TableDataInfo; @@ -39,7 +41,8 @@ @Autowired private IHiddenDangerCheckPointService hiddenDangerCheckPointService; @Autowired private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService; /** * 查询风险单元的检查点列表 @@ -126,15 +129,21 @@ /** * 根据隐患排查checkId获取基础清单下的检查点，并合并检查内容相同的行 * 根据隐患排查checkId获取基础清单下的检查点，并合并检查内容相同的行 todo */ @PostMapping("/selectBaseCheckPointListByCheckIdAndMergeSamePoint") @ResponseBody public TableDataInfo selectBaseCheckPointListByCheckIdAndMergeSamePoint(BaseCheckPointDTO baseCheckPointDTO) { List<BaseCheckPointDTO> list = hiddenDangerCheckPointService.selectBaseCheckPointListByCheckId(baseCheckPointDTO); List<PreventRiskDangerCheckAndMeasure> riskDangerCheckAndMeasures = riskDangerCheckAndMeasureService.getByCheckId(baseCheckPointDTO.getCheckId()); List<BaseCheckPointDTO> listLast = new ArrayList<>(); Set<Long> checkPointIds = new HashSet<Long>(); for (int i = 0; i < list.size(); i++) { for (PreventRiskDangerCheckAndMeasure riskDangerCheckAndMeasure : riskDangerCheckAndMeasures) { if (riskDangerCheckAndMeasure.getDangerCheckPointId().equals(list.get(i).getId())){ list.get(i).setCheckDesc(riskDangerCheckAndMeasure.getCheckDesc()); } } if ("0".equals(list.get(i).getWhetherDanger())) { listLast.add(list.get(i)); checkPointIds.add(list.get(i).getCheckPointId()); src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/BaseCheckPointDTO.java
@@ -1,7 +1,9 @@ package com.ruoyi.project.tr.hiddenDangerCheckPoint.domain; import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint; import kotlin.jvm.Transient; import lombok.Data; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -25,6 +27,10 @@ private String whetherDanger; @Transient private String checkDesc; List<Long> hiddenDangerCheckPointIds = new ArrayList<>(); } src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
@@ -492,6 +492,9 @@ private Integer tag; @Transient private String checkDesc; @Transient private List<PreventRiskDangerConfirmLog> confirmLogList;
@@ -10,12 +10,13 @@ <result column="control_measure_id" property="controlMeasureId"/> <result column="check_content" property="checkContent"/> <result column="check_result" property="checkResult"/> <result column="check_desc" property="checkDesc"/> </resultMap> <!-- int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);--> <insert id="insertCheckAndMeasure"> insert into prevent_risk_danger_check_and_measure values (null, #{checkId}, #{dangerCheckPointId}, #{baseCheckPointId}, #{controlMeasureId}, #{checkContent}, #{checkResult}) (null, #{checkId}, #{dangerCheckPointId}, #{baseCheckPointId}, #{controlMeasureId}, #{checkContent}, #{checkResult}, #{checkDesc}) </insert> <!-- List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);--> @@ -29,4 +30,15 @@ select * from prevent_risk_danger_check_and_measure where danger_check_point_id = #{dangerCheckPointId} </select> <!-- int updateCheckDesc(HiddenDangerCheckPoint hdcp);--> <update id="updateCheckDesc"> update prevent_risk_danger_check_and_measure set check_desc = #{checkDesc} where danger_check_point_id = #{id} </update> <!-- List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId);--> <select id="getByCheckId" resultMap="BaseResultMap"> select * from prevent_risk_danger_check_and_measure where check_id = #{checkId} </select> </mapper>
