优化上海接口字段

CZT

2023-10-21 92e9a4a4a5a48a575a5b9c996a02a23c3d815348

优化上海接口字段

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

@@ -60,47 +60,47 @@
        Date start = param.getStart();
        Date end = param.getEnd();

//        //客户同步
//        fzzySync1212.syncData(kqdm, deptId, start, end);
//
//        //合同同步
//        fzzySync1201.syncData(kqdm, deptId, start, end);
//
//        //粮食入库同步
//        fzzySync1202.syncData(kqdm, deptId, start, end);
//
//        //粮食入库质检
//        fzzySync1203.syncData(kqdm, deptId, start, end);
//
//        //粮食入库结算
//        fzzySync1204.syncData(kqdm, deptId, start, end);
//        //粮食出库同步
//        fzzySync1205.syncData(kqdm, deptId, start, end);
//
//        //粮食出库结算
//        fzzySync1206.syncData(kqdm, deptId, start, end);
//        //粮食损益
//        fzzySync1209.syncData(kqdm, deptId, start, end);
//        //倒仓信息同步
//        fzzySync1207.syncData(kqdm, deptId, start, end);
//
//        //出入库文件信息同步
        //客户同步
        fzzySync1212.syncData(kqdm, deptId, start, end);

        //合同同步
        fzzySync1201.syncData(kqdm, deptId, start, end);

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

        //粮食入库质检
        fzzySync1203.syncData(kqdm, deptId, start, end);

        //粮食入库结算
        fzzySync1204.syncData(kqdm, deptId, start, end);
        //粮食出库同步
        fzzySync1205.syncData(kqdm, deptId, start, end);

        //粮食出库结算
        fzzySync1206.syncData(kqdm, deptId, start, end);
        //粮食损益
        fzzySync1209.syncData(kqdm, deptId, start, end);
        //倒仓信息同步
        fzzySync1207.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);
        fzzySync1210.syncData(kqdm, deptId, start, end);

        /*-----各省独有接口信息同步-----*/
//        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
//            //上海市平台2023版，需要同步市储检斤单，同步市储驳运单
//            //同步市储检斤单
//            fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//            //同步市储驳运单
//            fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//        }
        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
            //上海市平台2023版，需要同步市储检斤单，同步市储驳运单
            //同步市储检斤单
            fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
            //同步市储驳运单
            fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
        }
        //账面库存信息同步  TODO

    }

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

@@ -118,7 +118,6 @@
                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());

                //获取合同号
                apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
                listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
                if(null != listInoutNotice && listInoutNotice.size() >0){
                    if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
@@ -150,8 +149,11 @@
                apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());

                //产地代码
                String cddm = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
                apiData.setCddm(cddm);
                mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiData.getHwdm().substring(2,8);
                }
                apiData.setCddm(mappingCode);

                //检斤类型，默认0-称重入库
                apiData.setJjlx("0");
@@ -213,6 +215,9 @@

                    int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                    for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                        if(fz40InoutRecordItem.getSettleWeight() <= 0){
                            continue;
                        }
                        apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                        apiData.setMz(fz40InoutRecordItem.getFullWeight());
                        apiData.setPz(fz40InoutRecordItem.getEmptyWeight());

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

@@ -114,7 +114,6 @@
            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));

            //获取合同号
            apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getCkywdh());
            listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
            if(null != listInoutNotice && listInoutNotice.size() >0){
                if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
@@ -147,8 +146,11 @@
            apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());

            //产地代码
            String cddm = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
            apiData.setCddm(cddm);
            mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
            if(StringUtils.isEmpty(mappingCode)){
                mappingCode = apiData.getHwdm().substring(2,8);
            }
            apiData.setCddm(mappingCode);

            //皮重信息
            apiData.setPz(sysData.getEmptyWeight());

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

@@ -101,8 +101,11 @@
                apiData.setShnd(fz40DepotStore.getFoodYear());

                //产地代码
                String cd = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
                apiData.setCd(cd);
                mappingCode = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiData.getHwdm().substring(2,8);
                }
                apiData.setCd(mappingCode);

                apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "保管员" : api1105.getBgy());
                //粮权归属单位

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

