From 4e398027ebc8a4cb0808bab00abeab7af605d85c Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 2 Aug 2021 17:44:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=20=E7=BC=96=E8=BE=91=E5=85=A5es=E5=BA=93=20=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandardsInfoServiceImpl.java     | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 500854cf..780d6015 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -110,6 +110,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Value("${elas.flag}")
     private boolean elasflag; //ES是否启用
 
+    @Value("${file.path}")
+    private String filePath;//文件存储路径
+
     @Autowired
     private SarStandardsInfoDao dao;
 
@@ -550,7 +553,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         Map<String, String> selectionMap = new HashMap<>();
         Map<String, String> fileMap = new HashMap<>();
         Map<String, String> multiTimeMap = new HashMap<>();
-        String fileIds = "";
+        List<String> fileIds = new ArrayList<>();
         for (Map.Entry<String, String> entry : sarStandAttrMap.entrySet()) {
             String attrKey = entry.getKey();
             String attrValue = String.valueOf(entry.getValue());
@@ -571,7 +574,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         selectionMap.put(attrKey, attrValue);
                     } else if (InitStandAttrUtil.fileFieldList.contains(attrKey)) {
                         fileMap.put(attrKey, attrValue);
-                        fileIds += attrValue + ",";
+                        List<String> list= Arrays.asList(attrValue .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
+                        fileIds.addAll(list);
+//                        String attrValueStr = String.join(",", list);
+//                        fileIds += attrValueStr + ",";
                         if (attrKey.equals("XXZLXX")) {
 //                            this.saveMsgDynamicInfo(attrValue,sarStandardsInfoEO.getStandName(),sarStandardsInfoEO.getId(),sarStandardsInfoEO.getStandSort()+" "+sarStandardsInfoEO.getStandNumber()+"-"+sarStandardsInfoEO.getStandYear());
                         }
@@ -589,10 +595,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         attrValue = "'" + attrValue + "'";
                     }
                     valuesBuilder.append("," + attrValue);
-                    sarStandardsInfoEO.setFileIds(fileIds);
                 }
             }
         }
+        if(!fileIds.isEmpty()){
+            sarStandardsInfoEO.setFileIds(String.join(",", fileIds));
+        }else {
+            sarStandardsInfoEO.setFileIds("");
+        }
         String insertField = mustFields + fieldsBuilder.toString();
         String insertValue = mustValues + valuesBuilder.toString();
         int insertRes = sarStandAttrInfoEODao.insertStandAttr(insertField, insertValue);
@@ -2062,8 +2072,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             for (int i = 0; i < attidlist.length; i++) {
                 if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) ){
                     AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
-                    //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
-                    String readFilePath = "E:\\上汽企标流程总览.pdf";
+                    String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
+//                    String readFilePath = "E:\\上汽企标流程总览.pdf";
                     try {
                         // 判断文件是docx还是PDF
                         if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
@@ -2122,10 +2132,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             for (int i = 0; i < attidlist.length; i++) {
                 if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])){
                     AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
-                    //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
+                    String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
                     try {
                         // 判断文件是docx还是PDF
-                        /*if (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")) {
+                        if (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")) {
                             if(attFileEO.getFileSuffix().equals("doc")){
                                 FileInputStream fis = new FileInputStream(readFilePath);
                                 WordExtractor wordExtractor = new WordExtractor(fis);
@@ -2148,8 +2158,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 // String[] lines = pdfFileInText.split("\\r?\\n");
                                 content.append(pdfFileInText);
                             }
-                        }*/
-                        String readFilePath = "E:\\上汽企标流程总览.pdf";
+                        }
+//                        String readFilePath = "E:\\上汽企标流程总览.pdf";
                         FileInputStream fis = new FileInputStream(readFilePath);
                         WordExtractor wordExtractor = new WordExtractor(fis);
                         String txt = wordExtractor.getText();