文档库推送信息处理
This commit is contained in:
+24
-15
@@ -49,6 +49,7 @@ import com.jero.modules.system.entity.SysDictItem;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.mapper.SysUserMapper;
|
||||
import com.jero.modules.system.service.ISysAnnouncementService;
|
||||
import com.jero.modules.system.service.ISysDepartService;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
|
||||
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
|
||||
@@ -94,16 +95,7 @@ import java.io.OutputStream;
|
||||
import java.text.DateFormat;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
@@ -143,6 +135,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
||||
@Autowired
|
||||
private ISysUserService sysUserService;
|
||||
@Autowired
|
||||
private ISysDepartService sysDepartService;
|
||||
@Autowired
|
||||
private JeroElasticsearchTemplate jeroElasticsearchTemplate;
|
||||
@Resource
|
||||
private WebSocket webSocket;
|
||||
@@ -2995,24 +2989,39 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
||||
// if(StringUtils.isBlank(documentIds)){
|
||||
// return "请选择文档";
|
||||
// }
|
||||
Set<String> allDepartIds = new HashSet<>();
|
||||
//查询当前部门下所有部门
|
||||
if(StringUtils.isNotEmpty(departIds)){
|
||||
String[] departIdArr = departIds.split(",");
|
||||
for (String departId : departIdArr) {
|
||||
List<String> subDepIdsByDepId = sysDepartService.getSubDepIdsByDepId(departId);
|
||||
allDepartIds.addAll(subDepIdsByDepId);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
List<String> userIdList = new ArrayList<>();
|
||||
List<String> thirdIdList = new ArrayList<>();
|
||||
if (StringUtils.isNotBlank(departIds)) {
|
||||
//查询部门下的人员
|
||||
List<SysUser> userList = sysUserService.getUserListByDepIds(Arrays.asList(departIds.split(",")));
|
||||
List<SysUser> userList = sysUserService.getUserListByDepIds(new ArrayList<>(allDepartIds));
|
||||
if (userList.size() != 0) {
|
||||
userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
|
||||
thirdIdList = userList.stream().map(SysUser::getThirdId).collect(Collectors.toList());
|
||||
userIdList = userList.stream().map(SysUser::getId).distinct().collect(Collectors.toList());
|
||||
thirdIdList = userList.stream().map(SysUser::getThirdId).distinct().collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
userIdList.addAll(Arrays.asList(userIds.split(",")));
|
||||
// userIdList.addAll(Arrays.asList(userIds.split(",")));
|
||||
//查询文档
|
||||
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(documentIds);
|
||||
List<String> serialNumberList = new ArrayList<>();
|
||||
List<String> hrefList = new ArrayList<>();
|
||||
for (Map<String, Object> map : mapList) {
|
||||
serialNumberList.add((String) map.get("serial_number"));
|
||||
// String href = "<a href='/docManage/library/detail?id:" + idTemp +
|
||||
// "&title:" + title +
|
||||
// "&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
|
||||
|
||||
String href = "<a href='/docManage/library/detail?id:" + (String) map.get("id") +
|
||||
"&title:" + (String) map.get("title") +
|
||||
"&serial_number:" + (String) map.get("serial_number") + "'" + " target='_blank'>" + (String) map.get("serial_number") + "</a>,";
|
||||
@@ -3022,7 +3031,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
||||
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
String content = sysUser.getRealname() + "向内推送了" + StringUtils.join(serialNumberList, ",") + ",请注意查看。";
|
||||
String contentInfo = sysUser.getRealname() + "向内推送了" + StringUtils.join(serialNumberList, ",") + ",请注意查看。";
|
||||
String contentInfo = sysUser.getRealname() + "向内推送了" + StringUtils.join(hrefList, ",") + ",请注意查看。";
|
||||
//封装消息的实体类
|
||||
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
|
||||
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
|
||||
|
||||
Reference in New Issue
Block a user