From a2735382e853f89465e328dce2df9f3f465bcda9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 20 九月 2023 17:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 879f6fd..aceab32 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
@@ -300,7 +300,7 @@
for(BaseData data :result.getRecords()){
//澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
if(StringUtils.isNotBlank(data.getBgImg())){
- String tImg = data.getBgImg().replace("锛�", ",").replace(".avif", "");
+ String tImg = data.getBgImg().replace("锛�", ",").replace(".avif", "").replace("/n1/jfs/", "/n0/jfs/");
String[] imgs =tImg.split(",");
data.setBgImgs(imgs);
@@ -319,7 +319,7 @@
@Override
@Async
@Transactional
- public void dealBaseData() {
+ public synchronized void dealBaseData() {
if(IS_RUNNING){
return;
}
@@ -411,7 +411,7 @@
updateModel.lambda().set(Multifile::getIsdeleted,Constants.ONE);
updateModel.lambda().set(Multifile::getEditDate, new Date());
updateModel.lambda().in(Multifile::getObjId, goodsIdList);
- updateModel.lambda().eq(Multifile::getObjType, Constants.ZERO);
+ updateModel.lambda().eq(Multifile::getObjType, Constants.ONE);
multifileMapper.delete(updateModel);
//鍒犻櫎鍘熸湁鍟嗗搧灞炴��
UpdateWrapper<BaseGoodsParam> bgModel = new UpdateWrapper<>();
@@ -461,12 +461,14 @@
private int addImg(int i,OssModel ossModel, Integer id,String bgImg,List<Multifile> fileList,List<FileRecord> fileRecords) {
if(StringUtils.isNotBlank(bgImg)){
+ bgImg = bgImg.replace("/n1/jfs/", "/n0/jfs/");
// String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
String img = getOssImgurlFile(ossModel.getGoodsFolder(), bgImg, null,Constants.TWO,fileRecords);
if(StringUtils.isNotBlank(img)){
+
Multifile f = new Multifile();
f.setFileurl(img);
- f.setObjType(Constants.ZERO);
+ f.setObjType(Constants.ONE);
f.setName(bgImg.substring(bgImg.lastIndexOf("/")+1));
f.setType(Constants.ZERO);
f.setObjId(id);
@@ -700,13 +702,17 @@
FileRecord model = new FileRecord();
model.setIsdeleted(Constants.ZERO);
model.setCreateDate(new Date());
- model.setName(key);
- model.setInfo(tempFileName);
+ model.setName(tempFileName);
+ model.setInfo(null);
model.setFolder(folder);
model.setUrl(img);
model.setObjId(id);
model.setType(objType);
model.setStatus(Constants.ZERO);
+ model.setKeyval(key);
+ fileRecords.add(model);
+
+ return tempFileName;
}catch (Exception e){
}
--
Gitblit v1.9.3