宁夏省平台调整-根据配置支持新旧两套接口并行

czt

2024-05-23 2dd54d3f031a3e0326bddc4b9cdddabb9ae08a98

宁夏省平台调整-根据配置支持新旧两套接口并行

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

@@ -157,7 +157,10 @@
    @PropertyDef(label = "是否上线")
    @Column(name = "exe_tag", length = 2)
    private String exeTag = Constant.YN_Y;
    

    @PropertyDef(label = "统一编码上传")
    @Column(name = "GB_CODING_TAG_", length = 200)
    private String gbCodingTag;
    
    @Transient
    @PropertyDef(label = "模拟得分")

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

@@ -200,6 +200,15 @@
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="gbCodingTag">
        <Property></Property>
        <Property name="label">统一编码上传</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;YN&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="pushProtocol">
        <Property></Property>
        <Property name="label">省平台协议</Property>
@@ -367,7 +376,7 @@
      <Property name="caption">接口配置信息</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="closeable">false</Property>
      <Property name="height">680</Property>
      <Property name="height">720</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
@@ -419,26 +428,22 @@
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">password</Property>
                  <Property name="property">password</Property>
                  <Property name="editorType">PasswordEditor</Property>
                  <Property name="name">appCode</Property>
                  <Property name="property">appCode</Property>
                  <Editor/>
                </AutoFormElement>

                <AutoFormElement>
                  <Property name="name">deptId</Property>
                  <Property name="property">deptId</Property>
                  <Property name="labelWidth">120</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">publicKey</Property>
                  <Property name="property">publicKey</Property>
                <AutoFormElement layoutConstraint="colSpan:2">
                  <Property name="name">password</Property>
                  <Property name="property">password</Property>
                  <Property name="editorType">PasswordEditor</Property>
                  <Property name="labelWidth">125</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">appCode</Property>
                  <Property name="property">appCode</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
@@ -448,8 +453,8 @@
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement layoutConstraint="colSpan:2">
                  <Property name="name">apiUrl</Property>
                  <Property name="property">apiUrl</Property>
                  <Property name="name">publicKey</Property>
                  <Property name="property">publicKey</Property>
                  <Property name="labelWidth">125</Property>
                  <Editor/>
                </AutoFormElement>
@@ -460,8 +465,8 @@
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement layoutConstraint="colSpan:2">
                  <Property name="name">imgUrl</Property>
                  <Property name="property">imgUrl</Property>
                  <Property name="name">apiUrl</Property>
                  <Property name="property">apiUrl</Property>
                  <Property name="labelWidth">125</Property>
                  <Editor/>
                </AutoFormElement>
@@ -471,6 +476,18 @@
                  <Property name="labelWidth">125</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement layoutConstraint="colSpan:2">
                  <Property name="name">imgUrl</Property>
                  <Property name="property">imgUrl</Property>
                  <Property name="labelWidth">125</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">gbCodingTag</Property>
                  <Property name="property">gbCodingTag</Property>
                  <Property name="labelWidth">125</Property>
                  <Editor/>
                </AutoFormElement>
              </AutoForm>
            </Children>
          </FieldSet>

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

@@ -11,7 +11,6 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.nx2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -99,7 +98,7 @@
                return responseDto;
            }

            String jsonData = getJsonData(param.getInteId(), data);
            String jsonData = getJsonData(param.getInteId(), data, conf);
            log.info("接口数据信息=" + jsonData);
            apiLog.setData(jsonData);
            apiLog.setKqdm(kqdm);
@@ -158,7 +157,7 @@
     * @param data
     * @return
     */
    private String getJsonData(String inteId, Object data) {
    private String getJsonData(String inteId, Object data, ApiConfs conf) {
        //若为财务1501、1502、1503接口，则接口编码填写1114
        if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)
                || NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)
