上海省平台协议-添加统一编码

czt

2024-06-28 4603da77459b23291191b52a35c5c8ccb9ac60e3

上海省平台协议-添加统一编码

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

@@ -76,14 +76,6 @@


    /*----------上海市平台规范字段----------*/
    @PropertyDef(label = "使用库区代码")
    @Column(name = "sykqdm", length = 21)
    private String sykqdm;

    @PropertyDef(label = "廒间联系电话")
    @Column(name = "ajlxdh", length = 20)
    private String ajlxdh;

    @PropertyDef(label = "标记位")
    @Column(name = "bjw", length = 40)
    private String bjw;

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

@@ -72,6 +72,10 @@
    @Column(name = "bjw", length = 40)
    private String bjw;

    @PropertyDef(label = "货位状态")
    @Column(name = "hwzt", length = 40)
    private String hwzt;


    /*----------接口系统自定义字段----------*/
    @JSONField(serialize = false)

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

@@ -2,9 +2,7 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;

import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -30,11 +28,6 @@
    @PropertyDef(label = "统一货位编码" )
    @Column(name = "tyhwbm", length = 28)
    private String tyhwbm;

    @JSONField(serialize = false)
    @PropertyDef(label = "业务id")
    @Column(name = "bizId", length = 40)
    private String bizId;

    @PropertyDef(label = "单位代码" )
    @Column(name = "dwdm", length = 18)
@@ -77,5 +70,10 @@
    @Column(name = "zhgxsj", nullable = false)
    private Date zhgxsj;

    @JSONField(serialize = false)
    @PropertyDef(label = "业务id")
    @Column(name = "bizId", length = 40)
    private String bizId;


}

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

@@ -2,15 +2,12 @@

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;

@@ -21,7 +18,7 @@
@Entity
@Table(name = "API_1206")
@EqualsAndHashCode(callSuper = false)
public class Api1206 extends ApiParent implements Serializable {
public class Api1206 implements Serializable {
    
    public static String SORT_PROP = "ckjsdh";

@@ -105,4 +102,19 @@
    @PropertyDef(label = "货位代码")
    @Column(name = "hwdm", length = 30)
    private String hwdm;

    @JSONField(serialize = false)
    @PropertyDef(label = "业务id")
    @Column(name = "bizId", length = 40)
    private String bizId;

    @JSONField(serialize = false)
    @PropertyDef(label = "库区代码")
    @Column(name = "kqdm", length = 21)
    private String kqdm;

    @JSONField(serialize = false)
    @PropertyDef(label = "同步时间", description = "从粮库系统同步到接口管理中心的时间")
    @Column(name = "syncTime")
    private Date syncTime;
}

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

@@ -77,13 +77,6 @@
        <Property name="dataType">Date</Property>
        <Property name="label">同步时间</Property>
      </PropertyDef>
      <PropertyDef name="sykqdm">
        <Property></Property>
        <Property name="label">使用库区代码</Property>
      </PropertyDef>
      <PropertyDef name="ajlxdh">
        <Property name="label">廒间联系电话</Property>
      </PropertyDef>
      <PropertyDef name="bjw">
        <Property name="label">标记位</Property>
      </PropertyDef>
@@ -378,16 +371,6 @@
              <Property name="labelAlign">left</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelPosition">top</Property>
              <AutoFormElement>
                <Property name="name">sykqdm</Property>
                <Property name="property">sykqdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">ajlxdh</Property>
                <Property name="property">ajlxdh</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bjw</Property>
                <Property name="property">bjw</Property>

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

@@ -64,6 +64,10 @@
        <Property></Property>
        <Property name="label">标记位</Property>
      </PropertyDef>
      <PropertyDef name="hwzt">
        <Property></Property>
        <Property name="label">货位状态</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="regionPadding:10">
@@ -340,6 +344,11 @@
                <Property name="property">bjw</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">hwzt</Property>
                <Property name="property">hwzt</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>

 src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java

@@ -88,7 +88,6 @@
        xmlStr = xmlStr.replace("{ajwd}", GDUtils.formatNum(api1103.getWd()));//廒间纬度

