diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java index 3c9a2ba01a..782ab153dd 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.entity.UserMessageEntity; import com.epmet.excel.UserMessageExcel; import com.epmet.service.UserMessageService; import org.springframework.beans.factory.annotation.Autowired; @@ -132,4 +133,15 @@ public class UserMessageController { public Result> getMyMessageList(@RequestBody MymessageFormDTO params){ return userMessageService.getMyMessageList(params); } + + /** + * @param msgList + * @return com.epmet.commons.tools.utils.Result + * @Author sun + * @Description 批量插入未读消息 + **/ + @PostMapping("saveusermessagelist") + public Result saveUserMessageList(@RequestBody List msgList) { + return userMessageService.saveUserMessageList(msgList); + } } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java index 1555f73aed..7623d45e0d 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java @@ -127,4 +127,12 @@ public interface UserMessageService extends BaseService { * @return */ Result> getMyMessageList(MymessageFormDTO param); + + /** + * @param msgList + * @return com.epmet.commons.tools.utils.Result + * @Author sun + * @Description 批量插入未读消息 + **/ + Result saveUserMessageList(List msgList); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java index 8354b9166c..cdbfe87ead 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java @@ -165,4 +165,9 @@ public class UserMessageServiceImpl extends BaseServiceImpl>().ok(ConvertUtils.sourceToTarget(myMessageList, UserMessageDTO.class)); } + @Override + public Result saveUserMessageList(List msgList) { + insertBatch(msgList); + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAndStaffsResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAndStaffsResultDTO.java new file mode 100644 index 0000000000..cde61478b9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAndStaffsResultDTO.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.CustomerStaffGridDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 根据网格ID查询网格信息、查询网格下所有工作人员列表-接口返参 + * + * @author sun + */ +@Data +public class AgencyAndStaffsResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格基本信息 + */ + private CustomerGridDTO customerGridDTO; + /** + * 网格下工作人员列表 + */ + private List staffList; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerGridConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerGridConstant.java new file mode 100644 index 0000000000..fe636fdcc2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerGridConstant.java @@ -0,0 +1,13 @@ +package com.epmet.constant; + +/** + * @author sun + * @dscription + */ +public interface CustomerGridConstant { + + /** + * 根据网格Id未查询到网格信息 + */ + String SELECT_EXCEPTION = "根据网格Id未查询到网格信息"; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 77e3b82908..834aa9bd1c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -27,12 +27,9 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.SelectGridNameByGridIdFormDTO; -import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.ListCustomerGridFormDTO; -import com.epmet.dto.result.CustomerGridByUserIdResultDTO; -import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.excel.CustomerGridExcel; import com.epmet.service.CustomerGridService; import org.springframework.beans.factory.annotation.Autowired; @@ -162,4 +159,16 @@ public class CustomerGridController { public Result> getMyGrids(@PathVariable("userId") String userId) { return customerGridService.getMyGrids(userId); } + + /** + * @param gridId + * @return + * @Author sun + * @Description 根据网格id查询所属组织信息、根据网格Id查询网格下所有工作人员列表 + **/ + @PostMapping("getagencyandstaffsbygridid/{gridId}") + public Result getAgencyAndStaffsBygridId(@PathVariable("gridId") String gridId) { + return customerGridService.getAgencyAndStaffsBygridId(gridId); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java index c0e8691363..07d59946ca 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java @@ -65,4 +65,12 @@ public interface CustomerStaffGridDao extends BaseDao { * @Date 2020.04.26 14:57 **/ void insertBatch(List list); + + /** + * @param gridId + * @return + * @Description 根据网格Id查询网格下工作人员列表 + * @Author sun + */ + List selectByGridId(@Param("gridId")String gridId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index cb9c9724e2..76459d1de6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -212,4 +212,11 @@ public interface CustomerGridService extends BaseService { **/ Result addGridStaffs(CommonGridStaffListFromDTO staffListFormDTO); + /** + * @param gridId + * @return + * @Author sun + * @Description 根据网格id查询所属组织信息、根据网格Id查询网格下所有工作人员列表 + **/ + Result getAgencyAndStaffsBygridId(String gridId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index cb544cba9f..c2078c1360 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -23,25 +23,20 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.CustomerGridConstant; import com.epmet.dao.CustomerGridDao; -import com.epmet.dto.CustomerAgencyDTO; -import com.epmet.dto.CustomerGridDTO; -import com.epmet.dto.form.CustomerGridFormDTO; -import com.epmet.dto.form.ListCustomerGridFormDTO; -import com.epmet.dto.form.SelectGridNameByGridIdFormDTO; -import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; -import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.dao.CustomerStaffGridDao; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerGridEntity; import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; import com.epmet.service.CustomerStaffGridService; @@ -473,4 +468,26 @@ public class CustomerGridServiceImpl extends BaseServiceImpl().ok(baseDao.selectGridNameByGridId(formDTO)); } + /** + * @param gridId + * @return + * @Author sun + * @Description 根据网格id查询所属组织信息、根据网格Id查询网格下所有工作人员列表 + **/ + @Override + public Result getAgencyAndStaffsBygridId(String gridId) { + Result result = new Result<>(); + AgencyAndStaffsResultDTO agencyAndStaffsResultDTO = new AgencyAndStaffsResultDTO(); + //1:查询网格基本信息 + CustomerGridEntity gridEntity = baseDao.selectById(gridId); + if (null == gridEntity) { + throw new RenException(CustomerGridConstant.SELECT_EXCEPTION); + } + CustomerGridDTO CustomerGridDTO = ConvertUtils.sourceToTarget(gridEntity, CustomerGridDTO.class); + agencyAndStaffsResultDTO.setCustomerGridDTO(CustomerGridDTO); + //2:查询网格下工作人员列表 + List staffList = customerStaffGridDao.selectByGridId(gridId); + agencyAndStaffsResultDTO.setStaffList(staffList); + return result.ok(agencyAndStaffsResultDTO); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml index 5e4c9bd1a3..c1721ea685 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml @@ -3,19 +3,18 @@ - - - - - - - - - - - - - + + csg.id AS "id", + csg.user_id AS "userId", + csg.grid_id AS "gridId", + csg.customer_id AS "customerId", + csg.del_flag AS "delflag", + csg.revision AS "revision", + csg.created_by AS "createdby", + csg.created_time AS "createdtime", + csg.updated_by AS "updatedby", + csg.updated_time AS "updatedtime" + + + insert into customer_staff_grid diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index ce7eabb912..80a2fd38cf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -93,6 +93,12 @@ 2.0.0 compile + + com.epmet + epmet-message-server + 0.3.1 + compile + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java new file mode 100644 index 0000000000..6945685c92 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java @@ -0,0 +1,10 @@ +package com.epmet.constant; + +/** + * @author sun + * @dscription + */ +public interface ResiWarmheartedConstant { + + String SELECT_EXCEPTION = "根据网格Id查询数据失败"; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java index 50b8cf9bb5..21a57747e2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.entity.UserMessageEntity; import com.epmet.modules.feign.fallback.EpmetMessageFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -10,6 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import java.util.List; + /** * @author kamui */ @@ -33,4 +36,13 @@ public interface EpmetMessageFeignClient { @PostMapping(value = "message/usermessage/saveusermessage", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result saveUserMessage(UserMessageFormDTO formDto); + /** + * @param msgList + * @return com.epmet.commons.tools.utils.Result + * @Author sun + * @Description 热心居民申请给网格长们发送消息 + **/ + @PostMapping(value = "message/usermessage/saveusermessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result saveUserMessageList(List msgList); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 7b3b142878..85d810e05e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -4,9 +4,11 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.StaffRoleFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.CertifiedResultDTO; +import com.epmet.dto.result.GovStaffRoleResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack; import com.epmet.resi.partymember.dto.partymember.UserHeadPhotoDTO; @@ -69,4 +71,12 @@ public interface EpmetUserFeignClient { @PostMapping("/epmetuser/userwechat/selectuserheadphotobyuserid") Result> selectUserHeadPhotoByUserId(List certifiedResultDTOS); + /** + * 根据机构Id查询机构下是网格长角色的用户 + * @param staffRoleFormDTO + * @return + * @Author sun + */ + @PostMapping("/epmetuser/staffrole/staffsinrole") + Result> getStaffsInRole(@RequestBody StaffRoleFormDTO staffRoleFormDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java index 4615564826..b3cd8ab7aa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.result.AgencyAndStaffsResultDTO; import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack; @@ -50,8 +51,12 @@ public interface GovOrgFeignClient { @PostMapping("/gov/org/customergrid/selectGridNameByGridId") Result selectGridNameByGridId(@RequestBody CertifiedFormDTO formDTO); - - - - + /** + * @param gridId + * @return + * @Author sun + * @Description 根据网格id查询所属组织信息、根据网格Id查询网格下所有工作人员列表 + **/ + @PostMapping("/gov/org/customergrid/getagencyandstaffsbygridid/{gridId}") + Result getAgencyAndStaffsBygridId(@PathVariable("gridId") String gridId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java index f588f55781..b356a338b9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java @@ -4,9 +4,12 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.entity.UserMessageEntity; import com.epmet.modules.feign.EpmetMessageFeignClient; import org.springframework.stereotype.Component; +import java.util.List; + /** * 消息服务降级 * @author zhaoqifeng @@ -24,4 +27,9 @@ public class EpmetMessageFeignClientFallback implements EpmetMessageFeignClient return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessage", formDto); } + @Override + public Result saveUserMessageList(List msgList) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessageList", msgList); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java index d7844431b9..e9125c16e0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java @@ -5,9 +5,11 @@ import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.StaffRoleFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.CertifiedResultDTO; +import com.epmet.dto.result.GovStaffRoleResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import org.springframework.stereotype.Component; @@ -45,4 +47,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { public Result> selectUserHeadPhotoByUserId(List certifiedResultDTOS) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectUserHeadPhotoByUserId", certifiedResultDTOS); } + + @Override + public Result> getStaffsInRole(StaffRoleFormDTO staffRoleFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffsInRole", staffRoleFormDTO); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java index 07775a8fb8..3098308b28 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.result.AgencyAndStaffsResultDTO; import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.modules.feign.GovOrgFeignClient; @@ -38,4 +39,10 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient { public Result selectGridNameByGridId(CertifiedFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectGridNameByGridId",formDTO); } + + @Override + public Result getAgencyAndStaffsBygridId(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyAndStaffsBygridId",gridId); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java index dbb6990310..3f85a6d199 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java @@ -9,7 +9,7 @@ public interface ResiWarmUserMessageConstant { /** * 消息标题 */ - String GROUP_TITLE = "您有一条小组消息"; + String GROUP_TITLE = "您有一条热心居民申请消息"; /** * 热心居民提交申请时给网格长发送消息：XX街道-XX先生/女士申请成为热心居民，请审核。 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java index 56946307cb..a0c0442d72 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java @@ -77,4 +77,10 @@ public interface ResiWarmheartedVisitConstant { String SELECT_EXCEPTION = "根据申请Id未查询到热心居民申请详情信息"; String AUDIT_EXCEPTION = "该申请数据已审核，不能再次审核"; + + /** + * 网格长角色 + */ + String GRID_MANAGER = "grid_manager"; + String SAVE_MSG_EXCEPTION = "发送消息给网格长操作失败"; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index b78ffa53eb..b3f9018fa0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -31,13 +31,15 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; import com.epmet.constant.ReadFlagConstant; +import com.epmet.constant.ResiWarmheartedConstant; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.dto.UserRoleDTO; -import com.epmet.dto.form.CustomerGridFormDTO; -import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.dto.form.UserResiInfoFormDTO; -import com.epmet.dto.form.UserResiInfoListFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.AgencyAndStaffsResultDTO; +import com.epmet.dto.result.GovStaffRoleResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; +import com.epmet.entity.UserMessageEntity; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; @@ -203,7 +205,10 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl resultAgencyAndStaffs = govOrgFeignClient.getAgencyAndStaffsBygridId(formDTO.getGridId()); + if(!resultAgencyAndStaffs.success()){ + throw new RenException(ResiWarmheartedConstant.SELECT_EXCEPTION); + } + AgencyAndStaffsResultDTO agencyAndStaffsResultDTO = resultAgencyAndStaffs.getData(); + //网格下工作人员列表 + CustomerGridDTO customerGridDTO = agencyAndStaffsResultDTO.getCustomerGridDTO(); + List staffList = agencyAndStaffsResultDTO.getStaffList(); + //2:调用epmet-user服务，根据组织机构Id和网格长角色查询组织机构下所有的网格长StaffId + StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO(); + staffRoleFormDTO.setOrgId(customerGridDTO.getPid()); + staffRoleFormDTO.setRoleKey(ResiWarmheartedVisitConstant.GRID_MANAGER); + Result> resultList = epmetUserFeignClient.getStaffsInRole(staffRoleFormDTO); + List roleList = resultList.getData(); + //3:遍历找出当前网格的所有网格长并给网格长发消息 + List msgList = new ArrayList<>(); + staffList.forEach(staff->{ + roleList.forEach(role->{ + if(staff.getUserId().equals(role.getStaffId())){ + UserMessageEntity msgEntity = new UserMessageEntity(); + msgEntity.setCustomerId(formDTO.getCustomerId()); + msgEntity.setGridId(formDTO.getGridId()); + msgEntity.setUserId(staff.getUserId()); + msgEntity.setApp(formDTO.getApp()); + msgEntity.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE); + msgEntity.setMessageContent(formDTO.getMessageText()); + msgEntity.setReadFlag(ReadFlagConstant.UN_READ); + msgList.add(msgEntity); + } + }); + }); + if (msgList.size() > NumConstant.ZERO) { + result = epmetMessageFeignClient.saveUserMessageList(msgList); + } + return result; } @Override