@@ -167,7 +166,7 @@
            return JSON.toJSONString(object);
        } else {
            List<Object> list = new ArrayList<>();
            Object object = getJsonApiData(inteId, data);
            Object object = getJsonApiData(inteId, data, conf);

            //除库存接口外，其他接口上传前更新最后更新时间
            if(!NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)){
@@ -187,52 +186,86 @@
     * @param data
     * @return
     */
    private Object getJsonApiData(String inteId, Object data) {
    private Object getJsonApiData(String inteId, Object data, ApiConfs conf) {
        if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) {

            Nx2023Api1101 api1101 = new Nx2023Api1101();
            BeanUtils.copyProperties(data, api1101);
            //若统一编码不上传，则统一编码设为空值；
            if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
                api1101.setTydwbm(null);
            }
            return api1101;
        }
        if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
            Nx2023Api1102 api1102 = new Nx2023Api1102();
            BeanUtils.copyProperties(data, api1102);
            api1102.setLkxz("1");
            //若统一编码不上传，则统一编码设为空值；
            if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
                api1102.setTykqbm(null);
            }
            return api1102;
        }
        if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {

            Nx2023Api1103 api1103 = new Nx2023Api1103();
            BeanUtils.copyProperties(data, api1103);
            //若统一编码不上传，则统一编码设为空值；
            if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
                api1103.setTycfbm(null);
            }
            return api1103;
        }
        if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {

            Nx2023Api1104 api1104 = new Nx2023Api1104();
            BeanUtils.copyProperties(data, api1104);
            //若统一编码不上传，则统一编码设为空值；
            if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
                api1104.setTyajbm(null);
            }
            return api1104;
        }
        if (NX2023Constant.NX_2023_API_CODE_1105.equals(inteId)) {

            Nx2023Api1105 api1105 = new Nx2023Api1105();
            BeanUtils.copyProperties(data, api1105);
            //若统一编码不上传，则统一编码设为空值；
            if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
                api1105.setTyhwbm(null);
            }
            return api1105;
        }
        if (NX2023Constant.NX_2023_API_CODE_1106.equals(inteId)) {

            Nx2023Api1106 api1106 = new Nx2023Api1106();
            BeanUtils.copyProperties(data, api1106);
            //若统一编码不上传，则统一编码设为空值；
            if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
                api1106.setTyygbm(null);
            }
            return api1106;
        }
        if (NX2023Constant.NX_2023_API_CODE_1107.equals(inteId)) {

            Nx2023Api1107 api1107 = new Nx2023Api1107();
            BeanUtils.copyProperties(data, api1107);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
                api1107.setTykqbm(tykqbm);
            }
            return api1107;
        }
        if (NX2023Constant.NX_2023_API_CODE_1108.equals(inteId)) {
            Nx2023Api1108 api1108 = new Nx2023Api1108();
            BeanUtils.copyProperties(data, api1108);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
                api1108.setTykqbm(tykqbm);
            }
            return api1108;
        }
        if (NX2023Constant.NX_2023_API_CODE_1109.equals(inteId)) {
@@ -242,117 +275,251 @@
            Map<String, String> map = new HashMap<>();
            map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1109.setWjl(JSON.toJSONString(map));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
                api1109.setTykqbm(tykqbm);
            }
            return api1109;
        }
        if (NX2023Constant.NX_2023_API_CODE_1110.equals(inteId)) {
            Nx2023Api1110 api1110 = new Nx2023Api1110();
            BeanUtils.copyProperties(data, api1110);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
                api1110.setTyhwbm(tyhwbm);
            }
            return api1110;
        }
        if (NX2023Constant.NX_2023_API_CODE_1111.equals(inteId)) {
            Nx2023Api1111 api1111 = new Nx2023Api1111();
            BeanUtils.copyProperties(data, api1111);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
                api1111.setTykqbm(api1102List.getTykqbm());
            }
            return api1111;
        }
        if (NX2023Constant.NX_2023_API_CODE_1112.equals(inteId)) {
            Api1112 apiData = (Api1112) data;
            Nx2023Api1112 api1112 = new Nx2023Api1112();
            BeanUtils.copyProperties(data, api1112);
            BeanUtils.copyProperties(apiData, api1112);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                api1112.setTydwbm(tydwbm);
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                api1112.setTykqbm(tykqbm);
            }
            return api1112;
        }
        if (NX2023Constant.NX_2023_API_CODE_1113.equals(inteId)) {
            Nx2023Api1113 api1113 = new Nx2023Api1113();
            BeanUtils.copyProperties(data, api1113);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
                api1113.setTydwbm(tydwbm);
            }
            return api1113;
        }
        if (NX2023Constant.NX_2023_API_CODE_1201.equals(inteId)) {
            Api1201 apiData = (Api1201) data;
            Nx2023Api1201 api1201 = new Nx2023Api1201();
            BeanUtils.copyProperties(data, api1201);
            BeanUtils.copyProperties(apiData, api1201);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                api1201.setTydwbm(tydwbm);
            }
            return api1201;
        }
        if (NX2023Constant.NX_2023_API_CODE_1202.equals(inteId)) {
            Nx2023Api1202 api1202 = new Nx2023Api1202();
            BeanUtils.copyProperties(data, api1202);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
                api1202.setTyhwbm(tyhwbm);
            }
            return api1202;
        }
        if (NX2023Constant.NX_2023_API_CODE_1203.equals(inteId)) {
            Nx2023Api1203 api1203 = new Nx2023Api1203();
            BeanUtils.copyProperties(data, api1203);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
                api1203.setTyhwbm(tyhwbm);
            }
            return api1203;
        }
        if (NX2023Constant.NX_2023_API_CODE_1204.equals(inteId)) {
            Nx2023Api1204 api1204 = new Nx2023Api1204();
            BeanUtils.copyProperties(data, api1204);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
                api1204.setTyhwbm(tyhwbm);
            }
            return api1204;
        }
        if (NX2023Constant.NX_2023_API_CODE_1205.equals(inteId)) {
            Nx2023Api1205 api1205 = new Nx2023Api1205();
            BeanUtils.copyProperties(data, api1205);
            api1205.setSzlx("09");
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
                api1205.setTyhwbm(tyhwbm);
            }
            return api1205;
        }
        if (NX2023Constant.NX_2023_API_CODE_1206.equals(inteId)) {
            Api1206 apiData = (Api1206) data;
            Nx2023Api1206 api1206 = new Nx2023Api1206();
            BeanUtils.copyProperties(data, api1206);
            BeanUtils.copyProperties(apiData, api1206);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
                api1206.setTydwbm(tydwbm);
            }
            return api1206;
        }
        if (NX2023Constant.NX_2023_API_CODE_1207.equals(inteId)) {
            Nx2023Api1207 api1207 = new Nx2023Api1207();
            BeanUtils.copyProperties(data, api1207);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
                api1207.setDckqtybm(dckqtybm);
                String drkqtybm = apiCommonService.getTykqbm(api1207.getDrdw());
                api1207.setDrkqtybm(drkqtybm);
                String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
                api1207.setDchwtybm(dchwtybm);
                String drhwtybm = apiCommonService.getTyhwbm(api1207.getDrhwdm());
                api1207.setDrhwtybm(drhwtybm);
            }
            return api1207;
        }
        if (NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)) {
            Nx2023Api1208 api1208 = new Nx2023Api1208();
            BeanUtils.copyProperties(data, api1208);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
                api1208.setTyhwbm(tyhwbm);
                if(StringUtils.isEmpty(api1208.getTyhwbm())){
                    String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
                    api1208.setLqgstydwbm(lqgstydwbm);
                }
            }
            return api1208;
        }
        if (NX2023Constant.NX_2023_API_CODE_1209.equals(inteId)) {
            Nx2023Api1209 api1209 = new Nx2023Api1209();
            BeanUtils.copyProperties(data, api1209);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
                api1209.setTyhwbm(tyhwbm);
            }
            return api1209;
        }
        if (NX2023Constant.NX_2023_API_CODE_1210.equals(inteId)) {
            Nx2023Api1210 api1210 = new Nx2023Api1210();
            BeanUtils.copyProperties(data, api1210);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
                api1210.setTyhwbm(tyhwbm);
            }
            return api1210;
        }
        if (NX2023Constant.NX_2023_API_CODE_1211.equals(inteId)) {
            Nx2023Api1211 api1211 = new Nx2023Api1211();
            BeanUtils.copyProperties(data, api1211);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tykqbm = apiCommonService.getTykqbm(api1211.getKqdm());
                api1211.setTykqbm(tykqbm);
            }
            return api1211;
        }
        if (NX2023Constant.NX_2023_API_CODE_1212.equals(inteId)) {
            Nx2023Api1212 api1212 = new Nx2023Api1212();
            BeanUtils.copyProperties(data, api1212);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
                api1212.setTydwbm(tydwbm);
                String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
                api1212.setTykqbm(tykqbm);
            }
            return api1212;
        }
        if (NX2023Constant.NX_2023_API_CODE_1301.equals(inteId)) {
            Nx2023Api1301 api1301 = new Nx2023Api1301();
            BeanUtils.copyProperties(data, api1301);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tydwbm = apiCommonService.getTydwbm(api1301.getDwdm());
                api1301.setTydwbm(tydwbm);
                String tykqbm = apiCommonService.getTykqbm(api1301.getKqdm());
                api1301.setTykqbm(tykqbm);
            }
            return api1301;
        }
        if (NX2023Constant.NX_2023_API_CODE_1302.equals(inteId)) {
            Nx2023Api1302 api1302 = new Nx2023Api1302();
            BeanUtils.copyProperties(data, api1302);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
                api1302.setTyhwbm(tyhwbm);
            }
            return api1302;
        }
        if (NX2023Constant.NX_2023_API_CODE_1303.equals(inteId)) {
            Nx2023Api1303 api1303 = new Nx2023Api1303();
            BeanUtils.copyProperties(data, api1303);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
                api1303.setTyhwbm(tyhwbm);
            }
            return api1303;
        }
        if (NX2023Constant.NX_2023_API_CODE_1304.equals(inteId)) {
            Nx2023Api1304 api1304 = new Nx2023Api1304();
            BeanUtils.copyProperties(data, api1304);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
                api1304.setTyhwbm(tyhwbm);
            }
            return api1304;
        }
        if (NX2023Constant.NX_2023_API_CODE_1305.equals(inteId)) {
            Nx2023Api1305 api1305 = new Nx2023Api1305();
            BeanUtils.copyProperties(data, api1305);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tycfbm = apiCommonService.getTycfbm(api1305.getCfdm());
                api1305.setTycfbm(tycfbm);
            }
            return api1305;
        }
        if (NX2023Constant.NX_2023_API_CODE_1306.equals(inteId)) {
            Nx2023Api1306 api1306 = new Nx2023Api1306();
            BeanUtils.copyProperties(data, api1306);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tycfbm = apiCommonService.getTycfbm(api1306.getCfdm());
                api1306.setTycfbm(tycfbm);
            }
            return api1306;
        }
        if (NX2023Constant.NX_2023_API_CODE_1307.equals(inteId)) {
@@ -363,21 +530,45 @@
            Map<String, String> map = new HashMap<>();
            map.put(apiData.getId() + "." + apiData.getTxwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1307.setCntxwjl(JSON.toJSONString(map));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
                api1307.setTykqbm(tykqbm);
                String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
                api1307.setTycfbm(tycfbm);
                String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
                api1307.setTyhwbm(tyhwbm);
            }
            return api1307;
        }
        if (NX2023Constant.NX_2023_API_CODE_1308.equals(inteId)) {
            Nx2023Api1308 api1308 = new Nx2023Api1308();
            BeanUtils.copyProperties(data, api1308);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
                api1308.setTykqbm(tykqbm);
            }
            return api1308;
        }
        if (NX2023Constant.NX_2023_API_CODE_1309.equals(inteId)) {
            Nx2023Api1309 api1309 = new Nx2023Api1309();
            BeanUtils.copyProperties(data, api1309);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tydwbm = apiCommonService.getTydwbm(api1309.getQydm());
                api1309.setWgdwtybm(tydwbm);
            }
            return api1309;
        }
        if (NX2023Constant.NX_2023_API_CODE_1310.equals(inteId)) {
            Nx2023Api1310 api1310 = new Nx2023Api1310();
            BeanUtils.copyProperties(data, api1310);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
                api1310.setTyhwbm(tyhwbm);
            }
            return api1310;
        }
        if (NX2023Constant.NX_2023_API_CODE_1401.equals(inteId)) {
@@ -393,16 +584,31 @@
        if (NX2023Constant.NX_2023_API_CODE_1403.equals(inteId)) {
            Nx2023Api1403 api1403 = new Nx2023Api1403();
            BeanUtils.copyProperties(data, api1403);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
                api1403.setJhxddwtybm(tydwbm);
            }
            return api1403;
        }
        if (NX2023Constant.NX_2023_API_CODE_1404.equals(inteId)) {
            Nx2023Api1404 api1404 = new Nx2023Api1404();
            BeanUtils.copyProperties(data, api1404);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
                api1404.setLhhwtybm(tyhwbm);
            }
            return api1404;
        }
        if (NX2023Constant.NX_2023_API_CODE_1405.equals(inteId)) {
            Nx2023Api1405 api1405 = new Nx2023Api1405();
            BeanUtils.copyProperties(data, api1405);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
                String tydwbm = apiCommonService.getTydwbm(api1405.getXmdm());
                api1405.setTydwbm(tydwbm);
            }
            return api1405;
        }
        return data;

 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java

