From 7e8d51b6a2d2892c8eca2c8cefd91f7d1b6f8f40 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 11 十月 2022 09:33:29 +0800
Subject: [PATCH] 隐患上报，已经测过
---
src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/controller/HiddenDangerCheckJobController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/controller/HiddenDangerCheckJobController.java b/src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/controller/HiddenDangerCheckJobController.java
index 6c4f657..1bec942 100644
--- a/src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/controller/HiddenDangerCheckJobController.java
+++ b/src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/controller/HiddenDangerCheckJobController.java
@@ -28,7 +28,9 @@
import com.ruoyi.project.tr.troubleshootType.service.ITroubleshootTypeService;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -89,11 +91,15 @@
@Log(title = "定时任务", businessType = BusinessType.DELETE)
@PostMapping("/remove")
@ResponseBody
+ @Transactional
public AjaxResult remove(String ids) throws SchedulerException {
hiddenDangerCheckJobService.deleteJobByIds(ids);
//todo-2022 删除job与措施的关联关系
- riskService.deleteJobAndMeasure(ids);
+ int result = riskService.deleteJobAndMeasure(ids);
+ if (result < 1){
+ throw new RuntimeException("删除调度与管控措施的关联失败");
+ }
return success();
}
@@ -167,6 +173,7 @@
@Log(title = "定时任务", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
+ @Transactional
public AjaxResult addSave(@Validated HiddenDangerCheckJob hiddenDangerCheckJob) throws SchedulerException, TaskException {
if (!StringUtils.isEmpty(hiddenDangerCheckJob.getExecuteUserIdString())) {
String[] executeUserIdArray = hiddenDangerCheckJob.getExecuteUserIdString().split(",");
@@ -226,7 +233,7 @@
//todo- 2022 保存job与管控措施的对应关系
hiddenDangerCheckJob.getJobId();
- int result = riskService.insertJobAndMeasure(hiddenDangerCheckJob.getJobId());{
+ int result = riskService.insertJobAndMeasure(hiddenDangerCheckJob.getJobId(),hiddenDangerCheckJob);{
if (result < 0 ){
throw new RuntimeException("保存job与管控措施的对应关系失败");
}
@@ -329,6 +336,7 @@
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
+ @Transactional
public AjaxResult editSave(@Validated HiddenDangerCheckJob hiddenDangerCheckJob) throws
SchedulerException, TaskException {
HiddenDangerCheckJob tempJob = hiddenDangerCheckJobService.selectJobById(hiddenDangerCheckJob.getJobId());
@@ -372,7 +380,9 @@
//todo- 2022 保存job与管控措施的对应关系
//1、先查询基础清单是否有变更
+ Long jobIds = hiddenDangerCheckJob.getJobId();
HiddenDangerCheckJob jobById = hiddenDangerCheckJobService.getJobById(hiddenDangerCheckJob.getJobId());
+
if (!jobById.getRiskId().equals(hiddenDangerCheckJob.getRiskId())){
// 2、若有变更，再次添加关联关系
riskService.updateJobAndMeasure(hiddenDangerCheckJob);
--
Gitblit v1.9.2