调整广东省平台接口-增加国家统一编码

czt

2024-04-21 940f1bb0ef8fc8dcf75eddb92723aa0ba1082350

调整广东省平台接口-增加国家统一编码

 src/main/java/com/fzzy/api/entity/Api1208.java

@@ -78,6 +78,10 @@
    @Column(name = "lqgsdwdm", length = 18)
    private String lqgsdwdm;

    @PropertyDef(label = "粮权归属单位统一编码")
    @Column(name = "lqgstydwbm", length = 20)
    private String lqgstydwbm;

    @JSONField(serialize = false)
    @PropertyDef(label = "粮权行政区划代码")
    @Column(name = "lqxzqhdm", length = 18)

 src/main/java/com/fzzy/api/service/ApiCommonService.java

@@ -5,9 +5,7 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.utils.RedisConst;
import com.fzzy.api.utils.RedisUtil;
import com.fzzy.api.view.repository.Api1105Rep;
import com.fzzy.api.view.repository.ApiConfsRep;
import com.fzzy.api.view.repository.GbAreaRep;
import com.fzzy.api.view.repository.*;

import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +30,17 @@
    @Autowired
    private GbAreaRep gbAreaRep;
    @Autowired
    private Api1101Rep api1101Rep;
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private Api1103Rep api1103Rep;
    @Autowired
    private Api1104Rep api1104Rep;
    @Autowired
    private Api1105Rep api1105Rep;
    @Autowired
    private Api1106Rep api1106ep;

    /**
     * 刷新缓存- 接口配置参数
@@ -231,4 +239,113 @@

        return null;
    }

    /**
     * 根据单位代码获取统一单位编码
     * @param dwdm
     * @return
     */
    public String getTydwbm(String dwdm) {
        if(StringUtils.isEmpty(dwdm)){
            return dwdm;
        }

        Api1101 api1101= api1101Rep.findData(dwdm);
        if(null == api1101){
            return dwdm;
        }

        return api1101.getTydwbm();
    }

    /**
     * 根据库区代码获取统一库区编码
     * @param kqdm
     * @return
     */
    public String getTykqbm(String kqdm) {
        if(StringUtils.isEmpty(kqdm)){
            return kqdm;
        }

        Api1102 api1102= api1102Rep.findDataByKqdm(kqdm);
        if(null == api1102){
            return kqdm;
        }

        return api1102.getTykqbm();
    }

    /**
     * 根据仓房代码获取统一仓房编码
     * @param cfdm
     * @return
     */
    public String getTycfbm(String cfdm) {
        if(StringUtils.isEmpty(cfdm)){
            return cfdm;
        }

        Api1103 api1103= api1103Rep.findDataByCfdm(cfdm);
        if(null == api1103){
            return cfdm;
        }

        return api1103.getTycfbm();
    }

    /**
     * 根据廒间代码获取统一廒间编码
     * @param ajdm
     * @return
     */
    public String getTyajbm(String ajdm) {
        if(StringUtils.isEmpty(ajdm)){
            return ajdm;
        }

        Api1104 api1104 = api1104Rep.findByAjdh(ajdm);
        if(null == api1104){
            return ajdm;
        }

        return api1104.getTyajbm();
    }

    /**
     * 根据货位代码获取统一货位编码
     * @param hwdm
     * @return
     */
    public String getTyhwbm(String hwdm) {
        if(StringUtils.isEmpty(hwdm)){
            return hwdm;
        }

        Api1105 api1105= api1105Rep.findDataByHwdm(hwdm);
        if(null == api1105){
            return hwdm;
        }

        return api1105.getTyhwbm();
    }

    /**
     * 根据油罐代码获取统一油罐编码
     * @param ygdm
     * @return
     */
    public String getTyygbm(String ygdm) {
        if(StringUtils.isEmpty(ygdm)){
            return ygdm;
        }

        Api1106 api1106= api1106ep.findDataByYgdm(ygdm);
        if(null == api1106){
            return ygdm;
        }

        return api1106.getTyygbm();
    }

}

 src/main/java/com/fzzy/api/view/Api1208.view.xml

@@ -90,6 +90,10 @@
        <Property></Property>
        <Property name="label">粮权归属单位代码</Property>
      </PropertyDef>
      <PropertyDef name="lqgstydwbm">
        <Property></Property>
        <Property name="label">粮权归属单位国家统一编码</Property>
      </PropertyDef>
      <PropertyDef name="lqxzqhdm">
        <Property></Property>
        <Property name="label">粮权行政区划代码</Property>
