From 906a46c22911f37bca4c6b727a7e0e57551b3ac0 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 27 九月 2022 10:11:58 +0800
Subject: [PATCH] 添加隐患可能导致的结果
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java | 12 ++++++
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java | 10 +++++
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java | 1
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 39 +++++++++++++++++++
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java | 11 +++++
src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml | 4 +
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java | 5 ++
7 files changed, 81 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java
index aeb9963..30a38f5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java
@@ -73,7 +73,18 @@
* 上报开关 1-上报；2-不上报
*/
private Byte reportSwitch;
+ /**
+ * 隐患造成的结果：1-无；2-轻伤；3-重伤；4-死亡
+ */
+ private Byte dangerResult;
+ public Byte getDangerResult() {
+ return dangerResult;
+ }
+
+ public void setDangerResult(Byte dangerResult) {
+ this.dangerResult = dangerResult;
+ }
public Long getId() {
return id;
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
index 78c8ea1..52f7962 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -144,4 +144,9 @@
* 删除隐患上报
*/
int deleteDangerInfo(Long id);
+
+ /**
+ * 隐患整改信息 - 修改
+ */
+ int updateDangerInfoRectify(HiddenDangerCheckPoint hiddenDangerCheckPoint);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
index 0e713b2..f9f216c 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -1023,6 +1023,7 @@
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);//暂时不清楚是否需要此功能，先设为空
@@ -1064,6 +1065,7 @@
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);//暂时不清楚是否需要此功能，先设为空
@@ -1097,4 +1099,41 @@
return preventRiskDangerInfoService.deleteDangerInfo(id);
}
+
+ /**
+ * 隐患整改信息 - 修改
+ */
+ @Override
+ public int updateDangerInfoRectify(HiddenDangerCheckPoint hdcp) {
+
+ //封装修改数据
+ PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
+
+ dangerInfo.setDangerCheckPointId(hdcp.getId());
+ //需要根据条件，判断附属表隐患状态。
+ // 目前想法：认定后的隐患-0整改中；整改后的隐患-1待验收；整改后的隐患-9已验收。2,3状态暂时未使用
+
+ dangerInfo.setDangerState(hdcp.getDangerState());
+ dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
+ //获取上报主配置信息
+ 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 0;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
index 677e71a..353460b 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -15,6 +16,7 @@
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +42,9 @@
@Autowired
JpushService jpushService;
+ @Autowired
+ private RiskService riskService;
+
@GetMapping()
public String hiddenDangerCheckPoint() {
return prefix + "/dangerRectify";
@@ -59,6 +64,7 @@
/**
* 隐患整改--整改
+ *
*/
@Log(title = "隐患整改--整改")
@GetMapping("/editDangerRectify/{id}")
@@ -85,6 +91,7 @@
@Log(title = "隐患整改--保存", businessType = BusinessType.UPDATE)
@PostMapping("/editDangerRectifySave")
@ResponseBody
+ @Transactional
public AjaxResult editDangerRectifySave(HiddenDangerCheckPoint hiddenDangerCheckPoint) {
//获取当前更新用户信息
hiddenDangerCheckPoint.setUpdateBy(ShiroUtils.getLoginName());
@@ -95,6 +102,9 @@
hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_ACCEPT);//隐患验收阶段(数据进入到隐患验收阶段)
int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
+ // todo-2022 隐患信息保存
+ int result = riskService.updateDangerInfoRectify(hiddenDangerCheckPoint);
+
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
return toAjax(i);
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
index 54faa6d..cba3adb 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
@@ -396,6 +396,7 @@
/**
* 修改判定隐患上报保存
+ * todo-2022 隐患核查（判定隐患） 以判定的隐患，才需要上报； 此处暂时不改动
*/
@Log(title = "修改判定隐患上报保存", businessType = BusinessType.UPDATE)
@PostMapping("/editJudgeDangerReportSave")
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
index ffb8574..dd88704 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
@@ -472,6 +472,18 @@
* 9-已验收
*/
private Byte dangerState;
+ /**
+ * 隐患造成的结果：1-无；2-轻伤；3-重伤；4-死亡
+ */
+ private Byte dangerResult;
+
+ public Byte getDangerResult() {
+ return dangerResult;
+ }
+
+ public void setDangerResult(Byte dangerResult) {
+ this.dangerResult = dangerResult;
+ }
public String getHazardCode() {
return hazardCode;
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
index 880f172..bcdb4be 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
@@ -12,6 +12,7 @@
<result column="danger_reason" property="dangerReason"/>
<result column="hazard_danger_type" property="hazardDangerType"/>
<result column="danger_state" property="dangerState"/>
+ <result column="danger_result" property="dangerResult"/>
<result column="timeout_flag" property="timeoutFlag"/>
<result column="report_time" property="reportTime"/>
<result column="update_report_data_time" property="updateReportDataTime"/>
@@ -23,7 +24,7 @@
<!-- int insertDangerInfo(PreventRiskDangerInfo dangerInfo);-->
<insert id="insertDangerInfo">
insert into prevent_risk_danger_info values
- (null, #{uuid}, #{dangerCheckPointId}, #{hazardCode}, #{dangerSrc}, #{dangerDesc}, #{dangerReason}, #{hazardDangerType}, #{dangerState},
+ (null, #{uuid}, #{dangerCheckPointId}, #{hazardCode}, #{dangerSrc}, #{dangerDesc}, #{dangerReason}, #{dangerResult}, #{hazardDangerType}, #{dangerState},
#{timeoutFlag}, #{reportTime}, #{updateReportDataTime}, #{reportStatus}, #{reportSwitch})
</insert>
@@ -36,6 +37,7 @@
danger_reason = #{dangerReason},
hazard_danger_type = #{hazardDangerType},
danger_state = #{dangerState},
+ danger_result =#{dangerResult}
timeout_flag = #{timeoutFlag},
update_report_data_time = #{updateReportDataTime},
report_status = #{reportStatus},
--
Gitblit v1.9.2