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 | 151 +++++++++++++++++++++++++++-----------------------
1 files changed, 82 insertions(+), 69 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 8ea175e..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
@@ -61,6 +61,8 @@
private BaseCateParamMapper baseCateParamMapper;
@Autowired
private BrandMapper brandMapper;
+ @Autowired
+ private FileRecordMapper fileRecordMapper;
@Override
public String create(BaseData baseData) {
@@ -298,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);
@@ -316,8 +318,8 @@
public static boolean IS_RUNNING = false;
@Override
@Async
- @Transactional(isolation = Isolation.READ_UNCOMMITTED)
- public void dealBaseData() {
+ @Transactional
+ public synchronized void dealBaseData() {
if(IS_RUNNING){
return;
}
@@ -353,6 +355,8 @@
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();
@@ -374,35 +378,20 @@
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.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
+// 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()));
if(model!=null){
- //濡傛灉宸茬粡瀛樺湪锛岄�昏緫鍒犻櫎鏃х殑鍟嗗搧鏁版嵁
-// 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.setEditDate(date);
goods.setId(model.getId());
baseGoodsMapper.updateById(goods);
- //鍒犻櫎鍘熸湁闄勪欢澶у浘
- UpdateWrapper<Multifile> updateModel = new UpdateWrapper<>();
- updateModel.lambda().set(Multifile::getIsdeleted,Constants.ONE);
- updateModel.lambda().set(Multifile::getEditDate, new Date());
- updateModel.lambda().eq(Multifile::getObjId, goods.getId());
- 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().eq(BaseGoodsParam::getGoodsId, goods.getId());
- baseGoodsParamMapper.delete(bgModel);
+ goodsIdList.add(goods.getId());
}else{
//鎻掑叆鏂板晢鍝佹暟鎹�
goods.setCreateDate(date);
@@ -411,17 +400,36 @@
//澶勭悊鍒嗙被灞炴��
dealCateParamAll(cModel.getId(),goods.getId(),data,paramList, baseGoodsParamList );
//澶勭悊鑳屾櫙鍥�
- dealBgImgAll(ossModel,goods.getId(),data,fileList);
+ 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.ONE);
+ 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){
@@ -435,7 +443,7 @@
}
- private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data,List<Multifile> fileList) {
+ private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data,List<Multifile> fileList,List<FileRecord> fileRecords) {
int i =0;
//澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
if(StringUtils.isNotBlank(data.getBgImg())){
@@ -443,7 +451,7 @@
String[] imgs =tImg.split(",");
for (int j = 0; j < imgs.length; j++) {
if(StringUtils.isNotBlank(imgs[j])){
- i += addImg(i,ossModel,id,imgs[j],fileList);
+ i += addImg(i,ossModel,id,imgs[j],fileList,fileRecords);
}
}
}
@@ -452,13 +460,16 @@
// addImg(i,ossModel,id,data.getBgImg3());
}
- private int addImg(int i,OssModel ossModel, Integer id,String bgImg,List<Multifile> fileList) {
+ 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);
+ 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);
@@ -501,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) {
@@ -548,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);
@@ -627,7 +607,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;
}
@@ -645,7 +625,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);
//鍔犲叆闆嗗悎涓�
@@ -654,7 +635,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;
}
@@ -666,6 +647,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;
@@ -675,6 +657,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