        xmlStr = xmlStr.replace("{ajqyrq}", GDUtils.formatDate(data.getAjqyrq(),"yyyy-MM-dd"));//廒间启用日期
        xmlStr = xmlStr.replace("{ajlxdh}", GDUtils.formatStr(data.getAjlxdh()));//廒间联系电话
        xmlStr = xmlStr.replace("{ajcd}", GDUtils.formatNum(data.getAjcd()));//廒间长度
        xmlStr = xmlStr.replace("{ajkd}", GDUtils.formatNum(data.getAjkd()));//廒间宽度
        xmlStr = xmlStr.replace("{ajgd}", GDUtils.formatNum(data.getAjgd()));//廒间高度

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

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.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.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -21,7 +20,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.lang.reflect.Field;
import java.util.*;

@@ -338,6 +336,11 @@
            SH2023Api1107 api1107 = new SH2023Api1107();
            BeanUtils.copyProperties(data, api1107);
            api1107.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1107.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
                api1107.setTykqbm(tykqbm);
            }

            //设置空属性为默认值
            changeObject(api1107);
@@ -347,6 +350,11 @@
            SH2023Api1108 api1108 = new SH2023Api1108();
            BeanUtils.copyProperties(data, api1108);
            api1108.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1108.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
                api1108.setTykqbm(tykqbm);
            }

            //设置空属性为默认值
            changeObject(api1108);
@@ -357,6 +365,11 @@
            Api1109 apiData = (Api1109) data;
            BeanUtils.copyProperties(apiData, api1109);
            api1109.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if(StringUtils.isEmpty(api1109.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
                api1109.setTykqbm(tykqbm);
            }

            Map<String, String> map = new HashMap<>();
            map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
@@ -374,6 +387,12 @@
            Api1110 apiData = (Api1110) data;
            BeanUtils.copyProperties(apiData, api1110);
            api1110.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1110.getTyajbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1110.getAjdm());
                api1110.setTyajbm(tyhwbm);
            }

            api1110.setAjdm(apiData.getHwdm().substring(0, 28));
            api1110.setAjxdwz(apiData.getHwxdwz());
            api1110.setAjwzys(apiData.getHwwzys());
@@ -386,6 +405,11 @@
            SH2023Api1111 api1111 = new SH2023Api1111();
            BeanUtils.copyProperties(data, api1111);
            api1111.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1111.getTykqbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm());
                api1111.setTykqbm(tyhwbm);
            }

            //设置空属性为默认值
            changeObject(api1111);
@@ -397,6 +421,16 @@
            api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
            api1112.setBjw(ShAreaBjw.getBjw(code));
            api1112.setZy("01");
            //校验统一编码是否为空，为空则查询信息进行赋值
            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);
            }

            //设置空属性为默认值
            changeObject(api1112);
@@ -406,7 +440,11 @@
            SH2023Api1113 api1113 = new SH2023Api1113();
            BeanUtils.copyProperties(data, api1113);
            api1113.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1113.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
                api1113.setTydwbm(tydwbm);
            }
            //设置空属性为默认值
            changeObject(api1113);
            return api1113;
@@ -415,6 +453,11 @@
            SH2023Api1201 api1201 = new SH2023Api1201();
            BeanUtils.copyProperties(data, api1201);
            api1201.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1201.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm());
                api1201.setTydwbm(tydwbm);
            }
            api1201.setHtsfzz("0");
            //合同签订地点不能为空或填无
            if (StringUtils.isEmpty(api1201.getQddd())) {
@@ -438,6 +481,11 @@
            Api1202 apiData = (Api1202) data;
            BeanUtils.copyProperties(apiData, api1202);
            api1202.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1202.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
                api1202.setTyhwbm(tyhwbm);
            }
            api1202.setJzrq(apiData.getCmsj());
            if (StringUtils.isEmpty(api1202.getCddm())) {
                api1202.setCddm(api1202.getHwdm().substring(2, 8));
@@ -480,6 +528,11 @@
            Api1203 apiData = (Api1203) data;
            BeanUtils.copyProperties(apiData, api1203);
            api1203.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1203.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
                api1203.setTyhwbm(tyhwbm);
            }
            if (StringUtils.isEmpty(api1203.getJyxm())) {
                api1203.setJyxm("0");
            }
