emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java

@@ -18,15 +18,15 @@

    private Date gmtModitify;

    private String createUid;
    private Long createUid;

    private String updateUid;
    private Long updateUid;

    private Byte statue;

    private Date releaseDate;

    private String authorUid;
    private Long authorUid;

    private Long authorDeptId;

@@ -70,19 +70,19 @@
        this.gmtModitify = gmtModitify;
    }

    public String getCreateUid() {
    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(String createUid) {
    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public String getUpdateUid() {
    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(String updateUid) {
    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

@@ -102,11 +102,11 @@
        this.releaseDate = releaseDate;
    }

    public String getAuthorUid() {
    public Long getAuthorUid() {
        return authorUid;
    }

    public void setAuthorUid(String authorUid) {
    public void setAuthorUid(Long authorUid) {
        this.authorUid = authorUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java

@@ -16,7 +16,7 @@

    private Date releaseDate;

    private String authorUid;
    private Long authorUid;

    private Long authorDeptId;

@@ -52,11 +52,11 @@
        this.releaseDate = releaseDate;
    }

    public String getAuthorUid() {
    public Long getAuthorUid() {
        return authorUid;
    }

    public void setAuthorUid(String authorUid) {
    public void setAuthorUid(Long authorUid) {
        this.authorUid = authorUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java

@@ -18,9 +18,9 @@

    private Date gmtModitify;

    private String createUid;
    private Long createUid;

    private String updateUid;
    private Long updateUid;

    private Long teamId;

@@ -60,19 +60,19 @@
        this.gmtModitify = gmtModitify;
    }

    public String getCreateUid() {
    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(String createUid) {
    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public String getUpdateUid() {
    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(String updateUid) {
    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java

@@ -18,11 +18,11 @@

    private Date gmtModitify;

    private String createUid;
    private Long createUid;

    private String updateUid;
    private Long updateUid;

    private String principalUid;
    private Long principalUid;

    private Long principalDepartmentId;

@@ -68,27 +68,27 @@
        this.gmtModitify = gmtModitify;
    }

    public String getCreateUid() {
    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(String createUid) {
    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public String getUpdateUid() {
    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(String updateUid) {
    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

    public String getPrincipalUid() {
    public Long getPrincipalUid() {
        return principalUid;
    }

    public void setPrincipalUid(String principalUid) {
    public void setPrincipalUid(Long principalUid) {
        this.principalUid = principalUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java

@@ -17,7 +17,7 @@

    private Date releaseDate;

    private String authorUid;
    private Long authorUid;

    private Long authorDeptId;

@@ -53,11 +53,11 @@
        this.releaseDate = releaseDate;
    }

    public String getAuthorUid() {
    public Long getAuthorUid() {
        return authorUid;
    }

    public void setAuthorUid(String authorUid) {
    public void setAuthorUid(Long authorUid) {
        this.authorUid = authorUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java

@@ -18,13 +18,13 @@

    private Date gmtModitify;

    private String createUid;
    private Long createUid;

    private String updateUid;
    private Long updateUid;

    private Long teamId;

    private String userUid;
    private Long userUid;

    private Byte gender;

@@ -68,19 +68,19 @@
        this.gmtModitify = gmtModitify;
    }

    public String getCreateUid() {
    public Long getCreateUid() {
        return createUid;
    }

    public void setCreateUid(String createUid) {
    public void setCreateUid(Long createUid) {
        this.createUid = createUid;
    }

    public String getUpdateUid() {
    public Long getUpdateUid() {
        return updateUid;
    }

    public void setUpdateUid(String updateUid) {
    public void setUpdateUid(Long updateUid) {
        this.updateUid = updateUid;
    }

@@ -92,11 +92,11 @@
        this.teamId = teamId;
    }

    public String getUserUid() {
    public Long getUserUid() {
        return userUid;
    }

    public void setUserUid(String userUid) {
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfoDO.java

@@ -12,7 +12,7 @@

    private Long teamId;

    private String userUid;
    private Long userUid;

    private Byte gender;

@@ -41,11 +41,11 @@
        this.teamId = teamId;
    }

    public String getUserUid() {
    public Long getUserUid() {
        return userUid;
    }

    public void setUserUid(String userUid) {
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java

@@ -7,7 +7,7 @@

    private Long teamId;

    private String userUid;
    private Long userUid;

    private Byte gender;

@@ -35,11 +35,11 @@
        this.teamId = teamId;
    }

    public String getUserUid() {
    public Long getUserUid() {
        return userUid;
    }

    public void setUserUid(String userUid) {
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java

@@ -6,7 +6,7 @@

    private Long id;

    private String principalUid;
    private Long principalUid;

    private Long principalDepartmentId;

@@ -32,11 +32,11 @@
        this.id = id;
    }

    public String getPrincipalUid() {
    public Long getPrincipalUid() {
        return principalUid;
    }

    public void setPrincipalUid(String principalUid) {
    public void setPrincipalUid(Long principalUid) {
        this.principalUid = principalUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java

@@ -7,7 +7,7 @@

    private Long teamId;

    private String userUid;
    private Long userUid;

    private Byte gender;

@@ -35,11 +35,11 @@
        this.teamId = teamId;
    }

    public String getUserUid() {
    public Long getUserUid() {
        return userUid;
    }

    public void setUserUid(String userUid) {
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }


 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java

@@ -13,5 +13,7 @@

@Repository
public interface EmergencyPlanInfoRepository extends BaseMapper<EmergencyPlanInfo> {

    List<EmergencyPlanInfoPageDO> selectEmergencyPlanList(Page<EmergencyPlanInfoPageDO> page, @Param("query") EmergencyPlanDBQuery emergencyPlanDBQuery);

}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -11,7 +12,7 @@
@Repository
public interface EmergencyTeamFileInfoRepository extends BaseMapper<EmergencyTeamFileInfo> {

    List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id);
    List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(@Param("teamId") Long teamId);

    void addEmergencyTeamFile(List<EmergencyTeamFileInfoDO> fileList);
    void addEmergencyTeamFile(EmergencyTeamFileInfo emergencyTeamFileInfoDO);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery;
@@ -16,5 +16,5 @@

    List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, @Param("query") EmergencyTeamDBQuery emergencyTeamDBQuery);

    void addEmergencyTeam(EmergencyTeamFileInfoDO emergencyTeamFileInfoDO);
    void addEmergencyTeam(EmergencyTeamFileInfo emergencyTeamFileInfo);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java

@@ -2,13 +2,12 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;
import org.springframework.stereotype.Repository;

import java.util.List;


@Repository
public interface EmergencyTeamMemberInfoRepository extends BaseMapper<EmergencyTeamMemberInfo> {
    void addEmergencyTeamMember(List<EmergencyTeamMemberInfoDO> memberList);

    void addEmergencyTeamMember(EmergencyTeamMemberInfo emergencyTeamMemberInfo);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java

@@ -11,5 +11,5 @@

    List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id);

    void addEmergencyTeamFile(List<EmergencyTeamFileInfoDO> fileList);
    void addEmergencyTeamFile(List<EmergencyTeamFileInfo> fileList);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery;
@@ -14,5 +14,5 @@

    List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, EmergencyTeamDBQuery emergencyTeamDBQuery);

    void addEmergencyTeam(EmergencyTeamFileInfoDO emergencyTeamFileInfoDO);
    void addEmergencyTeam(EmergencyTeamFileInfo emergencyTeamFileInfo);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java

@@ -2,13 +2,12 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;

import java.util.List;


public interface EmergencyTeamMemberInfoService extends IService<EmergencyTeamMemberInfo> {

    void addEmergencyTeamMember(List<EmergencyTeamMemberInfoDO> memberList);
    void addEmergencyTeamMember(List<EmergencyTeamMemberInfo> memberList);

}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java

@@ -26,8 +26,10 @@
    }

    @Override
    public void addEmergencyTeamFile(List<EmergencyTeamFileInfoDO> fileList) {
        emergencyTeamFileInfoRepository.addEmergencyTeamFile(fileList);
    public void addEmergencyTeamFile(List<EmergencyTeamFileInfo> fileList) {
        for (EmergencyTeamFileInfo emergencyTeamFileInfo : fileList){
            emergencyTeamFileInfoRepository.addEmergencyTeamFile(emergencyTeamFileInfo);
        }
    }



 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery;
@@ -25,8 +25,8 @@
    }

    @Override
    public void addEmergencyTeam(EmergencyTeamFileInfoDO emergencyTeamFileInfoDO) {
        emergencyTeamInfoRepository.addEmergencyTeam(emergencyTeamFileInfoDO);
    public void addEmergencyTeam(EmergencyTeamFileInfo emergencyTeamFileInfo) {
        emergencyTeamInfoRepository.addEmergencyTeam(emergencyTeamFileInfo);
    }



 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;
import com.gkhy.safePlatform.emergency.repository.EmergencyTeamMemberInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamMemberInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +17,9 @@
    private EmergencyTeamMemberInfoRepository emergencyTeamMemberInfoRepository;

    @Override
    public void addEmergencyTeamMember(List<EmergencyTeamMemberInfoDO> memberList) {
        emergencyTeamMemberInfoRepository.addEmergencyTeamMember(memberList);
    public void addEmergencyTeamMember(List<EmergencyTeamMemberInfo> memberList) {
        for (EmergencyTeamMemberInfo emergencyTeamMemberInfo : memberList){
            emergencyTeamMemberInfoRepository.addEmergencyTeamMember(emergencyTeamMemberInfo);
        }
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java

@@ -7,10 +7,8 @@
import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyServiceException;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamFileRespDTO;
@@ -27,6 +25,7 @@
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@Service("emergencyTeamService")
@@ -79,22 +78,33 @@

    @Override
    public ResultVO addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
        Date nowDate = new Date();
        //必填项验证
        checkRequired(emergencyTeamReqDTO);
        //1.新增应急队伍
        EmergencyTeamFileInfoDO emergencyTeamFileInfoDO = new EmergencyTeamFileInfoDO();
        BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfoDO);
        emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfoDO);
        EmergencyTeamFileInfo emergencyTeamFileInfo = new EmergencyTeamFileInfo();
        BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfo);
        emergencyTeamFileInfo.setCreateUid(uid);
        emergencyTeamFileInfo.setGmtCreate(nowDate);
        emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfo);
        //2.新增应急队伍附件
        List<EmergencyTeamFileInfoDO> fileInfoDOList = new ArrayList<>();
        BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoDOList.getClass());
        fileInfoDOList.forEach(e->e.setTeamId(emergencyTeamFileInfoDO.getId()));
        emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoDOList);
        List<EmergencyTeamFileInfo> fileInfoList = new ArrayList<>();
        BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoList.getClass());
        fileInfoList.forEach(EmergencyTeamFileInfo -> {
            EmergencyTeamFileInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
            EmergencyTeamFileInfo.setCreateUid(uid);
            EmergencyTeamFileInfo.setGmtCreate(nowDate);
        });
        emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoList);
        //3.新增应急队伍人员
        List<EmergencyTeamMemberInfoDO> memberInfoDOList = new ArrayList<>();
        BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoDOList.getClass());
        memberInfoDOList.forEach(e->e.setTeamId(emergencyTeamFileInfoDO.getId()));
        emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoDOList);
        List<EmergencyTeamMemberInfo> memberInfoList = new ArrayList<>();
        BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoList.getClass());
        memberInfoList.forEach(EmergencyTeamMemberInfo -> {
            EmergencyTeamMemberInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
            EmergencyTeamMemberInfo.setCreateUid(uid);
            EmergencyTeamMemberInfo.setGmtCreate(nowDate);
        });
        emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoList);

        return ResultVO.success();
    }
@@ -113,7 +123,7 @@
            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_LEVEL_NULL);
        }
        //负责人
        if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalUid())){
        if(emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0){
            throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
        }
        //负责人部门

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml

对比新文件
@@ -0,0 +1,42 @@
<?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.gkhy.safePlatform.emergency.repository.EmergencyTeamFileInfoRepository">

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO" id="emergencyTeamFileInfoDOResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="team_id" property="teamId" />
        <result column="file_url" property="fileUrl" />
        <result column="file_name" property="fileName" />
    </resultMap>

    <select id="selectByEmergencyTeamId" resultMap="emergencyTeamFileInfoDOResult">
        select id,`team_id`,`file_url`,`file_name` from emergency_team_file where del_flag = 0 and team_id = #{teamId}
    </select>

    <insert id="addEmergencyTeamFile" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo">
        insert into emergency_team_file(
        <if test="id != null ">id,</if>
        <if test="delFlag != null ">del_flag,</if>
        <if test="gmtCreate != null and gmtCreate != ''">gmt_create,</if>
        <if test="gmtModitify != null and gmtModitify != ''">gmt_moditify,</if>
        <if test="createUid != null ">create_uid,</if>
        <if test="updateUid != null ">update_uid,</if>
        <if test="teamId != null ">team_id,</if>
        <if test="fileUrl != null and fileUrl != ''">file_url,</if>
        <if test="fileName != null and fileName != ''">file_name,</if>
        )values(
        <if test="id != null ">#{id},</if>
        <if test="delFlag != null ">#{delFlag},</if>
        <if test="gmtCreate != null and gmtCreate != ''">#{gmtCreate},</if>
        <if test="gmtModitify != null and gmtModitify != ''">#{gmtModitify},</if>
        <if test="createUid != null ">#{createUid},</if>
        <if test="updateUid != null ">#{updateUid},</if>
        <if test="teamId != null ">#{teamId},</if>
        <if test="fileUrl != null and fileUrl != ''">#{fileUrl},</if>
        <if test="fileName != null and fileName != ''">#{fileName},</if>
        )
    </insert>

</mapper>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyTeamInfoRepository">

    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO" id="pageResult">
    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO" id="emergencyTeamInfoPageResult">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="team_level" property="teamLevel" />
        <result column="team_name" property="teamName" />
@@ -12,10 +12,42 @@
        <result column="team_desc" property="teamDesc" />
    </resultMap>

    <select id="selectEmergencyTeamList" resultMap="pageResult">
    <select id="selectEmergencyTeamList" resultMap="emergencyTeamInfoPageResult">
        select id,`team_level`,`team_name`,`principal_phone`,`team_desc` from emergency_team where del_flag = 0
        <if test="query.teamName != null  and query.teamName != ''"> and `team_name` like concat('%', #{query.teamName}, '%')</if>
        <if test="query.teamLevel != null  and query.teamLevel != ''"> and `team_level` = #{query.teamLevel}</if>
    </select>

    <insert id="addEmergencyTeam" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo">
        insert into emergency_team(
        <if test="id != null ">id,</if>
        <if test="delFlag != null ">del_flag,</if>
        <if test="gmtCreate != null and gmtCreate != ''">gmt_create,</if>
        <if test="gmtModitify != null and gmtModitify != ''">gmt_moditify,</if>
        <if test="createUid != null ">create_uid,</if>
        <if test="updateUid != null ">update_uid,</if>
        <if test="principalUid != null ">principal_uid,</if>
        <if test="principalDepartmentId != null ">principal_department_id,</if>
        <if test="teamLevel != null and teamLevel != ''">team_level,</if>
        <if test="teamName != null and teamName != ''">team_name,</if>
        <if test="principalPhone != null and principalPhone != ''">principal_phone,</if>
        <if test="telephoneNumber != null and telephoneNumber != ''">telephone_number,</if>
        <if test="teamDesc != null and teamDesc != ''">team_desc,</if>
        )values(
        <if test="id != null ">#{id},</if>
        <if test="delFlag != null ">#{delFlag},</if>
        <if test="gmtCreate != null and gmtCreate != ''">#{gmtCreate},</if>
        <if test="gmtModitify != null and gmtModitify != ''">#{gmtModitify},</if>
        <if test="createUid != null ">#{createUid},</if>
        <if test="updateUid != null ">#{updateUid},</if>
        <if test="principalUid != null ">#{principalUid},</if>
        <if test="principalDepartmentId != null ">#{principalDepartmentId},</if>
        <if test="teamLevel != null and teamLevel != ''">#{teamLevel},</if>
        <if test="teamName != null and teamName != ''">#{teamName},</if>
        <if test="principalPhone != null and principalPhone != ''">#{principalPhone},</if>
        <if test="telephoneNumber != null and telephoneNumber != ''">#{telephoneNumber},</if>
        <if test="teamDesc != null and teamDesc != ''">#{teamDesc},</if>
        )
    </insert>

</mapper>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml

对比新文件
@@ -0,0 +1,40 @@
<?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.gkhy.safePlatform.emergency.repository.EmergencyTeamMemberInfoRepository">

    <insert id="addEmergencyTeamMember" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo">
        insert into emergency_team_Member(
        <if test="id != null ">id,</if>
        <if test="delFlag != null ">del_flag,</if>
        <if test="gmtCreate != null and gmtCreate != ''">gmt_create,</if>
        <if test="gmtModitify != null and gmtModitify != ''">gmt_moditify,</if>
        <if test="createUid != null ">create_uid,</if>
        <if test="updateUid != null ">update_uid,</if>
        <if test="teamId != null ">team_id,</if>
        <if test="userUid != null ">#{user_uid},</if>
        <if test="gender != null ">#{gender},</if>
        <if test="jobNumber != null and jobNumber != ''">#{job_number},</if>
        <if test="name != null and name != ''">#{name},</if>
        <if test="phone != null and phone != ''">#{phone},</if>
        <if test="position != null and position != ''">#{position},</if>
        )values(
        <if test="id != null ">#{id},</if>
        <if test="delFlag != null ">#{delFlag},</if>
        <if test="gmtCreate != null and gmtCreate != ''">#{gmtCreate},</if>
        <if test="gmtModitify != null and gmtModitify != ''">#{gmtModitify},</if>
        <if test="createUid != null ">#{createUid},</if>
        <if test="updateUid != null ">#{updateUid},</if>

        <if test="teamId != null ">#{teamId},</if>
        <if test="userUid != null ">#{userUid},</if>
        <if test="gender != null ">#{gender},</if>
        <if test="jobNumber != null and jobNumber != ''">#{jobNumber},</if>
        <if test="name != null and name != ''">#{name},</if>
        <if test="phone != null and phone != ''">#{phone},</if>
        <if test="position != null and position != ''">#{position},</if>
        )
    </insert>

</mapper>

 pom.xml

@@ -146,6 +146,13 @@
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>${mybatisPlusStarter.version}</version>
        </dependency>


        <!-- redis连接 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>org.aspectj</groupId>
            <artifactId>aspectjweaver</artifactId>

 safePlatfrom-out-web/pom.xml

@@ -64,4 +64,4 @@
    </build>


</project>
</project>

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/Application.java

@@ -3,6 +3,8 @@
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.stereotype.Component;

@SpringBootApplication
@EnableDubbo

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java

@@ -1,15 +1,21 @@
package com.gkhy.safePlatform.accountController;

import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountMenuService;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountUserService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.req.query.AccountRPCQuery;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepUserRPCRespDTO;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.security.Principal;
import java.util.List;

@RestController
@RequestMapping("/account")
@@ -19,8 +25,21 @@
    private AccountUserService accountUserService;



    @RequestMapping("/page/list")
    public Object getUserPage(Principal principal, PageQuery<AccountRPCQuery> rpcQueryPageQuery) {
        return accountUserService.getAccountPage(Long.valueOf(principal.getName()), rpcQueryPageQuery);
    }


    /**
     * @Description: 获取部门下的用户列表
     */
    @RequestMapping(value = "/dep/list", method = RequestMethod.GET)
    public ResultVO<List<DepUserRPCRespDTO>> depUserList(Principal principal, Long depId) {
        String userId = principal.getName();
        return accountUserService.getDepList(Long.valueOf(userId), depId);
    }


}

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java

@@ -38,7 +38,7 @@
    @ExceptionHandler(value = BusinessException.class)
    public ResultVO AHandler(BusinessException e) {
        logger.warn(e.getMessage());
        return new ResultVO(e.getError());
        return new ResultVO(e.getCode(),e.getMessage());
    }



 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/redis/RedisConfig.java

对比新文件
@@ -0,0 +1,43 @@
package com.gkhy.safePlatform.config.redis;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;

@Configuration
public class RedisConfig  {



    /**
    * @Description: key和value的序列化方式
    */
    @Bean
    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {

        RedisTemplate<String, Object> template = new RedisTemplate<>();
        template.setConnectionFactory(factory);
        // json序列化对象
        GenericJackson2JsonRedisSerializer jackson2JsonRedisSerializer = new GenericJackson2JsonRedisSerializer();
        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
        // key=>string
        template.setKeySerializer(stringRedisSerializer);
        // hash=>string
        template.setHashKeySerializer(stringRedisSerializer);
        // value=>json
        template.setValueSerializer(jackson2JsonRedisSerializer);
        // hashValue=>json
        template.setHashValueSerializer(jackson2JsonRedisSerializer);
        // set
        template.afterPropertiesSet();
        return template;
    }





}

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/redis/RedisUtils.java

对比新文件
@@ -0,0 +1,261 @@
package com.gkhy.safePlatform.config.redis;


import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.redis.connection.RedisClusterConnection;
import org.springframework.data.redis.connection.RedisClusterNode;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.jedis.JedisClusterConnection;
import org.springframework.data.redis.connection.jedis.JedisConnection;
import org.springframework.data.redis.core.*;
import org.springframework.stereotype.Repository;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;

/**
* @Description: redis工具类
*/

@Repository("configRedisRepository")
@SuppressWarnings(value = { "unchecked", "rawtypes" })
public class RedisUtils {


    @Resource
    private RedisTemplate redisTemplate;
    /**
     * logger
     */
    private final Logger logger = LoggerFactory.getLogger(this.getClass());


    @PostConstruct
    public void initRepository(){
        try {
            this.set("test:module:Web", "testConnection", 60L, TimeUnit.SECONDS);
            logger.info("[ModuleRedis][Web] is connected");
        } catch (Exception e) {
            logger.error("[ModuleRedis][Web] connected failed!!");
        }
    }

    /**
     * 写入缓存
     * @param key
     * @param value
     * @return
     */
    public boolean set(final String key, Object value) {
        boolean result = false;
        try {
            ValueOperations<Serializable, Object> operations = redisTemplate.opsForValue();
            operations.set(key, value);
            result = true;
        } catch (Exception e) {
            e.printStackTrace();
        }
        return result;
    }
    /**
     * 写入缓存设置时效时间
     * @param key
     * @param value
     * @return
     */
    public boolean set(final String key, Object value, Long expireTime ,TimeUnit timeUnit) {
        boolean result = false;
        try {
            ValueOperations<Serializable, Object> operations = redisTemplate.opsForValue();
            operations.set(key, value);
            redisTemplate.expire(key, expireTime, timeUnit);
            result = true;
        } catch (Exception e) {
            e.printStackTrace();
        }
        return result;
    }
    /**
     * 批量删除对应的value
     * @param keys
     */
    public void remove(final String... keys) {
        for (String key : keys) {
            remove(key);
        }
    }
    /**
     * 批量删除key
     * @param pattern
     */
    public void removePattern(final String pattern) {
        Set<Serializable> keys = redisTemplate.keys(pattern);
        if (keys.size() > 0){
            redisTemplate.delete(keys);
        }
    }
    /**
     * 删除对应的value
     * @param key
     */
    public void remove(final String key) {
        if (exists(key)) {
            redisTemplate.delete(key);
        }
    }
    /**
     * 判断缓存中是否有对应的value
     * @param key
     * @return
     */
    public boolean exists(final String key) {
        return redisTemplate.hasKey(key);
    }
    /**
     * 读取缓存
     * @param key
     * @return
     */
    public Object get(final String key) {
        Object result = null;
        ValueOperations<Serializable, Object> operations = redisTemplate.opsForValue();
        result = operations.get(key);
        return result;
    }
    /**
     * 哈希 添加
     * @param key
     * @param hashKey
     * @param value
     */
    public void hmSet(String key, Object hashKey, Object value){
        HashOperations<String, Object, Object> hash = redisTemplate.opsForHash();
        hash.put(key,hashKey,value);
    }
    /**
     * 哈希获取数据
     * @param key
     * @param hashKey
     * @return
     */
    public Object hmGet(String key, Object hashKey){
        HashOperations<String, Object, Object>  hash = redisTemplate.opsForHash();
        return hash.get(key,hashKey);
    }
    /**
     * 列表添加
     * @param k
     * @param v
     */
    public void lPush(String k,Object v){
        ListOperations<String, Object> list = redisTemplate.opsForList();
        list.rightPush(k,v);
    }
    /**
     * 列表获取
     * @param k
     * @param l
     * @param l1
     * @return
     */
    public List<Object> lRange(String k, long l, long l1){
        ListOperations<String, Object> list = redisTemplate.opsForList();
        return list.range(k,l,l1);
    }
    /**
     * 集合添加
     * @param key
     * @param value
     */
    public void add(String key,Object value){
        SetOperations<String, Object> set = redisTemplate.opsForSet();
        set.add(key,value);
    }
    /**
     * 集合获取
     * @param key
     * @return
     */
    public Set<Object> setMembers(String key){
        SetOperations<String, Object> set = redisTemplate.opsForSet();
        return set.members(key);
    }
    /**
     * 有序集合添加
     * @param key
     * @param value
     * @param scoure
     */
    public void zAdd(String key,Object value,double scoure){
        ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
        zset.add(key,value,scoure);
    }
    /**
     * 有序集合获取
     * @param key
     * @param scoure
     * @param scoure1
     * @return
     */
    public Set<Object> rangeByScore(String key,double scoure,double scoure1){
        ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
        return zset.rangeByScore(key, scoure, scoure1);
    }

    /**
    * @Description: 获取过期时间 返回 秒
    */

    public Long getExpireTime(String key) {
        return redisTemplate.getExpire(key, TimeUnit.SECONDS);
    }


    /**
     * @Description: 重置key 的 过期时间
     */
    public void resetKeyExpireTime(String key, Long seconds) {
        redisTemplate.expire(key, seconds, TimeUnit.SECONDS);
    }

    public  Set<String> scanMatch(String matchKey) {
    Set<String> keys = new HashSet();
    RedisConnectionFactory connectionFactory = redisTemplate.getConnectionFactory();
    RedisConnection redisConnection = connectionFactory.getConnection();
    Cursor<byte[]> scan = null;
        if(redisConnection instanceof JedisClusterConnection){
        RedisClusterConnection clusterConnection = connectionFactory.getClusterConnection();
        Iterable<RedisClusterNode> redisClusterNodes = clusterConnection.clusterGetNodes();
        Iterator<RedisClusterNode> iterator = redisClusterNodes.iterator();
        while (iterator.hasNext()) {
            RedisClusterNode next = iterator.next();
            scan = clusterConnection.scan(next, ScanOptions.scanOptions().match(matchKey).count(Integer.MAX_VALUE).build());
            while (scan.hasNext()) {
                keys.add(new String(scan.next()));
            }
            scan.close();
        }
        return keys;
    }
        if(redisConnection instanceof JedisConnection){
        scan = redisConnection.scan(ScanOptions.scanOptions().match(matchKey).count(Integer.MAX_VALUE).build());
        while (scan.hasNext()){
            //找到一次就添加一次
            keys.add(new String(scan.next()));
        }
            scan.close();
            return keys;
    }

        return keys;
}

}

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/TokenAuthenticationFilter.java

@@ -9,8 +9,10 @@
import com.gkhy.safePlatform.commons.enums.RedisKeyEnum;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.exception.BusinessException;
import com.gkhy.safePlatform.commons.utils.RPCUtils;
import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.config.redis.RedisUtils;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -39,6 +41,8 @@
    private TokenConfig tokenConfig;
    @DubboReference(check = false)
    private AccountAuthService userAccountService;
    @Autowired
    private RedisUtils redisUtils;



@@ -55,7 +59,7 @@
            chain.doFilter(req, resp);
        } catch (BusinessException e) {
            // 返回异常
            this.writeJSON(req, resp, new ResultVO<>(e.getError()));
            this.writeJSON(req, resp, new ResultVO<>(e.getCode(),e.getMessage()));
        }

    }
@@ -75,14 +79,14 @@
            // 这里是验证获取权限信息
            // 1.从redis中获取对应该用户的权限信息
            String accessTokenKey = RedisKeyEnum.authKey(RedisKeyEnum.AUTH_TOKEN, loginUserId);
            String o = userAccountService.getValueByKeyFromRedis(accessTokenKey);
            Object o = redisUtils.get(accessTokenKey);
            // 2.token是否存在
            if (o == null) {
                // 是否存在
                throw new BusinessException(ResultCodes.CLIENT_CREDENTIALS_SIGN_INVALID);
                throw new BusinessException(ResultCodes.CLIENT_CREDENTIALS_TOKEN_INVALID);
            }else{
                Long userId = Long.valueOf(loginUserId);
                CacheUser cacheUser = JSONObject.parseObject(o, CacheUser.class);
                CacheUser cacheUser = JSONObject.parseObject(o.toString(), CacheUser.class);
                assert userId.equals(cacheUser.getUserId());
                if ( !authToken.equals(cacheUser.getAccessToken())) {
                    throw new BusinessException(ResultCodes.CLIENT_CREDENTIALS_TOKEN_INVALID);
@@ -90,23 +94,51 @@

                // 3.redis获取权限
                String authoritiesKey = RedisKeyEnum.authKey(RedisKeyEnum.AUTH_AUTHORITIES, userId);
                String oo = userAccountService.getValueByKeyFromRedis(authoritiesKey);
                Object oo = redisUtils.get(authoritiesKey);
                List<GrantedAuthority> authorities = new ArrayList<>();
                // 4.redis中是否存在
                if (oo != null) {
                    // 5.存在
                    List<CacheAuthority> cacheAuthorities = JSONArray.parseArray(oo, CacheAuthority.class);
                    List<CacheAuthority> cacheAuthorities = JSONArray.parseArray(oo.toString(), CacheAuthority.class);
                    for (CacheAuthority cacheAuthority: cacheAuthorities) {
                        authorities.add(new SimpleGrantedAuthority(cacheAuthority.getAuthority()));
                    }
                }else {
                    // 6.不存在=>数据库查询
                    String roleCode = userAccountService.getUserRoleCodeByUserId(userId);
                    ResultVO<String> rpcResultRole = userAccountService.getUserRoleCodeByUserId(userId);

                    if (rpcResultRole == null) {
                        throw new BusinessException(ResultCodes.RPC_RESULT_NULL);
                    }
                    if (!ResultCodes.OK.getCode().equals(rpcResultRole.getCode())) {
                        throw new BusinessException(rpcResultRole.getCode(), rpcResultRole.getMsg());
                    }
                    if (rpcResultRole.getData() == null) {
                        throw new BusinessException(ResultCodes.RPC_DATA_NULL);
                    }
                    if (!(rpcResultRole.getData() instanceof String)) {
                        throw new BusinessException(ResultCodes.RPC_DATA_TYPE_NOT_MATCH);
                    }
                    // role
                    authorities.add(new SimpleGrantedAuthority("ROLE_" + roleCode));
                    authorities.add(new SimpleGrantedAuthority("ROLE_" + rpcResultRole.getData().toString()));

                    // permission
                    List<String> permissions = userAccountService.getUserPermissionByUserId(userId);
                    ResultVO<List<String>> rpcResultPermission = userAccountService.getUserPermissionByUserId(userId);

                    if (rpcResultPermission == null) {
                        throw new BusinessException(ResultCodes.RPC_RESULT_NULL);
                    }
                    if (!ResultCodes.OK.getCode().equals(rpcResultPermission.getCode())) {
                        throw new BusinessException(rpcResultRole.getCode(), rpcResultRole.getMsg());
                    }
                    if (rpcResultPermission.getData() == null) {
                        throw new BusinessException(ResultCodes.RPC_DATA_NULL);
                    }
                    if (!(rpcResultPermission.getData() instanceof List)) {
                        throw new BusinessException(ResultCodes.RPC_DATA_TYPE_NOT_MATCH);
                    }

                    List<String> permissions = RPCUtils.castList(rpcResultPermission.getData(), String.class);
                    for (String permission : permissions) {
                        SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority(permission);
                        authorities.add(simpleGrantedAuthority);

 safePlatfrom-out-web/src/main/resources/config/application-dev.yaml

@@ -21,6 +21,19 @@
      username: gkhy_dev_out_team
      password: Adsdf675T6AC7yga
      type: com.alibaba.druid.pool.DruidDataSource
  redis:
    host: 192.168.0.52
    port: 6379
    password: SEF98uvs98dUAUEF90Udssa
    database: 0           # Redis 数据库号，默认为 0
    timeout: 15000        # Redis 连接超时时间，单位：毫秒。
    # 对应 RedisProperties.Jedis 内部类
    jedis:
      pool:
        max-active: 8     # 连接池最大连接数，默认为 8 。使用负数表示没有限制    同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
        max-idle: 8       # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
        min-idle: 0       # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
        max-wait: -1


mybatis-plus: