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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-03-11 10:56:56 +08:00
parent 36a7b8b9c8 0293ba14f5
commit babfac4ac7
1 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+36 -9
View File
@@ -731,7 +731,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|| FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
String mustFields = "id,create_by,create_time,update_by,update_time,sys_org_code";
String mustValues = getMustValues();
String idTemp = UUID.randomUUID().toString().replace("-", "");
String mustValues = getMustValues(idTemp);
//字段
StringBuilder fieldsBuilder = new StringBuilder();
//数据值
@@ -787,6 +788,30 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//新增时如果填写代替标准,需要向填写的代替标准的负责人发消息
replaceStandardSend(Arrays.asList(replaceStandard.split(",")));
}
//向订阅该领域管理的人发消息
sendMsg(map, idTemp);
}
private void sendMsg(Map<String, Object> map, String idTemp) {
Map<String, Object> mapTemp = new HashMap<>();
mapTemp.put("domainId", map.get("technology_territory"));
mapTemp.put("documentId", "");
List<String> userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp);
if(userIdList.size() != 0){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String title = (String) map.get("title");
String serialNumber = (String) map.get("serial_number");
String href = "<a href='/docManage/library?id:" + idTemp +
"&title:" + title +
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
String content = sysUser.getRealname() + "新增了" + serialNumber + "请及时查看";
String contentInfo = sysUser.getRealname() + "新增了" + href + "请及时查看";
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
sendWebsocket(idTemp, idTemp);
}
}
/**
@@ -1167,12 +1192,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
"&title:" + title +
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改请及时查看";
String contentInfo = sysUser.getRealname() + "修改标准" + href + "中" + sbStr.toString();
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
sendWebsocket((String) map.get("id"), (String) map.get("id"));
if(StringUtils.isNotBlank(sbStr.toString())){
String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改请及时查看";
String contentInfo = sysUser.getRealname() + "修改标准" + href + "中" + sbStr.toString();
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
sendWebsocket((String) map.get("id"), (String) map.get("id"));
}
// }
//2. 处理修改代替标准的发送消息(法规负责人)
//处理修改代替标准,发送通知
@@ -1257,10 +1284,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
return sysAnnouncement;
}
private String getMustValues() {
private String getMustValues(String id) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String mustValue = "'" + UUID.randomUUID().toString().replace("-", "") + "','" + sysUser.getUsername() + "',"
String mustValue = "'" + id + "','" + sysUser.getUsername() + "',"
+ "str_to_date('" + sdf.format(new Date()) + "','%Y-%m-%d %H:%i:%s')" + ",'" + sysUser.getUsername() + "',"
+ "str_to_date('" + sdf.format(new Date()) + "','%Y-%m-%d %H:%i:%s')" + ",'" + sysUser.getOrgCode() + "'";
return mustValue;