@@ -18,6 +18,9 @@
    @PropertyDef(label = "仓房代码" )
    private String cfdm;

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

    @PropertyDef(label = "仓房名称" )
    private String cfmc;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java

@@ -17,6 +17,9 @@
    @PropertyDef(label = "油罐代码" )
    private String ygdm;

    @PropertyDef(label = "统一油罐编码" )
    private String tyygbm;

    @PropertyDef(label = "油罐名称" )
    private String ygmc;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java

@@ -24,6 +24,9 @@

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

    @PropertyDef(label = "统一库区编码")
    private String tykqbm;
    
    @PropertyDef(label = "文件类型", description = "1：库区鸟瞰图 2：入库图片 3：出库图片 4：入库检斤视频（截取检斤时间前后各 5秒钟视频）5：出库检斤视频（截取检斤时间前后各 5 ç§’钟视频）104：熏蒸备案接口附件")
    private String wjlx;

 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java

@@ -12,6 +12,12 @@
@Data
public class Nx2023Api1112 implements Serializable {

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java

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

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;

@@ -21,6 +16,9 @@
    @PropertyDef(label = "单位代码" )
    private String dwdm;

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

    @PropertyDef(label = "信用等级" )
    private String xydj;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java

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

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

    @PropertyDef(label = "业务类别")
    private String ywlx;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java

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

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