@@ -514,7 +567,11 @@
            Api1204 apiData = (Api1204) data;
            BeanUtils.copyProperties(apiData, api1204);
            api1204.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1204.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
                api1204.setTyhwbm(tyhwbm);
            }
            //设置批次号
            if (StringUtils.isNotEmpty(api1204.getHth())) {
                List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
@@ -542,7 +599,11 @@
            Api1205 apiData = (Api1205) data;
            BeanUtils.copyProperties(apiData, api1205);
            api1205.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1205.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
                api1205.setTyhwbm(tyhwbm);
            }
            api1205.setJzrq(apiData.getCmsj());
            if (StringUtils.isEmpty(api1205.getCddm())) {
                api1205.setCddm(api1205.getHwdm().substring(2, 8));
@@ -580,6 +641,11 @@
            Api1206 apiData = (Api1206) data;
            BeanUtils.copyProperties(apiData, api1206);
            api1206.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1206.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                api1206.setTykqbm(tykqbm);
            }
            //批次号
            if (StringUtils.isNotEmpty(api1206.getHth())) {
                List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
@@ -608,6 +674,16 @@

            api1207.setDcrq(apiData.getDcrq());
            api1207.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1207.getDcdwtybm())){
                String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
                api1207.setDcdwtybm(dckqtybm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1207.getDchwtybm())){
                String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
                api1207.setDchwtybm(dchwtybm);
            }

            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
            if (null != api1208List && api1208List.size() > 0) {
@@ -625,6 +701,16 @@
            api1208.setZglkdm(api1208.getHwdm().substring(0, 21));

            api1208.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1208.getZglktybm())){
                String lqgstydwbm = apiCommonService.getTykqbm(api1208.getZglkdm());
                api1208.setZglktybm(lqgstydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1208.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
                api1208.setTyhwbm(tyhwbm);
            }
            //设置批次号
            api1208.setPch(apiData.getHwdm() + apiData.getShnd());
            if (StringUtils.isEmpty(api1208.getCd())) {
@@ -656,7 +742,11 @@
            if (null != api1208List && api1208List.size() > 0) {
                api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
            }

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1209.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
                api1209.setTyhwbm(tyhwbm);
            }
            //粮食性质,暂时默认区级储备
            api1209.setLsxzdm("122");

@@ -670,6 +760,11 @@

            BeanUtils.copyProperties(apiData, api1210);
            api1210.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1210.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
                api1210.setTyhwbm(tyhwbm);
            }
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -704,6 +799,11 @@
            BeanUtils.copyProperties(apiData, api1211);
            api1211.setZglkdm(api1211.getKqdm());
            api1211.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1211.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1211.getHwdm());
                api1211.setTyhwbm(tyhwbm);
            }
            api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
@@ -711,6 +811,11 @@
            }
            //主管粮库代码
            api1211.setZglkdm(apiData.getKqdm());
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1211.getZglktybm())){
                String zglktybm = apiCommonService.getTykqbm(api1211.getZglkdm());
                api1211.setZglktybm(zglktybm);
            }
            //设置空属性为默认值
            changeObject(api1211);
            return api1211;
@@ -719,7 +824,16 @@
            SH2023Api1212 api1212 = new SH2023Api1212();
            BeanUtils.copyProperties(data, api1212);
            api1212.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1212.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
                api1212.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1212.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
                api1212.setTykqbm(tykqbm);
            }
            //设置空属性为默认值
            changeObject(api1212);
            return api1212;
@@ -728,7 +842,11 @@
            SH2023Api1301 api1301 = new SH2023Api1301();
            BeanUtils.copyProperties(data, api1301);
            api1301.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1301.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm());
                api1301.setTykqbm(tykqbm);
            }
            //设置空属性为默认值
            changeObject(api1301);
            return api1301;
@@ -738,6 +856,11 @@
            Api1302 apiData = (Api1302) data;
            BeanUtils.copyProperties(apiData, api1302);
            api1302.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1302.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
                api1302.setTyhwbm(tyhwbm);
            }
            api1302.setLqjs("1");
            //批次号
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
@@ -756,6 +879,11 @@
            Api1303 apiData = (Api1303) data;
            BeanUtils.copyProperties(apiData, api1303);
            api1303.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1303.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
                api1303.setTyhwbm(tyhwbm);
            }
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -769,6 +897,11 @@
            Api1304 apiData = (Api1304) data;
            BeanUtils.copyProperties(apiData, api1304);
            api1304.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1304.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
                api1304.setTyhwbm(tyhwbm);
            }
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -784,6 +917,11 @@
            BeanUtils.copyProperties(apiData, api1305);
            api1305.setBjw(ShAreaBjw.getBjw(code));
            api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1305.getTyajbm())){
                String tyajbm = apiCommonService.getTyajbm(api1305.getAjdm());
                api1305.setTyajbm(tyajbm);
            }
            //上海通风作业单号：廒间代码+yyyyMMdd+3位顺序号
            api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
            api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
