From 20f5e1e683d2bd5f533f48cf906a137e66887c7a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 3 Nov 2022 17:11:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E4=B8=8D=E9=9C=80=E8=A6=81=E5=8F=91=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 21787ed53..e7692c4c6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -547,52 +547,52 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl userNameList = dummyReadEOService.queryReadUserInfo(dummyInventoryBaseEO.getId()); - List thirdIdList = new ArrayList<>(); - if(userNameList.size() != 0){ - List userIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getId()).collect(Collectors.toList()); - thirdIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getThirdId()).collect(Collectors.toList()); - if(userIdList.size() != 0){ - String hrefTemp = "" + baseEO.getName() + ""; - //封装消息的实体类 The XX virtual list you subscribed to has been withdrawn - String title = "The "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; - //Please note that the XX virtual list you subscribed to has been withdrawn. - String contentLog = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; +// try { +// List userNameList = dummyReadEOService.queryReadUserInfo(dummyInventoryBaseEO.getId()); +// List thirdIdList = new ArrayList<>(); +// if(userNameList.size() != 0){ +// List userIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getId()).collect(Collectors.toList()); +// thirdIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getThirdId()).collect(Collectors.toList()); +// if(userIdList.size() != 0){ +// String hrefTemp = "" + baseEO.getName() + ""; +// //封装消息的实体类 The XX virtual list you subscribed to has been withdrawn +// String title = "The "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; +// //Please note that the XX virtual list you subscribed to has been withdrawn. +// String contentLog = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; - String contentCnNo = "您订阅的虚拟清单"+ baseEO.getName()+"已被撤回."; - String contentCnYes = "您订阅的虚拟清单"+ hrefTemp+"已被撤回."; - String contentInfoEnNo = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; - String contentInfoEnYes = "Please note that the "+ hrefTemp+" virtual list you subscribed to has been withdrawn."; - SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, - title, - contentInfoEnNo, - contentInfoEnYes, - MessageTypeEnum.READ.getValue(), - MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(), - contentCnNo,contentCnYes); - sysAnnouncementService.saveAnnouncement(sysAnnouncement); - bussDocumentLibraryEOService.sendWebsocket(dummyInventoryBaseEO.getId(), title); - } - } +// String contentCnNo = "您订阅的虚拟清单"+ baseEO.getName()+"已被撤回."; +// String contentCnYes = "您订阅的虚拟清单"+ hrefTemp+"已被撤回."; +// String contentInfoEnNo = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; +// String contentInfoEnYes = "Please note that the "+ hrefTemp+" virtual list you subscribed to has been withdrawn."; +// SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, +// title, +// contentInfoEnNo, +// contentInfoEnYes, +// MessageTypeEnum.READ.getValue(), +// MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(), +// contentCnNo,contentCnYes); +// sysAnnouncementService.saveAnnouncement(sysAnnouncement); +// bussDocumentLibraryEOService.sendWebsocket(dummyInventoryBaseEO.getId(), title); +// } +// } //飞书 - if(thirdIdList.size() != 0){ - String contentInfoTemp = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; - String contentInfoFeiCn = "您订阅的虚拟清单"+ baseEO.getName()+"已被撤回."; - String href = backUrl + "/virtualListDetails?name=" + baseEO.getName() + "&useExplain=" + baseEO.getUseExplain() +"&id=" + baseEO.getId() +"&title=维护虚拟清单"; - FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); - feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName()); - feishuMsgVo.setUrl(href); - feishuMsgVo.setContentEn(contentInfoTemp); - feishuMsgVo.setContent(contentInfoFeiCn); - iFeishuService.sendCardMsgVirtua(thirdIdList.toArray(new String[]{}), feishuMsgVo,null,null); -// iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfoTemp, MessageTypeEnum.PUSH.getName(), href); - } - }catch (Exception e){ - e.printStackTrace(); - } +// if(thirdIdList.size() != 0){ +// String contentInfoTemp = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; +// String contentInfoFeiCn = "您订阅的虚拟清单"+ baseEO.getName()+"已被撤回."; +// String href = backUrl + "/virtualListDetails?name=" + baseEO.getName() + "&useExplain=" + baseEO.getUseExplain() +"&id=" + baseEO.getId() +"&title=维护虚拟清单"; +// FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); +// feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName()); +// feishuMsgVo.setUrl(href); +// feishuMsgVo.setContentEn(contentInfoTemp); +// feishuMsgVo.setContent(contentInfoFeiCn); +// iFeishuService.sendCardMsgVirtua(thirdIdList.toArray(new String[]{}), feishuMsgVo,null,null); +//// iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfoTemp, MessageTypeEnum.PUSH.getName(), href); +// } +// }catch (Exception e){ +// e.printStackTrace(); +// } } } // /** From 9469cd06e15ab037d75214354a50ae797a5b2aa8 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 4 Nov 2022 09:05:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0-=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E6=A0=87=E8=AE=B0bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/mapper/xml/TodoCenterMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml index a3a40b79c..75a7e43c2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml @@ -49,8 +49,8 @@