From 0b9c144b5110a7e2a85b2e5581ef304bb81a3ebc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 19:24:35 +0800
Subject: [PATCH] 修改
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 154 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 121 insertions(+), 33 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 603ddd7..d826fc3 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
@@ -20,7 +20,9 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -28,6 +30,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -58,6 +61,8 @@
private BaseCateParamMapper baseCateParamMapper;
@Autowired
private BrandMapper brandMapper;
+ @Autowired
+ private FileRecordMapper fileRecordMapper;
@Override
public String create(BaseData baseData) {
@@ -290,7 +295,19 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(baseDataMapper.selectPage(page, queryWrapper));
+ IPage<BaseData> result =baseDataMapper.selectPage(page, queryWrapper);
+ if(result!=null && result.getRecords()!=null){
+ for(BaseData data :result.getRecords()){
+ //澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
+ if(StringUtils.isNotBlank(data.getBgImg())){
+ String tImg = data.getBgImg().replace("锛�", ",").replace(".avif", "");
+ String[] imgs =tImg.split(",");
+ data.setBgImgs(imgs);
+
+ }
+ }
+ }
+ return PageData.from(result);
}
@Override
@@ -300,8 +317,9 @@
}
public static boolean IS_RUNNING = false;
@Override
+ @Async
@Transactional
- public void dealBaseData() {
+ public synchronized void dealBaseData() {
if(IS_RUNNING){
return;
}
@@ -335,23 +353,22 @@
BigDecimal rate = systemDictDataBiz.getGoodsPriceRate();
OssModel ossModel = initOssModel();
Date date = new Date();
+ List<BaseCateParam> baseCateParamList = new ArrayList<>();
+ List<Multifile> fileList = new ArrayList<>();
+ List<Integer> goodsIdList = new ArrayList<>();
+ List<FileRecord> fileRecords = new ArrayList<>();
+ List<BaseGoodsParam> baseGoodsParamList = new ArrayList<>();
for(BaseData data : allLis){
BaseGoods goods = new BaseGoods();
goods.setBaseDataId(data.getId());
goods.setIsdeleted(Constants.ZERO);
- if(baseGoodsMapper.selectCount(new QueryWrapper<>(goods)) >0){
- //濡傛灉宸茬粡瀛樺湪锛岄�昏緫鍒犻櫎鏃х殑鍟嗗搧鏁版嵁
- UpdateWrapper<BaseGoods> updateModel = new UpdateWrapper<>();
- updateModel.lambda().set(BaseGoods::getIsdeleted,Constants.ONE);
- updateModel.lambda().set(BaseGoods::getEditDate, new Date());
- updateModel.lambda().eq(BaseGoods::getBaseDataId, data.getId());
- baseGoodsMapper.update(null, updateModel);
- }
- goods.setCreateDate(date);
+ //鏌ヨ鏄惁瀛樺湪鍟嗗搧
+ BaseGoods model = baseGoodsMapper.selectOne(new QueryWrapper<>(goods).last(" limit 1"));
goods.setName(StringUtils.defaultString(data.getName(),data.getTitle()));
goods.setRemark(data.getTitle());
goods.setContent(data.getTitle());
goods.setStatus(Constants.ZERO);
+ goods.setOrigin(Constants.BasegoodsOrigin.basedata);
goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
goods.setZdPrice(data.getPrice());
@@ -361,28 +378,63 @@
goods.setBrandId(bModel.getId());
}
//澶勭悊鍒楄〃鏁版嵁
- BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList);
+ BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList,fileRecords);
if(cModel!= null){
goods.setCategoryId(cModel.getId());
}
- goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
+// 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())));
- //鎻掑叆鏂板晢鍝佹暟鎹�
- baseGoodsMapper.insert(goods);
- //澶勭悊鍒嗙被灞炴��
- dealCateParamAll(cModel.getId(),goods.getId(),data,paramList);
- //澶勭悊鑳屾櫙鍥�
- dealBgImgAll(ossModel,goods.getId(),data);
-
+ if(model!=null){
+ //濡傛灉宸茬粡瀛樺湪锛屾洿鏂板晢鍝佹暟鎹�
+ goods.setEditDate(date);
+ goods.setId(model.getId());
+ baseGoodsMapper.updateById(goods);
+ goodsIdList.add(goods.getId());
+ }else{
+ //鎻掑叆鏂板晢鍝佹暟鎹�
+ goods.setCreateDate(date);
+ baseGoodsMapper.insert(goods);
+ }
+ //澶勭悊鍒嗙被灞炴��
+ dealCateParamAll(cModel.getId(),goods.getId(),data,paramList, baseGoodsParamList );
+ //澶勭悊鑳屾櫙鍥�
+ dealBgImgAll(ossModel,goods.getId(),data,fileList,fileRecords);
data.setEditDate(new Date());
data.setStatus(Constants.ONE);
//鏇存柊鏁版嵁澶勭悊鐘舵��
baseDataMapper.updateById(data);
}
+ if(goodsIdList.size()>0){
+ //鍒犻櫎鍘熸湁闄勪欢澶у浘
+ UpdateWrapper<Multifile> updateModel = new UpdateWrapper<>();
+ 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);
+ multifileMapper.delete(updateModel);
+ //鍒犻櫎鍘熸湁鍟嗗搧灞炴��
+ UpdateWrapper<BaseGoodsParam> bgModel = new UpdateWrapper<>();
+ bgModel.lambda().set(BaseGoodsParam::getIsdeleted,Constants.ONE);
+ bgModel.lambda().set(BaseGoodsParam::getEditDate, new Date());
+ bgModel.lambda().in(BaseGoodsParam::getGoodsId, goodsIdList);
+ baseGoodsParamMapper.delete(bgModel);
+ }
+
+ if(fileList.size()>0){
+ multifileMapper.insertBatch(fileList);
+ }
+ if(baseGoodsParamList.size()>0){
+ baseGoodsParamMapper.insertBatch(baseGoodsParamList);
+ }
+ if(fileRecords.size()>0){
+ fileRecordMapper.insertBatch(fileRecords);
+ }
log.info("寮�濮嬪鐞嗘簮鏁版嵁=================success================澶勭悊鏁版嵁鍏憋紙"+allLis.size()+"锛変釜===");
}catch (Exception e){
e.printStackTrace();
log.info("寮�濮嬪鐞嗘簮鏁版嵁=================error==================="+e.getMessage());
+ throw e;
}finally {
IS_RUNNING = false;
log.info("寮�濮嬪鐞嗘簮鏁版嵁=================end===================");
@@ -390,15 +442,15 @@
}
- private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data) {
+ private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data,List<Multifile> fileList,List<FileRecord> fileRecords) {
int i =0;
//澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
if(StringUtils.isNotBlank(data.getBgImg())){
- String tImg = data.getBgImg().replace("锛�", ",");
+ String tImg = data.getBgImg().replace("锛�", ",").replace(".avif", "");
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,imgs[j],fileList,fileRecords);
}
}
}
@@ -407,9 +459,10 @@
// addImg(i,ossModel,id,data.getBgImg3());
}
- private int addImg(int i,OssModel ossModel, Integer id,String bgImg) {
+ private int addImg(int i,OssModel ossModel, Integer id,String bgImg,List<Multifile> fileList,List<FileRecord> fileRecords) {
if(StringUtils.isNotBlank(bgImg)){
- String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
+// 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);
@@ -420,7 +473,8 @@
f.setCreateDate(new Date());
f.setIsdeleted(Constants.ZERO);
f.setSortnum(i);
- multifileMapper.insert(f);
+ fileList.add(f);
+// multifileMapper.insert(f);
return 1;
}
}
@@ -441,14 +495,14 @@
}
- private void dealCateParamAll(Integer cateId,Integer goodsId, BaseData data ,List<BaseCateParam> cateList) {
+ private void dealCateParamAll(Integer cateId,Integer goodsId, BaseData data ,List<BaseCateParam> cateList,List<BaseGoodsParam> paramList) {
Method[] fields = data.getClass().getMethods(); // 鑾峰彇瀵硅薄鐨勬墍鏈夊睘鎬�
for (Method item : fields) {
String name = item.getName();
if(name.indexOf("getAttr") == 0){
try {
String val =(String) item.invoke(data);
- dealCateParam(cateId,goodsId,val.toString(),cateList);
+ dealCateParam(cateId,goodsId,val.toString(),cateList,paramList);
} catch (Exception e) {
// throw new RuntimeException(e);
}
@@ -491,7 +545,7 @@
// dealCateParam(cateId,goodsId,data.getAttr34(),cateList);
}
- private void dealCateParam(Integer cateId, Integer goodsId, String attr,List<BaseCateParam> list) {
+ private void dealCateParam(Integer cateId, Integer goodsId, String attr,List<BaseCateParam> list,List<BaseGoodsParam> paramList) {
if(StringUtils.isBlank(attr)){
return;
}
@@ -515,7 +569,8 @@
p.setVal(val);
p.setCreateDate(new Date());
p.setGoodsId(goodsId);
- baseGoodsParamMapper.insert(p);
+ paramList.add(p);
+// baseGoodsParamMapper.insert(p);
}
/**
@@ -580,7 +635,7 @@
* @return
*/
- private BaseCategory getCateModelFromList(BigDecimal dRate,String name, OssModel ossModel, String img, List<BaseCategory> list) {
+ private BaseCategory getCateModelFromList(BigDecimal dRate,String name, OssModel ossModel, String img, List<BaseCategory> list, List<FileRecord> fileRecords) {
if(StringUtils.isBlank(name)){
return null;
}
@@ -598,7 +653,8 @@
model.setIsdeleted(Constants.ZERO);
model.setPinyin(PinYinUtil.getFullSpell(model.getName()));
model.setShortPinyin(PinYinUtil.getFirstSpell(model.getName()));
- model.setImgurl(getOssImgurl(ossModel, ossModel.getCateFolder() ,img));
+// model.setImgurl(getOssImgurl(ossModel, ossModel.getCateFolder() ,img));
+ model.setImgurl(getOssImgurlFile(ossModel.getCateFolder(), img, null,Constants.ONE,fileRecords));
//鎻掑叆鏂扮殑鍝佺墝淇℃伅
baseCategoryMapper.insert(model);
//鍔犲叆闆嗗悎涓�
@@ -607,7 +663,7 @@
}
@Override
- public String getOssImgurl(OssModel ossModel, String folder,String img) {
+ public String getOssImgurl(OssModel ossModel, String folder,String img ) {
if(StringUtils.isBlank(img)){
return null;
}
@@ -619,6 +675,7 @@
String tempFileName = nowDate + "/" + fileName;
String key =folder+ tempFileName;// 鏂囦欢鍚�
+
ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
if (obs.uploadOnlineObject(img,ossModel.getBucket(), key,null)) {
return tempFileName;
@@ -628,6 +685,37 @@
}
return null;
}
+ public String getOssImgurlFile(String folder,String img ,String id,Integer objType,List<FileRecord> fileRecords) {
+ if(StringUtils.isBlank(img)){
+ return null;
+ }
+ try {
+ 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;// 鏂囦欢鍚�
+
+ FileRecord model = new FileRecord();
+ model.setIsdeleted(Constants.ZERO);
+ model.setCreateDate(new Date());
+ 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){
+
+ }
+ return null;
+ }
@Override
public String getOssImgurl(OssModel ossModel, String folder, File f) {
--
Gitblit v1.9.3