From dc352ea3b9ec925320784592f29ca640b3a7b2ea Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 05 十二月 2023 14:05:44 +0800
Subject: [PATCH] 6

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java |   23 ++++-------------------
 1 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
index 7a01b68..1e31c4f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -6,6 +6,7 @@
 import com.zt.core.sys.dto.DictLeafDto;
 import com.zt.life.export.dto.WordFile;
 import com.zt.life.export.service.WordFileService;
+import com.zt.life.modules.mainPart.utils.GetFilesPath;
 import com.zt.life.modules.mainPart.utils.GetShowDictList;
 import com.zt.life.modules.project.dao.EnvironDao;
 import com.zt.life.modules.project.dto.EnvironDto;
@@ -75,7 +76,7 @@
     private SysOssService sysOssService;
 
     @Autowired
-    private LocalStorageService localStorageService;
+    private GetFilesPath getFilesPath;
 
     @Value("${zt.oss.local-path}")
     private String localPath;
@@ -203,7 +204,7 @@
     public void exportEnviron(Long id, HttpServletRequest request, HttpServletResponse response) {
         try {
             EnvironDto dataObj = this.getDto(id, null);
-            String imagePath = "鏂囦欢鍥剧墖:"+getFirstImagePath(dataObj.getFiles());
+            String imagePath = "鏂囦欢鍥剧墖:"+getFilesPath.getFirstImagePath(dataObj.getFiles());
             dataObj.getEnviron().setTestEnvirontDiagram(imagePath);
             //閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
             String isVirusScanStr = getShowDictList.getShowDictList(dataObj.getEnviron().getIsVirusScan(), "is_or_not", false);
@@ -220,21 +221,5 @@
         }
     }
 
-    public String getFirstImagePath(OssDto oss) {
-        String filePath = "";
-        if (oss != null) {
-            if (oss.getGroups().size() > 0) {
-                OssDto.OssFieldGroupDto group = oss.getGroups().get(0);
-                if (group.getFields().size() > 0) {
-                    OssDto.OssFieldDto field = group.getFields().get(0);
-                    if (field.getFiles().size() > 0) {
-                        com.zt.core.oss.dto.OssDto file = field.getFiles().get(0);
-                        SysOss sysOss = sysOssService.get(file.getId());
-                        filePath = localPath+sysOss.getPath();
-                    }
-                }
-            }
-        }
-        return filePath;
-    }
+
 }

--
Gitblit v1.9.1