双重预防项目-国泰新华二开定制版
huangzhen
2022-09-06 b601ad896966018e9e9251b699cacaee14f56721
Merge remote-tracking branch 'origin/master'
已修改4个文件
已添加5个文件
201 ■■■■■ 文件已修改
src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java 133 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mybatis/doublePrevention/PreventRiskUnitUuidMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mybatis/doublePrevention/PreventTaskUnitAndMeasureMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    }
}
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
@@ -10,4 +10,8 @@
     * 为设施设备清单附属表添加uuid
     * */
    int insertUuid(PreventRiskUnitUuid riskUnitUuid);
    /**
     * 通过id获取uuid
     * */
    PreventRiskUnitUuid getRiskUnitUuidById(Long id);
}
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 {
}
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);
}
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java
对比新文件
@@ -0,0 +1,6 @@
package com.ruoyi.doublePrevention.service.baseService;
public interface PreventTaskUnitAndMeasureService {
}
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);
    }
}
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 {
}
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>
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>