From e98eeaaa5766511fdb8e6d5e412eb1c59d1f07ce Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 24 六月 2025 10:24:43 +0800
Subject: [PATCH] 隐患来源功能外加仓吉基础数据定时上报
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java | 93 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 27 deletions(-)
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 e376eca..011702a 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
@@ -8,6 +8,7 @@
import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO;
import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -57,6 +58,9 @@
@Autowired
private RiskService riskService;
+
+ @Autowired
+ private PreventRiskDangerConfirmLogService confirmLogService;
@GetMapping()
public String hiddenDangerCheck(ModelMap mmap) {
@@ -139,6 +143,7 @@
List<User> userList = userService.selectUserList(userTemp);
mmap.put("userList", userList);
}
+ mmap.put("dangerSrc", 0);
//隐患类别
HiddenTroubleType hiddenTroubleType = new HiddenTroubleType();
@@ -158,6 +163,12 @@
@ResponseBody
@Transactional
public AjaxResult addDangerReportSave(HiddenDangerCheckPoint hdcp) {
+ if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
+ throw new RuntimeException("检查人不能为空");
+ }
+ if (ObjectUtils.isEmpty(hdcp.getFindTime())){
+ throw new RuntimeException("发现时间不能为空");
+ }
HiddenDangerCheck hiddenDangerCheck = new HiddenDangerCheck();
hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者
hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间
@@ -181,13 +192,13 @@
throw new RuntimeException("添加隐患信息失败");
}
-// // 此处插入附属表 --- 此处已弃用，在核查整改后插入
-// //获取Id返回值
-// hdcp.getId();
-// int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
-// if (result< 1){
-// throw new RuntimeException("添加隐患附属信息失败");
-// }
+ // 此处插入附属表 --- 此处已弃用，在核查整改后插入20250623再次启用
+ //获取Id返回值
+ hdcp.getId();
+ int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
+ if (result< 1){
+ throw new RuntimeException("添加隐患附属信息失败");
+ }
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
@@ -230,7 +241,12 @@
HiddenDangerCheck hiddenDangerCheck = new HiddenDangerCheck();
// hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者
// hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间
-
+ if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
+ throw new RuntimeException("检查人不能为空");
+ }
+ if (ObjectUtils.isEmpty(hdcp.getFindTime())){
+ throw new RuntimeException("发现时间不能为空");
+ }
hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者
hiddenDangerCheck.setCreateTime(hdcp.getRectifyCreateTime());//获取创建时间
@@ -276,7 +292,6 @@
hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
}
}
- //2.全流程隐患提交信息封装-未操作
//隐患核查
@@ -292,7 +307,6 @@
}
}
- //3.全流程隐患核查信息封装-未操作
//隐患整改
// hdcp.setRectifyCreateTime(DateUtils.getNowDate());//设置整改时间
@@ -340,11 +354,6 @@
-
-
-
-
-
/**
* 修改隐患上报
*/
@@ -354,11 +363,13 @@
// todo-2022 修改前查询
PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hdcp.getId());
- hdcp.setHazardCode(dangerInfo.getHazardCode());
- hdcp.setDangerSrc(dangerInfo.getDangerSrc());
- hdcp.setDangerReason(dangerInfo.getDangerReason());
- hdcp.setHazardDangerType(dangerInfo.getHazardDangerType());
- hdcp.setDangerResult(dangerInfo.getDangerResult());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ hdcp.setHazardCode(dangerInfo.getHazardCode());
+ hdcp.setDangerSrc(dangerInfo.getDangerSrc());
+ hdcp.setDangerReason(dangerInfo.getDangerReason());
+ hdcp.setHazardDangerType(dangerInfo.getHazardDangerType());
+ hdcp.setDangerResult(dangerInfo.getDangerResult());
+ }
mmap.put("hiddenDangerCheckPoint", hdcp);
@@ -397,11 +408,11 @@
hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate());//设置更新时间
hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
- // todo-2022 此处修改附属表
-// int result = riskService.updateDangerInfo(hiddenDangerCheckPoint);
-// if (result < 1){
-// throw new RuntimeException("修改失败");
-// }
+ // todo-2022 此处修改附属表 20250623再次启用
+ int result = riskService.updateDangerInfo(hiddenDangerCheckPoint);
+ if (result < 1){
+ throw new RuntimeException("修改失败");
+ }
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
return AjaxResult.success();
@@ -442,7 +453,6 @@
/**
* 修改判定隐患上报保存
- * todo-2022 隐患核查（判定隐患） 以判定的隐患，才需要上报
*/
@Log(title = "修改判定隐患上报保存", businessType = BusinessType.UPDATE)
@PostMapping("/editJudgeDangerReportSave")
@@ -461,7 +471,7 @@
hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//隐患核查阶段(数据进入到隐患核查阶段)
hiddenDangerCheckPoint.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
-// // todo-2022 隐患信息判定
+// //
// int result = riskService.updateDangerInfoJudge(hiddenDangerCheckPoint);
// if (result < 1){
// throw new RuntimeException("整改信息保存失败");
@@ -470,6 +480,11 @@
}
}
int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
+
+ int result = confirmLogService.saveConfirmLog(hiddenDangerCheckPoint);
+ if (result < 1){
+ return AjaxResult.error("操作失败");
+ }
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
@@ -531,6 +546,14 @@
public String detailNotJudge(@PathVariable("id") Long id, ModelMap mmap) {
//隐患排查检查点信息实体
HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
+ PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hiddenDangerCheckPoint.getId());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ hiddenDangerCheckPoint.setHazardCode(dangerInfo.getHazardCode());
+ hiddenDangerCheckPoint.setDangerSrc(dangerInfo.getDangerSrc());
+ hiddenDangerCheckPoint.setDangerReason(dangerInfo.getDangerReason());
+ hiddenDangerCheckPoint.setHazardDangerType(dangerInfo.getHazardDangerType());
+ hiddenDangerCheckPoint.setDangerResult(dangerInfo.getDangerResult());
+ }
mmap.put("hiddenDangerCheckPoint", hiddenDangerCheckPoint);
return prefix + "/detailNotJudge";
}
@@ -544,6 +567,14 @@
public String detailNotDanger(@PathVariable("id") Long id, ModelMap mmap) {
//隐患排查检查点信息实体
HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
+ PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hiddenDangerCheckPoint.getId());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ hiddenDangerCheckPoint.setHazardCode(dangerInfo.getHazardCode());
+ hiddenDangerCheckPoint.setDangerSrc(dangerInfo.getDangerSrc());
+ hiddenDangerCheckPoint.setDangerReason(dangerInfo.getDangerReason());
+ hiddenDangerCheckPoint.setHazardDangerType(dangerInfo.getHazardDangerType());
+ hiddenDangerCheckPoint.setDangerResult(dangerInfo.getDangerResult());
+ }
mmap.put("hiddenDangerCheckPoint", hiddenDangerCheckPoint);
return prefix + "/detailNotDanger";
}
@@ -556,6 +587,14 @@
public String detailYesDanger(@PathVariable("id") Long id, ModelMap mmap) {
//隐患排查检查点信息实体
HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
+ PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hiddenDangerCheckPoint.getId());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ hiddenDangerCheckPoint.setHazardCode(dangerInfo.getHazardCode());
+ hiddenDangerCheckPoint.setDangerSrc(dangerInfo.getDangerSrc());
+ hiddenDangerCheckPoint.setDangerReason(dangerInfo.getDangerReason());
+ hiddenDangerCheckPoint.setHazardDangerType(dangerInfo.getHazardDangerType());
+ hiddenDangerCheckPoint.setDangerResult(dangerInfo.getDangerResult());
+ }
mmap.put("hiddenDangerCheckPoint", hiddenDangerCheckPoint);
return prefix + "/detailYesDanger";
}
--
Gitblit v1.9.2