@@ -521,6 +525,11 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lqgstydwbm</Property>
            <Property name="property">lqgstydwbm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lqxzqhdm</Property>
            <Property name="property">lqxzqhdm</Property>
            <Editor/>

 src/main/java/com/fzzy/api/view/repository/Api1101Rep.java

@@ -48,4 +48,7 @@
     */
    @Query("from Api1101 where dwdm =:dwdm ")
    List<Api1101> findDataByDwdm(@Param("dwdm") String dwdm);

    @Query("from Api1101 where dwdm =:dwdm ")
    Api1101 findData(@Param("dwdm") String dwdm);
}

 src/main/java/com/fzzy/api/view/repository/Api1102Rep.java

@@ -29,6 +29,14 @@
    List<Api1102> findPushData(@Param("kqdm") String kqdm);

    /**
     * 根据库区编码获取库区信息
     * @param kqdm
     * @return
     */
    @Query("from Api1102 where kqdm=:kqdm ")
    Api1102 findDataByKqdm(@Param("kqdm") String kqdm);

    /**
     *
     * @param kqdm
     * @return

 src/main/java/com/fzzy/api/view/repository/Api1103Rep.java

@@ -40,4 +40,14 @@
     */
    @Query("from Api1103 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1103> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);



    /**
     * 根据仓房代码查询
     * @param cfdm
     * @return
     */
    @Query("from Api1103 where cfdm=:cfdm ")
    Api1103 findDataByCfdm(@Param("cfdm") String cfdm);
}

 src/main/java/com/fzzy/api/view/repository/Api1104Rep.java

@@ -53,4 +53,12 @@
     */
    @Query("from Api1104 where cfbh=:cfbh ")
    List<Api1104> findDataByCfbh(@Param("cfbh") String cfbh);


    /**
     * @param
     * @return
     */
    @Query("from Api1104 where ajdh=:ajdh ")
    Api1104 findByAjdh(@Param("ajdh") String ajdh);
}

 src/main/java/com/fzzy/api/view/repository/Api1105Rep.java

@@ -48,4 +48,12 @@
    @Query("from Api1105 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1105> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);

    /**
     * 根据货位代码查询
     *
     * @param hwdm
     * @return
     */
    @Query("from Api1105 where hwdm=:hwdm ")
    Api1105 findDataByHwdm(@Param("hwdm") String hwdm);
}

 src/main/java/com/fzzy/api/view/repository/Api1106Rep.java

@@ -39,4 +39,11 @@
     */
    @Query("from Api1106 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1106> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);

    /**
     * @param ygdm
     * @return
     */
    @Query("from Api1106 where ygdm=:ygdm ")
    Api1106 findDataByYgdm(@Param("ygdm") String ygdm);
}

 src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java

@@ -244,7 +244,6 @@
            //从新获取TOKEN
            Map<String, Object> map = new HashMap<>();
            map.put("appid", conf.getUserName());
//            map.put("appkey", EncryptUtil.encryptHex(conf.getPassword(),conf.getPublicKey()));
            map.put("appkey", AESUtils.encrypt(conf.getPassword(), conf.getPublicKey()));
            GD2022ResponseDto<GD2022AuthToken> responseDto = GD2022HttpClientUtil.postGetToken(conf.getApiUrl() + "sfrz", map);
            token = new GD2022AuthToken();
@@ -345,11 +344,21 @@
        }
        if (Constant.API_CODE_1107.equals(inteId)) {
            Api1107 api1107 = (Api1107) data;
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1107.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
                api1107.setTykqbm(tykqbm);
            }
            api1107.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1107);
        }
        if (Constant.API_CODE_1108.equals(inteId)) {
            Api1108 api1108 = (Api1108) data;
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1108.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
                api1108.setTykqbm(tykqbm);
            }
            api1108.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1108);
        }
