Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-19 9c20f268e0628017d09427989724cdf2a8e9e8e2

 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;

@@ -290,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
@@ -300,7 +314,7 @@
    }
    public static   boolean IS_RUNNING = false;
    @Override
    @Transactional
    @Async
    public   void dealBaseData() {
        if(IS_RUNNING){
            return;
@@ -336,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,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);
              dealPerData(ossModel,rate,date,data,cateList,brandList,paramList);
            }
            log.info("开始处理源数据=================success================处理数据共（"+allLis.size()+"）个===");
        }catch (Exception e){
@@ -389,12 +362,58 @@
        }
    }

    @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;
        //多图，英文逗号隔开
        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])){