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 30304c593..6f0956ffc 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 @@ -264,31 +264,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stateDictItemList = dictItemList.stream() - .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) - .collect(Collectors.toList()); - if(stateDictItemList.size() != 0){ - if(CutEnum.CN.getValue().equals(cut)){ - category = stateDictItemList.get(0).getItemText(); - }else{ - category = stateDictItemList.get(0).getEnName(); - } - - } - }else { - category = ""; - } - - //文档动态------------------- - String hrefTemp =category + " " + "" + serialNumber + "" + " " + titleEn + ","; sbTemp.append(hrefTemp); - serialNumberListTemp.add(category + " " + serialNumber + " " + titleEn); - serialNumberListTempCn.add(category + " " + serialNumber + " " + title); + serialNumberListTemp.add(serialNumber + " " + titleEn); + serialNumberListTempCn.add(serialNumber + " " + title); //--------------------------- if (documentIds.size() != 0 && documentIds.contains((String) map.get("id"))) { serialNumberList.add(serialNumber); @@ -2176,22 +2158,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp); String title = StringUtils.valueOf(map.get("title")); String serialNumber = StringUtils.valueOf(map.get("serial_number")); - String category = StringUtils.valueOf(map.get("lei4_bie2")); - String categoryCn = ""; String titleEn = StringUtils.valueOf(map.get("title_en")); List dictItemList = sysDictItemServiceImpl.selectItemsAll(); - if(StringUtils.isNotBlank(category)){ - String finalCategory = category; - List stateDictItemList = dictItemList.stream() - .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) - .collect(Collectors.toList()); - if(stateDictItemList.size() != 0){ - category = stateDictItemList.get(0).getEnName(); - categoryCn = stateDictItemList.get(0).getItemText(); - } - }else{ - category = ""; - } Set technologyTerritorySet = new HashSet<>(); String technologyTerritoryId = ""; @@ -2229,19 +2197,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + "" + " "+ titleEn + " "; - String hrefCn = categoryCn + " " + "" + serialNumber + "" + " "+ title; //文档动态, 文档库中新增了标准XXXX homeDocumentDynamicEOService //The standard GB 7258-2017 Technical specifications has been added to the document library. - String msgContentCn = "文档库中新增了"+categoryCn+" "+serialNumber+" "+title; + String msgContentCn = "文档库中新增了" + serialNumber + " "+title; String msgContentInfoCn = "文档库中新增了"+hrefCn; HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); - homeDocumentDynamicEO.setMsgContent("The " + category + " " + serialNumber + " " + titleEn + " has been added to the document library."); - homeDocumentDynamicEO.setMsgContentInfo("The " + href + " has been added to the document library."); + homeDocumentDynamicEO.setMsgContent(serialNumber + " " + titleEn + " has been added to the document library."); + homeDocumentDynamicEO.setMsgContentInfo(href + " has been added to the document library."); homeDocumentDynamicEO.setMsgContentCn(msgContentCn); homeDocumentDynamicEO.setMsgContentInfoCn(msgContentInfoCn); homeDocumentDynamicEOService.save(homeDocumentDynamicEO); @@ -2259,7 +2227,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + ""; //消息英文--不带标签 String contentNo = "In the "+ technologyTerritoryName + " technical field you subscribed to, the "+ - category + " " + serialNumber +" has been updated.";; + serialNumber +" has been updated.";; //消息英文--带标签 String contentYes = "In the "+ technologyTerritoryName + " technical field you subscribed to, the "+ - category + " " + hrefYes +" has been updated.";; + hrefYes +" has been updated.";; //消息中文--不带标签 - String contentInfoNo = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + serialNumber;; + String contentInfoNo = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + serialNumber;; //消息中文--带标签 - String contentInfoYes = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + hrefYes;; + String contentInfoYes = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + hrefYes;; //封装消息的实体类 @@ -2303,9 +2271,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = this.list(); List serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); String serialNumber = StringUtils.valueOf(map.get("serial_number")); - String category = StringUtils.valueOf(map.get("lei4_bie2")); String id = StringUtils.valueOf(map.get("id")); String title = StringUtils.valueOf(map.get("title")); String titleEn = StringUtils.valueOf(map.get("title_en")); @@ -2349,7 +2316,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList = sysDictItemServiceImpl.selectItemsAll(); //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 - homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList,category,titleEn); + homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList,titleEn); try { @@ -2725,21 +2692,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> dataList, List fieldList, List dictItemList, - String category, String titleEn) { - String categoryCn = ""; - if(StringUtils.isNotBlank(category)){ - String finalCategory = category; - List stateDictItemList = dictItemList.stream() - .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) - .collect(Collectors.toList()); - if(stateDictItemList.size() != 0){ - category = stateDictItemList.get(0).getEnName(); - categoryCn = stateDictItemList.get(0).getItemText(); - } - }else{ - category = ""; - } //文件类型字段 List onlCgformFieldList = fieldList.stream() .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); @@ -2793,13 +2746,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList = sysDictItemServiceImpl.selectItemsAll(); - String finalCategory = category; - List stateDictItemList = dictItemList.stream() - .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) - .collect(Collectors.toList()); - if(stateDictItemList.size() != 0){ - category = stateDictItemList.get(0).getEnName(); - categoryCn = stateDictItemList.get(0).getItemText(); - } - }else{ - category = ""; - } //只要修改了标准,就需要向订阅用户发送消息(内容为-->XXX对“GB 7258 进行了修改请及时查看”) //向订阅领域管理中订阅了该技术领域的人和文档库中订阅了该条文档的人发送消息 // 只有技术领域变更为订阅的技术领域这一种情况发消息, 假如订阅了技术领域A,编辑的文档的技术领域也是A,这时编辑的是其他的字段,这种情况不发消息 @@ -3582,9 +3520,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl", "").replaceAll("", ""); //您订阅的XXX已被修改 - content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check."; + content = "In the "+ serialNumber+" you subscribed to, has been modified,Please pay attention to check."; //内容详情--英文(不带标签) - String contentInfoNo = "In the "+category + " " + serialNumber+" you subscribed to, "+ sbStr.toString(); + String contentInfoNo = "In the "+ serialNumber+" you subscribed to, "+ sbStr.toString(); //内容详情--英文(带标签) - String contentInfoYes = "In the "+category + " " + href+" you subscribed to, "+ sbStr.toString(); + String contentInfoYes = "In the "+ href+" you subscribed to, "+ sbStr.toString(); String msgTitle = serialNumber + " you subscribed to has been updated"; //内容详情-中文(不带标签) String sbStrCnTemp = sbStrCn.replaceAll("", "").replaceAll("", ""); - String contentCnNo = "您所订阅的"+categoryCn+serialNumber+","+sbStrCnTemp; + String contentCnNo = "您所订阅的"+serialNumber+","+sbStrCnTemp; //内容详情--中文(带标签) String contentInfoCnReplace = sbStrCn.replaceAll("","").replaceAll("",""); - String contentInfoCnYes ="您所订阅的"+categoryCn+href+","+contentInfoCnReplace;; + String contentInfoCnYes ="您所订阅的"+href+","+contentInfoCnReplace;; //封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, @@ -3683,9 +3621,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl