From cdf29a8f6fb9990f82ccc1d3f47bfba48cfaf4fc Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 10 一月 2024 17:24:53 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 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..25e9976 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,8 @@
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.contractReview.model.ContractReview;
+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 +77,7 @@
private SysOssService sysOssService;
@Autowired
- private LocalStorageService localStorageService;
+ private GetFilesPath getFilesPath;
@Value("${zt.oss.local-path}")
private String localPath;
@@ -108,9 +110,13 @@
if (data.getTestAgencyInfo() == null)
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
if (environId != null) {
- OssDto ossDto = sysOssConfigService.getOssByBusiType(environId, "test_environt_diagram");
- if (ossDto != null) {
- data.setFiles(ossDto);
+ OssDto ossDto1 = sysOssConfigService.getOssByBusiType(environId, "test_environ_diagram");
+ OssDto ossDto2 = sysOssConfigService.getOssByBusiType(environId, "test_environ");
+ if (ossDto1 != null ) {
+ data.setFiles(ossDto1);
+ }
+ if (ossDto2 != null){
+ data.setFiles2(ossDto2);
}
}
@@ -124,7 +130,11 @@
* @return
*/
public List<Environ> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<Environ> list = baseDao.getList(queryFilter.getQueryParams());
+ if (list.size() > 0) {
+ sysOssService.setListOsses(list, "test_environ");
+ }
+ return list;
}
/**
@@ -197,13 +207,14 @@
testAgencyInfoService.update(environDto.getTestAgencyInfo());
}
sysOssConfigService.updateOss(environDto.getEnviron().getId(), environDto.getFiles());// 淇濆瓨闄勪欢
+ sysOssConfigService.updateOss(environDto.getEnviron().getId(), environDto.getFiles2());// 淇濆瓨闄勪欢
return true;
}
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 +231,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