优化广东省接口

CZT

2023-11-06 b4e8dc09c2af2a331b477904f9d7b205a7224890

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

@@ -43,6 +43,8 @@
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private Api1101Rep api1101Rep;
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private Api1104Rep api1104Rep;
@@ -138,7 +140,7 @@
            reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
            //摘要，数据主体的MD5值
            reqData.setDigst(MyMD5Util.encrypt(jsonData));

            log.info("上报数据信息=" + JSON.toJSONString(reqData));
            SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);

            apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
@@ -270,7 +272,7 @@
            map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1109.setWjl(JSON.toJSONString(map));
            //上海市平台文件名称规则：库区编码_业务流水号_分类码_顺序码.jpg，例如：91310114703439394M001_142211080101_GL_00.jpg
            api1109.setWjmc(getWjmc(api1109.getWjmc()));
            api1109.setWjmc(getWjmc(api1109.getWjlx(), api1109.getWjmc()));
            //设置空属性为默认值
            changeObject(api1109);
            return api1109;
@@ -604,8 +606,6 @@
            BeanUtils.copyProperties(apiData, api1307);
            api1307.setBjw(ShAreaBjw.getBjw(code));
            api1307.setAjdm(apiData.getHwdm().substring(0, 28));
            List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
            api1307.setTxbh(api1109List.get(0).getWjmc());

            //设置空属性为默认值
            changeObject(api1307);
@@ -617,9 +617,6 @@

            BeanUtils.copyProperties(apiData, api1308);
            api1308.setBjw(ShAreaBjw.getBjw(code));
            List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
            api1308.setTxbh(api1109List.get(0).getWjmc());
            api1308.setSpbh(api1109List.get(0).getWjmc());

            //设置空属性为默认值
            changeObject(api1308);
@@ -706,8 +703,10 @@
            SH2023Api1403 api1403 = new SH2023Api1403();
            Api1403 apiData = (Api1403) data;
            BeanUtils.copyProperties(apiData, api1403);
            api1403.setJhzxdw(apiData.getJhxddw());
            api1403.setJhzxdwmc(apiData.getJhxddwmc());
            List<Api1101> api1101List = api1101Rep.findDataByDwdm(apiData.getLhjhdh().substring(0, 18));

            api1403.setJhzxdw(api1101List.get(0).getDwdm());
            api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
            api1403.setBjw(ShAreaBjw.getBjw(code));

            //设置空属性为默认值
@@ -762,12 +761,14 @@
        return data;
    }

    private String getWjmc(String wjmc){
        if(wjmc.endsWith(".jpg")) {
            wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
        }
        if(wjmc.endsWith(".png")) {
            wjmc = wjmc.replaceAll(".png", "_00.png");
    private String getWjmc(String wjlx, String wjmc){
        if("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)){
            if(wjmc.endsWith(".jpg")) {
                wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
            }
            if(wjmc.endsWith(".png")) {
                wjmc = wjmc.replaceAll(".png", "_00.png");
            }
        }
        return wjmc;
    }