@@ -800,6 +938,11 @@
            BeanUtils.copyProperties(apiData, api1306);
            api1306.setBjw(ShAreaBjw.getBjw(code));
            api1306.setAjdm(apiData.getHwdm().substring(0, 28));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1306.getTyajbm())){
                String tyajbm = apiCommonService.getTyajbm(api1306.getAjdm());
                api1306.setTyajbm(tyajbm);
            }
            //上海熏蒸作业单号：货位代码+yyyyMMdd + 3位顺序号
            api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
            //设置批次号
@@ -820,7 +963,21 @@
            BeanUtils.copyProperties(apiData, api1307);
            api1307.setBjw(ShAreaBjw.getBjw(code));
            api1307.setAjdm(apiData.getHwdm().substring(0, 28));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
                api1307.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTyajbm())){
                String tyajbm = apiCommonService.getTyajbm(api1307.getAjdm());
                api1307.setTyajbm(tyajbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1307.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
                api1307.setTyhwbm(tyhwbm);
            }
            //设置空属性为默认值
            changeObject(api1307);
            return api1307;
@@ -831,7 +988,16 @@

            BeanUtils.copyProperties(apiData, api1308);
            api1308.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1308.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
                api1308.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1308.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1308.getHwdm());
                api1308.setTyhwbm(tyhwbm);
            }
            //设置空属性为默认值
            changeObject(api1308);
            return api1308;
@@ -840,6 +1006,11 @@
            SH2023Api1309 api1309 = new SH2023Api1309();
            BeanUtils.copyProperties(data, api1309);
            api1309.setBjw(ShAreaBjw.getBjw(code));
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1309.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1309.getQydm());
                api1309.setTykqbm(tykqbm);
            }
            //设置空属性为默认值
            changeObject(api1309);
            return api1309;
@@ -850,7 +1021,11 @@
            BeanUtils.copyProperties(apiData, api1310);
            api1310.setBjw(ShAreaBjw.getBjw(code));
            api1310.setJyrq(apiData.getJysj());

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1310.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
                api1310.setTyhwbm(tyhwbm);
            }
            if (StringUtils.isEmpty(api1310.getJyxm())) {
                api1310.setJyxm("0");
            }
@@ -893,7 +1068,11 @@
            SH2023Api1311 api1311 = new SH2023Api1311();
            BeanUtils.copyProperties(data, api1311);
            api1311.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1311.getTykqbm())){
                String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
                api1311.setTykqbm(tykqbm);
            }
            //设置空属性为默认值
            changeObject(api1311);
            return api1311;
@@ -902,7 +1081,11 @@
            SH2023Api1401 api1401 = new SH2023Api1401();
            BeanUtils.copyProperties(data, api1401);
            api1401.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1401.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1401.getCcqy());
                api1401.setTydwbm(tydwbm);
            }
            //设置空属性为默认值
            changeObject(api1401);
            return api1401;
@@ -925,7 +1108,11 @@
            api1403.setJhzxdw(api1101List.get(0).getDwdm());
            api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
            api1403.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1403.getTydwbm())){
                String tydwbm = apiCommonService.getTydwbm(api1403.getJhzxdw());
                api1403.setTydwbm(tydwbm);
            }
            //查询轮换计划的轮入数量和轮出数量
            List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
            Double lrsl = 0.0, lcsl = 0.0; //用于统计轮入数量和轮出数量
@@ -951,7 +1138,11 @@
            BeanUtils.copyProperties(data, api1404);
            api1404.setMxzt("1");
            api1404.setBjw(ShAreaBjw.getBjw(code));

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1404.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
                api1404.setTyhwbm(tyhwbm);
            }
            //设置空属性为默认值
            changeObject(api1404);
            return api1404;
@@ -968,6 +1159,17 @@
            if (null != api1208List && api1208List.size() > 0) {
                apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getDrdwtybm())){
                String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
                apiData.setDrdwtybm(drkqtybm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getDrhwtybm())){
                String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
                apiData.setDrhwtybm(drhwtybm);
            }

            //设置空属性为默认值
            changeObject(apiData);
            return apiData;
