From f16cc8b94ee851b1332e16085a5658cdea28eddf Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 8 Sep 2022 23:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0websocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EpdcEventsServiceImpl.java   |  2 ++
 .../modules/item/service/ItemService.java     | 10 +++++++++
 .../item/service/impl/ItemServiceImpl.java    | 22 +++++++++++++++++--
 .../constants/MenuCodeConstant.java           |  6 +++++
 4 files changed, 38 insertions(+), 2 deletions(-)

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 2af284711..784924a02 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
@@ -463,6 +463,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
                 issueService.sendIssueHandleMenuNotice(deptId, userId);
                 // 项目-待处理项目-网格用户
                 itemService.sendItemHandleMenuNotice(deptId, userId);
+                // 项目-待处理项目-驳回-网格用户
+                itemService.sendItemHandleMenuNoticeReject(deptId, userId);
             } else if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_PARTY.equals(dtoResult.getData().getTypeKey())
                     || OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dtoResult.getData().getTypeKey())
                     || OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(dtoResult.getData().getTypeKey())
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 6e467d22d..2ed5ad898 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
@@ -315,6 +315,16 @@ public interface ItemService extends BaseService<ItemEntity> {
      */
     void sendItemHandleMenuNotice(Long deptId, Long userId);
 
+    /**
+     * 项目处理发送菜单消息-驳回
+     *
+     * @return void
+     * @params [deptId]
+     * @author liuchuang
+     * @since 2019/10/30 9:12
+     */
+    void sendItemHandleMenuNoticeReject(Long deptId, 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 c0ef45892..e3a31798e 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
@@ -1412,15 +1412,33 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Override
     public void sendItemHandleMenuNotice(Long deptId, Long userId) {
         // 获取部门待处理项目数量
-        int num = baseDao.selectCountOfItemDeptNotice(deptId, EventIssueItemState.ITEM_HANDLING);
+//        int num = baseDao.selectCountOfItemDeptNotice(deptId, EventIssueItemState.ITEM_HANDLING);
+        Map<String, Object> params = new HashMap<>();
+        params.put("itemState","0");
+        PageData<ItemPendingHandleDTO> page = listOfItemsForPCEnd(params);
         MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO();
         menuNoticeDTO.setDeptId(deptId);
-        menuNoticeDTO.setNum(num);
+        menuNoticeDTO.setNum(page.getTotal());
         menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_ITEM_HANDLE);
         // 发送菜单消息通知
         newsTask.eventMenuNotice(menuNoticeDTO, userId);
     }
 
+    @Override
+    public void sendItemHandleMenuNoticeReject(Long deptId, Long userId) {
+        // 获取部门待处理项目数量
+//        int num = baseDao.selectCountOfItemDeptNotice(deptId, EventIssueItemState.ITEM_HANDLING);
+        Map<String, Object> params = new HashMap<>();
+        params.put("itemState","0");
+        PageData<ItemPendingHandleDTO> page = listOfItemsForPCReject(params);
+        MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO();
+        menuNoticeDTO.setDeptId(deptId);
+        menuNoticeDTO.setNum(page.getTotal());
+        menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_ITEM_HANDLE_REJECT);
+        // 发送菜单消息通知
+        newsTask.eventMenuNotice(menuNoticeDTO, userId);
+    }
+
     @Override
     public void sendWhistlingDeptItemHandleMenuNotice(List<Long> deptIds, Long userId) {
         MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO();
diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-client/src/main/java/com.elink.esua.epdc/constants/MenuCodeConstant.java b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-client/src/main/java/com.elink.esua.epdc/constants/MenuCodeConstant.java
index 0048f11db..31fe292ea 100644
--- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-client/src/main/java/com.elink.esua.epdc/constants/MenuCodeConstant.java
+++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-client/src/main/java/com.elink.esua.epdc/constants/MenuCodeConstant.java
@@ -23,4 +23,10 @@ public interface MenuCodeConstant {
      * 党群议事-项目管理-待处理项目
      */
     String PARTY_GROUP_DISCUSSION_ITEM_HANDLE = "item-handle";
+
+    /**
+     * 党群议事-项目管理-待处理项目-驳回
+     */
+    String PARTY_GROUP_DISCUSSION_ITEM_HANDLE_REJECT = "item-handle-reject";
+
 }