From bd732b4fea72b65aabade0dfb14ddb1346ad3f8f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 12:39:12 +0800
Subject: [PATCH] sessionkey更换
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 173 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 116 insertions(+), 57 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 1fe955e..f0ba93b 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,10 +20,13 @@
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;
+import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.math.BigDecimal;
@@ -117,6 +120,7 @@
@Override
public PageData<BaseData> findPage(PageWrap<BaseData> pageWrap) {
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
IPage<BaseData> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<BaseData> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
@@ -141,19 +145,19 @@
queryWrapper.lambda().eq(BaseData::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(BaseData::getTitle, pageWrap.getModel().getTitle());
+ queryWrapper.lambda().like(BaseData::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(BaseData::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(BaseData::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getSku() != null) {
- queryWrapper.lambda().eq(BaseData::getSku, pageWrap.getModel().getSku());
+ queryWrapper.lambda().like(BaseData::getSku, pageWrap.getModel().getSku());
}
if (pageWrap.getModel().getBrand() != null) {
- queryWrapper.lambda().eq(BaseData::getBrand, pageWrap.getModel().getBrand());
+ queryWrapper.lambda().like(BaseData::getBrand, pageWrap.getModel().getBrand());
}
if (pageWrap.getModel().getCategory() != null) {
- queryWrapper.lambda().eq(BaseData::getCategory, pageWrap.getModel().getCategory());
+ queryWrapper.lambda().like(BaseData::getCategory, pageWrap.getModel().getCategory());
}
if (pageWrap.getModel().getUrl() != null) {
queryWrapper.lambda().eq(BaseData::getUrl, pageWrap.getModel().getUrl());
@@ -288,7 +292,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
@@ -298,7 +314,7 @@
}
public static boolean IS_RUNNING = false;
@Override
- @Transactional
+ @Async
public void dealBaseData() {
if(IS_RUNNING){
return;
@@ -334,48 +350,7 @@
OssModel ossModel = initOssModel();
Date date = new Date();
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);
- goods.setName(StringUtils.defaultString(data.getName(),data.getTitle()));
- goods.setRemark(data.getTitle());
- goods.setContent(data.getTitle());
- goods.setStatus(Constants.ZERO);
- goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
- goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
- goods.setZdPrice(data.getPrice());
- //澶勭悊鍝佺墝鏁版嵁
- Brand bModel = getBrandModelFromList(data.getBrand(),brandList);
- if(bModel!= null){
- goods.setBrandId(bModel.getId());
- }
- //澶勭悊鍒楄〃鏁版嵁
- BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList);
- if(cModel!= null){
- goods.setCategoryId(cModel.getId());
- }
- goods.setImgurl(getOssImgurl(ossModel, data.getImgurl()));
- 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);
-
- data.setEditDate(new Date());
- data.setStatus(Constants.ONE);
- //鏇存柊鏁版嵁澶勭悊鐘舵��
- baseDataMapper.updateById(data);
+ dealPerData(ossModel,rate,date,data,cateList,brandList,paramList);
}
log.info("寮�濮嬪鐞嗘簮鏁版嵁=================success================澶勭悊鏁版嵁鍏憋紙"+allLis.size()+"锛変釜===");
}catch (Exception e){
@@ -387,17 +362,73 @@
}
}
+ @Transactional(isolation = Isolation.READ_UNCOMMITTED)
+ private void dealPerData(OssModel ossModel, BigDecimal rate, Date date, BaseData data, List<BaseCategory> cateList, List<Brand> brandList, List<BaseCateParam> paramList) {
+ 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);
+ goods.setName(StringUtils.defaultString(data.getName(),data.getTitle()));
+ goods.setRemark(data.getTitle());
+ goods.setContent(data.getTitle());
+ goods.setStatus(Constants.ZERO);
+ goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
+ goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
+ goods.setZdPrice(data.getPrice());
+ //澶勭悊鍝佺墝鏁版嵁
+ Brand bModel = getBrandModelFromList(data.getBrand(),brandList);
+ if(bModel!= null){
+ goods.setBrandId(bModel.getId());
+ }
+ //澶勭悊鍒楄〃鏁版嵁
+ BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList);
+ if(cModel!= null){
+ goods.setCategoryId(cModel.getId());
+ }
+ goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
+ 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);
+
+ data.setEditDate(new Date());
+ data.setStatus(Constants.ONE);
+ //鏇存柊鏁版嵁澶勭悊鐘舵��
+ baseDataMapper.updateById(data);
+ }
+
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("锛�", ",").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,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) {
if(StringUtils.isNotBlank(bgImg)){
- String img =getOssImgurl(ossModel,bgImg);
+ String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
if(StringUtils.isNotBlank(img)){
Multifile f = new Multifile();
f.setFileurl(img);
@@ -415,7 +446,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());
@@ -585,7 +617,7 @@
model.setIsdeleted(Constants.ZERO);
model.setPinyin(PinYinUtil.getFullSpell(model.getName()));
model.setShortPinyin(PinYinUtil.getFirstSpell(model.getName()));
- model.setImgurl(getOssImgurl(ossModel,img));
+ model.setImgurl(getOssImgurl(ossModel, ossModel.getCateFolder() ,img));
//鎻掑叆鏂扮殑鍝佺墝淇℃伅
baseCategoryMapper.insert(model);
//鍔犲叆闆嗗悎涓�
@@ -593,7 +625,8 @@
return model;
}
- private String getOssImgurl(OssModel ossModel, String img) {
+ @Override
+ public String getOssImgurl(OssModel ossModel, String folder,String img) {
if(StringUtils.isBlank(img)){
return null;
}
@@ -603,7 +636,7 @@
nfix = StringUtils.defaultString(nfix,".jpg");
String fileName = UUID.randomUUID() + nfix;
String tempFileName = nowDate + "/" + fileName;
- String key = ossModel.getCateFolder() + tempFileName;// 鏂囦欢鍚�
+ String key =folder+ tempFileName;// 鏂囦欢鍚�
ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
if (obs.uploadOnlineObject(img,ossModel.getBucket(), key,null)) {
@@ -614,4 +647,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