From 7e7195766eb018b4ba00b2d0663f6dcb11adefc8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 27 九月 2022 09:01:38 +0800
Subject: [PATCH] 临时提交-目前改到隐患上报部分
---
src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/controller/HiddenDangerCheckJobController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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 036db18..6c4f657 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
@@ -4,6 +4,10 @@
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.doublePrevention.entity.PreventReportConfig;
+import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
+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;
@@ -56,6 +60,8 @@
private IRegionService regionService;
@Autowired
private IDeptService deptService;
+ @Autowired
+ private RiskService riskService;
@GetMapping()
public String hiddenDangerCheckJob() {
@@ -85,6 +91,10 @@
@ResponseBody
public AjaxResult remove(String ids) throws SchedulerException {
hiddenDangerCheckJobService.deleteJobByIds(ids);
+
+ //todo-2022 删除job与措施的关联关系
+ riskService.deleteJobAndMeasure(ids);
+
return success();
}
@@ -152,6 +162,7 @@
/**
* 新增保存调度
+ * todo-2022 对应work
*/
@Log(title = "定时任务", businessType = BusinessType.INSERT)
@PostMapping("/add")
@@ -212,6 +223,14 @@
}
}
hiddenDangerCheckJobService.insertJob(hiddenDangerCheckJob);
+
+ //todo- 2022 保存job与管控措施的对应关系
+ hiddenDangerCheckJob.getJobId();
+ int result = riskService.insertJobAndMeasure(hiddenDangerCheckJob.getJobId());{
+ if (result < 0 ){
+ throw new RuntimeException("保存job与管控措施的对应关系失败");
+ }
+ }
}
}
}
@@ -350,6 +369,15 @@
hiddenDangerCheckJob.setRiskDeptName(d.getDeptName());
}
}
+
+ //todo- 2022 保存job与管控措施的对应关系
+ //1、先查询基础清单是否有变更
+ HiddenDangerCheckJob jobById = hiddenDangerCheckJobService.getJobById(hiddenDangerCheckJob.getJobId());
+ if (!jobById.getRiskId().equals(hiddenDangerCheckJob.getRiskId())){
+ // 2、若有变更，再次添加关联关系
+ riskService.updateJobAndMeasure(hiddenDangerCheckJob);
+ }
+
return toAjax(hiddenDangerCheckJobService.updateJob(hiddenDangerCheckJob));
}
--
Gitblit v1.9.2