From 176447671a417ae00487fe0f037879c6070f1e68 Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: 星期三, 07 九月 2022 17:14:16 +0800
Subject: [PATCH] 新增风险事件、管控措施的主业务代码(增、删、改、查、分页查)、管控模板
---
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskMeasureTemplatesListQueryRespDTO.java | 60 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java | 21
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java | 16
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskListService.java | 11
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java | 9
src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java | 81 +
pom.xml | 1
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskControlMeasureRespDTO.java | 287 +++++
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskList.java | 249 ++++
src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml | 69
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java | 6
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureSaveReqDTO.java | 114 ++
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskControlTemplate.java | 9
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventPageQueryRespDTO.java | 223 ++++
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 601 +++++++++++
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java | 9
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java | 10
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventUpdateReqDTO.java | 52 +
src/main/resources/mybatis/doublePrevention/PreventRiskListMapper.xml | 34
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskListRepository.java | 13
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureGetReqDTO.java | 17
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureDeleteReqDTO.java | 17
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskListServiceImpl.java | 22
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventListQueryRespDTO.java | 209 ++++
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureQueryReqDTO.java | 48
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java | 12
src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml | 6
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureUpdateReqDTO.java | 120 ++
src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml | 65
src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java | 78 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java | 25
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventRespDTO.java | 206 +++
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java | 16
src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml | 2
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventGetReqDTO.java | 17
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskControlMeasurePageQueryRespDTO.java | 301 +++++
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventDeleteReqDTO.java | 17
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java | 63 +
38 files changed, 3,053 insertions(+), 63 deletions(-)
diff --git a/pom.xml b/pom.xml
index abdec62..9fc3a70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,6 +317,7 @@
<artifactId>core</artifactId>
<version>3.2.1</version>
</dependency>
+ <!--mybatis-plus-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
diff --git a/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java
new file mode 100644
index 0000000..e9fd8a3
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java
@@ -0,0 +1,78 @@
+package com.ruoyi.doublePrevention.controller;
+
+
+import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
+import com.ruoyi.doublePrevention.entity.dto.req.*;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasurePageQueryRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasureRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskMeasureTemplatesListQueryRespDTO;
+import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/prevent/riskControlMeasure")
+public class PreventRiskControlMeasureController {
+
+ @Autowired
+ private RiskService riskService;
+
+ /**
+ * 管控措施-分页查询
+ */
+ @PostMapping("/select/getRiskControlMeasurePage")
+ public ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(
+ @RequestBody PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) {
+ return riskService.getRiskControlMeasurePage(measureQueryReqDTO);
+ }
+
+
+ /**
+ * @description 根据风险措施id查询风险措施
+ */
+ @PostMapping("/select/getRiskControlMeasure")
+ public ResultVO<PreventRiskControlMeasureRespDTO> getRiskControlMeasure(@RequestBody PreventRiskControlMeasureGetReqDTO riskControlMeasureGetReqDTO){
+ return riskService.getRiskControlMeasure(riskControlMeasureGetReqDTO);
+ }
+
+ /**
+ * 管控措施-新增
+ */
+ @PostMapping("/insert/saveRiskControlMeasure")
+ public ResultVO<PreventRiskControlMeasure> saveRiskControlMeasure(@RequestBody PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO) {
+ return riskService.saveRiskControlMeasure(measureSaveReqDTO);
+ }
+
+ /**
+ * 管控措施-修改
+ */
+ @PostMapping("/update/updateRiskControlMeasure")
+ public ResultVO<PreventRiskControlMeasure> updateRiskControlMeasure(@RequestBody PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO) {
+ return riskService.updateRiskControlMeasure(measureUpdateReqDTO);
+ }
+
+ /**
+ * 管控措施-删除
+ */
+ @PostMapping("/delete/deleteRiskControlMeasure")
+ public ResultVO<PreventRiskControlMeasure> deleteRiskControlMeasure(@RequestBody PreventRiskControlMeasureDeleteReqDTO measureDeleteReqDTO) {
+ return riskService.deleteRiskControlMeasure(measureDeleteReqDTO);
+ }
+
+ /**
+ * 管控措施- 获取管控措施模板
+ */
+ @PostMapping("/select/listMeasureTemplates")
+ public ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasures() {
+ return riskService.listMeasureTemplates();
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java
new file mode 100644
index 0000000..97014fb
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java
@@ -0,0 +1,81 @@
+package com.ruoyi.doublePrevention.controller;
+
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
+import com.ruoyi.doublePrevention.entity.dto.req.*;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventListQueryRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventPageQueryRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventRespDTO;
+import com.ruoyi.doublePrevention.enums.ErrorCodes;
+import com.ruoyi.doublePrevention.enums.ResultCodes;
+import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.system.user.domain.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
+
+@RestController
+@RequestMapping("/prevent/riskEvent")
+public class PreventRiskEventController {
+
+ @Autowired
+ private RiskService riskService;
+
+ /**
+ * 风险事件-分页查询
+ */
+ @PostMapping("/select/listRiskEventPage")
+ public ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(@RequestBody PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO) {
+ return riskService.listRiskEventPage(riskEventQueryReqDTO);
+ }
+
+ /**
+ * 风险事件-新增
+ */
+ @PostMapping("/insert/saveRiskEvent")
+ public ResultVO<PreventRiskEvent> saveRiskEvent(@RequestBody PreventRiskEventSaveReqDTO riskEventSaveReqDTO) {
+ return riskService.saveRiskEvent(riskEventSaveReqDTO);
+ }
+
+ /**
+ * 风险事件-修改
+ */
+ @PostMapping("/update/updateRiskEvent")
+ public ResultVO<PreventRiskEvent> updateRiskEvent(@RequestBody PreventRiskEventUpdateReqDTO riskEventUpdateReqDTO) {
+ return riskService.updateRiskEvent(riskEventUpdateReqDTO);
+ }
+
+ /**
+ * 风险事件-删除
+ */
+ @PostMapping("/delete/deleteRiskEvent")
+ public ResultVO<PreventRiskEvent> deleteRiskEvent(@RequestBody PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO) {
+ return riskService.deleteRiskEvent(riskEventDeleteReqDTO);
+ }
+
+ /**
+ * @description 根据风险事件的id查询风险事件
+ */
+ @PostMapping("/select/getRiskEventById")
+ public ResultVO<PreventRiskEventRespDTO> getRiskEventById(@RequestBody PreventRiskEventGetReqDTO riskEventGetReqDTO){
+ return riskService.getRiskEventById(riskEventGetReqDTO);
+ }
+
+ /**
+ * @description 获取所有风险事件不分页
+ */
+ @PostMapping("/select/listRiskEvent")
+ public ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent() {
+ return riskService.listRiskEvent();
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskControlTemplate.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskControlTemplate.java
index 2c55a99..30a4782 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskControlTemplate.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskControlTemplate.java
@@ -17,7 +17,6 @@
*/
private Long id;
- private String uuid;
/**
* 删除标志：0-有效，1-删除
*/
@@ -49,14 +48,6 @@
public void setId(Long id) {
this.id = id;
- }
-
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
}
public Integer getDeleteStatus() {
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskList.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskList.java
new file mode 100644
index 0000000..08e7fa3
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskList.java
@@ -0,0 +1,249 @@
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 风险清单对象 tr_risk_list
+ *
+ */
+@TableName("tr_risk_list")
+public class PreventRiskList implements Serializable {
+
+ /** id */
+ private Long riskListId;
+
+ /** 创建者 */
+ private String createBy;
+
+ /** 创建时间 */
+ private Date createTime;
+
+ /** 更新者 */
+ private String updateBy;
+
+ /** 更新时间 */
+ private Date updateTime;
+
+ /** 备注 */
+ private String remark;
+
+ /** 风险单元编号 */
+ private String riskListNum;
+
+ /** 风险单元名称 */
+ private String riskListName;
+
+ /** 是否特种(1否,2是) */
+ private Long riskListIsSpecial;
+
+ /** 图片 */
+ private String riskListImgUrl;
+
+ /** 设备设施类型 */
+ private Long riskListDeviceType;
+
+ /** 规格/型号 */
+ private String riskListDeviceModel;
+
+ /** 作业活动类型 */
+ private Long riskListWorkType;
+
+ /** 作业频率 */
+ private Long riskListWorkFrequency;
+
+ /** 工艺作业类型 */
+ private Long riskListCraftsType;
+
+ /** 节点描述 */
+ private String riskListCraftsDescription;
+
+ /** 区域/位置 */
+ private Long regionId;
+
+ /** 管辖单位/部门 */
+ private Long deptId;
+
+ /** 负责人 */
+ private Long userId;
+
+
+ /** 风险单元类型(1设备设置,2作业活动,3工艺节点) */
+ private Integer riskType;
+
+ /** 所属公司 */
+ private Long companyId;
+
+ public Long getRiskListId() {
+ return riskListId;
+ }
+
+ public void setRiskListId(Long riskListId) {
+ this.riskListId = riskListId;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getRiskListNum() {
+ return riskListNum;
+ }
+
+ public void setRiskListNum(String riskListNum) {
+ this.riskListNum = riskListNum;
+ }
+
+ public String getRiskListName() {
+ return riskListName;
+ }
+
+ public void setRiskListName(String riskListName) {
+ this.riskListName = riskListName;
+ }
+
+ public Long getRiskListIsSpecial() {
+ return riskListIsSpecial;
+ }
+
+ public void setRiskListIsSpecial(Long riskListIsSpecial) {
+ this.riskListIsSpecial = riskListIsSpecial;
+ }
+
+ public String getRiskListImgUrl() {
+ return riskListImgUrl;
+ }
+
+ public void setRiskListImgUrl(String riskListImgUrl) {
+ this.riskListImgUrl = riskListImgUrl;
+ }
+
+ public Long getRiskListDeviceType() {
+ return riskListDeviceType;
+ }
+
+ public void setRiskListDeviceType(Long riskListDeviceType) {
+ this.riskListDeviceType = riskListDeviceType;
+ }
+
+ public String getRiskListDeviceModel() {
+ return riskListDeviceModel;
+ }
+
+ public void setRiskListDeviceModel(String riskListDeviceModel) {
+ this.riskListDeviceModel = riskListDeviceModel;
+ }
+
+ public Long getRiskListWorkType() {
+ return riskListWorkType;
+ }
+
+ public void setRiskListWorkType(Long riskListWorkType) {
+ this.riskListWorkType = riskListWorkType;
+ }
+
+ public Long getRiskListWorkFrequency() {
+ return riskListWorkFrequency;
+ }
+
+ public void setRiskListWorkFrequency(Long riskListWorkFrequency) {
+ this.riskListWorkFrequency = riskListWorkFrequency;
+ }
+
+ public Long getRiskListCraftsType() {
+ return riskListCraftsType;
+ }
+
+ public void setRiskListCraftsType(Long riskListCraftsType) {
+ this.riskListCraftsType = riskListCraftsType;
+ }
+
+ public String getRiskListCraftsDescription() {
+ return riskListCraftsDescription;
+ }
+
+ public void setRiskListCraftsDescription(String riskListCraftsDescription) {
+ this.riskListCraftsDescription = riskListCraftsDescription;
+ }
+
+ public Long getRegionId() {
+ return regionId;
+ }
+
+ public void setRegionId(Long regionId) {
+ this.regionId = regionId;
+ }
+
+ public Long getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public Integer getRiskType() {
+ return riskType;
+ }
+
+ public void setRiskType(Integer riskType) {
+ this.riskType = riskType;
+ }
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureDeleteReqDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureDeleteReqDTO.java
new file mode 100644
index 0000000..91ed14a
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureDeleteReqDTO.java
@@ -0,0 +1,17 @@
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+public class PreventRiskControlMeasureDeleteReqDTO {
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureGetReqDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureGetReqDTO.java
new file mode 100644
index 0000000..3a36c63
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureGetReqDTO.java
@@ -0,0 +1,17 @@
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+public class PreventRiskControlMeasureGetReqDTO {
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureQueryReqDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureQueryReqDTO.java
new file mode 100644
index 0000000..7c8550a
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureQueryReqDTO.java
@@ -0,0 +1,48 @@
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+public class PreventRiskControlMeasureQueryReqDTO {
+
+ private Integer pageIndex;
+
+ private Integer pageSize;
+ /**
+ * 管控方式：1-自动化监控，2-隐患排查
+ */
+ private Byte controlType;
+ /**
+ * 风险事件名称
+ */
+ private Long riskEventId;
+
+ public Byte getControlType() {
+ return controlType;
+ }
+
+ public void setControlType(Byte controlType) {
+ this.controlType = controlType;
+ }
+
+ public Long getRiskEventId() {
+ return riskEventId;
+ }
+
+ public void setRiskEventId(Long riskEventId) {
+ this.riskEventId = riskEventId;
+ }
+
+ public Integer getPageIndex() {
+ return pageIndex;
+ }
+
+ public void setPageIndex(Integer pageIndex) {
+ this.pageIndex = pageIndex;
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureSaveReqDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureSaveReqDTO.java
new file mode 100644
index 0000000..9a2a088
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureSaveReqDTO.java
@@ -0,0 +1,114 @@
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+public class PreventRiskControlMeasureSaveReqDTO {
+
+ /**
+ * 风险事件Id
+ */
+ private Long riskEventId;
+
+ /**
+ * 风险管控措施编号
+ */
+ private String controlMeasureCode;
+
+ /**
+ * 管控方式：1-自动化监控，2-隐患排查
+ */
+ private Byte controlType;
+
+ /**
+ * 隐患排查内容
+ */
+ private String checkContent;
+
+ /**
+ * 管控措施分类1
+ * 1-工程技术，2-维护保养，3-操作行为，4-应急设施
+ */
+ private Byte classify1;
+
+ /**
+ * 管控措施分类2
+ * 1工程技术-工艺控制，关键设备/部件，安全附件，安全仪表，其他;
+ * 2维护保养-动设备,静设备；3
+ * 操作行为-人员资质,操作记录,交接班；
+ * 4应急设施-应急设施,个体防护,消防设施,应急预案
+ */
+ private Byte classify2;
+ /**
+ * 管控措施分类3
+ * 自定义
+ */
+ private String classify3;
+
+ /**
+ * 风险管控措施描述
+ */
+ private String measureDesc;
+
+
+ public Byte getControlType() {
+ return controlType;
+ }
+
+ public void setControlType(Byte controlType) {
+ this.controlType = controlType;
+ }
+
+ public String getControlMeasureCode() {
+ return controlMeasureCode;
+ }
+
+ public void setControlMeasureCode(String controlMeasureCode) {
+ this.controlMeasureCode = controlMeasureCode;
+ }
+
+ public Byte getClassify1() {
+ return classify1;
+ }
+
+ public void setClassify1(Byte classify1) {
+ this.classify1 = classify1;
+ }
+
+ public Byte getClassify2() {
+ return classify2;
+ }
+
+ public void setClassify2(Byte classify2) {
+ this.classify2 = classify2;
+ }
+
+ public String getClassify3() {
+ return classify3;
+ }
+
+ public void setClassify3(String classify3) {
+ this.classify3 = classify3;
+ }
+
+ public Long getRiskEventId() {
+ return riskEventId;
+ }
+
+ public void setRiskEventId(Long riskEventId) {
+ this.riskEventId = riskEventId;
+ }
+
+ public String getMeasureDesc() {
+ return measureDesc;
+ }
+
+ public void setMeasureDesc(String measureDesc) {
+ this.measureDesc = measureDesc;
+ }
+
+ public String getCheckContent() {
+ return checkContent;
+ }
+
+ public void setCheckContent(String checkContent) {
+ this.checkContent = checkContent;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureUpdateReqDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureUpdateReqDTO.java
new file mode 100644
index 0000000..029ab01
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskControlMeasureUpdateReqDTO.java
@@ -0,0 +1,120 @@
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+public class PreventRiskControlMeasureUpdateReqDTO {
+
+ /**
+ * 主键
+ */
+ private Long id;
+ /**
+ * 风险管控措施编号
+ */
+ private String controlMeasureCode;
+
+ /**
+ * 管控方式：1-自动化监控，2-隐患排查
+ */
+ private Byte controlType;
+ /**
+ * 管控措施分类1
+ * 1-工程技术，2-维护保养，3-操作行为，4-应急设施
+ */
+ private Byte classify1;
+ /**
+ * 管控措施分类2
+ * 1工程技术-工艺控制，关键设备/部件，安全附件，安全仪表，其他;
+ * 2维护保养-动设备,静设备；3
+ * 操作行为-人员资质,操作记录,交接班；
+ * 4应急设施-应急设施,个体防护,消防设施,应急预案
+ */
+ private Byte classify2;
+ /**
+ * 管控措施分类3
+ * 自定义
+ */
+ private String classify3;
+ /**
+ * 风险事件名称
+ */
+ private Long riskEventId;
+ /**
+ * 风险管控措施描述
+ */
+ private String measureDesc;
+ /**
+ * 隐患排查内容
+ */
+ private String checkContent;
+
+ public String getCheckContent() {
+ return checkContent;
+ }
+
+ public void setCheckContent(String checkContent) {
+ this.checkContent = checkContent;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getControlMeasureCode() {
+ return controlMeasureCode;
+ }
+
+ public void setControlMeasureCode(String controlMeasureCode) {
+ this.controlMeasureCode = controlMeasureCode;
+ }
+
+ public Byte getControlType() {
+ return controlType;
+ }
+
+ public void setControlType(Byte controlType) {
+ this.controlType = controlType;
+ }
+
+ public Byte getClassify1() {
+ return classify1;
+ }
+
+ public void setClassify1(Byte classify1) {
+ this.classify1 = classify1;
+ }
+
+ public Byte getClassify2() {
+ return classify2;
+ }
+
+ public void setClassify2(Byte classify2) {
+ this.classify2 = classify2;
+ }
+
+ public String getClassify3() {
+ return classify3;
+ }
+
+ public void setClassify3(String classify3) {
+ this.classify3 = classify3;
+ }
+
+ public Long getRiskEventId() {
+ return riskEventId;
+ }
+
+ public void setRiskEventId(Long riskEventId) {
+ this.riskEventId = riskEventId;
+ }
+
+ public String getMeasureDesc() {
+ return measureDesc;
+ }
+
+ public void setMeasureDesc(String measureDesc) {
+ this.measureDesc = measureDesc;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventDeleteReqDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventDeleteReqDTO.java
new file mode 100644
index 0000000..c3e0cd1
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventDeleteReqDTO.java
@@ -0,0 +1,17 @@
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+public class PreventRiskEventDeleteReqDTO {
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventGetReqDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventGetReqDTO.java
new file mode 100644
index 0000000..448cbef
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventGetReqDTO.java
@@ -0,0 +1,17 @@
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+public class PreventRiskEventGetReqDTO {
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventUpdateReqDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventUpdateReqDTO.java
new file mode 100644
index 0000000..379952a
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventRiskEventUpdateReqDTO.java
@@ -0,0 +1,52 @@
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+public class PreventRiskEventUpdateReqDTO {
+ /**
+ * 主键
+ */
+ private Long id;
+ /**
+ * 风险分析单元id
+ */
+ private Long riskUnitId;
+ /**
+ * 安全风险事件名称
+ */
+ private String riskEventName;
+ /**
+ * 安全风险结果
+ */
+ private String eventResult;
+
+ public String getEventResult() {
+ return eventResult;
+ }
+
+ public void setEventResult(String eventResult) {
+ this.eventResult = eventResult;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getRiskUnitId() {
+ return riskUnitId;
+ }
+
+ public void setRiskUnitId(Long riskUnitId) {
+ this.riskUnitId = riskUnitId;
+ }
+
+ public String getRiskEventName() {
+ return riskEventName;
+ }
+
+ public void setRiskEventName(String riskEventName) {
+ this.riskEventName = riskEventName;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskControlMeasurePageQueryRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskControlMeasurePageQueryRespDTO.java
new file mode 100644
index 0000000..f29081b
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskControlMeasurePageQueryRespDTO.java
@@ -0,0 +1,301 @@
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class PreventRiskControlMeasurePageQueryRespDTO implements Serializable {
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+ private String uuid;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtModitify;
+
+ /**
+ * 管控方式：1-自动化监控，2-隐患排查，3-其他
+ */
+ private Byte controlType;
+
+ /**
+ * 管控措施分类1
+ * 1-工程技术，2-维护保养，3-操作行为，4-应急设施
+ */
+ private Byte classify1;
+ /**
+ * 管控措施分类2
+ * 1工程技术-工艺控制，关键设备/部件，安全附件，安全仪表，其他;
+ * 2维护保养-动设备,静设备；3
+ * 操作行为-人员资质,操作记录,交接班；
+ * 4应急设施-应急设施,个体防护,消防设施,应急预案
+ */
+ private Byte classify2;
+
+ /**
+ * 风险管控措施编号
+ */
+ private String controlMeasureCode;
+
+ /**
+ * 风险管控措施描述
+ */
+ private String measureDesc;
+
+ /**
+ * 企业id
+ */
+ private Long enterpriseId;
+
+ /**
+ * 企业uuid
+ */
+ private String enterpriseUuid;
+
+ /**
+ * 风险事件ID
+ */
+ private Long riskEventId;
+
+ /**
+ * 风险事件名称
+ */
+ private String riskEventName;
+
+ /**
+ * 关联风险事件uuid
+ */
+ private String riskEventUuid;
+
+ /**
+ * 管控措施分类3
+ * 自定义
+ */
+ private String classify3;
+
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+
+ /**
+ * 同步时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ /**
+ * 同步数据修改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateReportDataTime;
+
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+
+ /**
+ * 隐患排查内容
+ */
+ private String checkContent;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public Byte getControlType() {
+ return controlType;
+ }
+
+ public void setControlType(Byte controlType) {
+ this.controlType = controlType;
+ }
+
+ public Byte getClassify1() {
+ return classify1;
+ }
+
+ public void setClassify1(Byte classify1) {
+ this.classify1 = classify1;
+ }
+
+ public Byte getClassify2() {
+ return classify2;
+ }
+
+ public void setClassify2(Byte classify2) {
+ this.classify2 = classify2;
+ }
+
+ public String getControlMeasureCode() {
+ return controlMeasureCode;
+ }
+
+ public void setControlMeasureCode(String controlMeasureCode) {
+ this.controlMeasureCode = controlMeasureCode;
+ }
+
+ public String getMeasureDesc() {
+ return measureDesc;
+ }
+
+ public void setMeasureDesc(String measureDesc) {
+ this.measureDesc = measureDesc;
+ }
+
+ public Long getEnterpriseId() {
+ return enterpriseId;
+ }
+
+ public void setEnterpriseId(Long enterpriseId) {
+ this.enterpriseId = enterpriseId;
+ }
+
+ public String getEnterpriseUuid() {
+ return enterpriseUuid;
+ }
+
+ public void setEnterpriseUuid(String enterpriseUuid) {
+ this.enterpriseUuid = enterpriseUuid;
+ }
+
+ public Long getRiskEventId() {
+ return riskEventId;
+ }
+
+ public void setRiskEventId(Long riskEventId) {
+ this.riskEventId = riskEventId;
+ }
+
+ public String getRiskEventName() {
+ return riskEventName;
+ }
+
+ public void setRiskEventName(String riskEventName) {
+ this.riskEventName = riskEventName;
+ }
+
+ public String getRiskEventUuid() {
+ return riskEventUuid;
+ }
+
+ public void setRiskEventUuid(String riskEventUuid) {
+ this.riskEventUuid = riskEventUuid;
+ }
+
+ public String getClassify3() {
+ return classify3;
+ }
+
+ public void setClassify3(String classify3) {
+ this.classify3 = classify3;
+ }
+
+ public String getLastEditUserName() {
+ return lastEditUserName;
+ }
+
+ public void setLastEditUserName(String lastEditUserName) {
+ this.lastEditUserName = lastEditUserName;
+ }
+
+ public String getCreateByUserName() {
+ return createByUserName;
+ }
+
+ public void setCreateByUserName(String createByUserName) {
+ this.createByUserName = createByUserName;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Date getUpdateReportDataTime() {
+ return updateReportDataTime;
+ }
+
+ public void setUpdateReportDataTime(Date updateReportDataTime) {
+ this.updateReportDataTime = updateReportDataTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getReportSwitch() {
+ return reportSwitch;
+ }
+
+ public void setReportSwitch(Byte reportSwitch) {
+ this.reportSwitch = reportSwitch;
+ }
+
+ public String getCheckContent() {
+ return checkContent;
+ }
+
+ public void setCheckContent(String checkContent) {
+ this.checkContent = checkContent;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskControlMeasureRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskControlMeasureRespDTO.java
new file mode 100644
index 0000000..5722910
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskControlMeasureRespDTO.java
@@ -0,0 +1,287 @@
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class PreventRiskControlMeasureRespDTO implements Serializable {
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+
+ private String uuid;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtCreate;
+
+ /**
+ * 最后修改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtModitify;
+
+ /**
+ * 管控方式：1-自动化监控，2-隐患排查，3-其他
+ */
+ private Byte controlType;
+
+ /**
+ * 管控措施分类1
+ * 1-工程技术，2-维护保养，3-操作行为，4-应急设施
+ */
+ private Byte classify1;
+ /**
+ * 管控措施分类2
+ * 1工程技术-工艺控制，关键设备/部件，安全附件，安全仪表，其他;
+ * 2维护保养-动设备,静设备；3
+ * 操作行为-人员资质,操作记录,交接班；
+ * 4应急设施-应急设施,个体防护,消防设施,应急预案
+ */
+ private Byte classify2;
+
+ /**
+ * 风险管控措施编号
+ */
+ private String controlMeasureCode;
+
+ /**
+ * 风险管控措施描述
+ */
+ private String measureDesc;
+
+ /**
+ * 企业id
+ */
+ private Long enterpriseId;
+
+ /**
+ * 企业uuid
+ */
+ private String enterpriseUuid;
+
+ /**
+ * 风险事件ID
+ */
+ private Long riskEventId;
+
+ /**
+ * 关联风险事件uuid
+ */
+ private String riskEventUuid;
+
+ /**
+ * 管控措施分类3
+ * 自定义
+ */
+ private String classify3;
+
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+
+ /**
+ * 同步时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ /**
+ * 同步数据修改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateReportDataTime;
+
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+
+ private String checkContent;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public Byte getControlType() {
+ return controlType;
+ }
+
+ public void setControlType(Byte controlType) {
+ this.controlType = controlType;
+ }
+
+ public Byte getClassify1() {
+ return classify1;
+ }
+
+ public void setClassify1(Byte classify1) {
+ this.classify1 = classify1;
+ }
+
+ public Byte getClassify2() {
+ return classify2;
+ }
+
+ public void setClassify2(Byte classify2) {
+ this.classify2 = classify2;
+ }
+
+ public String getControlMeasureCode() {
+ return controlMeasureCode;
+ }
+
+ public void setControlMeasureCode(String controlMeasureCode) {
+ this.controlMeasureCode = controlMeasureCode;
+ }
+
+ public String getMeasureDesc() {
+ return measureDesc;
+ }
+
+ public void setMeasureDesc(String measureDesc) {
+ this.measureDesc = measureDesc;
+ }
+
+ public Long getEnterpriseId() {
+ return enterpriseId;
+ }
+
+ public void setEnterpriseId(Long enterpriseId) {
+ this.enterpriseId = enterpriseId;
+ }
+
+ public String getEnterpriseUuid() {
+ return enterpriseUuid;
+ }
+
+ public void setEnterpriseUuid(String enterpriseUuid) {
+ this.enterpriseUuid = enterpriseUuid;
+ }
+
+ public Long getRiskEventId() {
+ return riskEventId;
+ }
+
+ public void setRiskEventId(Long riskEventId) {
+ this.riskEventId = riskEventId;
+ }
+
+ public String getRiskEventUuid() {
+ return riskEventUuid;
+ }
+
+ public void setRiskEventUuid(String riskEventUuid) {
+ this.riskEventUuid = riskEventUuid;
+ }
+
+ public String getClassify3() {
+ return classify3;
+ }
+
+ public void setClassify3(String classify3) {
+ this.classify3 = classify3;
+ }
+
+ public String getLastEditUserName() {
+ return lastEditUserName;
+ }
+
+ public void setLastEditUserName(String lastEditUserName) {
+ this.lastEditUserName = lastEditUserName;
+ }
+
+ public String getCreateByUserName() {
+ return createByUserName;
+ }
+
+ public void setCreateByUserName(String createByUserName) {
+ this.createByUserName = createByUserName;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Date getUpdateReportDataTime() {
+ return updateReportDataTime;
+ }
+
+ public void setUpdateReportDataTime(Date updateReportDataTime) {
+ this.updateReportDataTime = updateReportDataTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getReportSwitch() {
+ return reportSwitch;
+ }
+
+ public void setReportSwitch(Byte reportSwitch) {
+ this.reportSwitch = reportSwitch;
+ }
+
+ public String getCheckContent() {
+ return checkContent;
+ }
+
+ public void setCheckContent(String checkContent) {
+ this.checkContent = checkContent;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventListQueryRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventListQueryRespDTO.java
new file mode 100644
index 0000000..a09b3af
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventListQueryRespDTO.java
@@ -0,0 +1,209 @@
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class PreventRiskEventListQueryRespDTO implements Serializable {
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+
+ private String uuid;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtModitify;
+
+ /**
+ * 所属安全风险分析单元id
+ */
+ private Long riskUnitId;
+ /**
+ * 企业id
+ */
+ private Long enterpriseId;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitUuid;
+ /**
+ * 企业uuid
+ */
+ private String enterpriseUuid;
+ /**
+ * 安全风险事件名称
+ */
+ private String riskEventName;
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+ /**
+ * 同步时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+ /**
+ * 同步数据修改时间
+ */
+ private Date updateReportDataTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+ /**
+ * 可能照成的后果
+ */
+ private String eventResult;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public Long getRiskUnitId() {
+ return riskUnitId;
+ }
+
+ public void setRiskUnitId(Long riskUnitId) {
+ this.riskUnitId = riskUnitId;
+ }
+
+ public Long getEnterpriseId() {
+ return enterpriseId;
+ }
+
+ public void setEnterpriseId(Long enterpriseId) {
+ this.enterpriseId = enterpriseId;
+ }
+
+ public String getRiskUnitUuid() {
+ return riskUnitUuid;
+ }
+
+ public void setRiskUnitUuid(String riskUnitUuid) {
+ this.riskUnitUuid = riskUnitUuid;
+ }
+
+ public String getEnterpriseUuid() {
+ return enterpriseUuid;
+ }
+
+ public void setEnterpriseUuid(String enterpriseUuid) {
+ this.enterpriseUuid = enterpriseUuid;
+ }
+
+ public String getRiskEventName() {
+ return riskEventName;
+ }
+
+ public void setRiskEventName(String riskEventName) {
+ this.riskEventName = riskEventName;
+ }
+
+ public String getCreateByUserName() {
+ return createByUserName;
+ }
+
+ public void setCreateByUserName(String createByUserName) {
+ this.createByUserName = createByUserName;
+ }
+
+ public String getLastEditUserName() {
+ return lastEditUserName;
+ }
+
+ public void setLastEditUserName(String lastEditUserName) {
+ this.lastEditUserName = lastEditUserName;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Date getUpdateReportDataTime() {
+ return updateReportDataTime;
+ }
+
+ public void setUpdateReportDataTime(Date updateReportDataTime) {
+ this.updateReportDataTime = updateReportDataTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getReportSwitch() {
+ return reportSwitch;
+ }
+
+ public void setReportSwitch(Byte reportSwitch) {
+ this.reportSwitch = reportSwitch;
+ }
+
+ public String getEventResult() {
+ return eventResult;
+ }
+
+ public void setEventResult(String eventResult) {
+ this.eventResult = eventResult;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventPageQueryRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventPageQueryRespDTO.java
new file mode 100644
index 0000000..71f0633
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventPageQueryRespDTO.java
@@ -0,0 +1,223 @@
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class PreventRiskEventPageQueryRespDTO implements Serializable {
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+
+ private String uuid;
+
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtModitify;
+
+ /**
+ * 所属安全风险分析单元id
+ */
+ private Long riskUnitId;
+
+ /**
+ * 所属安全风险分析单元名称
+ */
+ private String riskUnitName;
+ /**
+ * 企业id
+ */
+ private Long enterpriseId;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitUuid;
+ /**
+ * 企业uuid
+ */
+ private String enterpriseUuid;
+ /**
+ * 安全风险事件名称
+ */
+ private String riskEventName;
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+ /**
+ * 同步时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+ /**
+ * 同步数据修改时间
+ */
+ private Date updateReportDataTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+ /**
+ * 可能照成的后果
+ */
+ private String eventResult;
+
+
+ public String getRiskUnitName() {
+ return riskUnitName;
+ }
+
+ public void setRiskUnitName(String riskUnitName) {
+ this.riskUnitName = riskUnitName;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public Long getRiskUnitId() {
+ return riskUnitId;
+ }
+
+ public void setRiskUnitId(Long riskUnitId) {
+ this.riskUnitId = riskUnitId;
+ }
+
+ public Long getEnterpriseId() {
+ return enterpriseId;
+ }
+
+ public void setEnterpriseId(Long enterpriseId) {
+ this.enterpriseId = enterpriseId;
+ }
+
+ public String getRiskUnitUuid() {
+ return riskUnitUuid;
+ }
+
+ public void setRiskUnitUuid(String riskUnitUuid) {
+ this.riskUnitUuid = riskUnitUuid;
+ }
+
+ public String getEnterpriseUuid() {
+ return enterpriseUuid;
+ }
+
+ public void setEnterpriseUuid(String enterpriseUuid) {
+ this.enterpriseUuid = enterpriseUuid;
+ }
+
+ public String getRiskEventName() {
+ return riskEventName;
+ }
+
+ public void setRiskEventName(String riskEventName) {
+ this.riskEventName = riskEventName;
+ }
+
+ public String getCreateByUserName() {
+ return createByUserName;
+ }
+
+ public void setCreateByUserName(String createByUserName) {
+ this.createByUserName = createByUserName;
+ }
+
+ public String getLastEditUserName() {
+ return lastEditUserName;
+ }
+
+ public void setLastEditUserName(String lastEditUserName) {
+ this.lastEditUserName = lastEditUserName;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Date getUpdateReportDataTime() {
+ return updateReportDataTime;
+ }
+
+ public void setUpdateReportDataTime(Date updateReportDataTime) {
+ this.updateReportDataTime = updateReportDataTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getReportSwitch() {
+ return reportSwitch;
+ }
+
+ public void setReportSwitch(Byte reportSwitch) {
+ this.reportSwitch = reportSwitch;
+ }
+
+ public String getEventResult() {
+ return eventResult;
+ }
+
+ public void setEventResult(String eventResult) {
+ this.eventResult = eventResult;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventRespDTO.java
new file mode 100644
index 0000000..9c0b8e1
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskEventRespDTO.java
@@ -0,0 +1,206 @@
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class PreventRiskEventRespDTO implements Serializable {
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+ private String uuid;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date gmtModitify;
+ /**
+ * 所属安全风险分析单元id
+ */
+ private Long riskUnitId;
+ /**
+ * 企业id
+ */
+ private Long enterpriseId;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitUuid;
+ /**
+ * 企业uuid
+ */
+ private String enterpriseUuid;
+ /**
+ * 安全风险事件名称
+ */
+ private String riskEventName;
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+ /**
+ * 同步时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+ /**
+ * 同步数据修改时间
+ */
+ private Date updateReportDataTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+ /**
+ * 可能照成的后果
+ */
+ private String eventResult;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public Long getRiskUnitId() {
+ return riskUnitId;
+ }
+
+ public void setRiskUnitId(Long riskUnitId) {
+ this.riskUnitId = riskUnitId;
+ }
+
+ public Long getEnterpriseId() {
+ return enterpriseId;
+ }
+
+ public void setEnterpriseId(Long enterpriseId) {
+ this.enterpriseId = enterpriseId;
+ }
+
+ public String getRiskUnitUuid() {
+ return riskUnitUuid;
+ }
+
+ public void setRiskUnitUuid(String riskUnitUuid) {
+ this.riskUnitUuid = riskUnitUuid;
+ }
+
+ public String getEnterpriseUuid() {
+ return enterpriseUuid;
+ }
+
+ public void setEnterpriseUuid(String enterpriseUuid) {
+ this.enterpriseUuid = enterpriseUuid;
+ }
+
+ public String getRiskEventName() {
+ return riskEventName;
+ }
+
+ public void setRiskEventName(String riskEventName) {
+ this.riskEventName = riskEventName;
+ }
+
+ public String getCreateByUserName() {
+ return createByUserName;
+ }
+
+ public void setCreateByUserName(String createByUserName) {
+ this.createByUserName = createByUserName;
+ }
+
+ public String getLastEditUserName() {
+ return lastEditUserName;
+ }
+
+ public void setLastEditUserName(String lastEditUserName) {
+ this.lastEditUserName = lastEditUserName;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Date getUpdateReportDataTime() {
+ return updateReportDataTime;
+ }
+
+ public void setUpdateReportDataTime(Date updateReportDataTime) {
+ this.updateReportDataTime = updateReportDataTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getReportSwitch() {
+ return reportSwitch;
+ }
+
+ public void setReportSwitch(Byte reportSwitch) {
+ this.reportSwitch = reportSwitch;
+ }
+
+ public String getEventResult() {
+ return eventResult;
+ }
+
+ public void setEventResult(String eventResult) {
+ this.eventResult = eventResult;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskMeasureTemplatesListQueryRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskMeasureTemplatesListQueryRespDTO.java
new file mode 100644
index 0000000..9f70710
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskMeasureTemplatesListQueryRespDTO.java
@@ -0,0 +1,60 @@
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+public class PreventRiskMeasureTemplatesListQueryRespDTO {
+
+ /**
+ * 主键
+ */
+ private Long id;
+ /**
+ * 排序字段
+ */
+ private Integer orderIndex;
+ /**
+ * 父级别措施id
+ */
+ private Long parentId;
+ /**
+ *
+ 风控措施名称 ：
+ 管控措施分类1：1-工程技术，2-维护保养，3-操作行为，4-应急设施;
+ 管控措施分类2 子级目录：
+ 1、工程技术：1-工艺控制，2-关键设备/部件，3-安全附件，4-安全仪表，5-其他;
+ 2、维护保养：1-动设备,2-静设备；
+ 3、操作行为：1-人员资质,2-操作记录,3-交接班；
+ 4、应急设施：1-应急设施,2-个体防护,3-消防设施,4-应急预案
+ */
+ private String riskMeasureName;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Integer getOrderIndex() {
+ return orderIndex;
+ }
+
+ public void setOrderIndex(Integer orderIndex) {
+ this.orderIndex = orderIndex;
+ }
+
+ public Long getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Long parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getRiskMeasureName() {
+ return riskMeasureName;
+ }
+
+ public void setRiskMeasureName(String riskMeasureName) {
+ this.riskMeasureName = riskMeasureName;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java
index d5b4606..52dde12 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java
@@ -33,4 +33,13 @@
*/
PreventRiskControlMeasure getPreventRiskControlMeasureById(Long id);
+ /**
+ * @description 根据控制措施编号查询风险控制措施
+ */
+ PreventRiskControlMeasure getPreventRiskControlMeasureByControlMeasureCode(@Param("controlMeasureCode") String controlMeasureCode);
+
+ /**
+ * @description 分页获取风险管控措施
+ */
+ List<PreventRiskControlMeasure> listRiskEvenByCondition(@Param("controlType") Byte controlType,@Param("riskEventId") Long riskEventId);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java
index 354f4b1..d9bb898 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlTemplateRepository.java
@@ -1,6 +1,7 @@
package com.ruoyi.doublePrevention.repository;
+import com.ruoyi.doublePrevention.entity.PreventRiskControlTemplate;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -8,4 +9,9 @@
@Repository
public interface PreventRiskControlTemplateRepository{
+ /**
+ * 管控措施- 获取管控措施模板
+ */
+ List<PreventRiskControlTemplate> listMeasureTemplates();
+
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java
index ed03e50..78e089c 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java
@@ -1,7 +1,9 @@
package com.ruoyi.doublePrevention.repository;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
import org.apache.ibatis.annotations.Param;
@@ -33,4 +35,14 @@
* @description 根据主键id对风险控制事件进行修改
*/
int updatePreventRiskEventById(PreventRiskEvent preventRiskEvent);
+
+ /**
+ * @description 根据时间名查询风险控制事件
+ */
+ PreventRiskEvent getPreventRiskEventByEventName(String name);
+
+ /**
+ * @description 根据条件批量获取风险控制事件
+ */
+ List<PreventRiskEvent> listRiskEvenByCondition(@Param("riskUnitId") Long riskUnitId, @Param("riskEventName") String riskEventName);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskListRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskListRepository.java
new file mode 100644
index 0000000..b15ffc3
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskListRepository.java
@@ -0,0 +1,13 @@
+package com.ruoyi.doublePrevention.repository;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskList;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PreventRiskListRepository{
+
+ /**
+ * @description 根据id获取风险清单
+ */
+ PreventRiskList getPreventRiskListById(Long id);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
index 6333bb9..734b2ca 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -1,9 +1,15 @@
package com.ruoyi.doublePrevention.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventRiskEventSaveReqDTO;
+import com.ruoyi.doublePrevention.entity.dto.req.*;
+import com.ruoyi.doublePrevention.entity.dto.resp.*;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.tr.riskList.domain.RiskList;
+
+import java.util.List;
public interface RiskService {
/**
@@ -15,4 +21,59 @@
* 风险事件-新增
*/
ResultVO<PreventRiskEvent> saveRiskEvent(PreventRiskEventSaveReqDTO riskEventSaveReqDTO);
+
+ /**
+ * @description 风险事件-删除
+ */
+ ResultVO<PreventRiskEvent> deleteRiskEvent(PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO);
+
+ /**
+ * 风险事件-修改
+ */
+ ResultVO<PreventRiskEvent> updateRiskEvent(PreventRiskEventUpdateReqDTO riskEventUpdateReqDTO);
+
+ /**
+ * @description 根据风险事件的id查询风险事件
+ */
+ ResultVO<PreventRiskEventRespDTO> getRiskEventById(PreventRiskEventGetReqDTO riskEventGetReqDTO);
+
+ /**
+ * 风险事件-分页查询
+ */
+ ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO);
+
+ /**
+ * @description 获取所有风险事件不分页
+ */
+ ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent();
+
+ /**
+ * @description 新增管控措施
+ */
+ ResultVO<PreventRiskControlMeasure> saveRiskControlMeasure(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO);
+
+ /**
+ * 管控措施- 获取管控措施模板
+ */
+ ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasureTemplates();
+
+ /**
+ * 管控措施-删除
+ */
+ ResultVO<PreventRiskControlMeasure> deleteRiskControlMeasure(PreventRiskControlMeasureDeleteReqDTO measureDeleteReqDTO);
+
+ /**
+ * @description 根据风险措施id查询风险措施
+ */
+ ResultVO<PreventRiskControlMeasureRespDTO> getRiskControlMeasure(PreventRiskControlMeasureGetReqDTO riskControlMeasureGetReqDTO);
+
+ /**
+ * 管控措施-修改
+ */
+ ResultVO<PreventRiskControlMeasure> updateRiskControlMeasure(PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO);
+
+ /**
+ * 管控措施-分页查询
+ */
+ ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
index 742a7a6..efff455 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
@@ -31,4 +31,13 @@
*/
int updatePreventRiskControlMeasureById(PreventRiskControlMeasure preventRiskControlMeasure);
+ /**
+ * @description 根据控制措施编号查询风险控制措施
+ */
+ PreventRiskControlMeasure getPreventRiskControlMeasureByControlMeasureCode(String controlMeasureCode);
+
+ /**
+ * @description 分页获取风险管控措施
+ */
+ List<PreventRiskControlMeasure> listRiskEvenByCondition(Byte controlType, Long riskEventId);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java
new file mode 100644
index 0000000..7018eda
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.doublePrevention.service.baseService;
+
+
+
+import com.ruoyi.doublePrevention.entity.PreventRiskControlTemplate;
+
+import java.util.List;
+
+public interface PreventRiskControlTemplateService{
+
+ /**
+ * 管控措施- 获取管控措施模板
+ */
+ List<PreventRiskControlTemplate> listMeasureTemplates();
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java
index 6f089e0..9845fd6 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java
@@ -21,6 +21,11 @@
PreventRiskEvent getPreventRiskEventById(Long id);
/**
+ * @description 根据时间名查询风险控制事件
+ */
+ PreventRiskEvent getPreventRiskEventByEventName(String name);
+
+ /**
* @description 根据主键id删除风险控制事件
*/
int deletePreventRiskEventById(PreventRiskEvent preventRiskEvent);
@@ -30,5 +35,8 @@
*/
int updatePreventRiskEventById(PreventRiskEvent preventRiskEvent);
-
+ /**
+ * @description 根据条件批量获取风险控制事件
+ */
+ List<PreventRiskEvent> listRiskEvenByCondition(Long riskUnitId, String riskEventName);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskListService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskListService.java
new file mode 100644
index 0000000..3144790
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskListService.java
@@ -0,0 +1,11 @@
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskList;
+
+public interface PreventRiskListService {
+
+ /**
+ * @description 根据id获取风险清单
+ */
+ PreventRiskList getPreventRiskListById(Long id);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
index 03211a5..f5bcf56 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java
@@ -50,4 +50,20 @@
int updateResult = preventRiskControlMeasureRepository.updatePreventRiskControlMeasureById(preventRiskControlMeasure);
return updateResult;
}
+
+ /**
+ * @description 根据控制措施编号查询风险控制措施
+ */
+ @Override
+ public PreventRiskControlMeasure getPreventRiskControlMeasureByControlMeasureCode(String controlMeasureCode) {
+ return preventRiskControlMeasureRepository.getPreventRiskControlMeasureByControlMeasureCode(controlMeasureCode);
+ }
+
+ /**
+ * @description 分页获取风险管控措施
+ */
+ @Override
+ public List<PreventRiskControlMeasure> listRiskEvenByCondition(Byte controlType, Long riskEventId) {
+ return preventRiskControlMeasureRepository.listRiskEvenByCondition(controlType,riskEventId);
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java
new file mode 100644
index 0000000..73a9d3c
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlTemplateServiceImpl.java
@@ -0,0 +1,25 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+
+import com.ruoyi.doublePrevention.entity.PreventRiskControlTemplate;
+import com.ruoyi.doublePrevention.repository.PreventRiskControlTemplateRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskControlTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventRiskControlTemplateService")
+public class PreventRiskControlTemplateServiceImpl implements PreventRiskControlTemplateService {
+
+ @Autowired
+ private PreventRiskControlTemplateRepository preventRiskControlTemplateRepository;
+
+ /**
+ * 管控措施- 获取管控措施模板
+ */
+ @Override
+ public List<PreventRiskControlTemplate> listMeasureTemplates() {
+ return preventRiskControlTemplateRepository.listMeasureTemplates();
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java
index 7b7029d..8ea2c7b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java
@@ -1,8 +1,12 @@
package com.ruoyi.doublePrevention.service.baseService.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
+import com.ruoyi.doublePrevention.enums.StatusEnum;
import com.ruoyi.doublePrevention.repository.PreventRiskEventRepository;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskEventService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +38,14 @@
}
/**
+ * @description 根据时间名查询风险控制事件
+ */
+ @Override
+ public PreventRiskEvent getPreventRiskEventByEventName(String name) {
+ return preventRiskEventRepository.getPreventRiskEventByEventName(name);
+ }
+
+ /**
* @description 根据主键id删除风险控制事件
*/
@Override
@@ -50,4 +62,13 @@
int updateResult = preventRiskEventRepository.updatePreventRiskEventById(preventRiskEvent);
return updateResult;
}
+
+ /**
+ * @description 根据条件批量获取风险控制事件
+ */
+ @Override
+ public List<PreventRiskEvent> listRiskEvenByCondition(Long riskUnitId, String riskEventName) {
+ return preventRiskEventRepository.listRiskEvenByCondition(riskUnitId,riskEventName);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskListServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskListServiceImpl.java
new file mode 100644
index 0000000..ed0bf75
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskListServiceImpl.java
@@ -0,0 +1,22 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskList;
+import com.ruoyi.doublePrevention.repository.PreventRiskListRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("PreventRiskListService")
+public class PreventRiskListServiceImpl implements PreventRiskListService {
+
+ @Autowired
+ private PreventRiskListRepository riskListRepository;
+
+ /**
+ * @description 根据id获取风险清单
+ */
+ @Override
+ public PreventRiskList getPreventRiskListById(Long id) {
+ return riskListRepository.getPreventRiskListById(id);
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
index c2b1e60..0321bac 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -1,23 +1,53 @@
package com.ruoyi.doublePrevention.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
-import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventRiskEventSaveReqDTO;
+import com.ruoyi.doublePrevention.entity.*;
+import com.ruoyi.doublePrevention.entity.dto.req.*;
+import com.ruoyi.doublePrevention.entity.dto.resp.*;
+import com.ruoyi.doublePrevention.enums.ErrorCodes;
+import com.ruoyi.doublePrevention.enums.ResultCodes;
import com.ruoyi.doublePrevention.enums.StatusEnum;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
import com.ruoyi.doublePrevention.service.RiskService;
-import com.ruoyi.doublePrevention.service.baseService.PreventRiskUnitUuidService;
+import com.ruoyi.doublePrevention.service.baseService.*;
import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.system.user.domain.User;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
@Service("RiskService")
public class RiskServiceImpl implements RiskService {
@Autowired
private PreventRiskUnitUuidService preventRiskUnitUuidService;
+
+ @Autowired
+ private PreventRiskEventService preventRiskEventService;
+
+ @Autowired
+ private PreventReportConfigService preventReportConfigService;
+
+ @Autowired
+ private PreventRiskListService preventRiskListService;
+
+ @Autowired
+ private PreventRiskControlTemplateService riskControlTemplateService;
+
+ @Autowired
+ private PreventRiskControlMeasureService riskControlMeasureService;
/**
* 为设施设备清单附属表添加uuid
@@ -39,25 +69,578 @@
*/
@Override
public ResultVO<PreventRiskEvent> saveRiskEvent(PreventRiskEventSaveReqDTO riskEventSaveReqDTO) {
+ User sysUser = getSysUser();
ResultVO resultVO = new ResultVO<>();
- resultVO.setCode("200");
- resultVO.setMsg("新增成功");
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
Long riskUnitId = riskEventSaveReqDTO.getRiskUnitId();
String riskEventName = riskEventSaveReqDTO.getRiskEventName();
String eventResult = riskEventSaveReqDTO.getEventResult();
+
if (riskUnitId == null){
resultVO.setMsg("安全风险分析单元名称不能为空");
return resultVO;
}
+ PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
+ if (riskUnit == null){
+ resultVO.setMsg("安全风险分析单元名称不存在");
+ return resultVO;
+ }
if (StringUtils.isEmpty(riskEventName)){
- resultVO.setMsg("安全风险事件名称");
+ resultVO.setMsg("安全风险事件名称不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEventByEventName = preventRiskEventService.getPreventRiskEventByEventName(riskEventName);
+ if (riskEventByEventName != null){
+ resultVO.setMsg("安全风险事件名称已存在");
return resultVO;
}
if (StringUtils.isEmpty(eventResult)){
- resultVO.setMsg("可能造成得后果");
+ resultVO.setMsg("可能造成得后果不能为空");
return resultVO;
}
- return null;
+ Date date = new Date();
+ String uuid = UUID.randomUUID().toString();
+ PreventRiskEvent riskEvent = new PreventRiskEvent();
+ riskEvent.setUuid(uuid);
+ riskEvent.setEventResult(eventResult);
+ riskEvent.setRiskEventName(riskEventName);
+ riskEvent.setRiskUnitId(riskUnitId);
+ riskEvent.setRiskUnitUuid(riskUnit.getRiskUnitUuid());
+ riskEvent.setDeleteStatus(StatusEnum.DELETE_STATUS_USE.getCode());
+ riskEvent.setGmtCreate(date);
+ riskEvent.setGmtModitify(date);
+ riskEvent.setCreateByUserName(sysUser.getUserName());
+ riskEvent.setLastEditUserName(sysUser.getUserName());
+ //todo 对所属企业id和uuid没有进行设置
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置上报时间为空
+ riskEvent.setReportTime(null);
+ //设置本条数据上报更新时间
+ riskEvent.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ riskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ riskEvent.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ riskEvent.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ riskEvent.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int saveResult = preventRiskEventService.savePreventRiskEvent(riskEvent);
+ if (saveResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("新增安全风险事件成功");
+ return resultVO;
}
+
+ /**
+ * @description 风险事件-删除
+ */
+ @Override
+ public ResultVO<PreventRiskEvent> deleteRiskEvent(PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ Long eventId = riskEventDeleteReqDTO.getId();
+ if (eventId == null){
+ resultVO.setMsg("安全风险事件Id为空，删除失败");
+ return resultVO;
+ }
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(eventId);
+ if (riskEvent == null){
+ resultVO.setMsg("安全风险事件不存在，删除失败");
+ return resultVO;
+ }
+ Date date = new Date();
+ riskEvent.setGmtModitify(date);
+ riskEvent.setLastEditUserName(sysUser.getUserName());
+ riskEvent.setUpdateReportDataTime(date);
+
+ int deleteResult = preventRiskEventService.deletePreventRiskEventById(riskEvent);
+ if (deleteResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("删除安全风险事件成功");
+ return resultVO;
+ }
+
+ /**
+ * 风险事件-修改
+ */
+ @Override
+ public ResultVO<PreventRiskEvent> updateRiskEvent(PreventRiskEventUpdateReqDTO riskEventUpdateReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ Long riskEventId = riskEventUpdateReqDTO.getId();
+ Long riskUnitId = riskEventUpdateReqDTO.getRiskUnitId();
+ String riskEventName = riskEventUpdateReqDTO.getRiskEventName();
+ String eventResult = riskEventUpdateReqDTO.getEventResult();
+ if (riskEventId == null){
+ resultVO.setMsg("安全风险事件ID不能为空");
+ return resultVO;
+ }
+ if (riskUnitId == null){
+ resultVO.setMsg("安全风险分析单元名称不能为空");
+ return resultVO;
+ }
+ PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
+ if (riskUnit == null){
+ resultVO.setMsg("安全风险分析单元名称不存在");
+ return resultVO;
+ }
+ if (StringUtils.isEmpty(riskEventName)){
+ resultVO.setMsg("安全风险事件名称不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEventByEventName = preventRiskEventService.getPreventRiskEventByEventName(riskEventName);
+ if (riskEventByEventName != null){
+ if (!riskEventId.equals(riskEventByEventName.getId())){
+ resultVO.setMsg("安全风险事件名称已存在");
+ return resultVO;
+ }
+ }
+ if (StringUtils.isEmpty(eventResult)){
+ resultVO.setMsg("可能造成得后果不能为空");
+ return resultVO;
+ }
+
+ Date date = new Date();
+ PreventRiskEvent preventRiskEvent = new PreventRiskEvent();
+ BeanUtils.copyProperties(riskEventUpdateReqDTO,preventRiskEvent);
+ preventRiskEvent.setGmtModitify(date);
+ preventRiskEvent.setLastEditUserName(sysUser.getUserName());
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置本条数据上报更新时间
+ preventRiskEvent.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ preventRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ preventRiskEvent.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ preventRiskEvent.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ preventRiskEvent.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int updateResult = preventRiskEventService.updatePreventRiskEventById(preventRiskEvent);
+
+ if (updateResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("更新安全风险事件成功");
+ return resultVO;
+ }
+
+ /**
+ * @description 根据风险事件的id查询风险事件
+ */
+ @Override
+ public ResultVO<PreventRiskEventRespDTO> getRiskEventById(PreventRiskEventGetReqDTO riskEventGetReqDTO) {
+ Long eventId = riskEventGetReqDTO.getId();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ if (eventId == null){
+ resultVO.setMsg("安全风险事件ID不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(eventId);
+ if (riskEvent == null){
+ resultVO.setMsg("安全风险事件不存在");
+ return resultVO;
+ }
+ PreventRiskEventRespDTO respDTO = new PreventRiskEventRespDTO();
+ BeanUtils.copyProperties(riskEvent,respDTO);
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg(ResultCodes.OK.getDesc());
+ resultVO.setData(respDTO);
+ return resultVO;
+ }
+
+ /**
+ * 风险事件-分页查询
+ * @return
+ */
+ @Override
+ public ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO) {
+ Integer pageIndex = riskEventQueryReqDTO.getPageIndex();
+ Integer pageSize = riskEventQueryReqDTO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+ Long riskUnitId = riskEventQueryReqDTO.getRiskUnitId();
+ String riskEventName = riskEventQueryReqDTO.getRiskEventName();
+ Page<PreventRiskEvent> page = PageHelper.startPage(pageIndex, pageSize);
+ preventRiskEventService.listRiskEvenByCondition(riskUnitId,riskEventName);
+
+ List<PreventRiskEvent> result = page.getResult();
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<PreventRiskEventPageQueryRespDTO> pageResult = null;
+ if (result != null) {
+ pageResult = result.stream().map((preventRiskEvent) -> {
+ PreventRiskEventPageQueryRespDTO dto = new PreventRiskEventPageQueryRespDTO();
+ BeanUtils.copyProperties(preventRiskEvent, dto);
+ Long unitId = dto.getRiskUnitId();
+ if (unitId != null) {
+ PreventRiskList riskList = preventRiskListService.getPreventRiskListById(unitId);
+ if (riskList != null) {
+ dto.setRiskUnitName(riskList.getRiskListName());
+ }
+ }
+ return dto;
+ }).collect(Collectors.toList());
+ }
+
+ ResultVO<List<PreventRiskEventPageQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+ resultVO.setCount(count);
+ return resultVO;
+ }
+
+ /**
+ * @description 获取所有风险事件不分页
+ */
+ @Override
+ public ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent() {
+ List<PreventRiskEvent> riskEvents = preventRiskEventService.listRiskEvenByCondition(null, null);
+ List<PreventRiskEventListQueryRespDTO> riskEventList = null;
+ if (riskEvents != null){
+ riskEventList = riskEvents.stream().map((riskEvent)->{
+ PreventRiskEventListQueryRespDTO dto = new PreventRiskEventListQueryRespDTO();
+ BeanUtils.copyProperties(riskEvent,dto);
+ return dto;
+ }).collect(Collectors.toList());
+ }
+ return new ResultVO<>(ResultCodes.OK,riskEventList);
+ }
+
+ /**
+ * @description 新增风险管控措施
+ */
+ @Override
+ public ResultVO<PreventRiskControlMeasure> saveRiskControlMeasure(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ Long riskEventId = measureSaveReqDTO.getRiskEventId();
+ if (riskEventId == null){
+ resultVO.setMsg("安全风险事件ID不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(riskEventId);
+ if (riskEvent == null){
+ resultVO.setMsg("安全风险事件不存在");
+ return resultVO;
+ }
+ String controlMeasureCode = measureSaveReqDTO.getControlMeasureCode();
+ if (controlMeasureCode.isEmpty()){
+ resultVO.setMsg("风险措施编码不能为空");
+ return resultVO;
+ }
+ PreventRiskControlMeasure riskControlMeasure = riskControlMeasureService.getPreventRiskControlMeasureByControlMeasureCode(controlMeasureCode);
+ if (riskControlMeasure != null){
+ resultVO.setMsg("风险措施编码已存在");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getControlType() == null){
+ resultVO.setMsg("管控方式不能为空");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getCheckContent().isEmpty()){
+ resultVO.setMsg("管控内容不能为空");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getClassify1() == null){
+ resultVO.setMsg("管控措施分类1不能为空");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getClassify2() == null){
+ resultVO.setMsg("管控措施分类2不能为空");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getMeasureDesc().isEmpty()){
+ resultVO.setMsg("措施说明不能为空");
+ return resultVO;
+ }
+ Date date = new Date();
+ String uuid = UUID.randomUUID().toString();
+
+ PreventRiskControlMeasure controlMeasure = new PreventRiskControlMeasure();
+ BeanUtils.copyProperties(measureSaveReqDTO,controlMeasure);
+ controlMeasure.setUuid(uuid);
+ controlMeasure.setDeleteStatus(StatusEnum.DELETE_STATUS_USE.getCode());
+ controlMeasure.setGmtCreate(date);
+ controlMeasure.setGmtModitify(date);
+ controlMeasure.setLastEditUserName(sysUser.getUserName());
+ controlMeasure.setCreateByUserName(sysUser.getUserName());
+ controlMeasure.setRiskEventUuid(riskEvent.getUuid());
+
+ //todo 对所属企业id和uuid没有进行设置
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置上报时间为空
+ controlMeasure.setReportTime(null);
+ //设置本条数据上报更新时间
+ controlMeasure.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ controlMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ controlMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ controlMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ controlMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int saveResult = riskControlMeasureService.savePreventRiskControlMeasure(controlMeasure);
+ if (saveResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("新增风险管控措施成功");
+ return resultVO;
+ }
+
+ /**
+ * 管控措施- 获取管控措施模板
+ */
+ @Override
+ public ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasureTemplates() {
+ List<PreventRiskControlTemplate> riskControlTemplates = riskControlTemplateService.listMeasureTemplates();
+
+ List<PreventRiskMeasureTemplatesListQueryRespDTO> listResult = null;
+ if (riskControlTemplates != null){
+ listResult = riskControlTemplates.stream().map((riskControlTemplate)->{
+ PreventRiskMeasureTemplatesListQueryRespDTO dto = new PreventRiskMeasureTemplatesListQueryRespDTO();
+ BeanUtils.copyProperties(riskControlTemplate,dto);
+ return dto;
+ }).collect(Collectors.toList());
+ }
+ return new ResultVO<>(ResultCodes.OK,listResult);
+ }
+
+ /**
+ * 管控措施-删除
+ */
+ @Override
+ public ResultVO<PreventRiskControlMeasure> deleteRiskControlMeasure(PreventRiskControlMeasureDeleteReqDTO measureDeleteReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ Long measureId = measureDeleteReqDTO.getId();
+ if (measureId == null){
+ resultVO.setMsg("风险管控措施Id为空，删除失败");
+ return resultVO;
+ }
+ PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(measureId);
+ if (controlMeasure == null){
+ resultVO.setMsg("风险管控措施不存在，删除失败");
+ return resultVO;
+ }
+ Date date = new Date();
+ controlMeasure.setGmtModitify(date);
+ controlMeasure.setLastEditUserName(sysUser.getUserName());
+ controlMeasure.setUpdateReportDataTime(date);
+
+ int deleteResult = riskControlMeasureService.deletePreventRiskControlMeasureById(controlMeasure);
+ if (deleteResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("删除风险管控措施成功");
+ return resultVO;
+ }
+
+ /**
+ * @description 根据风险措施id查询风险措施
+ */
+ @Override
+ public ResultVO<PreventRiskControlMeasureRespDTO> getRiskControlMeasure(PreventRiskControlMeasureGetReqDTO riskControlMeasureGetReqDTO) {
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ Long measureId = riskControlMeasureGetReqDTO.getId();
+ if (measureId == null){
+ resultVO.setMsg("风险管控措施Id不能为空");
+ return resultVO;
+ }
+ PreventRiskControlMeasure measure = riskControlMeasureService.getPreventRiskControlMeasureById(measureId);
+ if (measure == null){
+ resultVO.setMsg("风险管控措施不存在");
+ return resultVO;
+ }
+ PreventRiskControlMeasureRespDTO dto = new PreventRiskControlMeasureRespDTO();
+ BeanUtils.copyProperties(measure,dto);
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg(ResultCodes.OK.getDesc());
+ resultVO.setData(dto);
+ return resultVO;
+ }
+
+ /**
+ * 管控措施-修改
+ */
+ @Override
+ public ResultVO<PreventRiskControlMeasure> updateRiskControlMeasure(PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ Long measureId = measureUpdateReqDTO.getId();
+ Long riskEventId = measureUpdateReqDTO.getRiskEventId();
+ if (measureId == null){
+ resultVO.setMsg("风险管控措施ID不能为空");
+ return resultVO;
+ }
+ if (riskEventId == null){
+ resultVO.setMsg("安全风险事件ID不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(riskEventId);
+ if (riskEvent == null){
+ resultVO.setMsg("安全风险事件不存在");
+ return resultVO;
+ }
+ String controlMeasureCode = measureUpdateReqDTO.getControlMeasureCode();
+ if (controlMeasureCode.isEmpty()){
+ resultVO.setMsg("风险措施编码不能为空");
+ return resultVO;
+ }
+ PreventRiskControlMeasure riskControlMeasure = riskControlMeasureService.getPreventRiskControlMeasureByControlMeasureCode(controlMeasureCode);
+ if (riskControlMeasure != null){
+ if (!measureId.equals(riskControlMeasure.getId())){
+ resultVO.setMsg("风险措施编码已存在");
+ return resultVO;
+ }
+ }
+ if (measureUpdateReqDTO.getControlType() == null){
+ resultVO.setMsg("管控方式不能为空");
+ return resultVO;
+ }
+ if (measureUpdateReqDTO.getCheckContent().isEmpty()){
+ resultVO.setMsg("管控内容不能为空");
+ return resultVO;
+ }
+ if (measureUpdateReqDTO.getClassify1() == null){
+ resultVO.setMsg("管控措施分类1不能为空");
+ return resultVO;
+ }
+ if (measureUpdateReqDTO.getClassify2() == null){
+ resultVO.setMsg("管控措施分类2不能为空");
+ return resultVO;
+ }
+ if (measureUpdateReqDTO.getMeasureDesc().isEmpty()){
+ resultVO.setMsg("措施说明不能为空");
+ return resultVO;
+ }
+
+ Date date = new Date();
+ PreventRiskControlMeasure controlMeasure = new PreventRiskControlMeasure();
+ BeanUtils.copyProperties(measureUpdateReqDTO,controlMeasure);
+ controlMeasure.setRiskEventUuid(riskEvent.getUuid());
+ controlMeasure.setGmtModitify(date);
+ controlMeasure.setLastEditUserName(sysUser.getUserName());
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置本条数据上报更新时间
+ controlMeasure.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ controlMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ controlMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ controlMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ controlMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int updateResult = riskControlMeasureService.updatePreventRiskControlMeasureById(controlMeasure);
+ if (updateResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("更新安全风险事件成功");
+ return resultVO;
+
+ }
+
+ /**
+ * 管控措施-分页查询
+ */
+ @Override
+ public ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) {
+ Integer pageIndex = measureQueryReqDTO.getPageIndex();
+ Integer pageSize = measureQueryReqDTO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+ Byte controlType = measureQueryReqDTO.getControlType();
+ Long riskEventId = measureQueryReqDTO.getRiskEventId();
+
+ Page<PreventRiskControlMeasure> page = PageHelper.startPage(pageIndex, pageSize);
+ riskControlMeasureService.listRiskEvenByCondition(controlType,riskEventId);
+
+ List<PreventRiskControlMeasure> result = page.getResult();
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<PreventRiskControlMeasurePageQueryRespDTO> pageResult = null;
+ if (result != null) {
+ pageResult = result.stream().map((preventRiskControlMeasure) -> {
+ PreventRiskControlMeasurePageQueryRespDTO dto = new PreventRiskControlMeasurePageQueryRespDTO();
+ BeanUtils.copyProperties(preventRiskControlMeasure, dto);
+ Long eventId = dto.getRiskEventId();
+ if (eventId != null) {
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(eventId);
+ if (riskEvent != null) {
+ dto.setRiskEventName(riskEvent.getRiskEventName());
+ }
+ }
+ return dto;
+ }).collect(Collectors.toList());
+ }
+
+ ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+ resultVO.setCount(count);
+ return resultVO;
+
+ }
+
}
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
index 8353bf5..c4425a8 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
@@ -82,64 +82,67 @@
update prevent_risk_control_measure
<set>
<if test="gmtModitify != null ">
- gmt_moditify = #{gmtModitify}
+ gmt_moditify = #{gmtModitify},
</if>
<if test="controlType != null">
- control_type = #{controlType}
+ control_type = #{controlType},
</if>
<if test="classify1 != null">
- classify1 = #{classify1}
+ classify1 = #{classify1},
</if>
<if test="classify2 != null">
- classify2 = #{classify2}
+ classify2 = #{classify2},
</if>
<if test="controlMeasureCode != null">
- control_measure_code = #{controlMeasureCode}
+ control_measure_code = #{controlMeasureCode},
</if>
<if test="measureDesc != null">
- measure_desc = #{measureDesc}
+ measure_desc = #{measureDesc},
</if>
<if test="riskEventId != null">
- risk_event_id = #{riskEventId}
+ risk_event_id = #{riskEventId},
</if>
<if test="riskEventUuid != null">
- risk_event_uuid = #{riskEventUuid}
+ risk_event_uuid = #{riskEventUuid},
</if>
<if test="classify3 != null">
- classify3 = #{classify3}
+ classify3 = #{classify3},
</if>
<if test="lastEditUserName != null">
- last_edit_user_name = #{lastEditUserName}
+ last_edit_user_name = #{lastEditUserName},
</if>
<if test="reportTime != null">
- report_time = #{reportTime}
+ report_time = #{reportTime},
</if>
<if test="updateReportDataTime != null">
- update_report_data_time = #{updateReportDataTime}
+ update_report_data_time = #{updateReportDataTime},
</if>
<if test="reportStatus != null">
- report_status = #{reportStatus}
+ report_status = #{reportStatus},
</if>
<if test="reportSwitch != null">
- report_switch = #{reportSwitch}
+ report_switch = #{reportSwitch},
</if>
<if test="checkContent != null">
- check_content = #{checkContent}
+ check_content = #{checkContent},
</if>
- where id = #{id} and delete_status = 0
</set>
+ where id = #{id} and delete_status = 0
</update>
<update id="deletePreventRiskControlMeasureById">
update prevent_risk_control_measure
<set>
- <if test="preventRiskControlMeasure.gmtModitify != null ">
- gmt_moditify = #{preventRiskControlMeasure.gmtModitify},
+ <if test="gmtModitify != null ">
+ gmt_moditify = #{gmtModitify},
</if>
- <if test="preventRiskControlMeasure.lastEditUserName != null ">
- last_edit_user_name = #{preventRiskControlMeasure.lastEditUserName},
+ <if test="lastEditUserName != null ">
+ last_edit_user_name = #{lastEditUserName},
</if>
- delete_status = 1 where id = #{id}
+ <if test="updateReportDataTime != null">
+ update_report_data_time = #{updateReportDataTime},
+ </if>
+ delete_status = 1 where id = #{id} and delete_status = 0
</set>
</update>
@@ -149,5 +152,29 @@
select * from prevent_risk_control_measure
where id = #{id} and delete_status = 0
</select>
+ <select id="getPreventRiskControlMeasureByControlMeasureCode" resultMap="BaseResultMap">
+ select * from prevent_risk_control_measure
+ <where>
+ delete_status = 0
+ <if test="controlMeasureCode != null">
+ and control_measure_code = #{controlMeasureCode}
+ </if>
+ </where>
+ </select>
+
+
+ <select id="listRiskEvenByCondition" resultMap="BaseResultMap">
+ select * from prevent_risk_control_measure
+ <where>
+ delete_status = 0
+ <if test="controlType != null">
+ and control_type = #{controlType}
+ </if>
+ <if test="riskEventId != null">
+ and risk_event_id = #{riskEventId}
+ </if>
+ order by gmt_moditify desc
+ </where>
+ </select>
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml
index 6d46839..1e887d6 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskControlTemplateMapper.xml
@@ -4,12 +4,16 @@
<resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskControlTemplate">
<id property="id" column="id"/>
- <result property="uuid" column="uuid"/>
<result property="deleteStatus" column="delete_status"/>
<result property="orderIndex" column="order_index"/>
<result property="parentId" column="parent_id"/>
<result property="riskMeasureName" column="risk_measure_name"/>
</resultMap>
+ <select id="listMeasureTemplates" resultMap="BaseResultMap">
+ select *
+ from prevent_risk_control_template
+ where delete_status = 0
+ </select>
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml
index f8b6ab6..00464a4 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml
@@ -3,34 +3,37 @@
<mapper namespace="com.ruoyi.doublePrevention.repository.PreventRiskEventRepository" >
<resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskEvent">
- <id column="id" property="id" jdbcType="BIGINT" />
- <result column="uuid" property="uuid" jdbcType="CHAR"/>
- <result column="delete_status" property="deleteStatus" jdbcType="TINYINT"/>
- <result column="risk_unit_id" property="riskUnitId" jdbcType="BIGINT"/>
- <result column="enterprise_id" property="enterpriseId" jdbcType="BIGINT"/>
- <result column="enterprise_uuid" property="enterpriseUuid" jdbcType="CHAR"/>
- <result column="risk_unit_uuid" property="riskUnitUuid" jdbcType="CHAR"/>
- <result column="gmt_create" property="gmtCreate" jdbcType="TIMESTAMP"/>
- <result column="gmt_moditify" property="gmtModitify" jdbcType="TIMESTAMP"/>
- <result column="create_by_user_name" property="createByUserName" jdbcType="VARCHAR"/>
- <result column="last_edit_user_name" property="lastEditUserName" jdbcType="VARCHAR"/>
+ <id column="id" property="id" />
+ <result column="uuid" property="uuid"/>
+ <result column="delete_status" property="deleteStatus"/>
+ <result column="risk_unit_id" property="riskUnitId"/>
+ <result column="enterprise_id" property="enterpriseId"/>
+ <result column="enterprise_uuid" property="enterpriseUuid"/>
+ <result column="risk_unit_uuid" property="riskUnitUuid"/>
+ <result column="gmt_create" property="gmtCreate"/>
+ <result column="gmt_moditify" property="gmtModitify"/>
+ <result column="create_by_user_name" property="createByUserName"/>
+ <result column="last_edit_user_name" property="lastEditUserName"/>
<result column="event_result" property="eventResult"/>
- <result column="risk_event_name" property="riskEventName" jdbcType="VARCHAR"/>
+ <result column="risk_event_name" property="riskEventName"/>
<result column="report_status" property="reportStatus"/>
<result column="report_time" property="reportTime"/>
<result column="update_report_data_time" property="updateReportDataTime"/>
<result column="report_switch" property="reportSwitch"/>
</resultMap>
- <update id="deletePreventRiskEventById">
+ <update id="deletePreventRiskEventById" parameterType="com.ruoyi.doublePrevention.entity.PreventRiskEvent">
update prevent_risk_event
<set>
- <if test="preventRiskEvent.gmtModitify != null ">
- gmt_moditify = #{preventRiskEvent.gmtModitify},
+ <if test="gmtModitify != null ">
+ gmt_moditify = #{gmtModitify},
</if>
- <if test="preventRiskEvent.lastEditUserName != null ">
- last_edit_user_name = #{preventRiskEvent.lastEditUserName},
+ <if test="lastEditUserName != null ">
+ last_edit_user_name = #{lastEditUserName},
</if>
- delete_status = 1 where id = #{id}
+ <if test="updateReportDataTime != null">
+ update_report_data_time = #{updateReportDataTime},
+ </if>
+ delete_status = 1 where id = #{id} and delete_status = 0
</set>
</update>
@@ -43,6 +46,8 @@
<if test="enterpriseId != null ">enterprise_id = #{enterpriseId},</if>
<if test="enterpriseUuid != null ">enterprise_uuid = #{enterpriseUuid},</if>
<if test="riskUnitUuid != null ">risk_unit_uuid = #{riskUnitUuid},</if>
+ <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
+ <if test="gmtCreate != null ">gmt_create = #{gmtCreate},</if>
<if test="createByUserName != null and createByUserName != '' ">create_by_user_name = #{createByUserName},</if>
<if test="lastEditUserName != null and lastEditUserName != ''">last_edit_user_name = #{lastEditUserName},</if>
<if test="eventResult != null and eventResult != '' ">event_result = #{eventResult},</if>
@@ -76,7 +81,7 @@
<if test="reportSwitch != null ">report_switch,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="uuid != null ">uuid,</if>
+ <if test="uuid != null ">#{uuid},</if>
<if test="deleteStatus != null ">#{deleteStatus},</if>
<if test="riskUnitId != null ">#{riskUnitId},</if>
<if test="enterpriseId != null ">#{enterpriseId},</if>
@@ -95,10 +100,30 @@
</trim>
</insert>
- <select id="getPreventRiskEventById" resultType="com.ruoyi.doublePrevention.entity.PreventRiskEvent">
+ <select id="getPreventRiskEventById" resultMap="BaseResultMap">
select * from prevent_risk_event
where id = #{id} and delete_status = 0
</select>
+ <select id="getPreventRiskEventByEventName"
+ resultMap="BaseResultMap">
+ select * from prevent_risk_event
+ where risk_event_name = #{name} and delete_status = 0
+ </select>
+
+
+ <select id="listRiskEvenByCondition" resultMap="BaseResultMap">
+ select * from prevent_risk_event
+ <where>
+ delete_status = 0
+ <if test="riskUnitId != null">
+ and risk_unit_id = #{riskUnitId}
+ </if>
+ <if test="riskEventName != null">
+ and risk_event_name like concat('%',#{riskEventName},'%')
+ </if>
+ order by gmt_moditify desc
+ </where>
+ </select>
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskListMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskListMapper.xml
new file mode 100644
index 0000000..c39d8cb
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskListMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventRiskListRepository">
+
+ <resultMap type="com.ruoyi.doublePrevention.entity.PreventRiskList" id="BaseResultMap">
+ <result property="riskListId" column="risk_list_id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
+ <result property="riskListNum" column="risk_list_num" />
+ <result property="riskListName" column="risk_list_name" />
+ <result property="riskListIsSpecial" column="risk_list_is_special" />
+ <result property="riskListImgUrl" column="risk_list_img_url" />
+ <result property="riskListDeviceType" column="risk_list_device_type" />
+ <result property="riskListDeviceModel" column="risk_list_device_model" />
+ <result property="riskListWorkType" column="risk_list_work_type" />
+ <result property="riskListWorkFrequency" column="risk_list_work_frequency" />
+ <result property="riskListCraftsType" column="risk_list_crafts_type" />
+ <result property="riskListCraftsDescription" column="risk_list_crafts_description" />
+ <result property="regionId" column="region_id" />
+ <result property="deptId" column="dept_id" />
+ <result property="userId" column="user_id" />
+ <result property="riskType" column="risk_type" />
+ <result property="companyId" column="company_id" />
+ </resultMap>
+
+ <select id="getPreventRiskListById" resultMap="BaseResultMap">
+ select * from tr_risk_list
+ where risk_list_id = #{id}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml
index dae941f..da74b4d 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml
@@ -15,6 +15,6 @@
<!-- PreventRiskUnitUuid getRiskUnitUuidById(Long id);-->
<select id="getRiskUnitUuidById" resultMap="BaseResultMap">
select * from prevent_risk_unit_uuid
- where delete_status = 0 and id = #{risk_unit_id}
+ where delete_status = 0 and risk_unit_id = #{id}
</select>
</mapper>
--
Gitblit v1.9.2