调整上海接口-船运分车上传时的照片同步

CZT

2023-10-20 b51b4406e1d0d0ab897a8a874e1f7e0f5e900236

调整上海接口-船运分车上传时的照片同步

 src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java

@@ -70,7 +70,7 @@
//        fzzySync1202.syncData(kqdm, deptId, start, end);
//
//        //粮食入库质检
        fzzySync1203.syncData(kqdm, deptId, start, end);
//        fzzySync1203.syncData(kqdm, deptId, start, end);
//
//        //粮食入库结算
//        fzzySync1204.syncData(kqdm, deptId, start, end);
@@ -85,10 +85,10 @@
//        fzzySync1207.syncData(kqdm, deptId, start, end);
//
//        //出入库文件信息同步
//        fzzySync1109.syncData(kqdm, deptId, start, end);
        fzzySync1109.syncData(kqdm, deptId, start, end);

        //粮食库存同步
        fzzySync1208.syncData(kqdm, deptId, start, end);
//        fzzySync1208.syncData(kqdm, deptId, start, end);

        //粮食性质转变信息同步
//        fzzySync1210.syncData(kqdm, deptId, start, end);

 src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java

@@ -51,31 +51,31 @@
            //熏蒸备案数据同步
            fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
        }
//        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
//            //上海市平台2023版，需要同步粮情设备配置信息
//
//            //同步粮情设备配置信息
//            fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//            //视频监控信息同步
//            fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//        }
//
//        /*-----公共接口-----*/
//
//        //温湿度检测数据同步
//        fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//
//        //虫害检测同步
//        fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//
//        //气体检测同步
//        fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//
//        //质检同步
//        fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//
//        //通风作业信息同步
//        fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
            //上海市平台2023版，需要同步粮情设备配置信息

            //同步粮情设备配置信息
            fzzy40Sync2103.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
            //视频监控信息同步
            fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
        }

        /*-----公共接口-----*/

        //温湿度检测数据同步
        fzzySync1302.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());

        //虫害检测同步
        fzzySync1303.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());

        //气体检测同步
        fzzySync1304.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());

        //质检同步
        fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());

        //通风作业信息同步
        fzzySync1305.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());

        //熏蒸作业信息同步
        fzzySync1306.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());

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

@@ -12,13 +12,16 @@
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
@@ -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,45 +105,59 @@
            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 (sysData.getBizId().startsWith(IMG_START_C)) {
                        wjlx = IMG_TYPE_3;
                        wjmc += "_" + Constant.INOUT_TYPE_15 + 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();

@@ -164,9 +189,11 @@

                    //保存数据
                    api1109Rep.save(apiData);
                        num ++;
                    log.info("1109---同步数据：{}", apiData.toString());
                }
            }
            }
        } catch (Exception e) {
            log.error("---文件同步执行失败----{}", e);
            apiLog.setResult("同步文件信息失败：" + e.getMessage());

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

@@ -4,18 +4,14 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1305Rep;
import com.fzzy.api.view.repository.Api1306Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40AreationData;
import com.fzzy.async.fzzy40.entity.Fz40DrugLog;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1305Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1306Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Date;
import java.util.List;


 src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1109Rep.java

@@ -22,4 +22,7 @@
     */
    @Query("from Fz40FileInfo where createTime >=:start and createTime <:end order by createTime ")
    List<Fz40FileInfo> listFileInfo(@Param("start") Date start, @Param("end") Date end);

    @Query("from Fz40FileInfo where bizId =:bizId order by createTime ")
    List<Fz40FileInfo> listFileInfoByBizId(@Param("bizId") String bizId);
}

 src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java

@@ -50,4 +50,8 @@
    List<Fz40InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);


    @Query("from Fz40InoutRecord where deptId=:deptId and (type=:type1 or type=:type2) and updateTime >=:start and updateTime <=:end order by id ")
    List<Fz40InoutRecord> listInAndOutRecord(@Param("deptId") String deptId, @Param("type1") String type1, @Param("type2") String type2, @Param("start") Date start, @Param("end") Date end);


}