From d271d6a60248888db389c295c2f8d56d7e048dda Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 30 May 2022 14:22:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=87=E6=A1=A3=E5=8A=A8?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 111 ++++++++++-------- 1 file changed, 62 insertions(+), 49 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 2f3131edc..6e2bdc06f 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 @@ -2455,11 +2455,66 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List 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 fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(keyTemp)).collect(Collectors.toList()); + List fileInfosTemp = iOSSFileService.getFileInfos(valueTemp); + //之前的文件 + List fileNameList = fileInfosTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + String value = (String) map.get(keyTemp); + List fileInfosTempNew = iOSSFileService.getFileInfos(value); + //现在的文件 + List 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 = "" + serialNumber + "" + " " + 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 = "" + serialNumber + "" + " " + titleEn; StringBuilder msgContentSb = new StringBuilder(); StringBuilder msgContentInfoSb = new StringBuilder(); @@ -2480,46 +2535,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIst = new ArrayList<>(); - for (Map.Entry 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 fileListTemp = new ArrayList<>(); - if(fileIdLIstTemp.size() != 0){ - fileListTemp = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIstTemp,",")); - } - List fileNameListTemp = fileListTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList()); - - - //编辑的文件 - List fileList = new ArrayList<>(); - if(fileIdLIst.size() != 0){ - fileList = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIst,",")); - } - List fileNameList = fileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); - //删除的文件 - - List deleteFileList = new ArrayList<>(); - for (String fileName : fileNameListTemp) { - if(fileNameList.size() != 0 && !fileNameList.contains(fileName)){ - deleteFileList.add(fileName); - } - } - //上传的文件 - List upFileList = new ArrayList<>(); - for (String fileName : fileNameList) { - if(!fileNameListTemp.contains(fileName)){ - upFileList.add(fileName); - } - } int count = 0; - for (Map.Entry entry : map.entrySet()) { String key = entry.getKey(); String value = String.valueOf(entry.getValue()); @@ -2549,7 +2565,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stateDictItemList = dictItemList.stream() @@ -2585,15 +2601,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0){ String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1);