    @PropertyDef(label = "业务类型", description = "2：入库（默认）")
    private String ywlx = "2";


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java

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

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

    @PropertyDef(label = "入库业务单号")
    private String rkywdh;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java

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

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

    @PropertyDef(label = "合同号")
    private String hth;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java

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

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

    @PropertyDef(label = "出库通知单号")
    private String cktzdh;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java

@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1206 implements Serializable {

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

    @PropertyDef(label = "出库结算单号" )
    private String ckjsdh;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java

@@ -32,6 +32,12 @@
    @PropertyDef(label = "倒入单位" )
    private String drdw;

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

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

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

@@ -41,6 +47,12 @@
    @PropertyDef(label = "倒入货位代码" )
    private String drhwdm;

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

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

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "倒仓日期" )
    private Date dcrq;

 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java

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

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java

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

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

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "业务日期" )
    private Date ywrq;

 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java

@@ -17,6 +17,12 @@
    @PropertyDef(label = "单位代码")
    private String dwdm;

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

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

    @PropertyDef(label = "单位名称")
    private String dwmc;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java

@@ -23,6 +23,12 @@
    @PropertyDef(label = "单位代码" )
    private String dwdm;

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

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

    @PropertyDef(label = "库区名称" )
    private String kqmc;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java

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

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

    @PropertyDef(label = "仓房外温" )
    private double cfww;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java

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

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

    @PropertyDef(label = "检查害虫方法" )
    private String jchcff;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java

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

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

    @PropertyDef(label = "氧气含量值集合" )
    private String yqhlzjh;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java

