调整菜单消息模块

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) {
+    public void eventMenuNotice(MenuNoticeDTO menuNoticeDTO, Long userId) {
-        // 获取部门下所有用户ID
+        List<Long> userIds = null;
-        Result<List<Long>> listResult = adminFeignClient.getUserIdsByDeptIds(menuNoticeDTO.getDeptId());
+        if (null != userId) {
-        EventMenuNoticeDto eventMenuNoticeDto = new EventMenuNoticeDto();
+            userIds = Collections.singletonList(userId);
-        eventMenuNoticeDto.setMenuCode(menuNoticeDTO.getMenuCode());
+        } else {
-        eventMenuNoticeDto.setNum(menuNoticeDTO.getNum());
+            // 获取部门下所有用户ID
-        if (listResult.success()) {
+            Result<List<Long>> listResult = adminFeignClient.getUserIdsByDeptIds(menuNoticeDTO.getDeptId());
-            for (Long userId:
+            if (listResult.success()) {
-                    listResult.getData()) {
+                userIds = listResult.getData();
-                eventMenuNoticeDto.setUserId(userId.toString());
+            }
+        }
+
+        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);
             }

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<EpdcEventsEntity> {
      */
     Result<EventAppDetailResultDTO> getEventDetail(String eventId);
 
+    /**
+     *
+     * 菜单消息-议题待回应
+     *
+     * @params [deptId]
+     * @return void
+     * @author liuchuang
+     * @since 2019/10/30 17:23
+     */
+    void sendMenuNoticeOfEventRespond(Long deptId, Long userId);
+
     /**
      *
      * 初始化党群议事菜单消息

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<EpdcEventsDao, EpdcEv
         imgService.saveImages(dto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_EVENTS);
 
         // 发送菜单消息-议题待回应
-        this.sendMenuNoticeOfEventRespond(entity.getGridId());
+        this.sendMenuNoticeOfEventRespond(entity.getGridId(), null);
     }
 
     @Override
@@ -193,14 +193,14 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ISSUE);
 
             // 发送菜单消息-议题待处理
-            issueService.sendIssueHandleMenuNotice(issueEntity.getGridId());
+            issueService.sendIssueHandleMenuNotice(issueEntity.getGridId(), null);
         }
 
         // 发送消息
         newsTask.insertUserInformation(informationFormDTO);
 
         // 发送菜单消息-议题待回应
-        this.sendMenuNoticeOfEventRespond(eventsEntity.getGridId());
+        this.sendMenuNoticeOfEventRespond(eventsEntity.getGridId(), null);
         return new Result();
     }
 
@@ -244,20 +244,21 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
     @Override
     public void initMenuNotice() {
         Long deptId = SecurityUser.getDeptId();
+        Long userId = SecurityUser.getUserId();
         // 获取部门信息
         Result<SysDeptDTO> 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<EpdcEventsDao, EpdcEv
      * @author liuchuang
      * @since 2019/10/29 18:05
      */
-    private void sendMenuNoticeOfEventRespond(Long deptId) {
+    @Override
+    public void sendMenuNoticeOfEventRespond(Long deptId, Long userId) {
         // 获取部门待审核事件数量
         int num = baseDao.selectCountOfDeptNotice(deptId, EventIssueItemState.EVENT_PENDING_REVIEW);
         MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO();
@@ -340,6 +342,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         menuNoticeDTO.setNum(num);
         menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_EVENT_RESPOND);
         // 发送菜单消息通知
-        newsTask.eventMenuNotice(menuNoticeDTO);
+        newsTask.eventMenuNotice(menuNoticeDTO, userId);
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/WebsocketFeignClient.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  * @Author：liuchuang
  * @Date：2019/10/29 15:02
  */
-@FeignClient(name = ServiceConstant.EPDC_WEBSOCKET_SERVER, fallback = WebsocketFeignClientFallback.class, url = "http://127.0.0.1:9988")
+@FeignClient(name = ServiceConstant.EPDC_WEBSOCKET_SERVER, fallback = WebsocketFeignClientFallback.class)
 public interface WebsocketFeignClient {
 
     /**

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java

@@ -211,5 +211,5 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @author liuchuang
      * @since 2019/10/29 18:13
      */
-    void sendIssueHandleMenuNotice(Long deptId);
+    void sendIssueHandleMenuNotice(Long deptId, Long userId);
 }

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<IssueDao, IssueEntity> 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<IssueDao, IssueEntity> 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<IssueDao, IssueEntity> imp
         menuNoticeDTO.setNum(num);
         menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_ISSUE_HANDLE);
         // 发送菜单消息通知
-        newsTask.eventMenuNotice(menuNoticeDTO);
+        newsTask.eventMenuNotice(menuNoticeDTO, userId);
     }
 
     /**

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<ItemEntity> {
      * @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<ItemEntity> {
      * @author liuchuang
      * @since 2019/10/30 12:26
      */
-    void sendWhistlingDeptItemHandleMenuNotice(List<Long> deptIds);
+    void sendWhistlingDeptItemHandleMenuNotice(List<Long> deptIds, Long userId);
 }

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<ItemDao, ItemEntity> implem
                 longTreeSet.addAll(newDeptIds);
                 List<Long> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> implem
         menuNoticeDTO.setNum(num);
         menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_ITEM_HANDLE);
         // 发送菜单消息通知
-        newsTask.eventMenuNotice(menuNoticeDTO);
+        newsTask.eventMenuNotice(menuNoticeDTO, userId);
     }
 
     @Override
-    public void sendWhistlingDeptItemHandleMenuNotice(List<Long> deptIds) {
+    public void sendWhistlingDeptItemHandleMenuNotice(List<Long> 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<ItemDao, ItemEntity> implem
             menuNoticeDTO.setDeptId(deptId);
             menuNoticeDTO.setNum(num);
             // 发送菜单消息通知
-            newsTask.eventMenuNotice(menuNoticeDTO);
+            newsTask.eventMenuNotice(menuNoticeDTO, userId);
         }
     }
 }

esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml

@@ -144,7 +144,7 @@
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>