@@ -8,12 +8,14 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.DateUtil;
import com.fzzy.api.view.repository.Api1310Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.view.repository.GbCheckItemRep;
import com.fzzy.async.fzzy40.entity.Fz40CheckItem;
import com.fzzy.async.fzzy40.entity.Fz40Quality;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1203Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1208Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1310Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -78,7 +80,7 @@
            List<Fz40CheckItem> fz40CheckItems;
            List<GbCheckItem> gbCheckList;
            String jyxm;
            String jyxmz;
            String jyz;
            List<Api1310> api1310List;
            int index = 10001;
            for (Fz40Quality fz40Quality : list) {
@@ -106,7 +108,7 @@
                api1310.setZblb("2");
                //检测项，检测值
                jyxm = "";
                jyxmz = "";
                jyz = "";
                fz40CheckItems = fzzySync1203Rep.listInoutCheckItem(fz40Quality.getId(), deptId.substring(0, 4));
                if (null != fz40CheckItems && fz40CheckItems.size() > 0) {

@@ -119,16 +121,19 @@
                            continue;
                        }
                        jyxm += gbCheckList.get(0).getCode() + ",";
                        jyxmz += fz40CheckItem.getValue() + ",";
                        jyz += fz40CheckItem.getValue() + ",";
                    }
                }
                api1310.setJyxm(jyxm);
                api1310.setJyxmz(jyxmz);
                api1310.setJyxmz(jyz);

                api1310.setZbjgpd(fz40Quality.getResult());
                api1310.setQfrq(fz40Quality.getTime());
                api1310.setBgcjsj(fz40Quality.getTime());
                api1310.setShrxm(fz40Quality.getCheckUser());
                if (!fz40Quality.getCheckTime().before(fz40Quality.getTime())) {
                    fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
                }
                api1310.setQysj(fz40Quality.getCheckTime());
                api1310.setQyqy(fz40Quality.getCheckArea());
                api1310.setQyrxm(fz40Quality.getCheckUser());

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

@@ -19,6 +19,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.lang.reflect.Field;
import java.util.*;

@@ -45,6 +46,8 @@
    private Api1102Rep api1102Rep;
    @Autowired
    private Api1104Rep api1104Rep;
    @Autowired
    private Api1208Rep api1208Rep;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
