From fae1245f6b137cc8375aa71f089a66070e7f9e91 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期一, 04 七月 2022 13:57:32 +0800 Subject: [PATCH] 应急队伍 --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java | 161 ++++++++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java | 44 ++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java | 10 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java | 29 + emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java | 161 ++++++++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java | 16 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java | 15 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java | 117 +++++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java | 79 +++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java | 5 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java | 5 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java | 4 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java | 117 +++++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoPageDO.java | 71 +++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java | 28 + emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java | 12 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java | 1 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamFileRespDTO.java | 56 ++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfoDO.java | 63 +++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java | 17 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 80 ++++ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfoDO.java | 105 +++++ 22 files changed, 1,196 insertions(+), 0 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java new file mode 100644 index 0000000..42e2add --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java @@ -0,0 +1,44 @@ +package com.gkhy.safePlatform.emergency.controller; + +import com.gkhy.safePlatform.commons.query.PageQuery; +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.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 java.security.Principal; +import java.util.List; + +@RestController +@RequestMapping("/emergencyTeam") +public class EmergencyTeamController { + + @Autowired + private EmergencyTeamService emergencyTeamService; + + /** + * 应急队伍列表 + */ + @RequestMapping(value = "/page/list" ,method = RequestMethod.POST) + private ResultVO<List<EmergencyTeamPageRespDTO>> list (@RequestBody PageQuery<EmergencyTeamQuery> pageQuery){ + PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize()); + return emergencyTeamService.selectEmergencyTeamList(pageQuery); + } + + /** + * 新增应急预案 + */ + @RequestMapping(value = "/add",method = RequestMethod.POST) + public ResultVO<String> add(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) { + String uid = principal.getName(); + return emergencyTeamService.add(Long.valueOf(uid), emergencyTeamReqDTO); + } + +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java new file mode 100644 index 0000000..c0ef0bd --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfo.java @@ -0,0 +1,117 @@ +package com.gkhy.safePlatform.emergency.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; + +@TableName("emergency_team_file") +public class EmergencyTeamFileInfo { + + @TableId(type = IdType.AUTO) + private Long id; + + private Byte delFlag; + + private Date gmtCreate; + + private Date gmtModitify; + + private String createUid; + + private String updateUid; + + private Long teamId; + + private String fileUrl; + + private String fileName; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Byte getDelFlag() { + return delFlag; + } + + public void setDelFlag(Byte delFlag) { + this.delFlag = delFlag; + } + + 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 getCreateUid() { + return createUid; + } + + public void setCreateUid(String createUid) { + this.createUid = createUid; + } + + public String getUpdateUid() { + return updateUid; + } + + public void setUpdateUid(String updateUid) { + this.updateUid = updateUid; + } + + public Long getTeamId() { + return teamId; + } + + public void setTeamId(Long teamId) { + this.teamId = teamId; + } + + public String getFileUrl() { + return fileUrl; + } + + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + @Override + public String toString() { + return "EmergencyTeamFileInfo{" + + "id=" + id + + ", delFlag=" + delFlag + + ", gmtCreate=" + gmtCreate + + ", gmtModitify=" + gmtModitify + + ", createUid='" + createUid + '\'' + + ", updateUid='" + updateUid + '\'' + + ", teamId=" + teamId + + ", fileUrl='" + fileUrl + '\'' + + ", fileName='" + fileName + '\'' + + '}'; + } +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfoDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfoDO.java new file mode 100644 index 0000000..5d11485 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamFileInfoDO.java @@ -0,0 +1,63 @@ +package com.gkhy.safePlatform.emergency.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; + +@TableName("emergency_team_file") +public class EmergencyTeamFileInfoDO { + + @TableId(type = IdType.AUTO) + private Long id; + + private Long teamId; + + private String fileUrl; + + private String fileName; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + + public Long getTeamId() { + return teamId; + } + + public void setTeamId(Long teamId) { + this.teamId = teamId; + } + + public String getFileUrl() { + return fileUrl; + } + + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + @Override + public String toString() { + return "EmergencyTeamFileInfo{" + + "id=" + id + + ", teamId=" + teamId + + ", fileUrl='" + fileUrl + '\'' + + ", fileName='" + fileName + '\'' + + '}'; + } +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java new file mode 100644 index 0000000..61eeaf4 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java @@ -0,0 +1,161 @@ +package com.gkhy.safePlatform.emergency.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; + +@TableName("emergency_team") +public class EmergencyTeamInfo { + + @TableId(type = IdType.AUTO) + private Long id; + + private Byte delFlag; + + private Date gmtCreate; + + private Date gmtModitify; + + private String createUid; + + private String updateUid; + + private String principalUid; + + private Long principalDepartmentId; + + private String teamLevel; + + private String teamName; + + private String principalPhone; + + private String telephoneNumber; + + private String teamDesc; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Byte getDelFlag() { + return delFlag; + } + + public void setDelFlag(Byte delFlag) { + this.delFlag = delFlag; + } + + 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 getCreateUid() { + return createUid; + } + + public void setCreateUid(String createUid) { + this.createUid = createUid; + } + + public String getUpdateUid() { + return updateUid; + } + + public void setUpdateUid(String updateUid) { + this.updateUid = updateUid; + } + + public String getPrincipalUid() { + return principalUid; + } + + public void setPrincipalUid(String principalUid) { + this.principalUid = principalUid; + } + + public Long getPrincipalDepartmentId() { + return principalDepartmentId; + } + + public void setPrincipalDepartmentId(Long principalDepartmentId) { + this.principalDepartmentId = principalDepartmentId; + } + + public String getTeamLevel() { + return teamLevel; + } + + public void setTeamLevel(String teamLevel) { + this.teamLevel = teamLevel; + } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + + public String getPrincipalPhone() { + return principalPhone; + } + + public void setPrincipalPhone(String principalPhone) { + this.principalPhone = principalPhone; + } + + public String getTelephoneNumber() { + return telephoneNumber; + } + + public void setTelephoneNumber(String telephoneNumber) { + this.telephoneNumber = telephoneNumber; + } + + public String getTeamDesc() { + return teamDesc; + } + + public void setTeamDesc(String teamDesc) { + this.teamDesc = teamDesc; + } + + @Override + public String toString() { + return "EmergencyTeamInfo{" + + "id=" + id + + ", delFlag=" + delFlag + + ", gmtCreate=" + gmtCreate + + ", gmtModitify=" + gmtModitify + + ", createUid='" + createUid + '\'' + + ", updateUid='" + updateUid + '\'' + + ", principalUid='" + principalUid + '\'' + + ", principalDepartmentId=" + principalDepartmentId + + ", teamLevel='" + teamLevel + '\'' + + ", teamName='" + teamName + '\'' + + ", principalPhone='" + principalPhone + '\'' + + ", telephoneNumber='" + telephoneNumber + '\'' + + ", teamDesc='" + teamDesc + '\'' + + '}'; + } +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java new file mode 100644 index 0000000..2313e84 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java @@ -0,0 +1,117 @@ +package com.gkhy.safePlatform.emergency.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; + +@TableName("emergency_team") +public class EmergencyTeamInfoDetailDO { + + @TableId(type = IdType.AUTO) + private Long id; + + private Byte status; + + private Date releaseDate; + + private String authorUid; + + private Long authorDeptId; + + private Byte associatedDanger; + + private String type; + + private String level; + + private String name ; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Byte getStatus() { + return status; + } + + public void setStatus(Byte status) { + this.status = status; + } + + public Date getReleaseDate() { + return releaseDate; + } + + public void setReleaseDate(Date releaseDate) { + this.releaseDate = releaseDate; + } + + public String getAuthorUid() { + return authorUid; + } + + public void setAuthorUid(String authorUid) { + this.authorUid = authorUid; + } + + public Long getAuthorDeptId() { + return authorDeptId; + } + + public void setAuthorDeptId(Long authorDeptId) { + this.authorDeptId = authorDeptId; + } + + public Byte getAssociatedDanger() { + return associatedDanger; + } + + public void setAssociatedDanger(Byte associatedDanger) { + this.associatedDanger = associatedDanger; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String toString() { + return "EmergencyPlanInfoDetailDO{" + + "id=" + id + + ", status=" + status + + ", releaseDate=" + releaseDate + + ", authorUid='" + authorUid + '\'' + + ", authorDeptId=" + authorDeptId + + ", associatedDanger=" + associatedDanger + + ", type='" + type + '\'' + + ", level='" + level + '\'' + + ", name='" + name + '\'' + + '}'; + } +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoPageDO.java new file mode 100644 index 0000000..4ffdf24 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoPageDO.java @@ -0,0 +1,71 @@ +package com.gkhy.safePlatform.emergency.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +@TableName("emergency_team") +public class EmergencyTeamInfoPageDO { + + @TableId(type = IdType.AUTO) + private Long id; + + private String teamLevel; + + private String teamName; + + private String principalPhone; + + private String teamDesc; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTeamLevel() { + return teamLevel; + } + + public void setTeamLevel(String teamLevel) { + this.teamLevel = teamLevel; + } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + + public String getPrincipalPhone() { + return principalPhone; + } + + public void setPrincipalPhone(String principalPhone) { + this.principalPhone = principalPhone; + } + + public String getTeamDesc() { + return teamDesc; + } + + public void setTeamDesc(String teamDesc) { + this.teamDesc = teamDesc; + } + + @Override + public String toString() { + return "EmergencyTeamInfoPageDO{" + + "id=" + id + + ", teamLevel='" + teamLevel + '\'' + + ", teamName='" + teamName + '\'' + + ", principalPhone='" + principalPhone + '\'' + + ", teamDesc='" + teamDesc + '\'' + + '}'; + } +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java new file mode 100644 index 0000000..9c8ce60 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java @@ -0,0 +1,161 @@ +package com.gkhy.safePlatform.emergency.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; + +@TableName("emergency_team_member") +public class EmergencyTeamMemberInfo { + + @TableId(type = IdType.AUTO) + private Long id; + + private Byte delFlag; + + private Date gmtCreate; + + private Date gmtModitify; + + private String createUid; + + private String updateUid; + + private Long teamId; + + private String userUid; + + private Byte gender; + + private String jobNumber; + + private String name; + + private String phone; + + private String position; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Byte getDelFlag() { + return delFlag; + } + + public void setDelFlag(Byte delFlag) { + this.delFlag = delFlag; + } + + 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 getCreateUid() { + return createUid; + } + + public void setCreateUid(String createUid) { + this.createUid = createUid; + } + + public String getUpdateUid() { + return updateUid; + } + + public void setUpdateUid(String updateUid) { + this.updateUid = updateUid; + } + + public Long getTeamId() { + return teamId; + } + + public void setTeamId(Long teamId) { + this.teamId = teamId; + } + + public String getUserUid() { + return userUid; + } + + public void setUserUid(String userUid) { + this.userUid = userUid; + } + + public Byte getGender() { + return gender; + } + + public void setGender(Byte gender) { + this.gender = gender; + } + + public String getJobNumber() { + return jobNumber; + } + + public void setJobNumber(String jobNumber) { + this.jobNumber = jobNumber; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + @Override + public String toString() { + return "EmergencyTeamMemberInfo{" + + "id=" + id + + ", delFlag=" + delFlag + + ", gmtCreate=" + gmtCreate + + ", gmtModitify=" + gmtModitify + + ", createUid='" + createUid + '\'' + + ", updateUid='" + updateUid + '\'' + + ", teamId=" + teamId + + ", userUid='" + userUid + '\'' + + ", gender=" + gender + + ", jobNumber='" + jobNumber + '\'' + + ", name='" + name + '\'' + + ", phone='" + phone + '\'' + + ", position='" + position + '\'' + + '}'; + } +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfoDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfoDO.java new file mode 100644 index 0000000..aff8a63 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfoDO.java @@ -0,0 +1,105 @@ +package com.gkhy.safePlatform.emergency.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +@TableName("emergency_team_member") +public class EmergencyTeamMemberInfoDO { + + @TableId(type = IdType.AUTO) + private Long id; + + private Long teamId; + + private String userUid; + + private Byte gender; + + private String jobNumber; + + private String name; + + private String phone; + + private String position; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + + public Long getTeamId() { + return teamId; + } + + public void setTeamId(Long teamId) { + this.teamId = teamId; + } + + public String getUserUid() { + return userUid; + } + + public void setUserUid(String userUid) { + this.userUid = userUid; + } + + public Byte getGender() { + return gender; + } + + public void setGender(Byte gender) { + this.gender = gender; + } + + public String getJobNumber() { + return jobNumber; + } + + public void setJobNumber(String jobNumber) { + this.jobNumber = jobNumber; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + @Override + public String toString() { + return "EmergencyTeamMemberInfo{" + + "id=" + id + + ", teamId=" + teamId + + ", userUid='" + userUid + '\'' + + ", gender=" + gender + + ", jobNumber='" + jobNumber + '\'' + + ", name='" + name + '\'' + + ", phone='" + phone + '\'' + + ", position='" + position + '\'' + + '}'; + } +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java new file mode 100644 index 0000000..1e4a7f7 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java @@ -0,0 +1,4 @@ +package com.gkhy.safePlatform.emergency.model.dto.req; + +public class EmergencyTeamReqDTO { +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamFileRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamFileRespDTO.java new file mode 100644 index 0000000..762bb4d --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamFileRespDTO.java @@ -0,0 +1,56 @@ +package com.gkhy.safePlatform.emergency.model.dto.resp; + + +public class EmergencyTeamFileRespDTO { + + private Long id; + + private Long teamId; + + private String fileUrl; + + private String fileName; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + + public Long getTeamId() { + return teamId; + } + + public void setTeamId(Long teamId) { + this.teamId = teamId; + } + + public String getFileUrl() { + return fileUrl; + } + + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + @Override + public String toString() { + return "EmergencyTeamFileInfo{" + + "id=" + id + + ", teamId=" + teamId + + ", fileUrl='" + fileUrl + '\'' + + ", fileName='" + fileName + '\'' + + '}'; + } +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java new file mode 100644 index 0000000..3c7d166 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java @@ -0,0 +1,79 @@ +package com.gkhy.safePlatform.emergency.model.dto.resp; + + +import java.util.List; + +public class EmergencyTeamPageRespDTO { + + private Long id; + + private String teamLevel; + + private String teamName; + + private String principalPhone; + + private String teamDesc; + + private List<EmergencyTeamFileRespDTO> fileList; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTeamLevel() { + return teamLevel; + } + + public void setTeamLevel(String teamLevel) { + this.teamLevel = teamLevel; + } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + + public String getPrincipalPhone() { + return principalPhone; + } + + public void setPrincipalPhone(String principalPhone) { + this.principalPhone = principalPhone; + } + + public String getTeamDesc() { + return teamDesc; + } + + public void setTeamDesc(String teamDesc) { + this.teamDesc = teamDesc; + } + + public List<EmergencyTeamFileRespDTO> getFileList() { + return fileList; + } + + public void setFileList(List<EmergencyTeamFileRespDTO> fileList) { + this.fileList = fileList; + } + + @Override + public String toString() { + return "EmergencyTeamPageRespDTO{" + + "id=" + id + + ", teamLevel='" + teamLevel + '\'' + + ", teamName='" + teamName + '\'' + + ", principalPhone='" + principalPhone + '\'' + + ", teamDesc='" + teamDesc + '\'' + + ", fileList=" + fileList + + '}'; + } +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java new file mode 100644 index 0000000..55d3a25 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java @@ -0,0 +1,5 @@ +package com.gkhy.safePlatform.emergency.query; + +public class EmergencyTeamQuery { + +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java new file mode 100644 index 0000000..a9706d4 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java @@ -0,0 +1,5 @@ +package com.gkhy.safePlatform.emergency.query.db; + +public class EmergencyTeamDBQuery { + +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java index 416eeb0..58891fb 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java @@ -6,6 +6,7 @@ import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery; import org.apache.ibatis.annotations.Param; + import org.springframework.stereotype.Repository; import java.util.List; diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java new file mode 100644 index 0000000..82b3d98 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java @@ -0,0 +1,10 @@ +package com.gkhy.safePlatform.emergency.repository; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; +import org.springframework.stereotype.Repository; + + +@Repository +public interface EmergencyTeamFileInfoRepository extends BaseMapper<EmergencyTeamFileInfoDO> { +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java new file mode 100644 index 0000000..14308b0 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java @@ -0,0 +1,16 @@ +package com.gkhy.safePlatform.emergency.repository; + +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.EmergencyTeamInfoPageDO; +import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface EmergencyTeamInfoRepository extends BaseMapper<EmergencyTeamInfo> { + List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, @Param("query") EmergencyTeamDBQuery emergencyTeamDBQuery); +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java new file mode 100644 index 0000000..52fcf00 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java @@ -0,0 +1,17 @@ +package com.gkhy.safePlatform.emergency.service; + +import com.gkhy.safePlatform.commons.query.PageQuery; +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.EmergencyTeamPageRespDTO; +import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery; + +import java.util.List; + +public interface EmergencyTeamService { + + SearchResultVO<List<EmergencyTeamPageRespDTO>> selectEmergencyTeamList(PageQuery<EmergencyTeamQuery> query); + + ResultVO<String> add(Long valueOf, EmergencyTeamReqDTO emergencyTeamReqDTO); +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java new file mode 100644 index 0000000..fe7b81e --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java @@ -0,0 +1,12 @@ +package com.gkhy.safePlatform.emergency.service.baseService; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; + +import java.util.List; + + +public interface EmergencyTeamFileInfoService extends IService<EmergencyTeamFileInfoDO> { + + List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id); +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java new file mode 100644 index 0000000..c2f79d8 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java @@ -0,0 +1,15 @@ +package com.gkhy.safePlatform.emergency.service.baseService; + +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.EmergencyTeamInfoPageDO; +import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; + +import java.util.List; + + +public interface EmergencyTeamInfoService extends IService<EmergencyTeamInfo> { + + List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, EmergencyTeamDBQuery emergencyTeamDBQuery); +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java new file mode 100644 index 0000000..33fc5dc --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.gkhy.safePlatform.emergency.service.baseService.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; +import com.gkhy.safePlatform.emergency.repository.EmergencyTeamFileInfoRepository; +import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamFileInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("emergencyTeamFileInfoService") +public class EmergencyTeamFileInfoServiceImpl extends ServiceImpl<EmergencyTeamFileInfoRepository, EmergencyTeamFileInfoDO> implements EmergencyTeamFileInfoService { + + @Autowired + private EmergencyTeamFileInfoRepository emergencyTeamFileInfoRepository; + + + @Override + public List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id) { + + QueryWrapper<EmergencyTeamFileInfoDO> wrapper = new QueryWrapper<>(); + wrapper.eq("team_id",id); + List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList= emergencyTeamFileInfoRepository.selectList(wrapper); + return emergencyTeamFileInfoDOList; + } + +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java new file mode 100644 index 0000000..70cc7a1 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java @@ -0,0 +1,28 @@ +package com.gkhy.safePlatform.emergency.service.baseService.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo; +import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO; +import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; +import com.gkhy.safePlatform.emergency.repository.EmergencyTeamInfoRepository; +import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("emergencyTeamInfoService") +public class EmergencyTeamInfoServiceImpl extends ServiceImpl<EmergencyTeamInfoRepository, EmergencyTeamInfo> implements EmergencyTeamInfoService { + + @Autowired + private EmergencyTeamInfoRepository emergencyTeamInfoRepository; + + @Override + public List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, EmergencyTeamDBQuery emergencyTeamDBQuery) { + return emergencyTeamInfoRepository.selectEmergencyTeamList(page,emergencyTeamDBQuery); + } + + + +} diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java new file mode 100644 index 0000000..f553a86 --- /dev/null +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java @@ -0,0 +1,80 @@ +package com.gkhy.safePlatform.emergency.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gkhy.safePlatform.commons.enums.ResultCodes; +import com.gkhy.safePlatform.commons.query.PageQuery; +import com.gkhy.safePlatform.commons.utils.BeanCopyUtils; +import com.gkhy.safePlatform.commons.vo.ResultVO; +import com.gkhy.safePlatform.commons.vo.SearchResultVO; +import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo; +import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; +import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO; +import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO; +import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamFileRespDTO; +import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO; +import com.gkhy.safePlatform.emergency.query.EmergencyTeamQuery; +import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; +import com.gkhy.safePlatform.emergency.service.EmergencyTeamService; +import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamFileInfoService; +import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamInfoService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +@Service("emergencyTeamService") +public class EmergencyTeamServiceImpl implements EmergencyTeamService { + + @Autowired + private EmergencyTeamInfoService emergencyTeamInfoService; + + @Autowired + private EmergencyTeamFileInfoService emergencyTeamFileInfoService; + + @Override + public SearchResultVO<List<EmergencyTeamPageRespDTO>> selectEmergencyTeamList(PageQuery<EmergencyTeamQuery> query) { + Long pageIndex = query.getPageIndex(); + Long pageSize = query.getPageSize(); + Page<EmergencyTeamInfoPageDO> page = new Page<>(pageIndex, pageSize); + + EmergencyTeamDBQuery emergencyTeamDBQuery = new EmergencyTeamDBQuery(); + if (query.getSearchParams() != null) { + BeanUtils.copyProperties(query.getSearchParams(), emergencyTeamDBQuery); + } + + List<EmergencyTeamPageRespDTO> respList = new ArrayList<>(); + List<EmergencyTeamInfoPageDO> emergencyTeamInfoPageDOList = emergencyTeamInfoService.selectEmergencyTeamList(page,emergencyTeamDBQuery); + + if (!CollectionUtils.isEmpty(emergencyTeamInfoPageDOList)){ + for (int i = 0 ; i < emergencyTeamInfoPageDOList.size() ; i++){ + List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(emergencyTeamInfoPageDOList.get(i).getId()); + List<EmergencyTeamFileRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamFileInfoDOList, EmergencyTeamFileRespDTO.class); + + EmergencyTeamPageRespDTO emergencyTeamPageRespDTO = new EmergencyTeamPageRespDTO(); + BeanUtils.copyProperties(emergencyTeamInfoPageDOList.get(i),emergencyTeamPageRespDTO); + emergencyTeamPageRespDTO.setFileList(emergencyTeamFileRespDTOList); + respList.add(emergencyTeamPageRespDTO); + } + } + + return new SearchResultVO<>( + true, + pageIndex, + pageSize, + page.getTotal(), + respList, + ResultCodes.OK + ); + } + + @Override + public ResultVO<String> add(Long valueOf, EmergencyTeamReqDTO emergencyTeamReqDTO) { + //新增应急预案 + //新增应急预案使用部门表 + // + return null; + } +} -- Gitblit v1.9.2