Merge remote-tracking branch 'origin/master'

YYC

2023-08-22 4be521d7e3135ac0a8e4a15e395f44448e23e09e

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java

@@ -2,10 +2,14 @@

import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1205;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtil;
import com.fzzy.api.view.repository.Api1109Rep;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.Fz35FileInfo;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1109Rep;
@@ -13,7 +17,6 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.*;

/**
@@ -47,6 +50,10 @@
    private Fzzy35Sync1109Rep fzzySync1109Rep;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
    private Api1202Rep api1202Rep;
    @Autowired
    private Api1205Rep api1205Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
@@ -83,10 +90,30 @@
            Api1109 apiData;
            String wjlx;
            String wjmc;
            List<Api1109> api1109List;
            List<Api1202> api1202List;
            List<Api1205> api1205List;
            String str = "";
            for (Fz35FileInfo sysData : list) {
                if (StringUtils.isEmpty(sysData.getBizId())) {
                    continue;
                }
                //根据图片id查询对应出入库信息
                if(sysData.getBizId().startsWith(IMG_START_R)){
                    api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
                    if (null == api1202List || api1202List.isEmpty()) {
                        continue;
                    }
                    str = api1202List.get(0).getRkywdh();
                }
                if(sysData.getBizId().startsWith(IMG_START_C)){
                    api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
                    if (null == api1205List || api1205List.isEmpty()) {
                        continue;
                    }
                    str = api1205List.get(0).getCkywdh();
                }

                //只同步称重
                if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
                    wjlx = "";
@@ -114,13 +141,12 @@
                    apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());

                    //文件名称
                    wjmc = getImgNameType(wjmc, sysData.getBizTag(), sysData.getBizId(), sysData.getFileName(), map);
                    wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
                    apiData.setWjmc(wjmc);
                    //文件类型
                    apiData.setWjlx(wjlx);

                    //操作标志及最后更新时间
                    apiData.setCzbz(Constant.CZBZ_I);
                    apiData.setZhgxsj(new Date());

                    //业务id、库区编码、同步时间
@@ -128,6 +154,13 @@
                    apiData.setKqdm(kqdm);
                    apiData.setSyncTime(new Date());

                    api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
                    if(null == api1109List || api1109List.isEmpty()){
                        apiData.setCzbz(Constant.CZBZ_I);
                    }else {
                        apiData.setCzbz(api1109List.get(0).getCzbz());
                    }

                    //保存数据
                    api1109Rep.save(apiData);
                    log.info("1109---同步数据：{}", apiData.toString());