@@ -975,6 +1177,11 @@
        if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
            SH2023Api2103 apiData = new SH2023Api2103();
            BeanUtils.copyProperties(data, apiData);
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(apiData.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置空属性为默认值
            changeObject(apiData);
            return apiData;
@@ -1159,6 +1366,17 @@
        List<SHFinanceDto> list = new ArrayList<>();
        SHFinanceDto shFinanceDto = new SHFinanceDto();
        shFinanceDto.setDwdm(api1503.getDwdm());
        shFinanceDto.setKqdm(api1503.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
            String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
            shFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
            String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
            shFinanceDto.setTykqbm(tykqbm);
        }
        shFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
        shFinanceDto.setBbm("03");
        shFinanceDto.setCzbz(api1503.getCzbz());
@@ -1209,6 +1427,17 @@
        List<SHFinanceDto> list = new ArrayList<>();
        SHFinanceDto shFinanceDto = new SHFinanceDto();
        shFinanceDto.setDwdm(api1502.getDwdm());
        shFinanceDto.setKqdm(api1502.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
            String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
            shFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
            String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
            shFinanceDto.setTykqbm(tykqbm);
        }
        shFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
        shFinanceDto.setBbm("02");
        shFinanceDto.setCzbz(api1502.getCzbz());
@@ -1261,6 +1490,17 @@
        List<SHFinanceDto> list = new ArrayList<>();
        SHFinanceDto shFinanceDto = new SHFinanceDto();
        shFinanceDto.setDwdm(api1501.getDwdm());
        shFinanceDto.setKqdm(api1501.getKqdm());
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
            String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
            shFinanceDto.setTydwbm(tydwbm);
        }
        //校验统一编码是否为空，为空则查询信息进行赋值
        if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
            String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
            shFinanceDto.setTykqbm(tykqbm);
        }
        shFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
        shFinanceDto.setBbm("01");
        shFinanceDto.setCzbz(api1501.getCzbz());

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java

@@ -2,9 +2,7 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java

@@ -2,14 +2,7 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonIgnore;
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;

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java

@@ -26,6 +26,9 @@
    @PropertyDef(label = "廒间名称")
    private String ajmc;

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

    @PropertyDef(label = "仓房(或油罐)编码")
    private String cfdm;

@@ -183,6 +186,9 @@
    @PropertyDef(label = "仓房纬度")
    private Double wd;

    @PropertyDef(label = "廒间状态")
    private String ajzt;

    @PropertyDef(label = "操作标志")
    private String czbz;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java

@@ -23,6 +23,9 @@
    @PropertyDef(label = "货位名称")
    private String hwmc;

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

    @PropertyDef(label = "廒间代码")
    private String ajdm;

@@ -42,6 +45,9 @@
    @PropertyDef(label = "操作标志")
    private String czbz;

    @PropertyDef(label = "货位状态")
    private String hwzt;

    @PropertyDef(label = "最后更新时间")
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date zhgxsj;

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java

@@ -24,6 +24,9 @@
    @PropertyDef(label = "油罐名称")
    private String ygmc;

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java

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

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

    @PropertyDef(label = "设备编号")
    private String sbbh;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java

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

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

    @PropertyDef(label = "采购日期")
    @JSONField(format = "yyyy-MM-dd")
    private Date cgrq;

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java

@@ -23,6 +23,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/sh2023/dto/SH2023Api1110.java

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

    @PropertyDef(label = "廒间代码")
    private String tyajbm;

    @PropertyDef(label = "廒间相对位置")
    private String ajxdwz;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java

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

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1114.java

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java

@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.conf.NumberSerializer;
import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -24,12 +23,14 @@
    private String hth;

    @PropertyDef(label = "合同名称")
    @Column(name = "htmc", length = 128)
    private String htmc;

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java

@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;

@@ -27,6 +26,9 @@

    @PropertyDef(label = "货位代码")
    private String hwdm;

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

    @PropertyDef(label = "业务类型", description = "2：入库（默认）")
    private String ywlx = "2";
@@ -171,7 +173,6 @@
    private String klyy;

    @PropertyDef(label = "现场扣量(公斤)")
    @Column(name = "xckl")
    private Double xckl;

    @PropertyDef(label = "增扣价(公斤)")

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java

@@ -2,14 +2,9 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
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;

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1206.java

@@ -2,14 +2,8 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
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;

@@ -27,6 +21,9 @@
    @PropertyDef(label = "出库结算单号")
    private String ckjsdh;

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java

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

import java.io.Serializable;
import java.util.Date;

@@ -34,6 +33,12 @@
    @PropertyDef(label = "倒出单位")
    private String dcdw;

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java

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

import java.io.Serializable;
import java.util.Date;

@@ -21,6 +20,9 @@

    @PropertyDef(label = "货位代码")
    private String hwdm;

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

    @PropertyDef(label = "粮食品种代码")
    private String lspzdm;
