From 7e6e106fe2813971bf1c276b785ac18f759c65ea Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sat, 28 May 2022 01:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?,=E5=88=A0=E9=99=A4(=E5=90=8C=E6=AD=A5=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=8A=A8=E6=80=81--=E8=8B=B1=E6=96=87)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 53 +++++++++++++++----
 1 file changed, 43 insertions(+), 10 deletions(-)

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 43131689a..2f3131edc 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
@@ -170,6 +170,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //删除文件
         List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(ids, ","));
 
+        List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
+
+
 
         List<String> connectIdList = new ArrayList<>();
         for (OnlCgformField onlCgformField : fieldFileList) {
@@ -202,14 +205,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         for (Map<String, Object> map : mapList) {
             String id = (String) map.get("id");
             String serialNumber = (String) map.get("serial_number");
+            String titleEn = (String) map.get("title_en");
             String title = (String) map.get("title");
-            //文档动态-------------------
-            String hrefTemp = "<a href='/docManage/library/detail?id=" + id +
+            String category = (String)map.get("lei4_bie2");
+            if(StringUtils.isNotBlank(category)){
+                String finalCategory = category;
+                List<SysDictItem> 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();
+                }
+            }else {
+                category = "";
+            }
+
+                //文档动态-------------------
+            String hrefTemp =category + " " + "<a href='/docManage/library/detail?id=" + id +
                     "&title=" + title +
-                    "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>,";
+                    "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn + ",";
             HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
             sbTemp.append(hrefTemp);
-            serialNumberListTemp.add(serialNumber);
+            serialNumberListTemp.add(category + " " + serialNumber + " " + titleEn);
             //---------------------------
             if (documentIds.size() != 0 && documentIds.contains((String) map.get("id"))) {
                 serialNumberList.add(serialNumber);
@@ -219,12 +236,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 sb.append(href);
             }
         }
+        //The standard GB 7258-2017 Technical specifications  has been deleted from the document library.
         //文档动态信息添加
         if(StringUtils.isNotBlank(sbTemp)){
             String substring = sbTemp.substring(0, sbTemp.length() - 1);
             HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
-            String msgContent = "文档库删除了" + StringUtils.join(serialNumberListTemp,",");
-            String msgContentInfo = "文档库删除了" + substring;
+            String msgContent = "The " + StringUtils.join(serialNumberListTemp,",") + " has been deleted from the document library.";
+            String msgContentInfo = "The " + substring + " has been deleted from the document library.";
             homeDocumentDynamicEO.setMsgContent(msgContent);
             homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo);
             homeDocumentDynamicEOService.save(homeDocumentDynamicEO);
@@ -1992,6 +2010,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<String> userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp);
         String title = (String) map.get("title");
         String serialNumber = (String) map.get("serial_number");
+        String category = (String)map.get("lei4_bie2");
+        String titleEn = (String) map.get("title_en");
+        List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
+        if(StringUtils.isNotBlank(category)){
+            String finalCategory = category;
+            List<SysDictItem> 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();
+            }
+        }else{
+            category = "";
+        }
 
         Set<String> technologyTerritorySet = new HashSet<>();
         String technologyTerritoryId = "";
@@ -2030,13 +2062,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
 
 
-        String href = "<a href='/docManage/library/detail?id=" + idTemp +
+        String href = category + " " + "<a href='/docManage/library/detail?id=" + idTemp +
                 "&title=" + title +
-                "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
+                "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " "+ titleEn + " ";
         //文档动态,  文档库中新增了标准XXXX  homeDocumentDynamicEOService
+        //The standard GB 7258-2017 Technical specifications  has been added to the document library.
         HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
-        homeDocumentDynamicEO.setMsgContent("文档库中新增了标准" + serialNumber);
-        homeDocumentDynamicEO.setMsgContentInfo("文档库中新增了标准" + href);
+        homeDocumentDynamicEO.setMsgContent("The " + category + " " + serialNumber + " " + titleEn + " has been added to the document library.");
+        homeDocumentDynamicEO.setMsgContentInfo("The " + href + " has been added to the document library.");
         homeDocumentDynamicEOService.save(homeDocumentDynamicEO);