@@ -366,70 +375,146 @@
            System.out.println((String) responseDto.getData());
            //设置上传文件id
            api1109.setFileStorageId((String) responseDto.getData());
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1109.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
                api1109.setTykqbm(tykqbm);
            }
            api1109.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1109);
        }
        if (Constant.API_CODE_1110.equals(inteId)) {
            Api1110 api1110 = (Api1110) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1110.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
                api1110.setTyhwbm(tyhwbm);
            }
            api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1110);
        }
        if (Constant.API_CODE_1111.equals(inteId)) {
            Gd2022Api1111 api1111 = new Gd2022Api1111();
            BeanUtils.copyProperties(data, api1111);
            List<Api1102> api1102List = api1102Rep.findPushData(api1111.getKqdm());
            if(null != api1102List && api1102List.size() > 0){
                api1111.setKqmc(api1102List.get(0).getKqmc());
            Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
            if(null != api1102List){
                api1111.setKqmc(api1102List.getKqmc());
                if(StringUtils.isEmpty(api1111.getTykqbm())){
                    api1111.setTykqbm(api1102List.getTykqbm());
                }
            }
            List<Api1101> api1101List = api1101Rep.findDataByDwdm(api1111.getDwdm());
            if(null != api1101List && api1101List.size() > 0){
                api1111.setDwmc(api1101List.get(0).getDwmc());
            Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
            if(null != api1101List){
                api1111.setDwmc(api1101List.getDwmc());
            }
            api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1111);
        }
        if (Constant.API_CODE_1112.equals(inteId)) {
            Api1112 api1112 = (Api1112) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1112.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
                api1112.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1112.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
                api1112.setTykqbm(tykqbm);
            }
            api1112.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1112);
        }
        if (Constant.API_CODE_1113.equals(inteId)) {
            Api1113 api1113 = (Api1113) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1113.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
                api1113.setTydwbm(tydwbm);
            }
            api1113.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1113);
        }
        if (Constant.API_CODE_1201.equals(inteId)) {
            Api1201 apiData = (Api1201) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1202.equals(inteId)) {
            Api1202 apiData = (Api1202) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1203.equals(inteId)) {
            Api1203 apiData = (Api1203) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1204.equals(inteId)) {
            Api1204 apiData = (Api1204) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1205.equals(inteId)) {
            Api1205 apiData = (Api1205) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1206.equals(inteId)) {
            Api1206 apiData = (Api1206) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
                apiData.setTydwbm(tydwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1207.equals(inteId)) {
            Api1207 apiData = (Api1207) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getDckqtybm())){
                String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
                apiData.setDckqtybm(dckqtybm);
            }
            if(StringUtils.isEmpty(apiData.getDrkqtybm())){
                String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
                apiData.setDrkqtybm(drkqtybm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getDchwtybm())){
                String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
                apiData.setDchwtybm(dchwtybm);
            }
            if(StringUtils.isEmpty(apiData.getDrhwtybm())){
                String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
                apiData.setDrhwtybm(drhwtybm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
@@ -442,57 +527,127 @@
            if("2".equals(api1208.getClfs()) && api1208.getBclbs() == 0){
                api1208.setBclbs((int)(api1208.getSjsl()/25));
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1208.getLqgstydwbm())){
                String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
                api1208.setLqgstydwbm(lqgstydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1208.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
                api1208.setTyhwbm(tyhwbm);
            }
            BeanUtils.copyProperties(data, api1208);
            return JSON.toJSONString(api1208);
        }
        if (Constant.API_CODE_1209.equals(inteId)) {
            Api1209 apiData = (Api1209) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1210.equals(inteId)) {
            Gd2022Api1210 api1210 = new Gd2022Api1210();
            BeanUtils.copyProperties(data, api1210);
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1210.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
                api1210.setTyhwbm(tyhwbm);
            }
            api1210.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1210);
        }
        if (Constant.API_CODE_1211.equals(inteId)) {
            Api1211 apiData = (Api1211) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1212.equals(inteId)) {
            Api1212 apiData = (Api1212) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1301.equals(inteId)) {
            Api1301 apiData = (Api1301) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1302.equals(inteId)) {
            Api1302 apiData = (Api1302) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1303.equals(inteId)) {
            Api1303 apiData = (Api1303) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1304.equals(inteId)) {
            Api1304 apiData = (Api1304) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1305.equals(inteId)) {
            Api1305 apiData = (Api1305) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTycfbm())){
                String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
                apiData.setTycfbm(tycfbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1306.equals(inteId)) {
            Api1306 apiData = (Api1306) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTycfbm())){
                String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
                apiData.setTycfbm(tycfbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
@@ -508,6 +663,21 @@
            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1307.getWjdz());
            //设置上传文件id
            api1307.setFileStorageId((String) responseDto.getData());
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
                api1307.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTycfbm())){
                String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
                api1307.setTycfbm(tycfbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
                api1307.setTyhwbm(tyhwbm);
            }
            api1307.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1307);
        }
@@ -523,17 +693,32 @@
            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1308.getWjdz());
            //设置上传文件id
            api1308.setFileStorageId((String) responseDto.getData());
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1308.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
                api1308.setTykqbm(tykqbm);
            }
            api1308.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1308);
        }
        if (Constant.API_CODE_1309.equals(inteId)) {
            Api1309 apiData = (Api1309) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
                apiData.setTydwbm(tydwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
        if (Constant.API_CODE_1310.equals(inteId)) {
            Gd2022Api1310 api1310 = new Gd2022Api1310();
            BeanUtils.copyProperties(data, api1310);
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1310.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
                api1310.setTyhwbm(tyhwbm);
            }
            api1310.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1310);
        }
