From d7cc4c8b4aacd3a0a78f6be4870af571f4f89199 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 06 九月 2022 09:42:15 +0800
Subject: [PATCH] 添加任务单元与措施关联表，提供风险单元uuid查询
---
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java | 6 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java | 7 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java | 4 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java | 13 +++
src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml | 5 +
src/main/resources/mybatis/doublePrevention/PreventTaskUnitAndMeasureMapper.xml | 19 ++++
src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java | 133 +++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java | 4 +
src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java | 10 ++
9 files changed, 201 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java
new file mode 100644
index 0000000..cc66760
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java
@@ -0,0 +1,133 @@
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("prevent_task_unit_and_measure")
+public class PreventTaskUnitAndMeasure {
+ /**
+ * 主键id
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * 排查任务Id
+ * */
+ private Long taskUnitId;
+ /**
+ * 管控措施Id
+ * */
+ private Long measureId;
+ /**
+ * 排查任务UUID
+ * */
+ private String taskUnitUuid;
+ /**
+ * 管控措施UUID
+ * */
+ private String measureUuid;
+ /**
+ * 创建时间
+ */
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private Byte deleteStatus;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getTaskUnitId() {
+ return taskUnitId;
+ }
+
+ public void setTaskUnitId(Long taskUnitId) {
+ this.taskUnitId = taskUnitId;
+ }
+
+ public Long getMeasureId() {
+ return measureId;
+ }
+
+ public void setMeasureId(Long measureId) {
+ this.measureId = measureId;
+ }
+
+ public String getTaskUnitUuid() {
+ return taskUnitUuid;
+ }
+
+ public void setTaskUnitUuid(String taskUnitUuid) {
+ this.taskUnitUuid = taskUnitUuid;
+ }
+
+ public String getMeasureUuid() {
+ return measureUuid;
+ }
+
+ public void setMeasureUuid(String measureUuid) {
+ this.measureUuid = measureUuid;
+ }
+
+ 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 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 Byte getDeleteStatus() {
+ return deleteStatus;
+ }
+
+ public void setDeleteStatus(Byte deleteStatus) {
+ this.deleteStatus = deleteStatus;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
index 3afe3a2..19a2af2 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
@@ -10,4 +10,8 @@
* 为设施设备清单附属表添加uuid
* */
int insertUuid(PreventRiskUnitUuid riskUnitUuid);
+ /**
+ * 通过id获取uuid
+ * */
+ PreventRiskUnitUuid getRiskUnitUuidById(Long id);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java
new file mode 100644
index 0000000..cf9cb58
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java
@@ -0,0 +1,10 @@
+package com.ruoyi.doublePrevention.repository;
+
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventTaskUnitAndMeasureRepository {
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java
index df3c18e..8a7e51e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java
@@ -8,4 +8,8 @@
* 为设施设备清单附属表添加uuid
* */
int insertRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
+ /**
+ * 通过id获取uuid
+ * */
+ PreventRiskUnitUuid getRiskUnitUuidById(Long id);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java
new file mode 100644
index 0000000..eb3d08a
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java
@@ -0,0 +1,6 @@
+package com.ruoyi.doublePrevention.service.baseService;
+
+
+public interface PreventTaskUnitAndMeasureService {
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
index fe55907..d53e946 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
@@ -19,4 +19,11 @@
public int insertRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid) {
return preventRiskUnitUuidRepository.insertUuid(riskUnitUuid);
}
+ /**
+ * 通过id获取uuid
+ * */
+ @Override
+ public PreventRiskUnitUuid getRiskUnitUuidById(Long id) {
+ return preventRiskUnitUuidRepository.getRiskUnitUuidById(id);
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java
new file mode 100644
index 0000000..5a9fe86
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java
@@ -0,0 +1,13 @@
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+
+import com.ruoyi.doublePrevention.service.baseService.PreventTaskUnitAndMeasureService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventTaskUnitAndMeasureService")
+public class PreventTaskUnitAndMeasureServiceImpl implements PreventTaskUnitAndMeasureService {
+
+
+}
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml
index 3bbd6b0..dae941f 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml
@@ -12,4 +12,9 @@
<insert id="insertUuid">
insert into prevent_risk_unit_uuid values(null, #{riskUnitId}, #{riskUnitUuid}, #{deleteStatus})
</insert>
+<!-- PreventRiskUnitUuid getRiskUnitUuidById(Long id);-->
+ <select id="getRiskUnitUuidById" resultMap="BaseResultMap">
+ select * from prevent_risk_unit_uuid
+ where delete_status = 0 and id = #{risk_unit_id}
+ </select>
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventTaskUnitAndMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventTaskUnitAndMeasureMapper.xml
new file mode 100644
index 0000000..0107099
--- /dev/null
+++ b/src/main/resources/mybatis/doublePrevention/PreventTaskUnitAndMeasureMapper.xml
@@ -0,0 +1,19 @@
+<?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.PreventTaskUnitAndMeasureRepository" >
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventTaskUnitAndMeasure">
+ <id column="id" property="id"/>
+ <result column="delete_status" property="deleteStatus"/>
+ <result column="task_unit_id" property="taskUnitId"/>
+ <result column="task_unit_uuid" property="taskUnitUuid"/>
+ <result column="measure_id" property="measureId"/>
+ <result column="measure_uuid" property="measureUuid"/>
+ <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"/>
+ </resultMap>
+
+
+</mapper>
--
Gitblit v1.9.2