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 | 330 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 270 insertions(+), 60 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 c0d4df7..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 @@ -1,26 +1,39 @@ package com.doumee.service.business.impl; +import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; +import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.PinYinUtil; import com.doumee.core.utils.Utils; +import com.doumee.core.utils.aliyun.ALiYunUtil; import com.doumee.dao.business.*; import com.doumee.dao.business.model.*; +import com.doumee.dao.business.model.dto.OssModel; import com.doumee.service.business.BaseDataService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; 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; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; /** * 鍟嗗搧婧愭暟鎹俊鎭〃Service瀹炵幇 @@ -28,10 +41,16 @@ * @date 2023/09/08 11:39 */ @Service +@Slf4j public class BaseDataServiceImpl implements BaseDataService { @Autowired private BaseDataMapper baseDataMapper; + @Autowired + private MultifileMapper multifileMapper; + @Autowired + @Lazy + private SystemDictDataBiz systemDictDataBiz; @Autowired private BaseGoodsMapper baseGoodsMapper; @Autowired @@ -42,6 +61,8 @@ private BaseCateParamMapper baseCateParamMapper; @Autowired private BrandMapper brandMapper; + @Autowired + private FileRecordMapper fileRecordMapper; @Override public String create(BaseData baseData) { @@ -102,6 +123,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()); @@ -126,19 +148,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()); @@ -273,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", "").replace("/n1/jfs/", "/imgzone/jfs/"); + String[] imgs =tImg.split(","); + data.setBgImgs(imgs); + + } + } + } + return PageData.from(result); } @Override @@ -283,10 +317,13 @@ } public static boolean IS_RUNNING = false; @Override - public void dealBaseData() { + @Async + @Transactional + public synchronized void dealBaseData() { if(IS_RUNNING){ return; } + log.info("寮�濮嬪鐞嗘簮鏁版嵁=================start==================="); IS_RUNNING = true; try { @@ -294,6 +331,8 @@ param.setStatus(Constants.ZERO); List<BaseData> allLis=findList(param); if(allLis==null || allLis.size() ==0){ + + log.info("寮�濮嬪鐞嗘簮鏁版嵁=================end========鏃犲緟澶勭悊鏁版嵁==========="); return ; } Brand brand = new Brand(); @@ -310,19 +349,28 @@ p.setIsdeleted(Constants.ZERO); //鏌ヨ鍏ㄩ儴绫诲埆灞炴�т俊鎭� List<BaseCateParam> paramList = baseCateParamMapper.selectList(new QueryWrapper<>(p)); + //榛樿獚鍔犱环绯绘暟 + 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); - 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.setPrice(data.getSaleprice()); goods.setZdPrice(data.getPrice()); //澶勭悊鍝佺墝鏁版嵁 Brand bModel = getBrandModelFromList(data.getBrand(),brandList); @@ -330,89 +378,159 @@ goods.setBrandId(bModel.getId()); } //澶勭悊鍒楄〃鏁版嵁 - BaseCategory cModel = getCateModelFromList(data.getBrand(),data.getCategoryImg(), cateList); - if(bModel!= null){ - goods.setBrandId(bModel.getId()); + BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList,fileRecords); + if(cModel!= null){ + goods.setCategoryId(cModel.getId()); } - - //鎻掑叆鏂板晢鍝佹暟鎹� - baseGoodsMapper.insert(goods); - //澶勭悊鍒嗙被灞炴�� - dealCateParamAll(cModel.getId(),goods.getId(),data,paramList); +// 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){ + //濡傛灉宸茬粡瀛樺湪锛屾洿鏂板晢鍝佹暟鎹� + 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); } - }catch (Exception e){ + 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){ + e.printStackTrace(); + log.info("寮�濮嬪鐞嗘簮鏁版嵁=================error==================="+e.getMessage()); + throw e; }finally { IS_RUNNING = false; + log.info("寮�濮嬪鐞嗘簮鏁版嵁=================end==================="); } - } - private void dealCateParamAll(Integer cateId,Integer goodsId, BaseData data ,List<BaseCateParam> cateList) { + 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("锛�", ",").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],fileList,fileRecords); + } + } + } +// 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,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.ONE); + f.setName(bgImg.substring(bgImg.lastIndexOf("/")+1)); + f.setType(Constants.ZERO); + f.setObjId(id); + f.setCreateDate(new Date()); + f.setIsdeleted(Constants.ZERO); + f.setSortnum(i); + fileList.add(f); +// multifileMapper.insert(f); + return 1; + } + } + return 0; + } + + @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()); + model.setAccessId(systemDictDataBiz.queryByCode(Constants.OSS, Constants.ACCESS_ID).getCode()); + model.setAccessKey(systemDictDataBiz.queryByCode(Constants.OSS, Constants.ACCESS_KEY).getCode()); + model.setBucket(systemDictDataBiz.queryByCode(Constants.OSS, Constants.BUCKETNAME).getCode()); + model.setCateFolder(systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode()); + model.setGoodsFolder(systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode()); + return model; + } + + + 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); +// throw new RuntimeException(e); } } } -// 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) { + private void dealCateParam(Integer cateId, Integer goodsId, String attr,List<BaseCateParam> list,List<BaseGoodsParam> paramList) { if(StringUtils.isBlank(attr)){ return; } +// 鍟嗗搧鍚嶇О锛氱伀鏄熶汉F30BX //濡傛灉灞炴�т笉涓虹┖锛屽鐞嗗睘鎬ф暟鎹� int index = attr.indexOf("锛�"); if(index <=0){ return; } String attrName = attr.substring(0,index); + if(StringUtils.isBlank(attrName) + || StringUtils.equals(attrName, "鍟嗗搧鍚嶇О") + || StringUtils.equals(attrName, "鍟嗗搧缂栧彿") + || StringUtils.equals(attrName, "搴楅摵")){ + return; + } String val = attr.substring(index+1); BaseCateParam cate = getCateParamModelFromList(cateId,attrName, list); BaseGoodsParam p = new BaseGoodsParam(); @@ -423,7 +541,8 @@ p.setVal(val); p.setCreateDate(new Date()); p.setGoodsId(goodsId); - baseGoodsParamMapper.insert(p); + paramList.add(p); +// baseGoodsParamMapper.insert(p); } /** @@ -459,6 +578,9 @@ */ private Brand getBrandModelFromList(String name, List<Brand> brandList) { + if(StringUtils.isBlank(name)){ + return null; + } if(brandList!=null && brandList.size()>0){ for(Brand brand : brandList){ if(StringUtils.equals(name,brand.getName())){ @@ -485,7 +607,10 @@ * @return */ - private BaseCategory getCateModelFromList(String name, 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; + } if(list!=null && list.size()>0){ for(BaseCategory p : list){ if(StringUtils.equals(name,p.getName())){ @@ -496,12 +621,97 @@ BaseCategory model = new BaseCategory(); model.setCreateDate(new Date()); model.setName(name); + model.setPriceRate(dRate); model.setIsdeleted(Constants.ZERO); - model.setImgurl(img); + model.setPinyin(PinYinUtil.getFullSpell(model.getName())); + model.setShortPinyin(PinYinUtil.getFirstSpell(model.getName())); +// model.setImgurl(getOssImgurl(ossModel, ossModel.getCateFolder() ,img)); + model.setImgurl(getOssImgurlFile(ossModel.getCateFolder(), img, null,Constants.ONE,fileRecords)); //鎻掑叆鏂扮殑鍝佺墝淇℃伅 baseCategoryMapper.insert(model); //鍔犲叆闆嗗悎涓� list.add(model); return model; } + + @Override + public String getOssImgurl(OssModel ossModel, String folder,String img ) { + 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;// 鏂囦欢鍚� + + + ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey()); + if (obs.uploadOnlineObject(img,ossModel.getBucket(), key,null)) { + return tempFileName; + } + }catch (Exception e){ + + } + 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) { + 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