优化陕西接口

czt

2025-01-20 56a56708269c7ea1dcb7414c973dd247223ba708

优化陕西接口

 src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java

@@ -374,8 +374,7 @@
                api1107.setTykqbm(tykqbm);
            }
            if (StringUtils.isEmpty(api1107.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1107.getDwdm());
                api1107.setTydwbm(tydwbm);
                api1107.setTydwbm(api1107.getTykqbm().substring(0, 20));
            }
            api1107.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1107);
@@ -389,8 +388,7 @@
                api1108.setTykqbm(tykqbm);
            }
            if (StringUtils.isEmpty(api1108.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1108.getDwdm());
                api1108.setTydwbm(tydwbm);
                api1108.setTydwbm(api1108.getTykqbm().substring(0, 20));
            }
            api1108.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1108);
@@ -429,8 +427,7 @@
                api1110.setTykqbm(tyhwbm.substring(0, 22));
            }
            if ("0".equals(api1110.getTydwbm()) || StringUtils.isEmpty(api1110.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1110.getDwdm());
                api1110.setTydwbm(tydwbm);
                api1110.setTydwbm(api1110.getTykqbm().substring(0 ,20));
            }
            api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1110);
@@ -445,7 +442,7 @@
                    api1111.setTykqbm(api1102List.getTykqbm());
                }
                if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
                    api1111.setTydwbm(apiCommonService.getTydwbm(api1111.getDwdm()));
                    api1111.setTydwbm(api1111.getTykqbm().substring(0,20));
                }
            }
            Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
@@ -458,8 +455,7 @@
                api1111.setTykqbm(tykqbm);
            }
            if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1111.getDwdm());
                api1111.setTydwbm(tydwbm);
                api1111.setTydwbm(api1111.getTykqbm().substring(0,20));
            }
            api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1111);

 src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java

@@ -100,14 +100,10 @@
            //获取指令id
            String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
            String orderId = (String) redisUtil.get(key);
//            if (StringUtils.isEmpty(orderId)) {
//                log.error("指令id失效");
//                ResponseDto responseDto = new ResponseDto(99, "指令id失效");
//                apiLog.setStatus(99);
//                apiLog.setResult("指令id失效");
//                apiLogRep.save(apiLog);
//                return responseDto;
//            }
            if (StringUtils.isEmpty(orderId)) {
                //陕西2024接口，取消指令校验
                orderId = ContextUtil.getUUID();
            }

            //封装推送数据
            SX2024ReqDto reqData = new SX2024ReqDto();
