优化3.5版本同步数据

CZT

2023-11-20 b19a8901f4060dcfd4cc2477374da2a7da267336

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java

@@ -6,19 +6,22 @@
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.utils.FileUtils;
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.fzzy40.entity.Fz40FileInfo;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1109Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.*;
import java.util.stream.Collectors;

/**
 * 文件信息
@@ -46,9 +49,16 @@
    private final static String BIZ_TAG_WEIGHT_EMPTY = "WEIGHT_EMPTY";
    private final static String BIZ_TAG_REGISTER = "REGISTER";
    private final static String BIZ_TAG_HANDLE = "HANDLE";
    /**
     * 出入库类型
     */
    private final static String INOUT_TYPE_IN = "IN";
    private final static String INOUT_TYPE_OUT = "OUT";

    @Autowired
    private Fzzy40Sync1109Rep fzzySync1109Rep;
    @Autowired
    private Fzzy40Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
@@ -58,7 +68,7 @@
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private FileUtil fileUtil;
    private FileUtils fileUtil;

    /**
     * 同步文件接口
@@ -80,7 +90,8 @@
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            List<Fz40FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
            //获取出入库数据
            List<Fz40InoutRecord> list = fzzySync1202Rep.listInAndOutRecord(deptId, INOUT_TYPE_IN, INOUT_TYPE_OUT, start, end);

            if (null == list || list.isEmpty()) {
                log.info("-------------没有获取到文件信息------------------");
@@ -94,77 +105,93 @@
            List<Api1109> api1109List;
            List<Api1202> api1202List;
            List<Api1205> api1205List;
            String str = "";
            for (Fz40FileInfo sysData : list) {
                if (StringUtils.isEmpty(sysData.getBizId())) {
            String str = "";  //出入库业务单号
            List<Fz40FileInfo> fileList; //文件信息
            List<String> ids;
            for (Fz40InoutRecord inoutData : list) {
                if (inoutData.getRecordStatus().equals("DEL") || inoutData.getRecordStatus().equals("ERROR")) {
                    continue;
                }
                //根据图片id查询对应出入库信息
                if(sysData.getBizId().startsWith(IMG_START_R)){
                    api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
                ids = new ArrayList<>();
                wjlx = "";
                //获取出入库业务单号信息
                if (inoutData.getType().equals(INOUT_TYPE_IN)) {
                    wjlx = IMG_TYPE_2;
                    api1202List = api1202Rep.getDataByBizId(inoutData.getId());
                    if (null == api1202List || api1202List.isEmpty()) {
                        continue;
                    }
                    str = api1202List.get(0).getRkywdh();
                    ids = api1202List.stream().map(Api1202::getRkywdh).collect(Collectors.toList());
                }
                if(sysData.getBizId().startsWith(IMG_START_C)){
                    api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
                if (inoutData.getType().equals(INOUT_TYPE_OUT)) {
                    wjlx = IMG_TYPE_3;
                    api1205List = api1205Rep.getDataByBizId(inoutData.getId());
                    if (null == api1205List || api1205List.isEmpty()) {
                        continue;
                    }
                    str = api1205List.get(0).getCkywdh();
                    ids = api1205List.stream().map(Api1205::getCkywdh).collect(Collectors.toList());

                }

                //只同步称重
                if (BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())) {
                    wjlx = "";
                    wjmc = kqdm;
                    //入库抓拍图
                    if (sysData.getBizId().startsWith(IMG_START_R)) {
                        wjlx = IMG_TYPE_2;
                        wjmc += "_" + Constant.INOUT_TYPE_14 + sysData.getBizId().substring(4);
                //若文件类型为空，则跳过
                if (StringUtils.isEmpty(wjlx)) {
                    continue;
                }

                //根据出入库单号获取对应文件信息
                fileList = fzzySync1109Rep.listFileInfoByBizId(inoutData.getId());
                if (null == fileList || fileList.isEmpty()) {
                    continue;
                }
                int num = 1;
                int idsNum = 0;
                for (Fz40FileInfo sysData : fileList) {
                    //只同步称重
                    if (BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())) {
                        if(num > 6){
                            num = 1;
                            idsNum ++;
                        }
                        if(idsNum == ids.size()){
                            break;
                        }
                        str = ids.get(idsNum);

                        wjmc = kqdm + "_" + str;

                        apiData = new Api1109();

                        //主键id
                        apiData.setId(UUID.randomUUID().toString());
                        //文件路径
                        apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());

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

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

                        //业务id、库区编码、同步时间
                        apiData.setBizId(sysData.getFileId());
                        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);
                        num ++;
                        log.info("1109---同步数据：{}", apiData.toString());
                    }
                    //出库抓拍图
                    if (sysData.getBizId().startsWith(IMG_START_C)) {
                        wjlx = IMG_TYPE_3;
                        wjmc += "_" + Constant.INOUT_TYPE_15 + sysData.getBizId().substring(4);
                    }
                    //若文件类型为空，则跳过
                    if (StringUtils.isEmpty(wjlx)) {
                        continue;
                    }

                    apiData = new Api1109();

                    //主键id
                    apiData.setId(UUID.randomUUID().toString());
                    //文件路径
                    apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());

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

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

                    //业务id、库区编码、同步时间
                    apiData.setBizId(sysData.getFileId());
                    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());
                }
            }
        } catch (Exception e) {
@@ -174,6 +201,121 @@
        }
    }


//    /**
//     * 同步文件接口
//     *
//     * @param deptId
//     * @param start
//     * @param end
//     */
//    public void syncData(String kqdm, String deptId, Date start, Date end) {
//
//        log.info("-------------1109接口数据开始同步------------------");
//
//        //同步数据，只记录失败的信息
//        ApiLog apiLog = new ApiLog();
//        apiLog.setType(ApiLog.TYPE_SYNC);
//        apiLog.setKqdm(deptId);
//        apiLog.setUploadTime(new Date());
//        apiLog.setInteId(Constant.API_CODE_1109);
//        apiLog.setStatus(99);
//        apiLog.setId(ContextUtil.getUUID());
//        try {
//            List<Fz40FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
//
//            if (null == list || list.isEmpty()) {
//                log.info("-------------没有获取到文件信息------------------");
//                return;
//            }
//
//            Map<String, Integer> map = new HashMap<>();
//            Api1109 apiData;
//            String wjlx;
//            String wjmc;
//            List<Api1109> api1109List;
//            List<Api1202> api1202List;
//            List<Api1205> api1205List;
//            String str = "";
//            for (Fz40FileInfo 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 = "";
//                    wjmc = kqdm;
//                    //入库抓拍图
//                    if (sysData.getBizId().startsWith(IMG_START_R)) {
//                        wjlx = IMG_TYPE_2;
//                        wjmc += "_" + Constant.INOUT_TYPE_14 + sysData.getBizId().substring(4);
//                    }
//                    //出库抓拍图
//                    if (sysData.getBizId().startsWith(IMG_START_C)) {
//                        wjlx = IMG_TYPE_3;
//                        wjmc += "_" + Constant.INOUT_TYPE_15 + sysData.getBizId().substring(4);
//                    }
//                    //若文件类型为空，则跳过
//                    if (StringUtils.isEmpty(wjlx)) {
//                        continue;
//                    }
//
//                    apiData = new Api1109();
//
//                    //主键id
//                    apiData.setId(UUID.randomUUID().toString());
//                    //文件路径
//                    apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());
//
//                    //文件名称
//                    wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
//                    apiData.setWjmc(wjmc);
//                    //文件类型
//                    apiData.setWjlx(wjlx);
//
//                    //操作标志及最后更新时间
//                    apiData.setZhgxsj(sysData.getCreateTime());
//
//                    //业务id、库区编码、同步时间
//                    apiData.setBizId(sysData.getFileId());
//                    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());
//                }
//            }
//        } catch (Exception e) {
//            log.error("---文件同步执行失败----{}", e);
//            apiLog.setResult("同步文件信息失败：" + e.getMessage());
//            apiLogRep.save(apiLog);
//        }
//    }

    /**
     * 获取图片命名类型
     *