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

k94314517

2023-09-11 95957395c7665c251ecf7f8bb24d95edfe826314

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

 .idea/vcs.xml

ÎļþÒÑɾ³ý

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -37,6 +37,7 @@
    public static final String PROJECTS = "PROJECTS";
    public static final String CATEGORY_IMG = "CATEGORY_IMG";
    public static final String GOODS_IMG ="GOODS_IMG" ;
    public static final String GOODS_PRICE_RATE = "GOODS_PRICE_RATE";

    /**
     * ä¼ä¸šæ•°æ®æ¥æº 0平台注册 1后台导入

 server/service/src/main/java/com/doumee/core/utils/PinYinUtil.java

@@ -81,29 +81,35 @@
     * @return æ±‰è¯­æ‹¼éŸ³é¦–字母
     */
    public static String getFirstSpell(String chinese) {
        StringBuffer pybf = new StringBuffer();
        char[] arr = chinese.toCharArray();
        HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
        defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
        defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
        for (int i = 0; i < arr.length; i++) {
            if (arr[i] > 128) {
                try {
                    String[] temp = PinyinHelper.toHanyuPinyinStringArray(
                            arr[i], defaultFormat);
                    if (temp != null) {
                        pybf.append(temp[0].charAt(0));
        try {
            StringBuffer pybf = new StringBuffer();
            char[] arr = chinese.toCharArray();
            HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
            defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
            defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
            for (int i = 0; i < arr.length; i++) {
                if (arr[i] > 128) {
                    try {
                        String[] temp = PinyinHelper.toHanyuPinyinStringArray(
                                arr[i], defaultFormat);
                        if (temp != null) {
                            pybf.append(temp[0].charAt(0));
                        }
                    } catch (BadHanyuPinyinOutputFormatCombination e) {
                        e.printStackTrace();
                    }catch (Exception e){
                        //e.printStackTrace();
                    }
                } catch (BadHanyuPinyinOutputFormatCombination e) {
                    e.printStackTrace();
                }catch (Exception e){
                    //e.printStackTrace();
                } else {
                    pybf.append(arr[i]);
                }
            } else {
                pybf.append(arr[i]);
            }
            return pybf.toString().replaceAll("\\W", "").trim();

        }catch (Exception e){

        }
        return pybf.toString().replaceAll("\\W", "").trim();
        return  null;
    }
    /**
     * èŽ·å–汉字串拼音首字母，英文字符不变
@@ -150,25 +156,30 @@
     * @return æ±‰è¯­æ‹¼éŸ³
     */
    public static String getFullSpell(String chinese) {
        StringBuffer pybf = new StringBuffer();
        char[] arr = chinese.toCharArray();
        HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
        defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
        defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
        for (int i = 0; i < arr.length; i++) {
            if (arr[i] > 128) {
                try {
                    pybf.append(PinyinHelper.toHanyuPinyinStringArray(arr[i],
                            defaultFormat)[0]);
                } catch (BadHanyuPinyinOutputFormatCombination e) {
                    //e.printStackTrace();
                }catch (Exception e){
                    //e.printStackTrace();
        try {
            StringBuffer pybf = new StringBuffer();
            char[] arr = chinese.toCharArray();
            HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
            defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
            defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
            for (int i = 0; i < arr.length; i++) {
                if (arr[i] > 128) {
                    try {
                        pybf.append(PinyinHelper.toHanyuPinyinStringArray(arr[i],
                                defaultFormat)[0]);
                    } catch (BadHanyuPinyinOutputFormatCombination e) {
                        //e.printStackTrace();
                    }catch (Exception e){
                        //e.printStackTrace();
                    }
                } else {
                    pybf.append(arr[i]);
                }
            } else {
                pybf.append(arr[i]);
            }
            return pybf.toString();
        }catch (Exception e){

        }
        return pybf.toString();
        return  null;
    }
}

 server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java

@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;

import java.math.BigDecimal;
import java.util.Date;

/**
@@ -83,6 +85,9 @@
    @ApiModelProperty(value = "名称拼音首字母")
    @ExcelColumn(name="名称拼音首字母")
    private String shortPinyin;
    @ApiModelProperty(value = "加价系数",example = "0")
    @ExcelColumn(name="加价系数")
    private BigDecimal priceRate;

    @ApiModelProperty(value = "图标")
    @ExcelColumn(name="图标")

 server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java

@@ -16,14 +16,17 @@
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -34,10 +37,13 @@
 * @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;
@@ -292,10 +298,12 @@
    }
    public static   boolean IS_RUNNING = false;
    @Override
    @Transactional
    public   void dealBaseData() {
        if(IS_RUNNING){
            return;
        }
        log.info("开始处理源数据=================start===================");
        IS_RUNNING = true;

        try {
@@ -303,6 +311,8 @@
            param.setStatus(Constants.ZERO);
            List<BaseData> allLis=findList(param);
            if(allLis==null || allLis.size() ==0){

                log.info("开始处理源数据=================end========无待处理数据===========");
                return ;
            }
            Brand brand = new Brand();
@@ -319,7 +329,7 @@
            p.setIsdeleted(Constants.ZERO);
            //查询全部类别属性信息
            List<BaseCateParam> paramList = baseCateParamMapper.selectList(new QueryWrapper<>(p));

            BigDecimal rate = getPriceRate();
            OssModel ossModel = initOssModel();
            Date date = new Date();
            for(BaseData data : allLis){
@@ -333,7 +343,6 @@
                goods.setStatus(Constants.ZERO);
                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);
@@ -341,26 +350,70 @@
                    goods.setBrandId(bModel.getId());
                }
                //处理列表数据
                BaseCategory cModel = getCateModelFromList(data.getBrand(),ossModel,data.getCategoryImg(), cateList);
                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);
            }
            log.info("开始处理源数据=================success================处理数据共（"+allLis.size()+"）个===");
        }catch (Exception e){

            e.printStackTrace();
            log.info("开始处理源数据=================error==================="+e.getMessage());
        }finally {
            IS_RUNNING = false;
            log.info("开始处理源数据=================end===================");
        }
    }

    private BigDecimal getPriceRate() {
        try {

            BigDecimal rate = new BigDecimal(Double.parseDouble(systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.GOODS_PRICE_RATE).getCode()));
            return rate;
        }catch (Exception e){
            return  new BigDecimal(1.2);
        }

    }

    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());
    }

    private int addImg(int i,OssModel ossModel, Integer id,String bgImg) {
        if(StringUtils.isNotBlank(bgImg)){
            String img =getOssImgurl(ossModel,bgImg);
            if(StringUtils.isNotBlank(img)){
                Multifile f = new Multifile();
                f.setFileurl(img);
                f.setObjType(Constants.ZERO);
                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);
                multifileMapper.insert(f);
                return  1;
            }
        }
        return  0;
    }

    private OssModel initOssModel() {
@@ -371,8 +424,7 @@
        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.setAccessKey(systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode());

        model.setGoodsFolder(systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode());
        return model;
    }

@@ -386,7 +438,7 @@
                    String val =(String) item.invoke(data);
                    dealCateParam(cateId,goodsId,val.toString(),cateList);
                } catch (Exception e) {
                    throw new RuntimeException(e);
//                    throw new RuntimeException(e);
                }
            }
        }
@@ -431,12 +483,16 @@
        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, "商品编号")){
            return;
        }
        String val = attr.substring(index+1);
        BaseCateParam cate = getCateParamModelFromList(cateId,attrName, list);
        BaseGoodsParam p = new BaseGoodsParam();
@@ -483,6 +539,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())){
@@ -509,7 +568,10 @@
     * @return
     */

    private BaseCategory getCateModelFromList(String name,OssModel ossModel, String img,List<BaseCategory> list) {
    private BaseCategory getCateModelFromList(BigDecimal dRate,String name, OssModel ossModel, String img, List<BaseCategory> list) {
        if(StringUtils.isBlank(name)){
            return  null;
        }
        if(list!=null && list.size()>0){
            for(BaseCategory p : list){
                if(StringUtils.equals(name,p.getName())){
@@ -520,7 +582,10 @@
        BaseCategory model = new BaseCategory();
        model.setCreateDate(new Date());
        model.setName(name);
        model.setPriceRate(dRate);
        model.setIsdeleted(Constants.ZERO);
        model.setPinyin(PinYinUtil.getFullSpell(model.getName()));
        model.setShortPinyin(PinYinUtil.getFirstSpell(model.getName()));
        model.setImgurl(getOssImgurl(ossModel,img));
        //插入新的品牌信息
        baseCategoryMapper.insert(model);