From 2165f5c087838fa0a72034a7d6f938ee80d1f0e7 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 25 八月 2023 09:48:55 +0800
Subject: [PATCH] 隐患整改延期
---
src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml | 3 +
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java | 22 +++++++++++
src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml | 7 +++
src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java | 27 +++++++++++++
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java | 3 +
src/main/java/com/ruoyi/project/mobile/service/ApiService.java | 5 ++
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java | 2 +
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java | 11 +++++
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java | 5 ++
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java | 4 ++
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java | 2 +
src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml | 8 +++
12 files changed, 98 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
index 60f74c6..892a2cd 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
@@ -17,6 +17,8 @@
* 查询JobAndMeasure - By JobId
*/
PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);
+
+ List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);
/**
* 删除job管控措施的附属表关联信息
*/
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
index 2d507f3..a200311 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
@@ -14,6 +14,8 @@
* 查询JobAndMeasure - By JobId
*/
PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);
+
+ List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);
/**
* 删除job管控措施的附属表关联信息
*/
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
index 1416c09..9808572 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
@@ -32,6 +32,11 @@
public PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId) {
return preventRiskJobAndMeasureRepository.getJobAndMeasureByJobId(jobId);
}
+
+ @Override
+ public List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId) {
+ return preventRiskJobAndMeasureRepository.getJobAndMeasureListByJobId(jobId);
+ }
/**
* 删除job管控措施的附属表关联信息
*/
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
index fc5cbbd..dbc9a29 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
@@ -20,6 +20,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.ReactiveListCommands;
import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
@@ -186,6 +187,31 @@
throw new RuntimeException("整改信息保存失败");
}
return ApiResult.success("隐患整改保存成功");
+ } catch (Exception e) {
+ return ApiResult.error("异常");
+ }
+ }
+
+ /**
+ * 整改延期--保存
+ */
+ public ApiResult rectifyTimeOutSave(String str, ApiRequestHeader header) {
+ //验证userId,loginName,token,deviceType,deviceId,appType 是否一致
+ ApiRequestHeader requestHeader = getHeader(header);
+ if (!(header.equals(requestHeader))) {
+ return ApiResult.errorToken("验证userId,loginName,token,deviceType,deviceId,appType 不一致");
+ }
+ try {
+ HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
+ hdcp.setUpdateBy(header.loginName);
+ hdcp.setUpdateTime(DateUtils.getNowDate());
+
+ int result = hdcpService.rectifyTimeOut(hdcp.getId(), hdcp.getRectifyDeadlineTime());
+ if (result < 1) {
+ return ApiResult.error("延期失败");
+ }
+
+ return ApiResult.success("延期成功");
} catch (Exception e) {
return ApiResult.error("异常");
}
@@ -715,4 +741,5 @@
return map;
}
+
}
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiService.java
index f694ef2..7e31c34 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiService.java
@@ -83,6 +83,11 @@
return hiddenDangerCheckService.editDangerRectifySave(str, header);
}
+ //隐患整改--延期 todo
+ public ApiResult rectifyTimeOutSave(String str, ApiRequestHeader header) {
+ return hiddenDangerCheckService.rectifyTimeOutSave(str, header);
+ }
+
//隐患验收--保存
public ApiResult editDangerAcceptSave(String str, ApiRequestHeader header) {
return hiddenDangerCheckService.editDangerAcceptSave(str, header);
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 f096232..1269eea 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
@@ -2,6 +2,7 @@
import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -14,6 +15,7 @@
import com.ruoyi.project.system.user.service.IUserService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
@@ -127,5 +129,25 @@
return prefix + "/detailDangerRectify";
}
+ /**
+ * 隐患整改延期
+ */
+ @Log(title = "隐患上报", businessType = BusinessType.DELETE)
+ @PostMapping("/rectifyTimeOut")
+ @ResponseBody
+ @Transactional
+ public AjaxResult rectifyTimeOut(HiddenDangerCheckPoint hdcp) {
+ if(ObjectUtils.isEmpty(hdcp.getId())){
+ return AjaxResult.error("id不能为空");
+ }
+ if(ObjectUtils.isEmpty(hdcp.getRectifyDeadlineTime())){
+ return AjaxResult.error("延期时间不能为空");
+ }
+ int i = hiddenDangerCheckPointService.rectifyTimeOut(hdcp.getId(), hdcp.getRectifyDeadlineTime());
+ if (i < 1){
+ return AjaxResult.error("操作失败");
+ }
+ return AjaxResult.success();
+ }
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java
index bb8c28b..431a39f 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java
@@ -5,6 +5,7 @@
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.RiskCheckPointDTO;
import com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPoint;
+import java.util.Date;
import java.util.List;
/**
@@ -83,4 +84,6 @@
HiddenDangerCheckPoint getHiddenDangerCheckPointById(Long dangerCheckPointId);
List<HiddenDangerCheckPoint> getHiddenDangerCheckPointByCheckId(Long checkId);
+
+ int rectifyTimeOut(Long id , Date rectifyDeadlineTime);
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java
index bc85357..79ac3ca 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java
@@ -1,10 +1,12 @@
package com.ruoyi.project.tr.hiddenDangerCheckPoint.service;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.BaseCheckPointDTO;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.RiskCheckPointDTO;
import com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPoint;
+import java.util.Date;
import java.util.List;
/**
@@ -93,4 +95,6 @@
* 查询by CheckId
*/
List<HiddenDangerCheckPoint> getHiddenDangerCheckPointByCheckId(Long checkId);
+
+ int rectifyTimeOut(Long id , Date rectifyDeadlineTime);
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java
index 527c3cf..01be05a 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.tr.hiddenDangerCheckPoint.service.impl;
import com.ruoyi.common.utils.text.Convert;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
import com.ruoyi.framework.web.service.JpushService;
import com.ruoyi.project.system.user.domain.User;
import com.ruoyi.project.system.user.service.IUserService;
@@ -17,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -200,5 +202,14 @@
return hiddenDangerCheckPointMapper.getHiddenDangerCheckPointByCheckId(checkId);
}
+ @Override
+ public int rectifyTimeOut(Long id , Date rectifyDeadlineTime) {
+ Date date = new Date();
+ if (date.getTime() - rectifyDeadlineTime.getTime() < 0){
+ throw new RuntimeException("延期时间设置不合理");
+ }
+ return hiddenDangerCheckPointMapper.rectifyTimeOut(id, rectifyDeadlineTime);
+ }
+
}
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
index 20ab984..24ce632 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
@@ -36,6 +36,9 @@
<select id="listReportTask" resultMap="BaseResultMap">
select * from prevent_risk_danger_check_log
where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null
+<!-- where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null and job_id = 47-->
+ order by update_report_data_time
+ limit 50
</select>
<!-- int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
index b9f7738..56d9ffa 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
@@ -26,6 +26,10 @@
where job_id = #{jobId}
limit 1
</select>
+ <select id="getJobAndMeasureListByJobId" resultMap="BaseResultMap">
+ select * from prevent_risk_job_and_measure
+ where job_id = #{jobId}
+ </select>
<!-- int deleteJobAndMeasure(Long jobId);-->
<delete id="deleteJobAndMeasure">
@@ -57,7 +61,9 @@
<!-- List<PreventRiskJobAndMeasure> listReportWork();-->
<select id="listReportWorkTest" resultMap="BaseResultMap">
select * from prevent_risk_job_and_measure
- where job_id = 84
+<!-- where job_id in (43,47,50,53,56,59,63,65,68,71,75,77,81)-->
+<!-- where job_id in (44,46,49,52,55,58,61,64,67,70,73,76,79)-->
+ where job_id in (45,48,51,54,57,60,62,66,69,72,74,78,80)
</select>
</mapper>
diff --git a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
index 7ee0f6a..14e2915 100644
--- a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
+++ b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
@@ -683,4 +683,11 @@
select * from tr_hidden_danger_check_point
where check_id = #{checkId}
</select>
+
+<!-- int rectifyTimeOut(HiddenDangerCheckPoint hdcp);-->
+ <update id="rectifyTimeOut" parameterType="HiddenDangerCheckPoint">
+ update tr_hidden_danger_check_point set
+ rectify_deadline_time = #{rectifyDeadlineTime}
+ where id = #{id}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.2