From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 60 ++++++++++++++++++------------------------------------------
1 files changed, 18 insertions(+), 42 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..7a8c622 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/", "/imgzone/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;
}
@@ -384,7 +384,8 @@
}
// goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
goods.setImgurl(getOssImgurlFile(ossModel.getGoodsFolder(), data.getImgurl(), data.getId(),Constants.ZERO,fileRecords));
- goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
+// goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
+ goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()));
if(model!=null){
//濡傛灉宸茬粡瀛樺湪锛屾洿鏂板晢鍝佹暟鎹�
goods.setEditDate(date);
@@ -411,7 +412,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 +462,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/", "/imgzone/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);
@@ -509,40 +512,6 @@
}
}
-// dealCateParam(cateId,goodsId,data.getAttr1(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr2(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr3(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr4(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr5(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr6(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr7(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr8(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr9(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr10(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr11(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr12(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr13(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr14(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr15(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr16(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr17(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr18(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr19(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr20(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr21(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr22(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr23(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr24(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr25(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr26(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr27(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr28(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr29(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr30(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr31(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr32(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr33(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr34(),cateList);
}
private void dealCateParam(Integer cateId, Integer goodsId, String attr,List<BaseCateParam> list,List<BaseGoodsParam> paramList) {
@@ -556,7 +525,10 @@
return;
}
String attrName = attr.substring(0,index);
- if(StringUtils.isBlank(attrName) || StringUtils.equals(attrName, "鍟嗗搧鍚嶇О") || StringUtils.equals(attrName, "鍟嗗搧缂栧彿")){
+ if(StringUtils.isBlank(attrName)
+ || StringUtils.equals(attrName, "鍟嗗搧鍚嶇О")
+ || StringUtils.equals(attrName, "鍟嗗搧缂栧彿")
+ || StringUtils.equals(attrName, "搴楅摵")){
return;
}
String val = attr.substring(index+1);
@@ -700,13 +672,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