From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
index ccc78a6..ce4f6ea 100644
--- a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
@@ -1,9 +1,10 @@
package com.java110.store.smo.impl;
-
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.resourceStore.ResourceStoreDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.purchase.ResourceStorePo;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,6 +38,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Override
public List<ResourceStoreDto> queryResourceStores(@RequestBody ResourceStoreDto resourceResourceStoreDto) {
@@ -48,8 +53,26 @@
}
List<ResourceStoreDto> resourceResourceStores = BeanConvertUtil.covertBeanList(resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto)), ResourceStoreDto.class);
-
- return resourceResourceStores;
+ //鑾峰彇鍥剧墖鍦板潃
+ List<ResourceStoreDto> resourceStoreDtos = new ArrayList<>();
+ for (ResourceStoreDto resourceStoreDto : resourceResourceStores) {
+ //鑾峰彇璧勬簮id
+ String resId = resourceStoreDto.getResId();
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(resId);
+ //鏌ヨ鏂囦欢琛�
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ if (fileRelDtos != null && fileRelDtos.size() > 0) {
+ List<String> fileUrls = new ArrayList<>();
+ for (FileRelDto fileRel : fileRelDtos) {
+ String url = "/callComponent/download/getFile/file?fileId=" + fileRel.getFileRealName() + "&communityId=-1";
+ fileUrls.add(url);
+ }
+ resourceStoreDto.setFileUrls(fileUrls);
+ }
+ resourceStoreDtos.add(resourceStoreDto);
+ }
+ return resourceStoreDtos;
}
@@ -86,7 +109,6 @@
DistributedLock.releaseDistributedLock(requestId, key);
}
}
-
public IResourceStoreServiceDao getResourceStoreServiceDaoImpl() {
return resourceResourceStoreServiceDaoImpl;
--
Gitblit v1.8.0