@@ -565,6 +750,11 @@
                    if(null!= gd2022Api1404.getLhlx() && "1".equals(gd2022Api1404.getLhlx())){
                        lcsl += gd2022Api1404.getLhsl();
                    }
                    //校验统一编码是否为空，为空则查询信息进行赋值
                    if(StringUtils.isEmpty(gd2022Api1404.getTyhwbm())){
                        String tyhwbm = apiCommonService.getTyhwbm(gd2022Api1404.getLhhwdm());
                        gd2022Api1404.setTyhwbm(tyhwbm);
                    }
                    gd2022Api1404.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
                    dtls.add(gd2022Api1404);
                }
@@ -576,6 +766,11 @@
            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());
            //设置上传文件id
            api1403.setFileStorageId((String) responseDto.getData());
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1403.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
                api1403.setTydwbm(tydwbm);
            }
            api1403.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(api1403);
        }
@@ -585,6 +780,11 @@
        }
        if (Constant.API_CODE_1405.equals(inteId)) {
            Api1405 apiData = (Api1405) data;
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getXmdm());
                apiData.setTydwbm(tydwbm);
            }
            apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
            return JSON.toJSONString(apiData);
        }
@@ -598,6 +798,16 @@
        GDFinanceDto gdFinanceDto = new GDFinanceDto();
        gdFinanceDto.setDwdm(api1503.getDwdm());
        gdFinanceDto.setKqdm(api1503.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(gdFinanceDto.getTydwbm())){
            String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
            gdFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(gdFinanceDto.getTykqbm())){
            String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
            gdFinanceDto.setTykqbm(tykqbm);
        }
        gdFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
        gdFinanceDto.setBbm("03");
        gdFinanceDto.setCzbz(api1503.getCzbz());
@@ -650,6 +860,16 @@
        GDFinanceDto gdFinanceDto = new GDFinanceDto();
        gdFinanceDto.setDwdm(api1502.getDwdm());
        gdFinanceDto.setKqdm(api1502.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(gdFinanceDto.getTydwbm())){
            String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
            gdFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(gdFinanceDto.getTykqbm())){
            String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
            gdFinanceDto.setTykqbm(tykqbm);
        }
        gdFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
        gdFinanceDto.setBbm("02");
        gdFinanceDto.setCzbz(api1502.getCzbz());
@@ -703,6 +923,16 @@
        GDFinanceDto gdFinanceDto = new GDFinanceDto();
        gdFinanceDto.setDwdm(api1501.getDwdm());
        gdFinanceDto.setKqdm(api1501.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(gdFinanceDto.getTydwbm())){
            String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
            gdFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(gdFinanceDto.getTykqbm())){
            String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
            gdFinanceDto.setTykqbm(tykqbm);
        }
        gdFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
        gdFinanceDto.setBbm("01");
        gdFinanceDto.setCzbz(api1501.getCzbz());