@@ -110,7 +113,7 @@
            //获取指令id
            String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
            OrderData orderData = (OrderData) redisUtil.get(key);
            if (StringUtils.isEmpty(orderData.getOrderid())) {
            if (null == orderData || StringUtils.isEmpty(orderData.getOrderid())) {
                log.error("指令id失效=" + jsonData);
                ResponseDto responseDto = new ResponseDto(99, "指令id失效");
                apiLog.setStatus(99);
@@ -154,6 +157,7 @@

    /**
     * 转为JSON
     *
     * @param inteId
     * @param data
     * @param code
@@ -177,6 +181,7 @@

    /**
     * 常规接口封装
     *
     * @param inteId
     * @param data
     * @param code
@@ -264,7 +269,11 @@
            Map<String, String> map = new HashMap<>();
            map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1109.setWjl(JSON.toJSONString(map));

            //上海市平台文件名称规则：库区编码_业务流水号_分类码_顺序码.jpg，例如：91310114703439394M001_142211080101_GL_00.jpg
            String[] split = api1109.getWjmc().split(".");
            if (split.length == 2) {
                api1109.setWjmc(split[0] + "_00" + split[1]);
            }
            //设置空属性为默认值
            changeObject(api1109);
            return api1109;
@@ -315,7 +324,14 @@
            BeanUtils.copyProperties(data, api1201);
            api1201.setBjw(ShAreaBjw.getBjw(code));
            api1201.setHtsfzz("0");

            //合同签订地点不能为空或填无
            if (StringUtils.isEmpty(api1201.getQddd())) {
                api1201.setQddd("签订地点");
            }
            //合同审核人不能为空或填无
            if (StringUtils.isEmpty(api1201.getShr())) {
                api1201.setShr("审批人");
            }
            //设置空属性为默认值
            changeObject(api1201);
            return api1201;
@@ -327,7 +343,18 @@
            api1202.setBjw(ShAreaBjw.getBjw(code));
            api1202.setPch(apiData.getHwdm() + apiData.getShnd());
            api1202.setJzrq(apiData.getCmsj());

            if (StringUtils.isEmpty(api1202.getCddm())) {
                api1202.setCddm(api1202.getHwdm().substring(2, 8));
            }
            if (StringUtils.isEmpty(api1202.getHth())) {
                api1202.setHth("无");
            }
            if (StringUtils.isEmpty(api1202.getJhmxh())) {
                api1202.setJhmxh("计划明细号");
            }
            if (StringUtils.isEmpty(api1202.getRkjsdh())) {
                api1202.setRkjsdh("0");
            }
            //设置空属性为默认值
            changeObject(api1202);
            return api1202;
@@ -340,6 +367,18 @@
            //查询收获年份
            List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
            api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
            if (StringUtils.isEmpty(api1203.getJyxm())) {
                api1203.setJyxm("0");
            }
            if (StringUtils.isEmpty(api1203.getJyz())) {
                api1203.setJyz("0");
            }
            if (StringUtils.isEmpty(api1203.getZkj())) {
                api1203.setZkj("0");
            }
            if (StringUtils.isEmpty(api1203.getZkl())) {
                api1203.setZkl("0");
            }
            //设置空属性为默认值
            changeObject(api1203);
            return api1203;
@@ -363,7 +402,18 @@
            api1205.setBjw(ShAreaBjw.getBjw(code));
            api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
            api1205.setJzrq(apiData.getCmsj());

            if (StringUtils.isEmpty(api1205.getCddm())) {
                api1205.setCddm(api1205.getHwdm().substring(2, 8));
            }
            if (StringUtils.isEmpty(api1205.getHth())) {
                api1205.setHth("无");
            }
            if (StringUtils.isEmpty(api1205.getJhmxh())) {
                api1205.setJhmxh("计划明细号");
            }
            if (StringUtils.isEmpty(api1205.getCkjsdh())) {
                api1205.setCkjsdh("0");
            }
            //设置空属性为默认值
            changeObject(api1205);
            return api1205;
@@ -403,7 +453,9 @@

            api1208.setBjw(ShAreaBjw.getBjw(code));
            api1208.setPch(apiData.getHwdm() + apiData.getShnd());

            if (StringUtils.isEmpty(api1208.getCd())) {
                api1208.setCd(api1208.getHwdm().substring(2, 8));
            }
            //设置空属性为默认值
            changeObject(api1208);
            return api1208;
@@ -516,7 +568,9 @@
            //上海通风作业单号：廒间代码+yyyyMMdd+3位顺序号
            api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
            api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));

            if (StringUtils.isEmpty(api1305.getTfmd())) {
                api1305.setTfmd("1"); //降温通风
            }
            //设置空属性为默认值
            changeObject(api1305);
            return api1305;
@@ -530,7 +584,9 @@
            api1306.setAjdm(apiData.getHwdm().substring(0, 28));
            //上海熏蒸作业单号：货位代码+yyyyMMdd + 3位顺序号
            api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());

            if (StringUtils.isEmpty(api1306.getSyff())) {
                api1306.setSyff("0"); //潮解法
            }
            //设置空属性为默认值
            changeObject(api1306);
            return api1306;
@@ -576,8 +632,32 @@
            BeanUtils.copyProperties(apiData, api1310);
            api1310.setBjw(ShAreaBjw.getBjw(code));
            api1310.setJyrq(apiData.getJysj());
            api1310.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));

            if (StringUtils.isEmpty(api1310.getJyxm())) {
                api1310.setJyxm("0");
            }
            if (StringUtils.isEmpty(api1310.getJyxmz())) {
                api1310.setJyxmz("0");
            }
            String lsxzdm = "122";
            List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                if(StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())){
                    lsxzdm = api1208List.get(0).getLsxzdm();
                }
            }
            api1310.setLsxzdm(lsxzdm);
            if (api1310.getYpsl() == 0.0){
                api1310.setYpsl(5.0);
            }
            if(StringUtils.isEmpty(api1310.getQyrxm())){
                api1310.setQyrxm("扦样人");
            }
            if(StringUtils.isEmpty(api1310.getJdrxm())){
                api1310.setJdrxm("监督人");
            }
            if(StringUtils.isEmpty(api1310.getShrxm())){
                api1310.setShrxm("审核人");
            }
            //设置空属性为默认值
            changeObject(api1310);
            return api1310;