@@ -42,6 +42,9 @@
    @Column(name = "cfdm", length = 25)
    private String cfdm;

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

    @PropertyDef(label = "通风目的" )
    @Column(name = "tfmd", length = 128)
    private String tfmd;

 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java

@@ -24,6 +24,9 @@
    @PropertyDef(label = "仓房代码" )
    private String cfdm;

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

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "熏蒸开始时间" )
    private Date xzkssj;

 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java

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

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

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

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

    @PropertyDef(label = "仓内图像文件流" )
    private String cntxwjl;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java

@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1309 implements Serializable {

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

    @PropertyDef(label = "预警信息代码" )
    private String yjxxdm;


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java

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

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java

@@ -3,12 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
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;

@@ -44,6 +38,9 @@
    @PropertyDef(label = "计划下达单位" )
    private String jhxddw;

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

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


 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java

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

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

    @PropertyDef(label = "轮换数量" )

    private double lhsl;

 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.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;

@@ -14,6 +16,9 @@
@Data
public class Nx2023Api1405 implements Serializable {

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

    @PropertyDef(label = "项目代码" )
    private String xmdm;


 src/main/java/com/fzzy/push/nx2023/package-info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
/**
 * @Desc: å®å¤2023版接口-不带统一编码
 *
 * @author: czt
 * @update-time: 2023/08/17
 *
 */
package com.fzzy.push.nx2023;

 src/main/resources/application-pro5306-gb.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
##########################  å®å¤çŸ³å˜´å±±çº¢æžœå­ç²®åº“   ##########################
server:
  port: 8091
  jetty:
    max-http-post-size: 209715200
  tomcat:
    max-http-post-size: 209715200
spring:
  datasource:
    #主数据源
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api_gb?useUnicode=true&characterEncoding=utf-8
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: Abc123..
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: Abc123..
  jpa:
    #主jpa配置
    primary:
      show-sql: true
      properties:
        hibernate:
          hbm2ddl:
            auto: update
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
    #次jpa配置
    secondary:
      show-sql: true
      properties:
        hibernate:
          hbm2ddl:
            auto: none
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
  # Redis相关配置
  redis:
    database: 1
    host: 127.0.0.1
    port: 6379
    password: Abc123..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0
      timeout: 6000
igds:
  default:
    companyId: 5306
  file-path: D:/IGDS-API/FILE-GB/
  img-path: D:/IGDS/FILE/
  # çœå¹³å°RSA密钥对信息
  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
  # åŒºçº§å¹³å°RSA密钥对信息
  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
  #私钥：MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==