From 0516be08f9b48d6ac9bf71810fd867997a6034e2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 22 Dec 2021 09:05:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=8B=E4=BB=B6=E3=80=91=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E6=9C=8D=E5=8A=A1=E7=83=AD=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/OrgMobileFormDTO.java | 26 +++++++++++++++++++ .../epmet/dto/result/OrgMobileResultDTO.java | 25 ++++++++++++++++++ .../controller/CustomerAgencyController.java | 10 +++++++ .../java/com/epmet/dao/CustomerAgencyDao.java | 5 ++++ .../epmet/service/CustomerAgencyService.java | 6 +++++ .../impl/CustomerAgencyServiceImpl.java | 10 +++++++ .../resources/mapper/CustomerAgencyDao.xml | 14 ++++++++++ 7 files changed, 96 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgMobileFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgMobileResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgMobileFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgMobileFormDTO.java new file mode 100644 index 0000000000..72e91bf810 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgMobileFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +/** + * @author sun + * @Description 查询网格所属组织电话 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class OrgMobileFormDTO { + + /** + * 网格Id + */ + @NotBlank(message = "网格Id不能为空", groups = OrgMobile.class) + private String gridId; + + public interface OrgMobile{} + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgMobileResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgMobileResultDTO.java new file mode 100644 index 0000000000..a27a28f18e --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgMobileResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author sun + * @Description 查询网格所属组织电话 + */ +@Data +public class OrgMobileResultDTO implements Serializable { + /** + * 机关组织Id + */ + private String agencyId = ""; + /** + * 机关组织名称 + */ + private String agencyName = ""; + /** + * 组织联系电话 + */ + private String mobile = ""; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 183b6f81f5..daceb9b531 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -369,4 +369,14 @@ public class CustomerAgencyController { return new Result().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId())); } + /** + * @Description 【事件】社区服务热线 + * @author sun + **/ + @PostMapping("orgmobile") + Result orgMobile(@RequestBody OrgMobileFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, OrgMobileFormDTO.OrgMobile.class); + return new Result().ok(customerAgencyService.orgMobile(formDTO.getGridId())); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index d1a49f7ba3..a1aa0b631a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -282,5 +282,10 @@ public interface CustomerAgencyDao extends BaseDao { */ List getSonAgencyId(@Param("orgId") String orgId); + /** + * @Description 【事件】社区服务热线 + * @author sun + **/ + OrgMobileResultDTO getAgencyMobile(@Param("gridId") String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index 4cacf505ef..5604b2d06f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -263,4 +263,10 @@ public interface CustomerAgencyService extends BaseService * @return */ AgencyTreeResultDTO getOrgTreeData(String staffId); + + /** + * @Description 【事件】社区服务热线 + * @author sun + **/ + OrgMobileResultDTO orgMobile(String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index f70fdd035a..3c4e0f1c00 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1193,4 +1193,14 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getStaffOrgListByStaffId(String staffId) { return baseDao.getStaffOrgListByStaffId(staffId); } + + /** + * @Description 【事件】社区服务热线 + * @author sun + **/ + @Override + public OrgMobileResultDTO orgMobile(String gridId) { + return baseDao.getAgencyMobile(gridId); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 80c0a05a08..69e86b72d4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -736,4 +736,18 @@ AND PID = #{orgId} + +