WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test

Browse Source
This commit is contained in:
CD
2022-11-04 09:11:44 +08:00
parent 66ed688f79 9469cd06e1
commit f4ff9764b5
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
+2 -2
View File
@@ -49,8 +49,8 @@
<select id="countState" resultType="java.lang.Integer">
select count(1) from params_collect_manifest
where params_manifest_id = ${manifestId} and id not in(
select id from params_collect_manifest where params_manifest_id = ${manifestId} and state in('7','8')
where params_manifest_id = #{manifestId} and id not in(
select id from params_collect_manifest where params_manifest_id = #{manifestId} and state in('7','8')
)
</select>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+44 -44
View File
@@ -547,52 +547,52 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}else{
//撤回,需要发消息
try {
List<String> userNameList = dummyReadEOService.queryReadUserInfo(dummyInventoryBaseEO.getId());
List<String> thirdIdList = new ArrayList<>();
if(userNameList.size() != 0){
List<String> 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 = "<a href='/virtualListDetails?id=" + dummyInventoryBaseEO.getId() +
"&useExplain="+baseEO.getUseExplain()+
"&name=" + baseEO.getName() + "'" + " target='_blank'>" + baseEO.getName() + "</a>";
//封装消息的实体类 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<String> userNameList = dummyReadEOService.queryReadUserInfo(dummyInventoryBaseEO.getId());
// List<String> thirdIdList = new ArrayList<>();
// if(userNameList.size() != 0){
// List<String> 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 = "<a href='/virtualListDetails?id=" + dummyInventoryBaseEO.getId() +
// "&useExplain="+baseEO.getUseExplain()+
// "&name=" + baseEO.getName() + "'" + " target='_blank'>" + baseEO.getName() + "</a>";
// //封装消息的实体类 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();
// }
}
}
// /**