首页文档动态

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -2455,11 +2455,66 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
 
         List<String> fileFieldList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+        StringBuilder sbTemp = new StringBuilder();
+        StringBuilder sbContent = new StringBuilder();
+        StringBuilder sbContentInfo = new StringBuilder();
+        StringBuilder sbField = new StringBuilder();
+        StringBuilder sbNew = new StringBuilder();
+        dataList.get(0).entrySet().forEach(entry -> {
+            String keyTemp = entry.getKey();
+            if(fileFieldList.contains(keyTemp)) {
+                String valueTemp = (String) entry.getValue();
+                List<OnlCgformField> fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(keyTemp)).collect(Collectors.toList());
+                List<OSSFile> fileInfosTemp = iOSSFileService.getFileInfos(valueTemp);
+                //之前的文件
+                List<String> fileNameList = fileInfosTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList());
+                String value = (String) map.get(keyTemp);
+                List<OSSFile> fileInfosTempNew = iOSSFileService.getFileInfos(value);
+                //现在的文件
+                List<String> fileNameListNew = fileInfosTempNew.stream().map(OSSFile::getFileName).collect(Collectors.toList());
+                boolean checkDiffrent = checkDiffrent(fileNameList, fileNameListNew);
+                if (!checkDiffrent && fileNameListNew.size() != 0) {
+                    //消息
+                    sbField.append(fields.get(0).getDbFieldEnName() + ",");
+
+                    for (String s : fileNameListNew) {
+                        if (!fileNameList.contains(s)) {
+                            //消息详情
+                            sbNew.append(fields.get(0).getDbFieldEnName() + " " + s + ",");
+                        }
+                    }
+                    if (StringUtils.isNotBlank(sbField)) {
+                        String substring = sbField.substring(0, sbField.length() - 1);
+                        String content = substring;
+                    }
+                    if (StringUtils.isNotBlank(sbNew)) {
+                        String substring = sbNew.substring(0, sbNew.length() - 1);
+                        //Standard GB 7258 Uploaded Supplement File AA.dox, Release File BB.dox
+                        String dbFieldEnName = fields.get(0).getDbFieldEnName();
+                        String contentInfo = dbFieldEnName + " " + fileNameList + ",";
+                    }
+                }
+            }
+        });
 
-        //编辑时处理首页文档动态  1. 标准XXXX的状态改为  2. 标准XXXX的适用车型改为   3. 标准XXXX删除了XXXX文件  4. 标准XXXX上传了XXXX文件
         String href = "<a href='/docManage/library/detail?id=" + id +
                 "&title=" + title +
                 "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn;
+        String contentFile = "";
+        String contentInfoFile = "";
+        if(StringUtils.isNotBlank(sbField)){
+            String substring = sbField.substring(0, sbField.length() - 1);
+            contentFile = category + " " + serialNumber + " " + titleEn + " uploaded " + substring;
+        }
+        if(StringUtils.isNotBlank(sbNew)){
+            String substring = sbNew.substring(0, sbNew.length() - 1);
+            contentInfoFile = category + " " + href + " uploaded " + substring;
+        }
+
+        //编辑时处理首页文档动态  1. 标准XXXX的状态改为  2. 标准XXXX的适用车型改为   3. 标准XXXX删除了XXXX文件  4. 标准XXXX上传了XXXX文件
+//        String href = "<a href='/docManage/library/detail?id=" + id +
+//                "&title=" + title +
+//                "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn;
 
         StringBuilder msgContentSb = new StringBuilder();
         StringBuilder msgContentInfoSb = new StringBuilder();
@@ -2480,46 +2535,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 fileIdLIstTemp.addAll(Arrays.asList(value.split(",")));
             }
         }
-        List<String> fileIdLIst = new ArrayList<>();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            String key = entry.getKey();
-            String value = String.valueOf(entry.getValue());
-            //文件
-            if(fileFieldList.contains(key) && !"null".equals(value) && StringUtils.isNotBlank(value)){
-                fileIdLIst.addAll(Arrays.asList(value.split(",")));
-            }
-        }
-        //之前的文件
-        List<OSSFile> fileListTemp = new ArrayList<>();
-        if(fileIdLIstTemp.size() != 0){
-            fileListTemp = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIstTemp,","));
-        }
-        List<String> fileNameListTemp = fileListTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList());
-
-
-        //编辑的文件
-        List<OSSFile> fileList = new ArrayList<>();
-        if(fileIdLIst.size() != 0){
-            fileList = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIst,","));
-        }
-        List<String> fileNameList = fileList.stream().map(OSSFile::getFileName).collect(Collectors.toList());
-        //删除的文件
-
-        List<String> deleteFileList = new ArrayList<>();
-        for (String fileName : fileNameListTemp) {
-            if(fileNameList.size() != 0 && !fileNameList.contains(fileName)){
-                deleteFileList.add(fileName);
-            }
-        }
-        //上传的文件
-        List<String> upFileList = new ArrayList<>();
-        for (String fileName : fileNameList) {
-            if(!fileNameListTemp.contains(fileName)){
-                upFileList.add(fileName);
-            }
-        }
         int count = 0;
-
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             String key = entry.getKey();
             String value = String.valueOf(entry.getValue());
@@ -2549,7 +2565,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
             }
             //适用车型 car_type
-            if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2"))){
+            if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2")) && !"null".equals(value)){
                 count++;
                 //数据字典转换 dictItemList
                 List<SysDictItem> stateDictItemList = dictItemList.stream()
@@ -2585,15 +2601,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
             }
         }
-        if(upFileList.size() != 0){
+        if(StringUtils.isNotBlank(contentFile)){
-            count++;
+            count ++;
-            msgContentSb.append("上传了" + StringUtils.join(upFileList,",") + ",");
+            msgContentSb.append(contentFile);
-            msgContentInfoSb.append("上传了" + StringUtils.join(upFileList,",") + ",");
         }
-        if(deleteFileList.size() != 0){
+        if(StringUtils.isNotBlank(contentInfoFile)){
-            count++;
+            msgContentInfoSb.append(contentInfoFile);
-            msgContentSb.append("删除了" + StringUtils.join(deleteFileList,",") + ",");
-            msgContentInfoSb.append("删除了" + StringUtils.join(deleteFileList,",") + ",");
         }
         if(count > 0){
             String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1);