From cb8db5f74edbbc4ae0f37aa089c761408cc017a5 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 18 九月 2023 18:37:29 +0800
Subject: [PATCH] #联调修改
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index 69a36fc..603ddd7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -24,6 +24,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.math.BigDecimal;
@@ -391,9 +392,19 @@
private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data) {
int i =0;
- i += addImg(i,ossModel,id,data.getBgImg());
- i += addImg(i,ossModel,id,data.getBgImg2());
- addImg(i,ossModel,id,data.getBgImg3());
+ //澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
+ if(StringUtils.isNotBlank(data.getBgImg())){
+ String tImg = data.getBgImg().replace("锛�", ",");
+ String[] imgs =tImg.split(",");
+ for (int j = 0; j < imgs.length; j++) {
+ if(StringUtils.isNotBlank(imgs[j])){
+ i += addImg(i,ossModel,id,imgs[j]);
+ }
+ }
+ }
+// i += addImg(i,ossModel,id,data.getBgImg());
+// i += addImg(i,ossModel,id,data.getBgImg2());
+// addImg(i,ossModel,id,data.getBgImg3());
}
private int addImg(int i,OssModel ossModel, Integer id,String bgImg) {
@@ -416,7 +427,8 @@
return 0;
}
- private OssModel initOssModel() {
+ @Override
+ public OssModel initOssModel() {
OssModel model = new OssModel();
model.setUrl(systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode());
model.setEndpoint(systemDictDataBiz.queryByCode(Constants.OSS, Constants.ENDPOINT).getCode());
@@ -594,7 +606,8 @@
return model;
}
- private String getOssImgurl(OssModel ossModel, String folder,String img) {
+ @Override
+ public String getOssImgurl(OssModel ossModel, String folder,String img) {
if(StringUtils.isBlank(img)){
return null;
}
@@ -615,4 +628,30 @@
}
return null;
}
+
+ @Override
+ public String getOssImgurl(OssModel ossModel, String folder, File f) {
+ if(f == null || !f.isFile()){
+ return null;
+ }
+ try {
+ String img = f.getPath();
+ String nowDate = DateUtil.getNowShortDate();// 褰撳墠鏃堕棿锛堝勾鏈堟棩锛�
+ String nfix = img.lastIndexOf(".")>0?img.substring(img.lastIndexOf(".")):null;
+ nfix = StringUtils.defaultString(nfix,".jpg");
+ String fileName = UUID.randomUUID() + nfix;
+ String tempFileName = nowDate + "/" + fileName;
+ String key =folder+ tempFileName;// 鏂囦欢鍚�
+
+ ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
+ if (obs.uploadFile(ossModel.getBucket(), key,f,null)) {
+ return tempFileName;
+ }
+ }catch (Exception e){
+
+ }
+ return null;
+ }
+
+
}
--
Gitblit v1.9.3