接口调整，增加封仓确认单同步

czt

2024-11-25 eb28cab79dc230ed71771f3984bcab69a435e53b

 src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java

@@ -81,19 +81,18 @@
            //添加日志
            ApiLog apiLog = new ApiLog();
            apiLog.setId(ContextUtil.getUUID());

            //获取接口编码
            String inteId = this.getInteId(param.getInteId());
            apiLog.setInteId(inteId);

            if (StringUtils.isEmpty(inteId)) {
            if (StringUtils.isEmpty(param.getInteId())) {
                ResponseDto responseDto = new ResponseDto(99, "没有获取到接口");
                apiLog.setStatus(99);
                apiLog.setResult("没有获取到接口");
                apiLogRep.save(apiLog);
                return responseDto;
            }
            apiLog.setInteId(param.getInteId());

            //获取接口编码
            String inteId = this.getInteId(param.getInteId());
            //获取JSON报文
            String jsonData = getJsonData(param.getInteId(), data);
            log.info("接口数据信息=" + jsonData);
            apiLog.setData(jsonData);
@@ -209,7 +208,7 @@
            BeanUtils.copyProperties(data, api1104);
            //设置统一仓房编码
            if (StringUtils.isEmpty(api1104.getTycfbm())) {
                String tycfbm = apiCommonService.getTykqbm(api1104.getCfbh());
                String tycfbm = apiCommonService.getTycfbm(api1104.getCfbh());
                api1104.setTycfbm(tycfbm);
            }
            return api1104;
@@ -219,7 +218,7 @@
            BeanUtils.copyProperties(data, api1105);
            //设置统一廒间编码
            if (StringUtils.isEmpty(api1105.getTyajbm())) {
                String tyajbm = apiCommonService.getTykqbm(api1105.getAjdm());
                String tyajbm = apiCommonService.getTyajbm(api1105.getAjdm());
                api1105.setTyajbm(tyajbm);
            }
            return api1105;
@@ -270,9 +269,6 @@
            Nx2023Api1109 api1109 = new Nx2023Api1109();
            Api1109 apiData = (Api1109) data;
            BeanUtils.copyProperties(apiData, api1109);
            Map<String, String> map = new HashMap<>();
            map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1109.setWjl(JSON.toJSONString(map));
            //设置统一库区编码
            if (StringUtils.isEmpty(api1109.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
@@ -284,6 +280,11 @@
            }
            //设置文件路径
            api1109.setWjlj("V2024/2409/" + api1109.getTykqbm() + "/" + api1109.getWjlx() + "/" + api1109.getWjmc());

            Map<String, String> map = new HashMap<>();
            map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1109.setWjl(JSON.toJSONString(map));

            return api1109;
        }
        if (Constant.API_CODE_1110.equals(inteId)) {
@@ -302,7 +303,7 @@
            //设置统一货位编码
            if (StringUtils.isEmpty(api1110.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
                api1110.setTykqbm(tyhwbm);
                api1110.setTyhwbm(tyhwbm);
            }
            return api1110;
        }
@@ -503,7 +504,7 @@
            }
            //设置粮权单位統一编码
            if (StringUtils.isEmpty(api1208.getLqgstydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1208.getHwdm());
                String tydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
                api1208.setLqgstydwbm(tydwbm);
            }
            return api1208;
@@ -667,9 +668,6 @@
            Nx2023Api1307 api1307 = new Nx2023Api1307();
            BeanUtils.copyProperties(apiData, api1307);

            Map<String, String> map = new HashMap<>();
            map.put(apiData.getId() + "." + apiData.getTxwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1307.setCntxwjl(JSON.toJSONString(map));
            //设置統一库区编码
            if (StringUtils.isEmpty(api1307.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
@@ -685,6 +683,10 @@
                String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
                api1307.setTyhwbm(tyhwbm);
            }
            //设置预置位编码
            if (api1307.getYzwbh().startsWith(api1307.getHwdm())) {
                api1307.setYzwbh(api1307.getYzwbh().replace(api1307.getHwdm(), api1307.getTyhwbm()));
            }

            //设置文件路径
            String cntxwjlj = "V2024/2432/";
@@ -693,15 +695,19 @@
            cntxwjlj += api1307.getSpjksbid() + "/";
            cntxwjlj += api1307.getTyhwbm() + "_" + DateFormatUtils.format(api1307.getZpsj(),"yyyyMMdd HHmmss") + "." + api1307.getTxwjhzm();
            api1307.setCntxwjlj(cntxwjlj);

            Map<String, String> map = new HashMap<>();
            String wjmc = api1307.getTyhwbm() + "_" + DateFormatUtils.format(api1307.getZpsj(),"yyyyMMdd HHmmss") + "." + api1307.getTxwjhzm();
            map.put(wjmc, FileUtils.fileToByteString(apiData.getWjdz()));
            api1307.setCntxwjl(JSON.toJSONString(map));

            return api1307;
        }
        if (Constant.API_CODE_1308.equals(inteId)) {
            Api1308 apiData = (Api1308) data;
            Nx2023Api1308 api1308 = new Nx2023Api1308();
            BeanUtils.copyProperties(apiData, api1308);
            Map<String, String> map = new HashMap<>();
            map.put(api1308.getSpjksbid() + DateFormatUtils.format(api1308.getGjsj(),"yyyyMMddHHmmss") + "." + apiData.getSpwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1308.setSpwjl(JSON.toJSONString(map));

            //设置統一库区编码
            if (StringUtils.isEmpty(api1308.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
@@ -715,6 +721,11 @@
            spwjlj += api1308.getSpjksbid() + "/";
            spwjlj += api1308.getTykqbm() + "_" + DateFormatUtils.format(api1308.getGjsj(),"yyyyMMdd HHmmss") + "." + api1308.getSpwjhzm();
            api1308.setSpwjlj(spwjlj);

            Map<String, String> map = new HashMap<>();
            String wjmc = api1308.getTykqbm() + "_" + DateFormatUtils.format(api1308.getGjsj(),"yyyyMMdd HHmmss") + "." + api1308.getSpwjhzm();
            map.put(wjmc, FileUtils.fileToByteString(apiData.getWjdz()));
            api1308.setSpwjl(JSON.toJSONString(map));
            return api1308;
        }
        if (Constant.API_CODE_1309.equals(inteId)) {
@@ -763,16 +774,6 @@
            Api1504 api1504 = (Api1504)data;
            Nx2023Api1504 apiData = new Nx2023Api1504();
            BeanUtils.copyProperties(api1504, apiData);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getXqydm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
                apiData.setXqydm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getXkqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
                apiData.setXkqdm(tykqbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1505.equals(inteId)) {