@@ -410,6 +406,8 @@
            if (StringUtils.isEmpty(apiData.getFKFS())) {
                apiData.setFKFS("4");
            }
            apiData.setHtzje(api1201.getHtzje().toPlainString());
            apiData.setJszje(api1201.getJszje().toPlainString());
            return apiData;
        }
        if (Constant.API_CODE_1202.equals(inteId)) {
@@ -435,12 +433,16 @@
                }
            }
            //设置合同号：统一库区编码加三维顺序号
            if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
                apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
            if (StringUtils.isNotEmpty(apiData.getHth())) {
                if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
                    apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
                }
            }
            //设置入库结算单号：统一库区编码+yyyyMMdd+三位顺序号
            if (apiData.getRkjsdh().startsWith(api1202.getKqdm())) {
                apiData.setRkjsdh(apiData.getRkjsdh().replace(api1202.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
            if (StringUtils.isNotEmpty(apiData.getRkjsdh())) {
                //设置入库结算单号：统一库区编码+yyyyMMdd+三位顺序号
                if (apiData.getRkjsdh().startsWith(api1202.getKqdm())) {
                    apiData.setRkjsdh(apiData.getRkjsdh().replace(api1202.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
                }
            }
            return apiData;
        }
@@ -464,13 +466,19 @@
                apiData.setTyhwbm(tyhwbm);
            }
            //设置入库结算单号：统一库区编码+yyyyMMdd+三位顺序号
            if (apiData.getRkjsdh().startsWith(api1204.getKqdm())) {
                apiData.setRkjsdh(apiData.getRkjsdh().replace(api1204.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
            if (StringUtils.isNotEmpty(apiData.getRkjsdh())) {
                if (apiData.getRkjsdh().startsWith(api1204.getKqdm())) {
                    apiData.setRkjsdh(apiData.getRkjsdh().replace(api1204.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
                }
            }

            //设置合同号：统一库区编码加三维顺序号
            if (apiData.getHth().startsWith(api1204.getKqdm().substring(0, 18))) {
                apiData.setHth(apiData.getHth().replace(api1204.getKqdm().substring(0, 18), apiData.getTyhwbm().substring(0, 20)));
            if (StringUtils.isNotEmpty(apiData.getHth())) {
                if (apiData.getHth().startsWith(api1204.getKqdm().substring(0, 18))) {
                    apiData.setHth(apiData.getHth().replace(api1204.getKqdm().substring(0, 18), apiData.getTyhwbm().substring(0, 20)));
                }
            }

            return apiData;
        }
        if (Constant.API_CODE_1205.equals(inteId)) {
@@ -490,13 +498,17 @@
                }
            }
            //设置合同号：统一库区编码加三维顺序号
            if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
                apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
            if (StringUtils.isNotEmpty(apiData.getHth())) {
                if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
                    apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
                }
            }
            //设置出库结算单号：统一库区编码+yyyyMMdd+三位顺序号
            if (apiData.getCkjsdh().startsWith(apiData.getHwdm().substring(0, 21))) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getHwdm().substring(0, 21));
                apiData.setCkjsdh(apiData.getCkjsdh().replace(apiData.getHwdm().substring(0, 21), tykqbm));
            if (StringUtils.isNotEmpty(apiData.getCkjsdh())) {
                if (apiData.getCkjsdh().startsWith(apiData.getHwdm().substring(0, 21))) {
                    String tykqbm = apiCommonService.getTykqbm(apiData.getHwdm().substring(0, 21));
                    apiData.setCkjsdh(apiData.getCkjsdh().replace(apiData.getHwdm().substring(0, 21), tykqbm));
                }
            }
            return apiData;
        }
@@ -541,9 +553,11 @@
                apiData.setDrhwtybm(drhwtybm);
            }
            //设置倒仓单号：统一库区编码+yyyyMMdd+4位顺序号
            if (apiData.getDcdh().startsWith(api1207.getKqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1207.getKqdm());
                apiData.setDcdh(apiData.getDcdh().replace(api1207.getKqdm(), tykqbm));
            if (StringUtils.isNotEmpty(apiData.getDcdh())) {
                if (apiData.getDcdh().startsWith(api1207.getKqdm())) {
                    String tykqbm = apiCommonService.getTykqbm(api1207.getKqdm());
                    apiData.setDcdh(apiData.getDcdh().replace(api1207.getKqdm(), tykqbm));
                }
            }
            return apiData;
        }
@@ -572,9 +586,12 @@
                apiData.setTyhwbm(tyhwbm);
            }
            //设置损益单号：统一货位编码+yyyyMMdd+3位顺序号
            if (apiData.getSydh().startsWith(apiData.getHwdm())) {
                apiData.setSydh(apiData.getSydh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
            if (StringUtils.isNotEmpty(apiData.getSydh())) {
                if (apiData.getSydh().startsWith(apiData.getHwdm())) {
                    apiData.setSydh(apiData.getSydh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
                }
            }

            //实际损耗数量赋值
            apiData.setSjsysl(api1209.getJzsysl());

@@ -597,8 +614,10 @@
                apiData.setTyhwbm(tyhwbm);
            }
            //设置性质变更单号：统一货位编码+yyyyMMdd+3位顺序号
            if (apiData.getLsxzzbdh().startsWith(apiData.getHwdm())) {
                apiData.setLsxzzbdh(apiData.getLsxzzbdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
            if (StringUtils.isNotEmpty(apiData.getLsxzzbdh())) {
                if (apiData.getLsxzzbdh().startsWith(apiData.getHwdm())) {
                    apiData.setLsxzzbdh(apiData.getLsxzzbdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
                }
            }
            return apiData;
        }
@@ -673,8 +692,10 @@
                apiData.setTyhwbm(tyhwbm);
            }
            //设置单号：统一货位编码+yyyyMMdd+4位顺序号
            if (apiData.getWsdjcdh().startsWith(apiData.getHwdm())) {
                apiData.setWsdjcdh(apiData.getWsdjcdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
            if (StringUtils.isNotEmpty(apiData.getWsdjcdh())) {
                if (apiData.getWsdjcdh().startsWith(apiData.getHwdm())) {
                    apiData.setWsdjcdh(apiData.getWsdjcdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
                }
            }
            return apiData;
        }
@@ -692,9 +713,12 @@
                apiData.setTyajbm(tyajbm);
            }
            //设置单号：统一廒间编码+yyyyMMdd+4位顺序号
            if (apiData.getHcjcdh().startsWith(apiData.getHwdm())) {
                apiData.setHcjcdh(apiData.getHcjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
            if (StringUtils.isNotEmpty(apiData.getHcjcdh())) {
                if (apiData.getHcjcdh().startsWith(apiData.getHwdm())) {
                    apiData.setHcjcdh(apiData.getHcjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
                }
            }

            return apiData;
        }
        if (Constant.API_CODE_1304.equals(inteId)) {
@@ -711,9 +735,12 @@
                apiData.setTyajbm(tyajbm);
            }
            //设置单号：统一廒间编码+yyyyMMdd+4位顺序号
            if (apiData.getQtndjcdh().startsWith(apiData.getHwdm())) {
                apiData.setQtndjcdh(apiData.getQtndjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
            if (StringUtils.isNotEmpty(apiData.getQtndjcdh())) {
                if (apiData.getQtndjcdh().startsWith(apiData.getHwdm())) {
                    apiData.setQtndjcdh(apiData.getQtndjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
                }
            }

            return apiData;
        }
        if (Constant.API_CODE_1305.equals(inteId)) {
@@ -731,9 +758,12 @@
                apiData.setTyajbm(tyajbm);
            }
            //设置通风作业单号：统一廒间编码+yyyyMMdd+3位顺序号
            if (apiData.getTfzydh().startsWith(api1305.getHwdm())) {
                apiData.setTfzydh(apiData.getTfzydh().replace(api1305.getHwdm(), apiData.getTyajbm()));
            if (StringUtils.isNotEmpty(apiData.getTfzydh())) {
                if (apiData.getTfzydh().startsWith(api1305.getHwdm())) {
                    apiData.setTfzydh(apiData.getTfzydh().replace(api1305.getHwdm(), apiData.getTyajbm()));
                }
            }

            return apiData;
        }
        if (Constant.API_CODE_1306.equals(inteId)) {
@@ -751,13 +781,19 @@
                apiData.setTyajbm(tyajbm);
            }
            //设置熏蒸作业单号：统一廒间编码+yyyyMMdd+3位顺序号
            if (apiData.getXzzydh().startsWith(apiData.getCfdm())) {
                apiData.setXzzydh(apiData.getXzzydh().replace(apiData.getCfdm(), apiData.getTyajbm()));
            if (StringUtils.isNotEmpty(apiData.getXzzydh())) {
                if (apiData.getXzzydh().startsWith(apiData.getCfdm())) {
                    apiData.setXzzydh(apiData.getXzzydh().replace(apiData.getCfdm(), apiData.getTyajbm()));
                }
            }

            //设置单号：统一廒间编码+yyyyMMdd+4位顺序号
            if (apiData.getHcjcdh().startsWith(api1306.getHwdm())) {
                apiData.setHcjcdh(apiData.getHcjcdh().replace(api1306.getHwdm(), apiData.getTyajbm()));
            if (StringUtils.isNotEmpty(apiData.getHcjcdh())) {
                if (apiData.getHcjcdh().startsWith(api1306.getHwdm())) {
                    apiData.setHcjcdh(apiData.getHcjcdh().replace(api1306.getHwdm(), apiData.getTyajbm()));
                }
            }

            return apiData;
        }
        if (Constant.API_CODE_1307.equals(inteId)) {
@@ -782,9 +818,12 @@
            //设置文件流
            apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));
            //预置位
            if (apiData.getYzwbh().startsWith(apiData.getHwdm())) {
                apiData.setYzwbh(apiData.getYzwbh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
            if (StringUtils.isNotEmpty(apiData.getYzwbh())) {
                if (apiData.getYzwbh().startsWith(apiData.getHwdm())) {
                    apiData.setYzwbh(apiData.getYzwbh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
                }
            }

            return apiData;
        }
        if (Constant.API_CODE_1308.equals(inteId)) {
@@ -809,10 +848,13 @@
                apiData.setWgdwtybm(tydwbm);
            }
            //设置预警信息代码：统一库区编码+yyyyMMdd+3位顺序号
            if (apiData.getYjxxdm().startsWith(api1309.getKqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1309.getKqdm());
                apiData.setYjxxdm(apiData.getYjxxdm().replace(api1309.getKqdm(), tykqbm));
            if (StringUtils.isNotEmpty(apiData.getYjxxdm())) {
                if (apiData.getYjxxdm().startsWith(api1309.getKqdm())) {
                    String tykqbm = apiCommonService.getTykqbm(api1309.getKqdm());
                    apiData.setYjxxdm(apiData.getYjxxdm().replace(api1309.getKqdm(), tykqbm));
                }
            }

            return apiData;
        }
        if (Constant.API_CODE_1310.equals(inteId)) {
@@ -856,10 +898,13 @@
                apiData.setLhhwtybm(tyhwbm);
            }
            //计划明细号：更换为轮换计划单号+统一库区编码+4为顺序号
            if (apiData.getJhmxdh().startsWith(apiData.getLhjhdh() + api1404.getKqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1404.getKqdm());
                apiData.setJhmxdh(apiData.getJhmxdh().replace(apiData.getLhjhdh() + api1404.getKqdm(), apiData.getLhjhdh() + tykqbm));
            if (StringUtils.isNotEmpty(apiData.getJhmxdh())) {
                if (apiData.getJhmxdh().startsWith(apiData.getLhjhdh() + api1404.getKqdm())) {
                    String tykqbm = apiCommonService.getTykqbm(api1404.getKqdm());
                    apiData.setJhmxdh(apiData.getJhmxdh().replace(apiData.getLhjhdh() + api1404.getKqdm(), apiData.getLhjhdh() + tykqbm));
                }
            }

            return apiData;
        }
        if (Constant.API_CODE_1504.equals(inteId)) {

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1201.java

@@ -113,7 +113,7 @@

    @PropertyDef(label = "合同总金额")
    @JsonProperty("HTZJE")
    private BigDecimal htzje;
    private String htzje;

    @PropertyDef(label = "履约保证金")
    @JsonProperty("LYBZJ")
@@ -134,7 +134,7 @@

    @PropertyDef(label = "结算总金额")
    @JsonProperty("JSZJE")
    private BigDecimal jszje;
    private String jszje;

    @PropertyDef(label = "客户方开户行")
    @JsonProperty("KHFKHH")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1202.java

@@ -279,7 +279,7 @@

    @PropertyDef(label = "生成方式")
    @JsonProperty("SCFS")
    private String scfs;
    private Integer scfs;

    @PropertyDef(label = "手动补录原因")
    @JsonProperty("SDBLYY")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1205.java

@@ -199,7 +199,7 @@

    @PropertyDef(label = "生成方式")
    @JsonProperty("SCFS")
    private String scfs;
    private Integer scfs;

    @PropertyDef(label = "手动补录原因")
    @JsonProperty("SDBLYY")

 src/main/resources/application-pro5349.yml

@@ -1,6 +1,6 @@
##########################  陕西柞水县   ##########################
server:
  port: 8091
  port: 8090
  jetty:
    max-http-post-size: 209715200
  tomcat: