From 303223dc45f41cdfb14364a7aa7b643f91421b76 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 08 十一月 2023 16:19:50 +0800
Subject: [PATCH] 添加检查上报
---
src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
index ac26a21..8bd9bed 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
+++ b/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;
/**
* 获取定时任务隐患列表
@@ -103,7 +106,7 @@
/**
- * 定时隐患排查保存 -- todo
+ * 定时隐患排查保存
*/
public ApiResult editDangerScheduleSave(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
@@ -143,7 +146,6 @@
}
});
-
hiddenDangerCheckService.updateHiddenDangerCheck(hiddenDangerCheck);
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
@@ -158,7 +160,7 @@
/**
- * 设置为记录正常 // todo
+ * 设置为记录正常 todo
*/
public ApiResult editPointScheduleSetNormal(String str, ApiRequestHeader header) {
//验证userId,loginName,token,deviceType,deviceId,appType 是否一致
@@ -175,11 +177,16 @@
hdcpService.updateHiddenDangerCheckPoint(hdcp);
PreventRiskDangerCheckAndMeasure dangerCheckPointInfo = preventRiskDangerCheckAndMeasureService.getByDangerCheckPointId(hdcp.getId());
- int result = riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);// todo
+ int result = riskService.updateCheckLog(dangerCheckPointInfo.getCheckId(), hdcp);
if (result < 1){
return ApiResult.error("隐患排查记录附属表：写入手机识别码错误");
}
+ //添加检查说明信息
+ int result1 = riskDangerCheckAndMeasureService.updateCheckDesc(hdcp);
+ if (result1 < 1){
+ throw new RuntimeException("登记检查上报结果失败");
+ }
hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送
return ApiResult.success("定时隐患排查--设置为正常--成功");
@@ -192,7 +199,6 @@
/**
* 定时隐患排查---隐患登记
- * todo-2022 手机端-暂时未改动
*/
@Transactional
public ApiResult editPointScheduleDangerRegisterSave(String str, ApiRequestHeader header) {
@@ -214,7 +220,6 @@
hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//隐患核查阶段(数据进入到隐患核查阶段)
hdcp.setDangerSources(TrHiddenDangerCheckConstants.DANGER_SOURCES_SCHEDULE_PRODUCE); //隐患来源(定时器任务生成)
-
HiddenDangerCheckPoint queryExist = new HiddenDangerCheckPoint();
queryExist.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES);//是否为隐患(是隐患)
@@ -241,7 +246,6 @@
throw new RuntimeException("添加隐患附属信息失败");
}
- // todo-2022 此处插入附属表
//获取Id返回值
hdcp.getId();
int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
@@ -249,15 +253,15 @@
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());
hdcp.setUpdateTime(DateUtils.getNowDate());
i = hdcpService.updateHiddenDangerCheckPoint(hdcp);
- // todo-2022 此处修改附属表,注释：
+ // todo-2022 此处修改附属表
// int result = riskService.updateDangerInfo(hdcp);
// if (result < 1){
// throw new RuntimeException("修改失败");
--
Gitblit v1.9.2