@@ -787,12 +1017,7 @@
        return list;
    }

    private void paddingData(GDFinanceDto common,
                             List<GDFinanceDto> list,
                             Integer zbxh,
                             String zbmc,
                             String zbz1,
                             String zbz2) {
    private void paddingData(GDFinanceDto common, List<GDFinanceDto> list, Integer zbxh, String zbmc, String zbz1, String zbz2) {
        GDFinanceDto gdFinanceDto = new GDFinanceDto();
        BeanUtils.copyProperties(common, gdFinanceDto);
        gdFinanceDto.setZbxh(zbxh);

 src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java

@@ -13,9 +13,15 @@
    @PropertyDef(label = "单位代码")
    private String dwdm;

    @PropertyDef(label = "统一单位编码")
    private String tydwbm;

    @PropertyDef(label = "库区代码")
    private String kqdm;

    @PropertyDef(label = "统一库区编码")
    private String tykqbm;

    @PropertyDef(label = " 报表期号")
    private String bbsj;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1101.java

@@ -28,6 +28,9 @@
    @PropertyDef(label = "单位名称")
    private String dwmc;

    @PropertyDef(label = "统一单位编码")
    private String tydwbm;

    @PropertyDef(label = "单位类型")
    private String dwlx;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1102.java

@@ -23,6 +23,9 @@
    @PropertyDef(label = "库区代码")
    private String kqdm;

    @PropertyDef(label = "统一库区编码")
    private String tykqbm;

    @PropertyDef(label = "单位代码")
    private String dwdm;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1103.java

@@ -3,6 +3,8 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;

import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;

@@ -23,6 +25,9 @@
    @PropertyDef(label = "仓房名称")
    private String cfmc;

    @PropertyDef(label = "统一仓房编码")
    private String tycfbm;

    @PropertyDef(label = "库区代码")
    private String kqdm;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1104.java

@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;

import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;

@@ -24,6 +25,9 @@
    @PropertyDef(label = "廒间代码")
    private String ajdh;

    @PropertyDef(label = "统一廒间编码")
    private String tyajbm;

    @PropertyDef(label = "廒间名称")
    private String ajmc;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1105.java

@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;

import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;

@@ -21,6 +22,9 @@
    @PropertyDef(label = "货位代码")
    private String hwdm;

    @PropertyDef(label = "统一货位编码" )
    private String tyhwbm;

    @PropertyDef(label = "货位名称")
    private String hwmc;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1109.java

@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
import java.util.Date;
@@ -32,6 +34,9 @@
    @PropertyDef(label = "库区代码")
    private String kqdm;

    @PropertyDef(label = "统一库区编码")
    private String tykqbm;

    @PropertyDef(label = "文件类型", description = "1：库区鸟瞰图 2：入库图片 3：出库图片 4：入库检斤视频（截取检斤时间前后各 5秒钟视频）5：出库检斤视频（截取检斤时间前后各 5 秒钟视频）")
    private String wjlx;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java

@@ -25,6 +25,10 @@
    @PropertyDef(label = "库区代码" )
    private String kqdm;

    @PropertyDef(label = "统一库区编码")
    private String tykqbm;


    @PropertyDef(label = "视频监控设备名称" )
    private String spjksbmc;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1114.java

@@ -28,6 +28,12 @@
    @PropertyDef(label = "报表期号")
    private Date bbsj;

    @PropertyDef(label = "统一单位编码")
    private String tydwbm;

    @PropertyDef(label = "统一库区编码")
    private String tykqbm;

    //01-资产负债；02-现金流量表；03-利润表
    @PropertyDef(label = "报表名")
    private String bbm;

 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1208.java

@@ -35,6 +35,9 @@
    @PropertyDef(label = "货位代码" )
    private String hwdm;

    @PropertyDef(label = "统一货位编码" )
    private String tyhwbm;

    @PropertyDef(label = "粮食品种代码" )
    private String lspzdm;

@@ -59,6 +62,9 @@
    @PropertyDef(label = "粮权归属单位代码" )
    private String lqgsdwdm;

    @PropertyDef(label = "粮权归属单位统一编码")
    private String lqgstydwbm;

    @PropertyDef(label = "粮权行政区划代码" )
    private String lqxzqhdm;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1210.java

@@ -25,6 +25,9 @@
    @PropertyDef(label = "货位代码")
    private String hwdm;

    @PropertyDef(label = "统一货位编码" )
    private String tyhwbm;

    @PropertyDef(label = "粮食数量(公斤)")
    private double lssl;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1307.java

@@ -29,6 +29,15 @@
    @PropertyDef(label = "库区代码")
    private String kqdm;

    @PropertyDef(label = "统一库区编码")
    private String tykqbm;

    @PropertyDef(label = "统一仓房编码")
    private String tycfbm;

    @PropertyDef(label = "统一货位编码" )
    private String tyhwbm;

    @PropertyDef(label = "视频监控设备id" )
    private String spjksbid;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java

@@ -34,6 +34,9 @@
    @PropertyDef(label = "库区代码" )
    private String kqdm;

    @PropertyDef(label = "统一库区编码")
    private String tykqbm;

    @PropertyDef(label = "库区地址" )
    private String kqdz;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1310.java

@@ -27,6 +27,9 @@
    @PropertyDef(label = "货位代码" )
    private String hwdm;

    @PropertyDef(label = "统一货位编码" )
    private String tyhwbm;

    @PropertyDef(label = "粮食品种代码" )
    private String lspzdm;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java

@@ -6,9 +6,6 @@
import lombok.EqualsAndHashCode;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -51,6 +48,9 @@
    @PropertyDef(label = "计划下达单位" )
    private String jhxddw;

    @PropertyDef(label = "统一单位编码")
    private String tydwbm;

    @PropertyDef(label = "计划下达单位名称" )
    private String jhxddwmc;


 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java

@@ -38,6 +38,9 @@
    @PropertyDef(label = "轮换货位代码" )
    private String lhhwdm;

    @PropertyDef(label = "统一货位编码" )
    private String tyhwbm;

    @PropertyDef(label = "轮换数量" )
    private double lhsl;