From 33383ff09bd168ca6b4002e2d45f068ec57fcfff Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 30 Oct 2019 19:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8F=9C=E5=8D=95=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/async/NewsTask.java | 30 ++++++++++++------- .../events/service/EpdcEventsService.java | 11 +++++++ .../service/impl/EpdcEventsServiceImpl.java | 20 +++++++------ .../modules/feign/WebsocketFeignClient.java | 2 +- .../modules/issue/service/IssueService.java | 2 +- .../issue/service/impl/IssueServiceImpl.java | 8 ++--- .../modules/item/service/ItemService.java | 4 +-- .../item/service/impl/ItemServiceImpl.java | 14 ++++----- .../epdc-websocket-server/pom.xml | 2 +- 9 files changed, 58 insertions(+), 35 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/async/NewsTask.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/async/NewsTask.java index 3fbf6b6d3..82fe374ec 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/async/NewsTask.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/async/NewsTask.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import java.util.Collections; import java.util.List; /** @@ -54,16 +55,25 @@ public class NewsTask { * @since 2019/10/29 15:26 */ @Async - public void eventMenuNotice(MenuNoticeDTO menuNoticeDTO) { - // 获取部门下所有用户ID - Result> listResult = adminFeignClient.getUserIdsByDeptIds(menuNoticeDTO.getDeptId()); - EventMenuNoticeDto eventMenuNoticeDto = new EventMenuNoticeDto(); - eventMenuNoticeDto.setMenuCode(menuNoticeDTO.getMenuCode()); - eventMenuNoticeDto.setNum(menuNoticeDTO.getNum()); - if (listResult.success()) { - for (Long userId: - listResult.getData()) { - eventMenuNoticeDto.setUserId(userId.toString()); + public void eventMenuNotice(MenuNoticeDTO menuNoticeDTO, Long userId) { + List userIds = null; + if (null != userId) { + userIds = Collections.singletonList(userId); + } else { + // 获取部门下所有用户ID + Result> listResult = adminFeignClient.getUserIdsByDeptIds(menuNoticeDTO.getDeptId()); + if (listResult.success()) { + userIds = listResult.getData(); + } + } + + if (null != userIds) { + EventMenuNoticeDto eventMenuNoticeDto = new EventMenuNoticeDto(); + eventMenuNoticeDto.setMenuCode(menuNoticeDTO.getMenuCode()); + eventMenuNoticeDto.setNum(menuNoticeDTO.getNum()); + for (Long user: + userIds) { + eventMenuNoticeDto.setUserId(user.toString()); // 给用户发送菜单消息 websocketFeignClient.eventMenuNotice(eventMenuNoticeDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index 9239dd7c8..58fd5bb72 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -157,6 +157,17 @@ public interface EpdcEventsService extends BaseService { */ Result getEventDetail(String eventId); + /** + * + * 菜单消息-议题待回应 + * + * @params [deptId] + * @return void + * @author liuchuang + * @since 2019/10/30 17:23 + */ + void sendMenuNoticeOfEventRespond(Long deptId, Long userId); + /** * * 初始化党群议事菜单消息 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 27cb666c1..506cbb1a1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -130,7 +130,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl dtoResult = adminFeignClient.getSysDeptInfo(deptId); if (dtoResult.success()) { // 网格用户 if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dtoResult.getData().getTypeKey())) { // 议题-待回应 - this.sendMenuNoticeOfEventRespond(deptId); + this.sendMenuNoticeOfEventRespond(deptId, userId); // 议题-待处理 - issueService.sendIssueHandleMenuNotice(deptId); + issueService.sendIssueHandleMenuNotice(deptId, userId); // 项目-待处理项目-网格用户 - itemService.sendItemHandleMenuNotice(deptId); + itemService.sendItemHandleMenuNotice(deptId, userId); } else { // 项目-待处理项目-吹哨部门用户 - itemService.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(deptId)); + itemService.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(deptId), userId); } } } @@ -332,7 +333,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl { * @author liuchuang * @since 2019/10/29 18:13 */ - void sendIssueHandleMenuNotice(Long deptId); + void sendIssueHandleMenuNotice(Long deptId, Long userId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index a265ed66d..03e0a8d61 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -209,14 +209,14 @@ public class IssueServiceImpl extends BaseServiceImpl imp informationFormDTO.setBusinessId(itemEntity.getId()); // 发送菜单消息-待处理项目 - itemService.sendItemHandleMenuNotice(itemEntity.getGridId()); + itemService.sendItemHandleMenuNotice(itemEntity.getGridId(), null); } } // 发送消息 newsTask.insertUserInformation(informationFormDTO); // 发送菜单消息-议题待处理 - this.sendIssueHandleMenuNotice(entity.getGridId()); + this.sendIssueHandleMenuNotice(entity.getGridId(), null); return new Result(); } @@ -312,7 +312,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp } @Override - public void sendIssueHandleMenuNotice(Long deptId) { + public void sendIssueHandleMenuNotice(Long deptId, Long userId) { // 获取部门待处理事件数量 int num = baseDao.selectCountOfDeptNotice(deptId, EventIssueItemState.ISSUE_REVIEW_PASS); MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO(); @@ -320,7 +320,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp menuNoticeDTO.setNum(num); menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_ISSUE_HANDLE); // 发送菜单消息通知 - newsTask.eventMenuNotice(menuNoticeDTO); + newsTask.eventMenuNotice(menuNoticeDTO, userId); } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index aa9e30b02..0aac60bbf 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -218,7 +218,7 @@ public interface ItemService extends BaseService { * @author liuchuang * @since 2019/10/30 9:12 */ - void sendItemHandleMenuNotice(Long deptId); + void sendItemHandleMenuNotice(Long deptId, Long userId); /** * @@ -229,5 +229,5 @@ public interface ItemService extends BaseService { * @author liuchuang * @since 2019/10/30 12:26 */ - void sendWhistlingDeptItemHandleMenuNotice(List deptIds); + void sendWhistlingDeptItemHandleMenuNotice(List deptIds, Long userId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index c0ab900b9..80de3b2d4 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -444,7 +444,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem longTreeSet.addAll(newDeptIds); List deptIds = new ArrayList<>(longTreeSet); // 发送菜单消息-待处理项目-吹哨部门 - this.sendWhistlingDeptItemHandleMenuNotice(deptIds); + this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); } else { handleProcessEntity.setState(dto.getHandleCategory()); // 更新项目状态 @@ -482,10 +482,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发送菜单消息-待处理项目 if (entity.getGridId().equals(user.getDeptId())) { // 网格长操作-发送菜单消息 - this.sendItemHandleMenuNotice(entity.getGridId()); + this.sendItemHandleMenuNotice(entity.getGridId(), null); } else { // 吹哨部门操作-发送菜单消息 - this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(user.getDeptId())); + this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(user.getDeptId()), null); } } catch (Exception e) { e.printStackTrace(); @@ -577,7 +577,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } @Override - public void sendItemHandleMenuNotice(Long deptId) { + public void sendItemHandleMenuNotice(Long deptId, Long userId) { // 获取部门待处理项目数量 int num = baseDao.selectCountOfItemDeptNotice(deptId, EventIssueItemState.ITEM_HANDLING); MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO(); @@ -585,11 +585,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem menuNoticeDTO.setNum(num); menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_ITEM_HANDLE); // 发送菜单消息通知 - newsTask.eventMenuNotice(menuNoticeDTO); + newsTask.eventMenuNotice(menuNoticeDTO, userId); } @Override - public void sendWhistlingDeptItemHandleMenuNotice(List deptIds) { + public void sendWhistlingDeptItemHandleMenuNotice(List deptIds, Long userId) { MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO(); menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_ITEM_HANDLE); for (Long deptId: @@ -599,7 +599,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem menuNoticeDTO.setDeptId(deptId); menuNoticeDTO.setNum(num); // 发送菜单消息通知 - newsTask.eventMenuNotice(menuNoticeDTO); + newsTask.eventMenuNotice(menuNoticeDTO, userId); } } } diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index 33361901b..376706dfb 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml @@ -144,7 +144,7 @@ epdc elink833066 - true + false 47.104.224.45:8848 wx3ef8f2cd12a19fcb