diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java index f15e2b7cd..ff0b20a30 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java @@ -38,4 +38,6 @@ public interface SysCategoryMapper extends BaseMapper { */ @Update("update sys_category set del_flag = #{flag,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR}") public void updateDictDelFlag(@Param("flag") int delFlag, @Param("id") String id); + + public String getFieldInfo(@Param("fieldName") String fieldName); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml index 1b6277116..67ecf593f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml @@ -36,4 +36,11 @@ order by create_time desc + + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 6bfcb23e5..73baf4f08 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -21,6 +21,7 @@ import com.jero.modules.system.service.ISysCategoryService; import com.jero.modules.system.util.TreeUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.RandomUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -234,7 +235,14 @@ public class SysCategoryServiceImpl extends ServiceImpl getSysCategoryTree() { try { - List list = super.baseMapper.selectList(new QueryWrapper<>()); + //只查询技术领域的technology_territory + String dictId = sysCategoryMapper.getFieldInfo("technology_territory"); + List list = new ArrayList<>(); + if(StringUtils.isNotBlank(dictId)){ + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(SysCategory::getSysDictId,dictId); + list = super.baseMapper.selectList(lambdaQueryWrapper); + } List tree = new ArrayList<>(); if(CollectionUtils.isNotEmpty(list)){ tree = TreeUtils.getSysCategoryTree(list); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 1345168cb..a8cf3306f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -1548,8 +1548,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImplXXX对“GB 7258 进行了修改请及时查看”) - //项订阅领域管理中订阅了该技术领域的人和文档库中订阅了该条文档的人发送消息 + //向订阅领域管理中订阅了该技术领域的人和文档库中订阅了该条文档的人发送消息 Map mapTemp = new HashMap<>(); mapTemp.put("domainId", map.get("technology_territory")); mapTemp.put("documentId", map.get("id")); + //订阅技术领域的人和订阅该条标准的人 List userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysUser::getId,userIdList); + List sysUserList = sysUserService.list(wrapper); + List thirdIdList = sysUserList.stream().map(SysUser::getThirdId).collect(Collectors.toList()); + String id = (String) map.get("id"); String title = (String) map.get("title"); String href = "" + serialNumber + ""; + String url = backUrl + "/docManage/library/detail?id=" + id; if (StringUtils.isNotBlank(sbStr.toString())) { - String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改请及时查看"; + 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")); } + //飞书 + try { + String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改,请及时查看"; + iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), content, MessageTypeEnum.READ.getName(), url); + } catch (IOException e) { + log.error("文档新增飞书消息推送失败"); + } // } //2. 处理修改代替标准的发送消息(法规负责人) //处理修改代替标准,发送通知 @@ -2230,6 +2244,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(documentIdList, ",")); List userNameListTemp = new ArrayList<>(); List serialNumberList = new ArrayList<>(); + List urlList = new ArrayList<>(); StringBuilder sb = new StringBuilder(); for (Map stringObjectMap : mapList) { String id = (String) stringObjectMap.get("id"); @@ -2242,6 +2257,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + ","; sb.append(href); + String url = backUrl + "/docManage/library/detail?id=" + (String) stringObjectMap.get("id"); + urlList.add(url); } String sbStr = ""; if (ObjectUtils.isNotEmpty(sb)) { @@ -2249,12 +2266,29 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameListTemp, ",")); List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + List thirdIdList = userList.stream().map(SysUser::getThirdId).collect(Collectors.toList()); String content = "新标准编号已实施,请注意更新替代标准编号:" + StringUtils.join(serialNumberList, ",") + "的状态"; String contentInfo = "新标准编号已实施,请注意更新替代标准编号:" + sbStr + "的状态," + "链接: http://localhost:3000/docManage/library"; //封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); sysAnnouncementService.saveAnnouncement(sysAnnouncement); sendWebsocket(StringUtils.join(documentIdList, ","), StringUtils.join(documentIdList, ",")); + //飞书 + try { + for (String s : urlList) { + List list = new ArrayList<>(); + mapList.stream().forEach(e->{ + if(s.contains((String)e.get("id"))){ + String serialNumber = (String) e.get("serial_number"); + list.add(serialNumber); + } + }); + String contentTemp = StringUtils.join(list, ",")+"已被其他标准代替,请注意更新"+StringUtils.join(list, ",") + "的状态"; + iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), s); + } + } catch (IOException e) { + log.error("飞书推送失败"); + } }