优化附件处理代码

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionAttachServiceImpl.java

@@ -96,11 +96,10 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
     @Override
     public List<String> getAttachPathToStrArray(String busId) {
         List<CenterdataTHousingconstructionAttach> attachPathToEntityArray = getAttachPathToEntityArray(busId);
-        String fileUrl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey("fileUrl").getData();
         List<String> resultList = new ArrayList<>();
         if (!attachPathToEntityArray.isEmpty()) {
             attachPathToEntityArray.forEach(attach -> {
-                resultList.add(fileUrl + attach.getAttachPath());
+                resultList.add(attach.getAttachPath());
             });
         }
         return resultList;
@@ -219,14 +218,18 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
         });
     }
 
+
+    /**
+     * 针对文件类型数据处理
+     * @param busId 业务id
+     * @param type 要与附件表中dict_type匹配的字符串
+     * @return String   附件路径+文件名 以逗号拼接
+     */
     @Override
     public String replasePathToFile(String busId,String type){
         List<CenterdataTHousingconstructionAttach> attachList = getAttachPathToEntityArray(busId);
-
         StringBuilder newDiles = new StringBuilder();
-
         String fileurl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(DOWNLOAD_URL).getData();
-
         attachList.forEach(attach->{
             if(StringUtils.isNotEmpty(type)){
                 if(type.equals(attach.getDictType())){

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionEnterpriseproductionreportServiceImpl.java

@@ -1,12 +1,9 @@
 package com.sooka.sponest.data.housingconstruction.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteConfigService;
-import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionAttach;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionEnterpriseproductionreport;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionEnterpriseproductionreportMapper;
 import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionAttachService;
@@ -15,9 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
-
-import static com.sooka.sponest.data.utils.DataConstants.DOWNLOAD_URL;
 
 /**
  * 企业生产报告Service业务层处理
@@ -42,23 +36,6 @@ public class CenterdataTHousingconstructionEnterpriseproductionreportServiceImpl
     @Override
     public CenterdataTHousingconstructionEnterpriseproductionreport selectCenterdataTHousingconstructionEnterpriseproductionreportById(String id) {
         CenterdataTHousingconstructionEnterpriseproductionreport report = centerdataTHousingconstructionEnterpriseproductionreportMapper.selectCenterdataTHousingconstructionEnterpriseproductionreportById(id);
-
-        /*List<CenterdataTHousingconstructionAttach> attachList = attachService.getAttachPathToEntityArray(id);
-        StringBuilder newDiles = new StringBuilder();
-
-        String fileurl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(DOWNLOAD_URL).getData();
-
-        attachList.forEach(attach->{
-            if(report.getReportType().equals(attach.getDictValue())){
-                String filename = attach.getFileName(); //新建 Microsoft Excel 工作表 (2).xlsx
-                String url = attach.getAttachPath().substring(attach.getAttachPath().indexOf("group1"),attach.getAttachPath().length()); //group1/M00/00/84/wKgKEGawNfGAW7bwAAAxRySSUAM25.xlsx
-                String group = url.substring(0, url.indexOf('/')); //group1
-                newDiles.append(fileurl + "Download?fileName=" + filename + "&&group=" + group + "&&path=" + url.substring(url.indexOf('/') + 1) + "+" + filename + ",");
-            }
-        });
-        if(newDiles.length() > 0){
-            newDiles.deleteCharAt(newDiles.length() - 1);
-        }*/
         report.setFileUrl(attachService.replasePathToFile(id,null));
         return report;
     }