emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
@@ -4,14 +4,12 @@ import com.gkhy.safePlatform.commons.utils.PageUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery; import com.gkhy.safePlatform.emergency.service.EmergencyTeamService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import java.security.Principal; import java.util.List; @@ -44,8 +42,8 @@ /** * 应急队伍详情 */ @RequestMapping(value = "/detail",method = RequestMethod.GET) public ResultVO<EmergencyTeamPageRespDTO> getEmergencyTeamById(Long id){ @RequestMapping(value = "/info/{id}",method = RequestMethod.GET) public ResultVO<EmergencyTeamDetailRespDTO> getEmergencyTeamById(@PathVariable("id")Long id){ return emergencyTeamService.getEmergencyTeamById(id); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java
@@ -13,21 +13,19 @@ @TableId(type = IdType.AUTO) private Long id; private Byte status; private Long principalUid; private Date releaseDate; private Long principalDepartmentId; private Long authorUid; private String teamLevel; private Long authorDeptId; private String teamName; private Byte associatedDanger; private String principalPhone; private String type; private String telephoneNumber; private String level; private String name ; private String teamDesc; public Long getId() { return id; @@ -37,82 +35,73 @@ this.id = id; } public Byte getStatus() { return status; public Long getPrincipalUid() { return principalUid; } public void setStatus(Byte status) { this.status = status; public void setPrincipalUid(Long principalUid) { this.principalUid = principalUid; } public Date getReleaseDate() { return releaseDate; public Long getPrincipalDepartmentId() { return principalDepartmentId; } public void setReleaseDate(Date releaseDate) { this.releaseDate = releaseDate; public void setPrincipalDepartmentId(Long principalDepartmentId) { this.principalDepartmentId = principalDepartmentId; } public Long getAuthorUid() { return authorUid; public String getTeamLevel() { return teamLevel; } public void setAuthorUid(Long authorUid) { this.authorUid = authorUid; public void setTeamLevel(String teamLevel) { this.teamLevel = teamLevel; } public Long getAuthorDeptId() { return authorDeptId; public String getTeamName() { return teamName; } public void setAuthorDeptId(Long authorDeptId) { this.authorDeptId = authorDeptId; public void setTeamName(String teamName) { this.teamName = teamName; } public Byte getAssociatedDanger() { return associatedDanger; public String getPrincipalPhone() { return principalPhone; } public void setAssociatedDanger(Byte associatedDanger) { this.associatedDanger = associatedDanger; public void setPrincipalPhone(String principalPhone) { this.principalPhone = principalPhone; } public String getType() { return type; public String getTelephoneNumber() { return telephoneNumber; } public void setType(String type) { this.type = type; public void setTelephoneNumber(String telephoneNumber) { this.telephoneNumber = telephoneNumber; } public String getLevel() { return level; public String getTeamDesc() { return teamDesc; } public void setLevel(String level) { this.level = level; } public String getName() { return name; } public void setName(String name) { this.name = name; public void setTeamDesc(String teamDesc) { this.teamDesc = teamDesc; } @Override public String toString() { return "EmergencyPlanInfoDetailDO{" + return "EmergencyTeamInfoDetailDO{" + "id=" + id + ", status=" + status + ", releaseDate=" + releaseDate + ", authorUid='" + authorUid + '\'' + ", authorDeptId=" + authorDeptId + ", associatedDanger=" + associatedDanger + ", type='" + type + '\'' + ", level='" + level + '\'' + ", name='" + name + '\'' + ", principalUid=" + principalUid + ", principalDepartmentId=" + principalDepartmentId + ", teamLevel='" + teamLevel + '\'' + ", teamName='" + teamName + '\'' + ", principalPhone='" + principalPhone + '\'' + ", telephoneNumber='" + telephoneNumber + '\'' + ", teamDesc='" + teamDesc + '\'' + '}'; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
@@ -26,7 +26,7 @@ private Long userUid; private Byte gender; private Boolean gender; private String jobNumber; @@ -100,11 +100,11 @@ this.userUid = userUid; } public Byte getGender() { public Boolean getGender() { return gender; } public void setGender(Byte gender) { public void setGender(Boolean gender) { this.gender = gender; } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
@@ -24,6 +24,8 @@ TEAM_USER_POSITION_NULL("T1007", "应急队伍人员职位不可为空"), TEAM_NOT_EXIST("T1008" , "应急队伍不存在"), ERROR("A3000", "未知错误"); emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java
@@ -7,11 +7,17 @@ private Long id; private Long principalUid; private Long principalDepartmentId; private String teamLevel; private String teamName; private String principalPhone; private String telephoneNumber; private String teamDesc; @@ -25,6 +31,22 @@ public void setId(Long id) { this.id = id; } public Long getPrincipalUid() { return principalUid; } public void setPrincipalUid(Long principalUid) { this.principalUid = principalUid; } public Long getPrincipalDepartmentId() { return principalDepartmentId; } public void setPrincipalDepartmentId(Long principalDepartmentId) { this.principalDepartmentId = principalDepartmentId; } public String getTeamLevel() { @@ -51,6 +73,14 @@ this.principalPhone = principalPhone; } public String getTelephoneNumber() { return telephoneNumber; } public void setTelephoneNumber(String telephoneNumber) { this.telephoneNumber = telephoneNumber; } public String getTeamDesc() { return teamDesc; } @@ -74,4 +104,20 @@ public void setMemberList(List<EmergencyTeamMemberRespDTO> memberList) { this.memberList = memberList; } @Override public String toString() { return "EmergencyTeamDetailRespDTO{" + "id=" + id + ", principalUid=" + principalUid + ", principalDepartmentId=" + principalDepartmentId + ", teamLevel='" + teamLevel + '\'' + ", teamName='" + teamName + '\'' + ", principalPhone='" + principalPhone + '\'' + ", telephoneNumber='" + telephoneNumber + '\'' + ", teamDesc='" + teamDesc + '\'' + ", fileList=" + fileList + ", memberList=" + memberList + '}'; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java
@@ -3,9 +3,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoDetailDO; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; import org.apache.ibatis.annotations.Param; import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Repository; import java.util.List; @@ -16,4 +18,6 @@ List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, @Param("query") EmergencyTeamDBQuery emergencyTeamDBQuery); void addEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo); EmergencyTeamInfoDetailDO selectEmergencyTeamById(@P("id") Long id); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java
@@ -2,12 +2,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO; import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Repository; import java.util.List; @Repository public interface EmergencyTeamMemberInfoRepository extends BaseMapper<EmergencyTeamMemberInfo> { void addEmergencyTeamMember(EmergencyTeamMemberInfo emergencyTeamMemberInfo); List<EmergencyTeamMemberInfoDO> selectByEmergencyTeamId(@P("id") Long id); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
@@ -4,6 +4,7 @@ import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.commons.vo.SearchResultVO; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery; @@ -15,5 +16,5 @@ ResultVO addEmergencyTeam(Long valueOf, EmergencyTeamReqDTO emergencyTeamReqDTO); ResultVO<EmergencyTeamPageRespDTO> getEmergencyTeamById(Long id); ResultVO<EmergencyTeamDetailRespDTO> getEmergencyTeamById(Long id); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoDetailDO; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; @@ -14,4 +15,6 @@ List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, EmergencyTeamDBQuery emergencyTeamDBQuery); void addEmergencyTeam(EmergencyTeamInfo emergencyTeamInfo); EmergencyTeamInfoDetailDO selectEmergencyTeamById(Long id); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java
@@ -2,6 +2,7 @@ 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; @@ -10,4 +11,5 @@ void addEmergencyTeamMember(List<EmergencyTeamMemberInfo> memberList); List<EmergencyTeamMemberInfoDO> selectByEmergencyTeamId(Long id); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoDetailDO; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; import com.gkhy.safePlatform.emergency.repository.EmergencyTeamInfoRepository; @@ -29,5 +30,10 @@ emergencyTeamInfoRepository.addEmergencyTeam(emergencyTeamInfo); } @Override public EmergencyTeamInfoDetailDO selectEmergencyTeamById(Long id) { return emergencyTeamInfoRepository.selectEmergencyTeamById(id); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java
@@ -2,6 +2,7 @@ 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; @@ -22,4 +23,9 @@ emergencyTeamMemberInfoRepository.addEmergencyTeamMember(emergencyTeamMemberInfo); } } @Override public List<EmergencyTeamMemberInfoDO> selectByEmergencyTeamId(Long id) { return emergencyTeamMemberInfoRepository.selectByEmergencyTeamId(id); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -12,7 +12,9 @@ import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamMemberReqDTO; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamFileRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamMemberRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery; import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; @@ -114,8 +116,28 @@ } @Override public ResultVO<EmergencyTeamPageRespDTO> getEmergencyTeamById(Long id) { return null; public ResultVO<EmergencyTeamDetailRespDTO> getEmergencyTeamById(Long id) { EmergencyTeamDetailRespDTO emergencyTeamDetailRespDTO = new EmergencyTeamDetailRespDTO(); EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(id); if (emergencyTeamInfoDetailDO==null){ throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST); }else{ BeanUtils.copyProperties(emergencyTeamInfoDetailDO,emergencyTeamDetailRespDTO); //查找对应的附件 List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(id); if (!CollectionUtils.isEmpty(emergencyTeamFileInfoDOList)){ List<EmergencyTeamFileRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamFileInfoDOList , EmergencyTeamFileRespDTO.class); emergencyTeamDetailRespDTO.setFileList(emergencyTeamFileRespDTOList); } //查找对应的人员 List<EmergencyTeamMemberInfoDO> emergencyTeamMemberInfoDOList = emergencyTeamMemberInfoService.selectByEmergencyTeamId(id); if (!CollectionUtils.isEmpty(emergencyTeamMemberInfoDOList)){ List<EmergencyTeamMemberRespDTO> emergencyTeamMemberRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamMemberInfoDOList , EmergencyTeamMemberRespDTO.class); emergencyTeamDetailRespDTO.setMemberList(emergencyTeamMemberRespDTOList); } } return new ResultVO<>(ResultCodes.OK ,emergencyTeamDetailRespDTO); } /** @@ -174,15 +196,6 @@ } } } } /** * 验证数据库是否存在 * * @return */ public Boolean checkeExist() { return null; } } 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="emergencyTeamInfoPageResult"> <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO" id="emergencyTeamInfoPageDOResult"> <id column="id" property="id" jdbcType="BIGINT"/> <result column="team_level" property="teamLevel" /> <result column="team_name" property="teamName" /> @@ -12,7 +12,7 @@ <result column="team_desc" property="teamDesc" /> </resultMap> <select id="selectEmergencyTeamList" resultMap="emergencyTeamInfoPageResult"> <select id="selectEmergencyTeamList" resultMap="emergencyTeamInfoPageDOResult"> 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> @@ -50,4 +50,20 @@ ) </insert> <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoDetailDO" id="emergencyTeamInfoDetailDOResult"> <id column="id" property="id" jdbcType="BIGINT"/> <result column="principal_uid" property="principalUid" /> <result column="principal_department_id" property="principalDepartmentId" /> <result column="team_level" property="teamLevel" /> <result column="team_name" property="teamName" /> <result column="principal_phone" property="principalPhone" /> <result column="telephone_number" property="telephoneNumber" /> <result column="team_desc" property="teamDesc" /> </resultMap> <select id="selectEmergencyTeamById" resultMap="emergencyTeamInfoDetailDOResult"> select id,principal_uid,principal_department_id,`team_level`,`team_name`,`principal_phone`,telephone_number,`team_desc` from emergency_team where del_flag = 0 and id = #{id} </select> </mapper> emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
@@ -37,4 +37,19 @@ ) </insert> <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO" id="emergencyTeamMemberInfoDOResult"> <id column="id" property="id" jdbcType="BIGINT"/> <result column="team_id" property="teamId" /> <result column="user_uid" property="userUid" /> <result column="gender" property="gender" /> <result column="job_number" property="jobNumber" /> <result column="name" property="name" /> <result column="phone" property="phone" /> <result column="position" property="position" /> </resultMap> <select id="selectByEmergencyTeamId" resultMap="emergencyTeamMemberInfoDOResult"> select id ,team_id ,user_uid ,gender ,job_number ,`name` ,phone ,`position` from emergency_team_Member where del_flag = 0 and team_id = #{teamId} </select> </mapper>