Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect in...

jiangping

2023-09-20 3d540cdfd6420f01bf9db167bd26d563fa549e88

 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) {
@@ -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,19 @@
                    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.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())));
                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 +399,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 +442,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 +450,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 +459,14 @@
//        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);
//            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);
@@ -627,7 +635,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 +653,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 +663,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 +675,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 +685,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) {