@@ -46,6 +48,9 @@
    @PropertyDef(label = "主管粮库代码")
    private String zglkdm;

    @PropertyDef(label = "主管粮库统一代码")
    private String zglktybm;

    @PropertyDef(label = "管理方式")
    private String glfs;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java

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

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

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "记账日期")
    private Date jzrq;

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.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/sh2023/dto/SH2023Api1211.java

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

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

    @PropertyDef(label = "主管粮库代码")
    private String zglkdm;

    @PropertyDef(label = "主管粮库统一编码")
    private String zglktybm;

    @PropertyDef(label = "年度")
    private String nd;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1212.java

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

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

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

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

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

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


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

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java

@@ -2,14 +2,8 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
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;

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java

@@ -2,14 +2,8 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
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;

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java

@@ -2,14 +2,8 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
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;

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java

@@ -2,14 +2,8 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
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;

@@ -186,6 +180,9 @@
    @PropertyDef(label = "廒间代码")
    private String ajdm;

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

    @PropertyDef(label = "标记位")
    private String bjw;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java

@@ -2,14 +2,8 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
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;

@@ -231,6 +225,9 @@
    @PropertyDef(label = "廒间代码")
    private String ajdm;

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

    @PropertyDef(label = "批次号")
    private String pch;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java

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

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

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

    @PropertyDef(label = "廒间代码")
    private String ajdm;

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

    @PropertyDef(label = "货位代码")
    private String hwdm;

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

    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @PropertyDef(label = "抓拍时间")
    private Date zpsj;

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java

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

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

    @PropertyDef(label = "货位代码")
    private String hwdm;

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java

@@ -33,9 +33,12 @@
    @PropertyDef(label = "违规主体类型")
    private String wgztlx;

    @PropertyDef(label = "违规单位代码")
    @PropertyDef(label = "违规库区代码")
    private String qydm;

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

    @PropertyDef(label = "违规行为人")
    private String wgxwr;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java

@@ -2,14 +2,8 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
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;

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java

@@ -2,7 +2,6 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;

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

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

    /**
     * 1 æµ·åº·, 2 å¤§åŽ, 3 å®‡è§†
     * 4 å¤©åœ°ä¼Ÿä¸š,5 åŽä¸º,9 å…¶ä»–

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java

@@ -4,9 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.GenericGenerator;

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

@@ -34,6 +31,9 @@
    @PropertyDef(label = "承储企业")
    private String ccqy;

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

    @PropertyDef(label = "粮食品种")
    private String ylpz;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java

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

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

@@ -48,6 +46,9 @@
    @PropertyDef(label = "计划执行单位")
    private String jhzxdw;

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

    @PropertyDef(label = "计划执行单位名称")
    private String jhzxdwmc;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java

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

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

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

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

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


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java

@@ -2,11 +2,8 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;

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

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

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

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "检斤日期")
    private Date jjrq;

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java

@@ -2,7 +2,6 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;

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

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

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

    @PropertyDef(label = "操作标志")
    private String czbz;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java

@@ -2,10 +2,7 @@

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fzzy.api.entity.ApiParent;
import lombok.Data;

import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
@@ -25,6 +22,9 @@
    @PropertyDef(label = "货位代码")
    private String hwdm;

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

    @PropertyDef(label = "电缆行数")
    private String dlhs;


 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java

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

import java.io.Serializable;
import java.util.Date;

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

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

    @PropertyDef(label = "记账日期")
    @JSONField(format = "yyyy-MM-dd")
    private Date jzrq;

 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java

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

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

    @PropertyDef(label = "粮食性质代码")
    private String lsxzdm;


 src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java

@@ -10,6 +10,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/resources/application-pro.yml

@@ -1,4 +1,4 @@
##########################  å¹¿ä¸œæ±•å¤´æ½®å—   ##########################
##########################  å¹¿ä¸œæ½®é˜³   ##########################
server:
  port: 8090
  jetty:
@@ -9,16 +9,16 @@
  datasource:
    #主数据源
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
      driver-class-name: com.mysql.jdbc.Driver
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Fzzy@#$%5432..K
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
      driver-class-name: com.mysql.jdbc.Driver
      url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Fzzy@#$%5432..K
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
  jpa:
    #主jpa配置
    primary:
@@ -38,10 +38,10 @@
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
  # Redis相关配置
  redis:
    database: 1
    database: 0
    host: 127.0.0.1
    port: 6379
    password: Redispwd..
    password: Abc123..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
@@ -51,6 +51,7 @@
      timeout: 6000
igds:
  default:
    companyId: 5348
    companyId: 5317

  file-path: D:/IGDS-API/FILE/
  img-path: D:/IGDS/FILE/