陕西2024版接口-测试调整

czt

2024-11-06 11af6525c78f401f8e7ca1100417adf90415586e

陕西2024版接口-测试调整

 src/main/java/com/fzzy/api/Constant.java

@@ -204,9 +204,16 @@

    //财务报表接口
    public static String API_CODE_1114 = "1114";
    public static String API_CODE_1114_1501 = "1501";
    public static String API_CODE_1114_1502 = "1502";
    public static String API_CODE_1114_1503 = "1503";
    public static String API_CODE_1501 = "1501";
    public static String API_CODE_1502 = "1502";
    public static String API_CODE_1503 = "1503";
    public static String API_CODE_1504 = "1504";
    public static String API_CODE_1505 = "1505";
    public static String API_CODE_1506 = "1506";
    public static String API_CODE_1507 = "1507";
    public static String API_CODE_1508 = "1508";
    public static String API_CODE_1509 = "1509";
    public static String API_CODE_1510 = "1510";
    /**
     * å›½æ ‡å‡ºå…¥åº“类型
     */

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

@@ -99,7 +99,7 @@

    @PropertyDef(label = "储备时长")
    @Column(name = "ccsc",precision = 3)
    private BigDecimal ccsc;
    private Integer ccsc;

    @PropertyDef(label = "实际损溢数量(公斤)")
    @Column(name = "jzsysl", precision = 20, scale = 6)

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

@@ -73,8 +73,8 @@
    private Double fcsl;

    @PropertyDef(label = "封仓申请人")
    @Column(name = "fcsrq", length = 40)
    private String fcsrq;
    @Column(name = "fcsqr", length = 40)
    private String fcsqr;

    @PropertyDef(label = "部门审核人")
    @Column(name = "bmshr", length = 40)

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

@@ -21,7 +21,7 @@
@Entity
@Table(name = "API_1305")
@EqualsAndHashCode(callSuper=false)
public class Api1305 extends ApiParent implements Serializable {
public class Api1305 implements Serializable {

    /**
     * 
@@ -239,4 +239,24 @@
    @Column(name = "zhgxsj")
    private Date zhgxsj;

    @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 = "货位代码")
    @Column(name = "hwdm", length = 30)
    private String hwdm;

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

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

@@ -21,7 +21,7 @@
@Entity
@Table(name = "API_1306")
@EqualsAndHashCode(callSuper=false)
public class Api1306 extends ApiParent implements Serializable {
public class Api1306 implements Serializable {

    /**
     * 
@@ -298,10 +298,25 @@
    @Column(name = "zhgxsj")
    private Date zhgxsj;

    @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;

    /*---------系统内使用:国标和广东熏蒸单号：仓房代码+yyyyMMdd+3位顺序号；上海熏蒸单号：货位代码+yyyyMMdd+3位顺序号----------*/
    @JSONField(serialize = false)
    @PropertyDef(label = "货位代码" )
    @Column(name = "hwdm", length = 30)
    private String hwdm;

}

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

@@ -193,6 +193,7 @@
        list.add(new ApiTrigger(PushProtocol.SB_NX_2023.getCode(), PushProtocol.SB_NX_2023.getName()));
        list.add(new ApiTrigger(PushProtocol.SB_NX_2024.getCode(), PushProtocol.SB_NX_2024.getName()));
        list.add(new ApiTrigger(PushProtocol.SB_SX_2023.getCode(), PushProtocol.SB_SX_2023.getName()));
        list.add(new ApiTrigger(PushProtocol.SB_SX_2024.getCode(), PushProtocol.SB_SX_2024.getName()));
        return list;
    }


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

@@ -70,6 +70,26 @@
      <PropertyDef name="spjklx">
        <Property></Property>
        <Property name="label">视频监控类型</Property>
        <Property name="mapping">
            <Property name="keyProperty">key</Property>
            <Property name="valueProperty">value</Property>
            <Property name="mapValues">
                <Collection>
                    <Entity>
                        <Property name="key">1</Property>
                        <Property name="value">1-仓内</Property>
                    </Entity>
                    <Entity>
                        <Property name="key">2</Property>
                        <Property name="value">2-业务类</Property>
                    </Entity>
                    <Entity>
                        <Property name="key">3</Property>
                        <Property name="value">3-安防类</Property>
                    </Entity>
                </Collection>
            </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="spdwlx">
        <Property></Property>
@@ -205,7 +225,12 @@
      <DataColumn name="spjksbmc">
        <Property name="property">spjksbmc</Property>
        <Property name="align">center</Property>
        <Property name="width">500</Property>
        <Property name="width">250</Property>
      </DataColumn>
      <DataColumn name="spjklx">
          <Property name="property">spjklx</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
      </DataColumn>
      <DataColumn name="spjksbid">
        <Property name="property">spjksbid</Property>

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

@@ -190,7 +190,7 @@
        <Property name="label">同步时间</Property>
      </PropertyDef>
      <PropertyDef name="ccsc">
        <Property/>
        <Property name="dataType">Integer</Property>
        <Property name="label">储备时长</Property>
      </PropertyDef>
      <PropertyDef name="sfch">

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

@@ -318,7 +318,7 @@
    </ToolBar>
    <Dialog id="dialogMain">
      <Property name="width">1000</Property>
      <Property name="caption">到仓信息</Property>
      <Property name="caption">账面库存</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="closeable">false</Property>
      <Buttons>
@@ -341,100 +341,114 @@
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*</Property>
          <Property name="labelWidth">100</Property>
          <Property name="labelAlign">left</Property>
          <Property name="labelSeparator">：</Property>
          <Property name="labelPosition">top</Property>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tykqbm</Property>
            <Property name="property">tykqbm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lspzdm</Property>
            <Property name="property">lspzdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">nd</Property>
            <Property name="property">nd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwdm</Property>
            <Property name="property">hwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lsxzdm</Property>
            <Property name="property">lsxzdm</Property>
            <Editor/>
          </AutoFormElement>
          <Label>
            <Property name="text">说明：上海使用(货位代码、粮食性质代码)</Property>
            <Property name="style">
              <Property name="color">blue</Property>
            </Property>
          </Label>
          <AutoFormElement>
            <Property name="name">yf</Property>
            <Property name="property">yf</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">qcsl</Property>
            <Property name="property">qcsl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bqsrsl</Property>
            <Property name="property">bqsrsl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bqzcsl</Property>
            <Property name="property">bqzcsl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">qmye</Property>
            <Property name="property">qmye</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">yjbz</Property>
            <Property name="property">yjbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ywrq</Property>
            <Property name="property">ywrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhgxsj</Property>
            <Property name="property">zhgxsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
        <GroupBox>
          <Property name="caption">基础信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelAlign">left</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelPosition">top</Property>
              <AutoFormElement>
                <Property name="name">kqdm</Property>
                <Property name="property">kqdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">tykqbm</Property>
                <Property name="property">tykqbm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">lspzdm</Property>
                <Property name="property">lspzdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">nd</Property>
                <Property name="property">nd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">yf</Property>
                <Property name="property">yf</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">qcsl</Property>
                <Property name="property">qcsl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bqsrsl</Property>
                <Property name="property">bqsrsl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bqzcsl</Property>
                <Property name="property">bqzcsl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">qmye</Property>
                <Property name="property">qmye</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">yjbz</Property>
                <Property name="property">yjbz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">ywrq</Property>
                <Property name="property">ywrq</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">czbz</Property>
                <Property name="property">czbz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zhgxsj</Property>
                <Property name="property">zhgxsj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bizId</Property>
                <Property name="property">bizId</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>
        <GroupBox>
          <Property name="caption">上海市平台</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelAlign">left</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelPosition">top</Property>
              <AutoFormElement>
                <Property name="name">hwdm</Property>
                <Property name="property">hwdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">lsxzdm</Property>
                <Property name="property">lsxzdm</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>
      </Children>
      <Tools/>
    </Dialog>

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

@@ -73,7 +73,7 @@
        <Property></Property>
        <Property name="label">封仓数量(kg)</Property>
      </PropertyDef>
      <PropertyDef name="fcsrq">
      <PropertyDef name="fcsqr">
        <Property></Property>
        <Property name="label">封仓申请人</Property>
      </PropertyDef>
@@ -429,8 +429,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">fcsrq</Property>
                <Property name="property">fcsrq</Property>
                <Property name="name">fcsqr</Property>
                <Property name="property">fcsqr</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>

 src/main/java/com/fzzy/api/view/pr/Api1211PR.java

@@ -119,6 +119,9 @@
        Api1211 data = new Api1211();
        BeanUtils.copyProperties(entity, data);

        if(StringUtils.isEmpty(data.getId())){
            data.setId(ContextUtil.getUUID());
        }
        apiRepository.save(data);
    }


 src/main/java/com/fzzy/api/view/pr/Api1213PR.java

@@ -189,7 +189,7 @@
        String result = "";

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1213);
        Api1213 d;
        for (Api1213 data : items) {
            d = new Api1213();
@@ -217,7 +217,7 @@
    private String pushDataList(List<Api1213> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1213);

        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);

 src/main/java/com/fzzy/api/view/pr/Api1501PR.java

@@ -124,7 +124,7 @@
        String result = "";

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1501);
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1501);
        Api1501 d;
        for (Api1501 data : items) {
            d = new Api1501();
@@ -153,7 +153,7 @@
    private String pushDataList(List<Api1501> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1501);
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1501);

        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);

 src/main/java/com/fzzy/api/view/pr/Api1502PR.java

@@ -122,7 +122,7 @@
        String result = "";

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1502);
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1502);
        Api1502 d;
        for (Api1502 data : items) {
            d = new Api1502();
@@ -151,7 +151,7 @@
    private String pushDataList(List<Api1502> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1502);
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1502);

        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);

 src/main/java/com/fzzy/api/view/pr/Api1503PR.java

@@ -120,7 +120,7 @@
        String result = "";

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1503);
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1503);
        Api1503 d;
        for (Api1503 data : items) {
            d = new Api1503();
@@ -149,7 +149,7 @@
    private String pushDataList(List<Api1503> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1503);
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1503);

        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);

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

@@ -37,4 +37,7 @@
     */
    @Query("from Api1404 where bizId =:bizId and kqdm =:kqdm")
    List<Api1404> getDataByBizIdAndKqdm(@Param("bizId") String bizId, @Param("kqdm") String kqdm);

    @Query("from Api1404 where jhmxdh=:jhmxdh ")
    Api1404 getOneDataByJhmxdh(@Param("jhmxdh") String jhmxdh);
}

 src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java

@@ -80,7 +80,7 @@

    @Column(name = "ccsc")
    @PropertyDef(label = "储存时长")
    private BigDecimal ccsc;
    private Integer ccsc;

    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    @PropertyDef(label = "入库时间")

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java

@@ -95,6 +95,7 @@
                api1305.setZhgxsj(new Date());

                api1305.setKqdm(kqdm);
                api1305.setHwdm(api1105.getHwdm());
                api1305.setBizId(fzAreationData.getId());
                api1305List = api1305Rep.getDataById(api1305.getTfzydh());
                if (null == api1305List || api1305List.isEmpty()) {

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

@@ -70,9 +70,9 @@

    @Override
    public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
        if (Constant.API_CODE_1114_1501.equals(param.getInteId())
                || Constant.API_CODE_1114_1502.equals(param.getInteId())
                || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
        if (Constant.API_CODE_1501.equals(param.getInteId())
                || Constant.API_CODE_1502.equals(param.getInteId())
                || Constant.API_CODE_1503.equals(param.getInteId())) {
            return pushFinanceData(param, conf, data);
        }

@@ -193,11 +193,11 @@
            }

            List<GDFinanceDto> list = null;
            if (Constant.API_CODE_1114_1501.equals(param.getInteId())) {
            if (Constant.API_CODE_1501.equals(param.getInteId())) {
                list = copyApi1501((Api1501) data);
            } else if (Constant.API_CODE_1114_1502.equals(param.getInteId())) {
            } else if (Constant.API_CODE_1502.equals(param.getInteId())) {
                list = copyApi1502((Api1502) data);
            } else if (Constant.API_CODE_1114_1503.equals(param.getInteId())) {
            } else if (Constant.API_CODE_1503.equals(param.getInteId())) {
                list = copyApi1503((Api1503) data);
            }
            GD2022ResponseDto responseDto;

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

@@ -6,10 +6,7 @@
import com.fzzy.order.common.OrderCommonService;
import com.fzzy.order.common.data.OrderCommonConstant;
import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService12;
import com.fzzy.push.impl.ComPushService13;
import com.fzzy.push.impl.ComPushService14;
import com.fzzy.push.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -38,7 +35,8 @@
    private ComPushService13 pushService13;
    @Autowired
    private ComPushService14 pushService14;

    @Autowired
    private ComPushService15 pushService15;
    @Override
    public String getProtocol() {
        return PushProtocol.SB_GD_2022.getCode();
@@ -118,7 +116,7 @@
                pushService11.pushData1113(apiRemoteService, param);
                break;
            case "1114":
                pushService11.pushData1114(apiRemoteService, param);
                pushService15.pushData1500(apiRemoteService, param);
                break;
            case "1201":
                pushService12.pushData1201(apiRemoteService, param);

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

@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService15;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -21,7 +22,9 @@
    private GD2022ApiRemoteService2022 apiRemoteService;

    @Autowired
    private ComPushService11 pushService;
    private ComPushService11 pushService11;
    @Autowired
    private ComPushService15 pushService15;

    @Override
    public String getProtocol() {
@@ -32,34 +35,34 @@
    public void pushData(ApiParam param) {

        //单位信息
        pushService.pushData1101(apiRemoteService, param);
        pushService11.pushData1101(apiRemoteService, param);
        //库区信息
        pushService.pushData1102(apiRemoteService, param);
        pushService11.pushData1102(apiRemoteService, param);
        //仓房信息
        pushService.pushData1103(apiRemoteService, param);
        pushService11.pushData1103(apiRemoteService, param);
        //廒间信息
        pushService.pushData1104(apiRemoteService, param);
        pushService11.pushData1104(apiRemoteService, param);
        //货位信息
        pushService.pushData1105(apiRemoteService, param);
        pushService11.pushData1105(apiRemoteService, param);
        //油罐信息
        pushService.pushData1106(apiRemoteService, param);
        pushService11.pushData1106(apiRemoteService, param);
        //设备信息
        pushService.pushData1107(apiRemoteService, param);
        pushService11.pushData1107(apiRemoteService, param);
        //药剂信息
        pushService.pushData1108(apiRemoteService, param);
        pushService11.pushData1108(apiRemoteService, param);
        //库区图仓房点位信息
        pushService.pushData1110(apiRemoteService, param);
        pushService11.pushData1110(apiRemoteService, param);

        //库区图视频监控设备点位数据
        pushService.pushData1111(apiRemoteService, param);
        pushService11.pushData1111(apiRemoteService, param);

        //人员信息
        pushService.pushData1112(apiRemoteService, param);
        pushService11.pushData1112(apiRemoteService, param);
        //企业信用信息
        pushService.pushData1113(apiRemoteService, param);
        pushService11.pushData1113(apiRemoteService, param);
        //文件信息推送，转移到12大类进行推送

        //财务报表数据推送
        pushService.pushData1114(apiRemoteService, param);
        pushService15.pushData1500(apiRemoteService, param);
    }
}

 src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java

@@ -69,9 +69,9 @@

    @Override
    public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
        if (Constant.API_CODE_1114_1501.equals(param.getInteId())
                || Constant.API_CODE_1114_1502.equals(param.getInteId())
                || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
        if (Constant.API_CODE_1501.equals(param.getInteId())
                || Constant.API_CODE_1502.equals(param.getInteId())
                || Constant.API_CODE_1503.equals(param.getInteId())) {
            return pushFinanceData(param, conf, data);
        }

@@ -192,11 +192,11 @@
            }

            List<GDFinanceDto> list = null;
            if (Constant.API_CODE_1114_1501.equals(param.getInteId())) {
            if (Constant.API_CODE_1501.equals(param.getInteId())) {
                list = copyApi1501((Api1501) data);
            } else if (Constant.API_CODE_1114_1502.equals(param.getInteId())) {
            } else if (Constant.API_CODE_1502.equals(param.getInteId())) {
                list = copyApi1502((Api1502) data);
            } else if (Constant.API_CODE_1114_1503.equals(param.getInteId())) {
            } else if (Constant.API_CODE_1503.equals(param.getInteId())) {
                list = copyApi1503((Api1503) data);
            }
            GD2023ResponseDto responseDto;

 src/main/java/com/fzzy/push/gd2023/GD2023OrderServiceImpl.java

@@ -6,10 +6,7 @@
import com.fzzy.order.common.OrderCommonService;
import com.fzzy.order.common.data.OrderCommonConstant;
import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService12;
import com.fzzy.push.impl.ComPushService13;
import com.fzzy.push.impl.ComPushService14;
import com.fzzy.push.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -38,6 +35,8 @@
    private ComPushService13 pushService13;
    @Autowired
    private ComPushService14 pushService14;
    @Autowired
    private ComPushService15 pushService15;

    @Override
    public String getProtocol() {
@@ -118,7 +117,7 @@
                pushService11.pushData1113(apiRemoteService, param);
                break;
            case "1114":
                pushService11.pushData1114(apiRemoteService, param);
                pushService15.pushData1500(apiRemoteService, param);
                break;
            case "1201":
                pushService12.pushData1201(apiRemoteService, param);

 src/main/java/com/fzzy/push/gd2023/GD2023PushService11.java

@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService15;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -21,7 +22,9 @@
    private GD2023ApiRemoteService2023 apiRemoteService;

    @Autowired
    private ComPushService11 pushService;
    private ComPushService11 pushService11;
    @Autowired
    private ComPushService15 pushService15;

    @Override
    public String getProtocol() {
@@ -32,34 +35,34 @@
    public void pushData(ApiParam param) {

        //单位信息
        pushService.pushData1101(apiRemoteService, param);
        pushService11.pushData1101(apiRemoteService, param);
        //库区信息
        pushService.pushData1102(apiRemoteService, param);
        pushService11.pushData1102(apiRemoteService, param);
        //仓房信息
        pushService.pushData1103(apiRemoteService, param);
        pushService11.pushData1103(apiRemoteService, param);
        //廒间信息
        pushService.pushData1104(apiRemoteService, param);
        pushService11.pushData1104(apiRemoteService, param);
        //货位信息
        pushService.pushData1105(apiRemoteService, param);
        pushService11.pushData1105(apiRemoteService, param);
        //油罐信息
        pushService.pushData1106(apiRemoteService, param);
        pushService11.pushData1106(apiRemoteService, param);
        //设备信息
        pushService.pushData1107(apiRemoteService, param);
        pushService11.pushData1107(apiRemoteService, param);
        //药剂信息
        pushService.pushData1108(apiRemoteService, param);
        pushService11.pushData1108(apiRemoteService, param);
        //库区图仓房点位信息
        pushService.pushData1110(apiRemoteService, param);
        pushService11.pushData1110(apiRemoteService, param);

        //库区图视频监控设备点位数据
        pushService.pushData1111(apiRemoteService, param);
        pushService11.pushData1111(apiRemoteService, param);

        //人员信息
        pushService.pushData1112(apiRemoteService, param);
        pushService11.pushData1112(apiRemoteService, param);
        //企业信用信息
        pushService.pushData1113(apiRemoteService, param);
        pushService11.pushData1113(apiRemoteService, param);
        //文件信息推送，转移到12大类进行推送

        //财务报表数据推送
        pushService.pushData1114(apiRemoteService, param);
        pushService15.pushData1500(apiRemoteService, param);
    }
}

 src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java

@@ -73,7 +73,7 @@
    private Double ckzz;

    @PropertyDef(label = "储存时长" )
    private BigDecimal ccsc;
    private Integer ccsc;

    @PropertyDef(label = "实际损益数量" )
    private Double jzsysl;

 src/main/java/com/fzzy/push/impl/ComPushService11.java

@@ -45,12 +45,7 @@
    private Api1112Rep api1112Rep;
    @Autowired
    private Api1113Rep api1113Rep;
    @Autowired
    private Api1501Rep api1501Rep;
    @Autowired
    private Api1502Rep api1502Rep;
    @Autowired
    private Api1503Rep api1503Rep;

    /**
     * 1101 å•ä½ä¿¡æ¯
     */
@@ -379,96 +374,4 @@
        }
    }

    /**
     * è´¢åŠ¡æŠ¥è¡¨
     * @param apiRemoteService
     * @param param
     */
    public void pushData1114(ApiRemoteService apiRemoteService, ApiParam param) {
        this.pushData1501(apiRemoteService, param);
        this.pushData1502(apiRemoteService, param);
        this.pushData1503(apiRemoteService, param);

    }
    /**
     * 1501  è´¢åŠ¡æŠ¥è¡¨-资产负债--单条上传
     */
    public void pushData1501(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取财务报表-资产负债
        List<Api1501> list = api1501Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----未获取到资产负债信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1114_1501);
        ResponseDto responseDto;
        for (Api1501 data : list) {
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1501Rep.save(data);
                }
            }
        }
    }

    /**
     * 1502  è´¢åŠ¡æŠ¥è¡¨-现金流
     */
    public void pushData1502(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取财务报表-资产负债
        List<Api1502> list = api1502Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----未获取到现金流信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1114_1502);
        ResponseDto responseDto;
        for (Api1502 data : list) {
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1502Rep.save(data);
                }
            }
        }
    }

    /**
     * 1503  è´¢åŠ¡æŠ¥è¡¨-利润信息
     */
    public void pushData1503(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取财务报表-资产负债
        List<Api1503> list = api1503Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----未获取到利润信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1114_1503);
        ResponseDto responseDto;
        Api1503 d;
        for (Api1503 data : list) {
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1503Rep.save(data);
                }
            }
        }
    }
}

 src/main/java/com/fzzy/push/impl/ComPushService15.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,178 @@
package com.fzzy.push.impl;

import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1501;
import com.fzzy.api.entity.Api1502;
import com.fzzy.api.entity.Api1503;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.Api1501Rep;
import com.fzzy.api.view.repository.Api1502Rep;
import com.fzzy.api.view.repository.Api1503Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * @Description  è´¢åŠ¡ç®¡ç†æŽ¥å£å¤„理
 * @Author CZT
 * @Date 2024/11/6 15:53
 */
@Slf4j
@Service
public class ComPushService15 {

    @Autowired
    private Api1501Rep api1501Rep;
    @Autowired
    private Api1502Rep api1502Rep;
    @Autowired
    private Api1503Rep api1503Rep;

    /**
     * è´¢åŠ¡æŠ¥è¡¨
     * @param apiRemoteService
     * @param param
     */
    public void pushData1500(ApiRemoteService apiRemoteService, ApiParam param) {
        this.pushData1501(apiRemoteService, param);
        this.pushData1502(apiRemoteService, param);
        this.pushData1503(apiRemoteService, param);

    }
    /**
     * 1501  è´¢åŠ¡æŠ¥è¡¨-资产负债--单条上传
     */
    public void pushData1501(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取财务报表-资产负债
        List<Api1501> list = api1501Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----未获取到资产负债信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1501);
        ResponseDto responseDto;
        for (Api1501 data : list) {
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1501Rep.save(data);
                }
            }
        }
    }

    /**
     * 1502  è´¢åŠ¡æŠ¥è¡¨-现金流
     */
    public void pushData1502(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取财务报表-资产负债
        List<Api1502> list = api1502Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----未获取到现金流信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1502);
        ResponseDto responseDto;
        for (Api1502 data : list) {
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1502Rep.save(data);
                }
            }
        }
    }

    /**
     * 1503  è´¢åŠ¡æŠ¥è¡¨-利润信息
     */
    public void pushData1503(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取财务报表-资产负债
        List<Api1503> list = api1503Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----未获取到利润信息，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_11);
        param.setInteId(Constant.API_CODE_1503);
        ResponseDto responseDto;
        Api1503 d;
        for (Api1503 data : list) {
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1503Rep.save(data);
                }
            }
        }
    }


    /**
     * 1504  è´¦å¥—信息
     */
    public void pushData1504(ApiRemoteService apiRemoteService, ApiParam param) {
        //TODO

    }
    /**
     * 1505  ç§‘目信息
     */
    public void pushData1505(ApiRemoteService apiRemoteService, ApiParam param) {
        //TODO

    }
    /**
     * 1506  ç§‘目余额信息
     */
    public void pushData1506(ApiRemoteService apiRemoteService, ApiParam param) {
        //TODO

    }
    /**
     * 1507  ä¼šè®¡å‡­è¯ä¿¡æ¯
     */
    public void pushData1507(ApiRemoteService apiRemoteService, ApiParam param) {
        //TODO

    }
    /**
     * 1508  çŽ°é‡‘流量分配信息
     */
    public void pushData1508(ApiRemoteService apiRemoteService, ApiParam param) {
        //TODO

    }
    /**
     * 1509  å›ºå®šèµ„产卡片信息
     */
    public void pushData1509(ApiRemoteService apiRemoteService, ApiParam param) {
        //TODO

    }
    /**
     * 1510  èµ„产折旧信息
     */
    public void pushData1510(ApiRemoteService apiRemoteService, ApiParam param) {
        //TODO

    }
}

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

@@ -181,18 +181,51 @@
     */
    private Object getJsonApiData(String inteId, Object data) {
        if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) {
            Api1101 apiData = (Api1101)data;
            Nx2023Api1101 api1101 = new Nx2023Api1101();
            BeanUtils.copyProperties(data, api1101);
            BeanUtils.copyProperties(apiData, api1101);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1101.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                api1101.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1101.getSjdwtybm()) && StringUtils.isNotEmpty(apiData.getSjdwdm())) {
                String sjdwtybm = apiCommonService.getTydwbm(apiData.getDwdm());
                api1101.setSjdwtybm(sjdwtybm);
            }
            return api1101;
        }
        if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
            Api1102 apiData = (Api1102)data;
            Nx2023Api1102 api1102 = new Nx2023Api1102();
            BeanUtils.copyProperties(data, api1102);
            BeanUtils.copyProperties(apiData, api1102);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1102.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                api1102.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1102.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                api1102.setTydwbm(tydwbm);
            }
            return api1102;
        }
        if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {
            Api1103 apiData = (Api1103)data;
            Nx2023Api1103 api1103 = new Nx2023Api1103();
            BeanUtils.copyProperties(data, api1103);
            BeanUtils.copyProperties(apiData, api1103);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1103.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                api1103.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1103.getTycfbm())) {
                String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
                api1103.setTycfbm(tycfbm);
            }
            return api1103;
        }
        if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {

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

@@ -8,10 +8,7 @@
import com.fzzy.order.common.OrderCommonService;
import com.fzzy.order.common.data.OrderCommonConstant;
import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService12;
import com.fzzy.push.impl.ComPushService13;
import com.fzzy.push.impl.ComPushService14;
import com.fzzy.push.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -41,6 +38,8 @@
    private ComPushService13 pushService13;
    @Autowired
    private ComPushService14 pushService14;
    @Autowired
    private ComPushService15 pushService15;

    @Override
    public String getProtocol() {
@@ -121,7 +120,7 @@
                pushService11.pushData1112(apiRemoteService, param);
                break;
            case "1114":
                pushService11.pushData1114(apiRemoteService, param);
                pushService15.pushData1500(apiRemoteService, param);
                break;
            case "1201":
                pushService12.pushData1201(apiRemoteService, param);

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

@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService15;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -22,6 +23,8 @@
    private NX2023ApiRemoteService apiRemoteService;
    @Autowired
    private ComPushService11 pushService11;
    @Autowired
    private ComPushService15 pushService15;

    @Override
    public String getProtocol() {
@@ -62,7 +65,7 @@
        //文件信息推送，转移到12大类进行推送

        //财务报表数据推送
        pushService11.pushData1114(apiRemoteService, param);
        pushService15.pushData1500(apiRemoteService, param);

        log.info("------->>>>基础信息 æŽ¥å£æ¨¡å—上报结束");
    }

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

@@ -15,6 +15,9 @@
@Data
public class Nx2023Api1101 implements Serializable {

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

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

@@ -70,6 +73,9 @@
    @PropertyDef(label = "上级单位名称")
    private String sjdwmc;

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

    @PropertyDef(label = "上级单位代码")
    private String sjdwdm;

@@ -88,6 +94,9 @@
    @PropertyDef(label = "纬度")
    private Double wd;

    @PropertyDef(label = "单位状态")
    private String dwzt;

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


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

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

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

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

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

@@ -51,6 +57,9 @@
    @PropertyDef(label = "库区纬度")
    private Double wd;

    @PropertyDef(label = "库区状态")
    private String kqzt;

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


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

@@ -14,6 +14,8 @@
@Data
public class Nx2023Api1103 implements Serializable {

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

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

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

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


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

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

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

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


 src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java

@@ -8,10 +8,7 @@
import com.fzzy.order.common.OrderCommonService;
import com.fzzy.order.common.data.OrderCommonConstant;
import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService12;
import com.fzzy.push.impl.ComPushService13;
import com.fzzy.push.impl.ComPushService14;
import com.fzzy.push.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -40,7 +37,8 @@
    private ComPushService13 pushService13;
    @Autowired
    private ComPushService14 pushService14;

    @Autowired
    private ComPushService15 pushService15;
    @Override
    public String getProtocol() {
        return PushProtocol.SB_NX_2024.getCode();
@@ -202,7 +200,7 @@
                pushService14.pushData1405(apiRemoteService, param);
                break;
            case "2441":
                pushService11.pushData1114(apiRemoteService, param);
                pushService15.pushData1500(apiRemoteService, param);
                break;
            default:
                log.error("-----宁夏省平台2024版：未匹配到接口编码，不推送-----");

 src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java

@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService15;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -20,6 +21,8 @@
    private NX2024ApiRemoteService apiRemoteService;
    @Autowired
    private ComPushService11 pushService11;
    @Autowired
    private ComPushService15 pushService15;

    @Override
    public String getProtocol() {
@@ -70,7 +73,7 @@
        pushService11.pushData1113(apiRemoteService, param);

        //2441-财务报表数据推送
        pushService11.pushData1114(apiRemoteService, param);
        pushService15.pushData1500(apiRemoteService, param);

        log.info("------->>>>宁夏省平台2024版接口，基础信息，上报结束");
    }

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

@@ -91,9 +91,9 @@
            apiLog.setId(ContextUtil.getUUID());

            //若为财务1501、1502、1503接口，则接口编码填写1114
            if (Constant.API_CODE_1114_1501.equals(param.getInteId())
                    || Constant.API_CODE_1114_1502.equals(param.getInteId())
                    || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
            if (Constant.API_CODE_1501.equals(param.getInteId())
                    || Constant.API_CODE_1502.equals(param.getInteId())
                    || Constant.API_CODE_1503.equals(param.getInteId())) {
                inteId = Constant.API_CODE_1114;
            }
            apiLog.setInteId(inteId);

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

@@ -40,6 +40,8 @@
    @Autowired
    private ComPushService14 pushService14;
    @Autowired
    private ComPushService15 pushService15;
    @Autowired
    private ComPushService99 pushService99;

    @Override
@@ -125,7 +127,7 @@
                pushService11.pushData1113(apiRemoteService, param);
                break;
            case "1114":
                pushService11.pushData1114(apiRemoteService, param);
                pushService15.pushData1500(apiRemoteService, param);
                break;
            case "1115":
                pushService99.pushData1115(apiRemoteService, param);

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

@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService15;
import com.fzzy.push.impl.ComPushService99;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,8 @@
    private SH2023ApiRemoteService apiRemoteService;
    @Autowired
    private ComPushService11 pushService11;
    @Autowired
    private ComPushService15 pushService15;
    @Autowired
    private ComPushService99 pushService99;
    @Override
@@ -64,7 +67,8 @@
        //文件信息推送，转移到12大类进行推送

        //财务报表数据推送
        pushService11.pushData1114(apiRemoteService, param);
        pushService15.pushData1500(apiRemoteService, param);
        //数据相符性
        pushService99.pushData1115(apiRemoteService, param);

        log.info("------->>>>基础信息 æŽ¥å£æ¨¡å—上报结束");

 src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java

@@ -106,7 +106,7 @@
            //报文标识
            reqData.setID(orderId);
            //版本号
            reqData.setVER("1.0");
            reqData.setVER("2022");
            //单位编码：11位
            reqData.setOrgNo(conf.getUserName());
            //单位名称
@@ -185,9 +185,9 @@
        Map<String, Object> map = new HashMap<>();
        String inteIdUrl = getInteId(inteId);
        //若为财务1501、1502、1503接口，则接口编码填写1114
        if (Constant.API_CODE_1114_1501.equals(inteId)
                || Constant.API_CODE_1114_1502.equals(inteId)
                || Constant.API_CODE_1114_1503.equals(inteId)) {
        if (Constant.API_CODE_1501.equals(inteId)
                || Constant.API_CODE_1502.equals(inteId)
                || Constant.API_CODE_1503.equals(inteId)) {
            List<SXFinanceDto> list = getFinanceData(inteId, data);
            map.put(inteIdUrl, list);
        } else {
@@ -437,9 +437,9 @@
     */
    private List<SXFinanceDto> getFinanceData(String inteId, Object data) {
        //财务报表数据封装
        if (Constant.API_CODE_1114_1501.equals(inteId)) {
        if (Constant.API_CODE_1501.equals(inteId)) {
            return copyApi1501((Api1501) data);
        } else if (Constant.API_CODE_1114_1502.equals(inteId)) {
        } else if (Constant.API_CODE_1502.equals(inteId)) {
            return copyApi1502((Api1502) data);
        } else {
            return copyApi1503((Api1503) data);

 src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java

@@ -38,6 +38,8 @@
    private ComPushService13 pushService13;
    @Autowired
    private ComPushService14 pushService14;
    @Autowired
    private ComPushService15 pushService15;

    @Override
    public String getProtocol() {
@@ -117,7 +119,7 @@
                pushService11.pushData1112(apiRemoteService, param);
                break;
            case "ODS_UP_CWBBXXJK":
                pushService11.pushData1114(apiRemoteService, param);
                pushService15.pushData1500(apiRemoteService, param);
                break;
            case "ODS_UP_HTXXJK":
                pushService12.pushData1201(apiRemoteService, param);

 src/main/java/com/fzzy/push/sx2023/data/SX2023Api1108.java

@@ -46,7 +46,7 @@
    private String bzw;

    @PropertyDef(label = "型号规格")
    @JsonProperty("BZW")
    @JsonProperty("GGXH")
    private String ggxh;

    @PropertyDef(label = "安全使用说明书")

 src/main/java/com/fzzy/push/sx2023/data/SX2023Api1111.java

@@ -32,10 +32,6 @@
    @JsonProperty("SPJKSBID")
    private String spjksbid;

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

    @PropertyDef(label = "视频监控设备相对位置")
    @JsonProperty("SPJKSBXDWZ")
    private String spjksbxdwz;

 src/main/java/com/fzzy/push/sx2023/data/SX2023Api1204.java

@@ -33,7 +33,7 @@
    private double jssl;

    @PropertyDef(label = "结算单价(元/公斤)")
    @JsonProperty("JSSL")
    @JsonProperty("JSDJ")
    private double jsdj;

    @PropertyDef(label = "结算金额(元)")

 src/main/java/com/fzzy/push/sx2023/data/SX2023Api1206.java

@@ -29,7 +29,7 @@
    private double jssl;

    @PropertyDef(label = "结算单价(元/公斤)")
    @JsonProperty("JSSL")
    @JsonProperty("JSDJ")
    private double jsdj;

    @PropertyDef(label = "结算金额(元)")

 src/main/java/com/fzzy/push/sx2023/data/SX2023Api1209.java

@@ -60,7 +60,7 @@
    private Double cksf;

    @PropertyDef(label = "出库杂质(%)")
    @JsonProperty("CKSF")
    @JsonProperty("CKZZ")
    private Double ckzz;

    @PropertyDef(label = "净重损溢数量(公斤)")

 src/main/java/com/fzzy/push/sx2023/data/SX2023Api1210.java

@@ -50,7 +50,7 @@

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "划转日期")
    @JsonProperty("HZHLSXZDM")
    @JsonProperty("HZRQ")
    private Date hzrq;

    @PropertyDef(label = "仓储审核人")

 src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java

@@ -200,7 +200,7 @@
    private Date sqrq;

    @PropertyDef(label = "散气方法")
    @JsonProperty("SQRQ")
    @JsonProperty("SQFF")
    private String sqff;

    @PropertyDef(label = "散气批准人")

 src/main/java/com/fzzy/push/sx2023/data/SX2023Api1308.java

@@ -50,7 +50,7 @@
    private String ycgjsm;

    @PropertyDef(label = "视频文件流")
    @JsonProperty("YCGJSM")
    @JsonProperty("SPWJL")
    private String spwjl;

    @PropertyDef(label = "视频文件后缀名")

 src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java

@@ -11,6 +11,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;

import com.fzzy.push.sx2024.data.*;
@@ -44,6 +45,8 @@
    private ApiTriggerService apiTriggerService;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private Api1404Rep api1404Rep;

    @Override
    public String getProtocol() {
@@ -107,7 +110,7 @@
            //报文标识
            reqData.setID(orderId);
            //版本号
            reqData.setVER("1.0");
            reqData.setVER("2024");
            //单位编码：11位
            reqData.setOrgNo(conf.getUserName());
            //单位名称
@@ -185,22 +188,16 @@
        List<Map<String, Object>> result = new ArrayList<>();
        Map<String, Object> map = new HashMap<>();
        String inteIdUrl = getInteId(inteId);
        //若为财务1501、1502、1503接口，则接口编码填写1114
        if (Constant.API_CODE_1114_1501.equals(inteId)
                || Constant.API_CODE_1114_1502.equals(inteId)
                || Constant.API_CODE_1114_1503.equals(inteId)) {
            List<SXFinanceDto> list = getFinanceData(inteId, data);
            map.put(inteIdUrl, list);
        } else {
            List<Object> list = new ArrayList<>();
            Object object = getApiData(inteId, data, conf);
            //除库存接口外，其他接口上传前更新最后更新时间
            if (!Constant.API_CODE_1208.equals(inteId)) {
                setZhgxsjValue(data);
            }
            list.add(object);
            map.put(inteIdUrl, list);

        List<Object> list = new ArrayList<>();
        Object object = getApiData(inteId, data, conf);
        //除库存接口外，其他接口上传前更新最后更新时间
        if (!Constant.API_CODE_1208.equals(inteId)) {
            setZhgxsjValue(data);
        }
        list.add(object);
        map.put(inteIdUrl, list);

        result.add(map);
        return JSON.toJSONString(result);
    }
@@ -216,324 +213,678 @@
        if (Constant.API_CODE_1101.equals(inteId)) {
            SX2024Api1101 apiData = new SX2024Api1101();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            //统一单位名称赋值
            apiData.setTydwmc(apiData.getDwmc());
            return apiData;
        }
        if (Constant.API_CODE_1102.equals(inteId)) {
            SX2024Api1102 apiData = new SX2024Api1102();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            //设置統一编码
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //统一库区名称赋值
            apiData.setTykqmc(apiData.getKqmc());
            return apiData;
        }
        if (Constant.API_CODE_1103.equals(inteId)) {
            SX2024Api1103 apiData = new SX2024Api1103();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
            apiData.setTycfbm(tycfbm);
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            //设置統一仓房名称
            apiData.setTycfmc(apiData.getCfmc());
            return apiData;
        }
        if (Constant.API_CODE_1104.equals(inteId)) {
            SX2024Api1104 apiData = new SX2024Api1104();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tyajbm = apiCommonService.getTyajbm(apiData.getAjdh());
            apiData.setTyajbm(tyajbm);
            String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
            apiData.setTycfbm(tycfbm);
            //设置統一仓房编码
            if (StringUtils.isEmpty(apiData.getTycfbm())) {
                String tycfbm = apiCommonService.getTykqbm(apiData.getCfbh());
                apiData.setTycfbm(tycfbm);
            }
            //设置統一廒间名称
            apiData.setTyajmc(apiData.getAjmc());
            return apiData;
        }
        if (Constant.API_CODE_1105.equals(inteId)) {
            SX2024Api1105 apiData = new SX2024Api1105();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
            apiData.setTyajbm(tyajbm);
            //设置統一编码
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyajbm(tyhwbm);
            //设置統一廒间编码
            if (StringUtils.isEmpty(apiData.getTyajbm())) {
                String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
                apiData.setTyajbm(tyajbm);
            }
            //设置統一货位名称
            apiData.setTyhwmc(apiData.getHwmc());
            return apiData;
        }
        if (Constant.API_CODE_1106.equals(inteId)) {
            SX2024Api1106 apiData = new SX2024Api1106();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            String tyygbm = apiCommonService.getTyygbm(apiData.getYgdm());
            apiData.setTyygbm(tyygbm);
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            //设置統一油罐名称
            apiData.setTyygmc(apiData.getYgmc());
            return apiData;
        }
        if (Constant.API_CODE_1107.equals(inteId)) {
            SX2024Api1107 apiData = new SX2024Api1107();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            //设置統一库区名称
            apiData.setTykqmc(apiData.getKqmc());
            return apiData;
        }
        if (Constant.API_CODE_1108.equals(inteId)) {
            SX2024Api1108 apiData = new SX2024Api1108();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            //设置統一库区名称
            apiData.setTykqmc(apiData.getKqmc());
            //设置药剂编码：统一库区编码加三维顺序号
            if (apiData.getYjbh().startsWith(apiData.getKqdm())) {
                apiData.setYjbh(apiData.getYjbh().replace(apiData.getKqdm(), apiData.getTykqbm()));
            }
            return apiData;
        }
        if (Constant.API_CODE_1109.equals(inteId)) {
            Api1109 api1109 = (Api1109) data;
            SX2024Api1109 apiData = new SX2024Api1109();
            BeanUtils.copyProperties(api1109, apiData);
            //设置統一编码
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            //设置文件流
            apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
            //TODO WJLJ文件路径
            //设置文件名称：统一库区编码加三维顺序号
            if (apiData.getWjmc().startsWith(apiData.getKqdm())) {
                apiData.setWjmc(apiData.getWjmc().replace(apiData.getKqdm(), apiData.getTykqbm()));
            }
            return apiData;
        }
        if (Constant.API_CODE_1110.equals(inteId)) {
            SX2024Api1110 apiData = new SX2024Api1110();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1111.equals(inteId)) {
            SX2024Api1111 apiData = new SX2024Api1111();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1112.equals(inteId)) {
            SX2024Api1112 apiData = new SX2024Api1112();
            BeanUtils.copyProperties(data, apiData);
            //设置統一编码
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            //统一单位名称赋值
            apiData.setTydwmc(apiData.getDwmc());
            return apiData;
        }
        if (Constant.API_CODE_1201.equals(inteId)) {
            Api1201 api1201 = (Api1201) data;
            SX2024Api1201 apiData = new SX2024Api1201();
            BeanUtils.copyProperties(data, apiData);
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            BeanUtils.copyProperties(api1201, apiData);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            if (StringUtils.isEmpty(apiData.getHtzl())) {
                apiData.setHtzl(api1201.getYwlx());
            }
            //设置合同号：统一库区编码加三维顺序号
            if (apiData.getHth().startsWith(apiData.getDwdm())) {
                apiData.setHth(apiData.getHth().replace(apiData.getDwdm(), apiData.getTydwbm()));
            }
            if (StringUtils.isEmpty(apiData.getYsfs())) {
                apiData.setYsfs("根据到货数量进行验收");
            }
            if (StringUtils.isEmpty(apiData.getFKFS())) {
                apiData.setFKFS("4");
            }
            return apiData;
        }
        if (Constant.API_CODE_1202.equals(inteId)) {
            Api1202 api1202 = (Api1202) data;
            SX2024Api1202 apiData = new SX2024Api1202();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm().substring(0,18));
            apiData.setLqgsdwtybm(tydwbm);
            BeanUtils.copyProperties(api1202, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置粮权单位統一编码
            if (StringUtils.isEmpty(apiData.getLqgsdwtybm())) {
                String tydwbm = apiCommonService.getTydwbm(api1202.getKqdm().substring(0, 18));
                apiData.setLqgsdwtybm(tydwbm);
            }
            //判断计划明细号，不为空
            if (StringUtils.isNotEmpty(apiData.getJhmxh())) {
                Api1404 api1404 = api1404Rep.getOneDataByJhmxdh(apiData.getJhmxh());
                //计划明细号：更换为轮换计划单号+统一库区编码+4为顺序号
                if (api1404.getJhmxdh().startsWith(api1404.getLhjhdh() + api1404.getKqdm())) {
                    apiData.setJhmxh(api1404.getJhmxdh().replace(api1404.getLhjhdh() + api1404.getKqdm(), api1404.getLhjhdh() + apiData.getTyhwbm().substring(0, 22)));
                }
            }
            //设置合同号：统一库区编码加三维顺序号
            if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
                apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
            }
            return apiData;
        }
        if (Constant.API_CODE_1203.equals(inteId)) {
            SX2024Api1203 apiData = new SX2024Api1203();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1204.equals(inteId)) {
            Api1204 api1204 = (Api1204) data;
            SX2024Api1204 apiData = new SX2024Api1204();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            BeanUtils.copyProperties(api1204, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置入库结算单号：统一库区编码+yyyyMMdd+三位顺序号
            if (apiData.getRkjsdh().startsWith(api1204.getKqdm())) {
                apiData.setRkjsdh(apiData.getRkjsdh().replace(api1204.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
            }
            //设置合同号：统一库区编码加三维顺序号
            if (apiData.getHth().startsWith(api1204.getKqdm().substring(0, 18))) {
                apiData.setHth(apiData.getHth().replace(api1204.getKqdm().substring(0, 18), apiData.getTyhwbm().substring(0, 20)));
            }
            return apiData;
        }
        if (Constant.API_CODE_1205.equals(inteId)) {
            SX2024Api1205 apiData = new SX2024Api1205();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //判断计划明细号，不为空
            if (StringUtils.isNotEmpty(apiData.getJhmxh())) {
                Api1404 api1404 = api1404Rep.getOneDataByJhmxdh(apiData.getJhmxh());
                //计划明细号：更换为轮换计划单号+统一库区编码+4为顺序号
                if (api1404.getJhmxdh().startsWith(api1404.getLhjhdh() + api1404.getKqdm())) {
                    apiData.setJhmxh(api1404.getJhmxdh().replace(api1404.getLhjhdh() + api1404.getKqdm(), api1404.getLhjhdh() + apiData.getTyhwbm().substring(0, 22)));
                }
            }
            //设置合同号：统一库区编码加三维顺序号
            if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
                apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
            }
            return apiData;
        }
        if (Constant.API_CODE_1206.equals(inteId)) {
            Api1206 api1206 = (Api1206) data;
            SX2024Api1206 apiData = new SX2024Api1206();
            BeanUtils.copyProperties(data, apiData);
            BeanUtils.copyProperties(api1206, apiData);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(api1206.getKqdm().substring(0, 18));
                apiData.setTydwbm(tydwbm);
            }
            //设置出库结算单号：统一库区编码+yyyyMMdd+三位顺序号
            if (apiData.getCkjsdh().startsWith(api1206.getKqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1206.getKqdm());
                apiData.setCkjsdh(apiData.getCkjsdh().replace(api1206.getKqdm(), tykqbm));
            }
            return apiData;
        }
        if (Constant.API_CODE_1207.equals(inteId)) {
            Api1207 api1207 = (Api1207) data;
            SX2024Api1207 apiData = new SX2024Api1207();
            BeanUtils.copyProperties(data, apiData);
            String dckqtybm = apiCommonService.getTykqbm(apiData.getDchwdm().substring(0,21));
            apiData.setDckqtybm(dckqtybm);
            String drkqtybm = apiCommonService.getTykqbm(apiData.getDrhwdm().substring(0,21));
            apiData.setDrkqtybm(drkqtybm);
            String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
            apiData.setDchwtybm(dchwtybm);
            String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
            apiData.setDrhwtybm(drhwtybm);
            BeanUtils.copyProperties(api1207, apiData);
            //设置倒出库区统一编码
            if (StringUtils.isEmpty(apiData.getDckqtybm())) {
                String dckqtybm = apiCommonService.getTykqbm(apiData.getDchwdm().substring(0, 21));
                apiData.setDckqtybm(dckqtybm);
            }
            //设置倒入库区统一编码
            if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
                String drkqtybm = apiCommonService.getTykqbm(apiData.getDrhwdm().substring(0, 21));
                apiData.setDrkqtybm(drkqtybm);
            }
            //设置倒出货位统一编码
            if (StringUtils.isEmpty(apiData.getDchwtybm())) {
                String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
                apiData.setDchwtybm(dchwtybm);
            }
            //设置倒入货位统一编码
            if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
                String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
                apiData.setDrhwtybm(drhwtybm);
            }
            //设置倒仓单号：统一库区编码+yyyyMMdd+4位顺序号
            if (apiData.getDcdh().startsWith(api1207.getKqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1207.getKqdm());
                apiData.setDcdh(apiData.getDcdh().replace(api1207.getKqdm(), tykqbm));
            }
            return apiData;
        }
        if (Constant.API_CODE_1208.equals(inteId)) {
            SX2024Api1208 apiData = new SX2024Api1208();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            String lqgstydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
            apiData.setLqgstydwbm(lqgstydwbm);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置粮权单位統一编码
            if (StringUtils.isEmpty(apiData.getLqgstydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm());
                apiData.setLqgstydwbm(tydwbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1209.equals(inteId)) {
            Api1209 api1209 = (Api1209) data;
            SX2024Api1209 apiData = new SX2024Api1209();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            BeanUtils.copyProperties(api1209, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置损益单号：统一货位编码+yyyyMMdd+3位顺序号
            if (apiData.getSydh().startsWith(apiData.getHwdm())) {
                apiData.setSydh(apiData.getSydh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
            }
            //实际损耗数量赋值
            apiData.setSjsysl(api1209.getJzsysl());
            return apiData;
        }
        if (Constant.API_CODE_1210.equals(inteId)) {
            SX2024Api1210 apiData = new SX2024Api1210();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置性质变更单号：统一货位编码+yyyyMMdd+3位顺序号
            if (apiData.getLsxzzbdh().startsWith(apiData.getHwdm())) {
                apiData.setLsxzzbdh(apiData.getLsxzzbdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
            }
            return apiData;
        }
        if (Constant.API_CODE_1211.equals(inteId)) {
            SX2024Api1211 apiData = new SX2024Api1211();
            BeanUtils.copyProperties(data, apiData);
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1212.equals(inteId)) {
            SX2024Api1212 apiData = new SX2024Api1212();
            BeanUtils.copyProperties(data, apiData);
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1213.equals(inteId)) {
            SX2024Api1213 apiData = new SX2024Api1213();
            BeanUtils.copyProperties(data, apiData);
            apiData.setCfdm(apiData.getHwdm().substring(0, 25));
            apiData.setAjdm(apiData.getHwdm().substring(0, 28));
            //设置統一仓房编码
            if (StringUtils.isEmpty(apiData.getTycfbm())) {
                String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
                apiData.setTycfbm(tycfbm);
            }
            //设置統一廒间编码
            if (StringUtils.isEmpty(apiData.getTyajbm())) {
                String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
                apiData.setTyajbm(tyajbm);
            }
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1301.equals(inteId)) {
            SX2024Api1301 apiData = new SX2024Api1301();
            BeanUtils.copyProperties(data, apiData);
            String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
            apiData.setTydwbm(tydwbm);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                apiData.setTydwbm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1302.equals(inteId)) {
            SX2024Api1302 apiData = new SX2024Api1302();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置单号：统一货位编码+yyyyMMdd+4位顺序号
            if (apiData.getWsdjcdh().startsWith(apiData.getHwdm())) {
                apiData.setWsdjcdh(apiData.getWsdjcdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
            }
            return apiData;
        }
        if (Constant.API_CODE_1303.equals(inteId)) {
            SX2024Api1303 apiData = new SX2024Api1303();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
            apiData.setTyajbm(tyajbm);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置統一廒间编码
            if (StringUtils.isEmpty(apiData.getTyajbm())) {
                String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
                apiData.setTyajbm(tyajbm);
            }
            //设置单号：统一廒间编码+yyyyMMdd+4位顺序号
            if (apiData.getHcjcdh().startsWith(apiData.getHwdm())) {
                apiData.setHcjcdh(apiData.getHcjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
            }
            return apiData;
        }
        if (Constant.API_CODE_1304.equals(inteId)) {
            SX2024Api1304 apiData = new SX2024Api1304();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
            apiData.setTyajbm(tyajbm);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置統一廒间编码
            if (StringUtils.isEmpty(apiData.getTyajbm())) {
                String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
                apiData.setTyajbm(tyajbm);
            }
            //设置单号：统一廒间编码+yyyyMMdd+4位顺序号
            if (apiData.getQtndjcdh().startsWith(apiData.getHwdm())) {
                apiData.setQtndjcdh(apiData.getQtndjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
            }
            return apiData;
        }
        if (Constant.API_CODE_1305.equals(inteId)) {
            Api1305 api1305 = (Api1305) data;
            SX2024Api1305 apiData = new SX2024Api1305();
            BeanUtils.copyProperties(data, apiData);
            String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
            apiData.setTycfbm(tycfbm);
            //todo ç»Ÿä¸€è´§ä½ç¼–码

            BeanUtils.copyProperties(api1305, apiData);
            //设置統一仓房编码
            if (StringUtils.isEmpty(apiData.getTycfbm())) {
                String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
                apiData.setTycfbm(tycfbm);
            }
            //设置統一廒间编码
            if (StringUtils.isEmpty(apiData.getTyajbm())) {
                String tyajbm = apiCommonService.getTyajbm(api1305.getHwdm().substring(0, 28));
                apiData.setTyajbm(tyajbm);
            }
            //设置通风作业单号：统一廒间编码+yyyyMMdd+3位顺序号
            if (apiData.getTfzydh().startsWith(api1305.getHwdm())) {
                apiData.setTfzydh(apiData.getTfzydh().replace(api1305.getHwdm(), apiData.getTyajbm()));
            }
            return apiData;
        }
        if (Constant.API_CODE_1306.equals(inteId)) {
            Api1306 api1306 = (Api1306) data;
            SX2024Api1306 apiData = new SX2024Api1306();
            BeanUtils.copyProperties(data, apiData);
            String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
            apiData.setTycfbm(tycfbm);
            //todo ç»Ÿä¸€è´§ä½ç¼–码
            BeanUtils.copyProperties(api1306, apiData);
            //设置統一仓房编码
            if (StringUtils.isEmpty(apiData.getTycfbm())) {
                String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
                apiData.setTycfbm(tycfbm);
            }
            //设置統一廒间编码
            if (StringUtils.isEmpty(apiData.getTyajbm())) {
                String tyajbm = apiCommonService.getTyajbm(api1306.getHwdm().substring(0, 28));
                apiData.setTyajbm(tyajbm);
            }
            //设置熏蒸作业单号：统一廒间编码+yyyyMMdd+3位顺序号
            if (apiData.getXzzydh().startsWith(apiData.getCfdm())) {
                apiData.setXzzydh(apiData.getXzzydh().replace(apiData.getCfdm(), apiData.getTyajbm()));
            }
            //设置单号：统一廒间编码+yyyyMMdd+4位顺序号
            if (apiData.getHcjcdh().startsWith(api1306.getHwdm())) {
                apiData.setHcjcdh(apiData.getHcjcdh().replace(api1306.getHwdm(), apiData.getTyajbm()));
            }
            return apiData;
        }
        if (Constant.API_CODE_1307.equals(inteId)) {
            Api1307 api1307 = (Api1307) data;
            SX2024Api1307 apiData = new SX2024Api1307();
            BeanUtils.copyProperties(api1307, apiData);
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);
            String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
            apiData.setTycfbm(tycfbm);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
            apiData.setTyhwbm(tyhwbm);
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            //设置統一仓房编码
            if (StringUtils.isEmpty(apiData.getTycfbm())) {
                String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
                apiData.setTycfbm(tycfbm);
            }
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置文件流
            apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));

            //todo ä»“内图像文件路径 CNTXWJLJ
            //预置位
            if (apiData.getYzwbh().startsWith(apiData.getHwdm())) {
                apiData.setYzwbh(apiData.getYzwbh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
            }
            return apiData;
        }
        if (Constant.API_CODE_1308.equals(inteId)) {
            SX2024Api1308 apiData = new SX2024Api1308();
            BeanUtils.copyProperties(data, apiData);
            String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
            apiData.setTykqbm(tykqbm);

            //todo è§†é¢‘文件路径 SPWJLJ
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                apiData.setTykqbm(tykqbm);
            }
            //统一库区名称
            apiData.setTykqmc(apiData.getKqmc());
            return apiData;
        }
        if (Constant.API_CODE_1309.equals(inteId)) {
            Api1309 api1309 = (Api1309) data;
            SX2024Api1309 apiData = new SX2024Api1309();
            BeanUtils.copyProperties(data, apiData);
            String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
            apiData.setWgdwtybm(tydwbm);
            BeanUtils.copyProperties(api1309, apiData);
            //设置违规单位統一编码
            if (StringUtils.isEmpty(apiData.getWgdwtybm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
                apiData.setWgdwtybm(tydwbm);
            }
            //设置预警信息代码：统一库区编码+yyyyMMdd+3位顺序号
            if (apiData.getYjxxdm().startsWith(api1309.getKqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1309.getKqdm());
                apiData.setYjxxdm(apiData.getYjxxdm().replace(api1309.getKqdm(), tykqbm));
            }
            return apiData;
        }
        if (Constant.API_CODE_1310.equals(inteId)) {
            SX2024Api1310 apiData = new SX2024Api1310();
            BeanUtils.copyProperties(data, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1401.equals(inteId)) {
            SX2024Api1401 apiData = new SX2024Api1401();
            BeanUtils.copyProperties(data, apiData);
            String tydwbm = apiCommonService.getTydwbm(apiData.getCcqy());
            apiData.setTydwbm(tydwbm);
            apiData.setCcqytydm(tydwbm);
            //设置承储企业统一编码、统一单位编码
            if (StringUtils.isEmpty(apiData.getCcqytydm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getCcqy());
                apiData.setCcqytydm(tydwbm);
                apiData.setTydwbm(tydwbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1403.equals(inteId)) {
            SX2024Api1403 apiData = new SX2024Api1403();
            BeanUtils.copyProperties(data, apiData);
            String tydwbm = apiCommonService.getTydwbm(apiData.getJhxddw());
            apiData.setJHXDDWTYBM(tydwbm);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getJhxddwtybm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getJhxddw());
                apiData.setJhxddwtybm(tydwbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1404.equals(inteId)) {
            Api1404 api1404 = (Api1404) data;
            SX2024Api1404 apiData = new SX2024Api1404();
            BeanUtils.copyProperties(data, apiData);
            String tyhwbm = apiCommonService.getTyhwbm(apiData.getLhhwdm());
            apiData.setLhhwtybm(tyhwbm);
            BeanUtils.copyProperties(api1404, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getLhhwtybm())) {
                String tyhwbm = apiCommonService.getTyhwbm(apiData.getLhhwdm());
                apiData.setLhhwtybm(tyhwbm);
            }
            //计划明细号：更换为轮换计划单号+统一库区编码+4为顺序号
            if (apiData.getJhmxdh().startsWith(apiData.getLhjhdh() + api1404.getKqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1404.getKqdm());
                apiData.setJhmxdh(apiData.getJhmxdh().replace(apiData.getLhjhdh() + api1404.getKqdm(), apiData.getLhjhdh() + tykqbm));
            }
            return apiData;
        }
        if (Constant.API_CODE_1504.equals(inteId)) {
            Api1504 api1504 = (Api1504)data;
            SX2024Api1504 apiData = new SX2024Api1504();
            BeanUtils.copyProperties(api1504, apiData);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getXqydm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
                apiData.setXqydm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getXkqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
                apiData.setXkqdm(tykqbm);
            }
            return data;
        }
        if (Constant.API_CODE_1505.equals(inteId)) {
            SX2024Api1505 apiData = new SX2024Api1505();
            BeanUtils.copyProperties(data, apiData);
            return data;
        }
        if (Constant.API_CODE_1506.equals(inteId)) {
            SX2024Api1506 apiData = new SX2024Api1506();
            BeanUtils.copyProperties(data, apiData);
            return data;
        }
        if (Constant.API_CODE_1507.equals(inteId)) {
            SX2024Api1507 apiData = new SX2024Api1507();
            BeanUtils.copyProperties(data, apiData);
            return data;
        }
        if (Constant.API_CODE_1508.equals(inteId)) {
            SX2024Api1508 apiData = new SX2024Api1508();
            BeanUtils.copyProperties(data, apiData);
            return data;
        }
        if (Constant.API_CODE_1509.equals(inteId)) {
            SX2024Api1509 apiData = new SX2024Api1509();
            BeanUtils.copyProperties(data, apiData);
            return data;
        }
        if (Constant.API_CODE_1510.equals(inteId)) {
            SX2024Api1510 apiData = new SX2024Api1510();
            BeanUtils.copyProperties(data, apiData);
            return data;
        }
        return data;
    }
@@ -554,255 +905,6 @@
            e.printStackTrace();
        }
        return object;
    }

    /**
     * èŽ·å–财务封装数据
     *
     * @param inteId
     * @param data
     * @return
     */
    private List<SXFinanceDto> getFinanceData(String inteId, Object data) {
        //财务报表数据封装
        if (Constant.API_CODE_1114_1501.equals(inteId)) {
            return copyApi1501((Api1501) data);
        } else if (Constant.API_CODE_1114_1502.equals(inteId)) {
            return copyApi1502((Api1502) data);
        } else {
            return copyApi1503((Api1503) data);
        }
    }

    /**
     * å°è£…1501-资产负债数据
     *
     * @param api1503
     * @return
     */
    private List<SXFinanceDto> copyApi1503(Api1503 api1503) {
        List<SXFinanceDto> list = new ArrayList<>();
        SXFinanceDto SXFinanceDto = new SXFinanceDto();
        SXFinanceDto.setDWDM(api1503.getDwdm());
        SXFinanceDto.setKQDM(api1503.getKqdm());
        SXFinanceDto.setBBSJ(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
        SXFinanceDto.setBBM("03");
        SXFinanceDto.setCZBZ(api1503.getCzbz());
        SXFinanceDto.setZHGXSJ(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));

        paddingData(SXFinanceDto, list, "0", "项目//t", "本期金额//t", "本年累计//t");
        paddingData(SXFinanceDto, list, "1", "一、营业收入", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
        paddingData(SXFinanceDto, list, "2", "减：营业成本", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
        paddingData(SXFinanceDto, list, "3", "税金及附加", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
        paddingData(SXFinanceDto, list, "4", "销售费用", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
        paddingData(SXFinanceDto, list, "5", "管理费用", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
        paddingData(SXFinanceDto, list, "6", "研发费用", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
        paddingData(SXFinanceDto, list, "7", "财务费用", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
        paddingData(SXFinanceDto, list, "8", "其中：利息费用", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
        paddingData(SXFinanceDto, list, "9", "利息收入", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
        paddingData(SXFinanceDto, list, "10", "加：其他收益", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
        paddingData(SXFinanceDto, list, "11", "投资收益（损失以“-”号填列）", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
        paddingData(SXFinanceDto, list, "12", "其中：对联营企业和合营企业的投资收益", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
        paddingData(SXFinanceDto, list, "13", "公允价值变动收益（损失以“-”号填列）", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
        paddingData(SXFinanceDto, list, "14", "资产减值损失（损失以“-”号填列）", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
        paddingData(SXFinanceDto, list, "15", "资产处置收益（损失以“-”号填列）", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
        paddingData(SXFinanceDto, list, "16", "二、营业利润（亏损以“-”号填列）", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
        paddingData(SXFinanceDto, list, "17", "加：营业外收入", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
        paddingData(SXFinanceDto, list, "18", "减：营业外支出", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
        paddingData(SXFinanceDto, list, "19", "三、利润总额（亏损总额以“-”号填列）", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
        paddingData(SXFinanceDto, list, "20", "减：所得税费用", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
        paddingData(SXFinanceDto, list, "21", "四、净利润（净亏损以“-”号填列）", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
        paddingData(SXFinanceDto, list, "22", "（一）持续经营净利润（净亏损以“-”号填列）", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
        paddingData(SXFinanceDto, list, "23", "（二）终止经营净利润（净亏损以“-”号填列）", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
        paddingData(SXFinanceDto, list, "24", "五、其他综合收益的税后净额", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
        paddingData(SXFinanceDto, list, "25", "（一）不能重分类进损益的其他综合收益", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
        paddingData(SXFinanceDto, list, "26", "1．重新计量设定受益计划变动额", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
        paddingData(SXFinanceDto, list, "27", "（二）将重分类进损益的其他综合收益", "0", "0");
        paddingData(SXFinanceDto, list, "28", "1．权益法下可转损益的其他综合收益", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
        paddingData(SXFinanceDto, list, "29", "2．可供出售金融资产公允价值变动损益", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
        paddingData(SXFinanceDto, list, "30", "3．持有至到期投资重分类为可供出售金融资产损益", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
        paddingData(SXFinanceDto, list, "31", "4．现金流量套期损益的有效部分", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
        paddingData(SXFinanceDto, list, "32", "5．外币财务报表折算差额", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
        paddingData(SXFinanceDto, list, "33", "六、综合收益总额", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
        paddingData(SXFinanceDto, list, "34", "七、每股收益：", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
        paddingData(SXFinanceDto, list, "35", "（一）基本每股收益", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
        paddingData(SXFinanceDto, list, "36", "（二）稀释每股收益", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");

        return list;
    }

    /**
     * å°è£…1502-现金流数据
     *
     * @param api1502
     * @return
     */
    private List<SXFinanceDto> copyApi1502(Api1502 api1502) {
        List<SXFinanceDto> list = new ArrayList<>();
        SXFinanceDto SXFinanceDto = new SXFinanceDto();
        SXFinanceDto.setDWDM(api1502.getDwdm());
        SXFinanceDto.setKQDM(api1502.getKqdm());
        SXFinanceDto.setBBSJ(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
        SXFinanceDto.setBBM("02");
        SXFinanceDto.setCZBZ(api1502.getCzbz());
        SXFinanceDto.setZHGXSJ(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));

        paddingData(SXFinanceDto, list, "0", "项目//t", "本月数//t", "本年累计数//t");
        paddingData(SXFinanceDto, list, "1", "一、经营活动产生的现金流量：", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
        paddingData(SXFinanceDto, list, "2", "销售商品、提供劳务收到的现金", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
        paddingData(SXFinanceDto, list, "3", "收到的税费返还", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
        paddingData(SXFinanceDto, list, "4", "收到其他与经营活动有关的现金", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
        paddingData(SXFinanceDto, list, "5", "经营活动现金流入小计", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
        paddingData(SXFinanceDto, list, "6", "购买商品、接受劳务支付的现金", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
        paddingData(SXFinanceDto, list, "7", "支付给职工以及为职工支付的现金", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
        paddingData(SXFinanceDto, list, "8", "支付的各项税费", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
        paddingData(SXFinanceDto, list, "9", "支付其他与经营活动有关的现金", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
        paddingData(SXFinanceDto, list, "10", "经营活动现金流出小计", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
        paddingData(SXFinanceDto, list, "11", "经营活动产生的现金流量净额", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
        paddingData(SXFinanceDto, list, "12", "二、投资活动产生的现金流量：", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
        paddingData(SXFinanceDto, list, "13", "收回投资收到的现金", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
        paddingData(SXFinanceDto, list, "14", "取得投资收益收到的现金", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
        paddingData(SXFinanceDto, list, "15", "处置固定资产、无形资产和其他长期资产收回的现金净额", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
        paddingData(SXFinanceDto, list, "16", "处置子公司及其他营业单位收到的现金净额", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
        paddingData(SXFinanceDto, list, "17", "收到其他与投资活动有关的现金", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
        paddingData(SXFinanceDto, list, "18", "投资活动现金流入小计", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
        paddingData(SXFinanceDto, list, "19", "购建固定资产、无形资产和其他长期资产支付的现金", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
        paddingData(SXFinanceDto, list, "20", "投资支付的现金", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
        paddingData(SXFinanceDto, list, "21", "取得子公司及其他营业单位支付的现金净额", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
        paddingData(SXFinanceDto, list, "22", "支付其他与投资活动有关的现金", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
        paddingData(SXFinanceDto, list, "23", "投资活动现金流出小计", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
        paddingData(SXFinanceDto, list, "24", "投资活动产生的现金流量净额", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
        paddingData(SXFinanceDto, list, "25", "三、筹资活动产生的现金流量：", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
        paddingData(SXFinanceDto, list, "26", "吸收投资收到的现金", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
        paddingData(SXFinanceDto, list, "27", "取得借款收到的现金", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
        paddingData(SXFinanceDto, list, "28", "收到其他与筹资活动有关的现金", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
        paddingData(SXFinanceDto, list, "29", "筹资活动现金流入小计", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
        paddingData(SXFinanceDto, list, "30", "偿还债务支付的现金", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
        paddingData(SXFinanceDto, list, "31", "分配股利、利润或偿付利息支付的现金", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
        paddingData(SXFinanceDto, list, "32", "支付其他与筹资活动有关的现金", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
        paddingData(SXFinanceDto, list, "33", "筹资活动现金流出小计", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
        paddingData(SXFinanceDto, list, "34", "筹资活动产生的现金流量净额", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
        paddingData(SXFinanceDto, list, "35", "四、汇率变动对现金及现金等价物的影响", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
        paddingData(SXFinanceDto, list, "36", "五、现金及现金等价物净增加额", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
        paddingData(SXFinanceDto, list, "37", "加：期初现金及现金等价物余额", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
        paddingData(SXFinanceDto, list, "38", "六、期末现金及现金等价物余额", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");

        return list;
    }

    /**
     * å°è£…1503-利润表数据
     *
     * @param api1501
     * @return
     */
    private List<SXFinanceDto> copyApi1501(Api1501 api1501) {
        List<SXFinanceDto> list = new ArrayList<>();
        SXFinanceDto SXFinanceDto = new SXFinanceDto();
        SXFinanceDto.setDWDM(api1501.getDwdm());
        SXFinanceDto.setKQDM(api1501.getKqdm());
        SXFinanceDto.setBBSJ(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
        SXFinanceDto.setBBM("01");
        SXFinanceDto.setCZBZ(api1501.getCzbz());
        SXFinanceDto.setZHGXSJ(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));

        paddingData(SXFinanceDto, list, "0", "资产//t", "期末余额//t", "年初余额//t");
        paddingData(SXFinanceDto, list, "1", "流动资产：", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(SXFinanceDto, list, "2", "货币资金", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
        paddingData(SXFinanceDto, list, "3", "交易性金融资产", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
        paddingData(SXFinanceDto, list, "4", "衍生金融资产", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
        paddingData(SXFinanceDto, list, "5", "应收票据", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
        paddingData(SXFinanceDto, list, "6", "应收账款", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
        paddingData(SXFinanceDto, list, "7", "预付款项", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
        paddingData(SXFinanceDto, list, "8", "其他应收款", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
        paddingData(SXFinanceDto, list, "9", "存货", api1501.getChqmye() + "", api1501.getChncye() + "");
        paddingData(SXFinanceDto, list, "10", "合同资产", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
        paddingData(SXFinanceDto, list, "11", "持有待售资产", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
        paddingData(SXFinanceDto, list, "12", "一年内到期的非流动资产", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
        paddingData(SXFinanceDto, list, "13", "其他流动资产", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
        paddingData(SXFinanceDto, list, "14", "流动资产合计", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(SXFinanceDto, list, "15", "非流动资产：", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
        paddingData(SXFinanceDto, list, "16", "债券投资", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
        paddingData(SXFinanceDto, list, "17", "其他债券投资", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
        paddingData(SXFinanceDto, list, "18", "长期应收款", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
        paddingData(SXFinanceDto, list, "19", "长期股权投资", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
        paddingData(SXFinanceDto, list, "20", "其他权益工具投资", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
        paddingData(SXFinanceDto, list, "21", "其他非流动金融资产", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
        paddingData(SXFinanceDto, list, "22", "投资性房地产", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
        paddingData(SXFinanceDto, list, "23", "固定资产", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
        paddingData(SXFinanceDto, list, "24", "在建工程", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
        paddingData(SXFinanceDto, list, "25", "生产性生物资产", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
        paddingData(SXFinanceDto, list, "26", "油气资产", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
        paddingData(SXFinanceDto, list, "27", "无形资产", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
        paddingData(SXFinanceDto, list, "28", "开发支出", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
        paddingData(SXFinanceDto, list, "29", "商誉", api1501.getSyqmye() + "", api1501.getSyncye() + "");
        paddingData(SXFinanceDto, list, "30", "长期待摊费用", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
        paddingData(SXFinanceDto, list, "31", "递延所得税资产", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
        paddingData(SXFinanceDto, list, "32", "其他非流动资产", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
        paddingData(SXFinanceDto, list, "33", "非流动资产合计", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
        paddingData(SXFinanceDto, list, "34", "资产总计", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
        paddingData(SXFinanceDto, list, "35", "负债和所有者权益（或股东权益）//t", "期末余额//t", "年初余额//t");
        paddingData(SXFinanceDto, list, "36", "流动负债：", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
        paddingData(SXFinanceDto, list, "37", "短期借款", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(SXFinanceDto, list, "38", "交易性金融负债", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
        paddingData(SXFinanceDto, list, "39", "衍生金融负债", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
        paddingData(SXFinanceDto, list, "40", "应付票据", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
        paddingData(SXFinanceDto, list, "41", "应付账款", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
        paddingData(SXFinanceDto, list, "42", "预收款项", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
        paddingData(SXFinanceDto, list, "43", "合同负债", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
        paddingData(SXFinanceDto, list, "44", "应付职工薪酬", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
        paddingData(SXFinanceDto, list, "45", "应交税费", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
        paddingData(SXFinanceDto, list, "46", "其他应付款", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
        paddingData(SXFinanceDto, list, "47", "持有待售负债", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
        paddingData(SXFinanceDto, list, "48", "一年内到期的非流动负债", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
        paddingData(SXFinanceDto, list, "49", "其他流动负债", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
        paddingData(SXFinanceDto, list, "50", "流动负债合计", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
        paddingData(SXFinanceDto, list, "51", "非流动负债：", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
        paddingData(SXFinanceDto, list, "52", "长期借款", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
        paddingData(SXFinanceDto, list, "53", "应付债券", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
        paddingData(SXFinanceDto, list, "54", "其中：优先股", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
        paddingData(SXFinanceDto, list, "55", "永续债", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
        paddingData(SXFinanceDto, list, "56", "长期应付款", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
        paddingData(SXFinanceDto, list, "57", "预计负债", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
        paddingData(SXFinanceDto, list, "58", "递延收益", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
        paddingData(SXFinanceDto, list, "59", "递延所得税负债", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
        paddingData(SXFinanceDto, list, "60", "其他非流动负债", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
        paddingData(SXFinanceDto, list, "61", "非流动负债合计", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
        paddingData(SXFinanceDto, list, "62", "负债合计", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
        paddingData(SXFinanceDto, list, "63", "所有者权益（或股东权益）：", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
        paddingData(SXFinanceDto, list, "64", "实收资本（或股本）", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
        paddingData(SXFinanceDto, list, "65", "其他权益工具", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
        paddingData(SXFinanceDto, list, "66", "其中：优先股", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
        paddingData(SXFinanceDto, list, "67", "永续债", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
        paddingData(SXFinanceDto, list, "68", "资本公积", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
        paddingData(SXFinanceDto, list, "69", "减：库存股", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
        paddingData(SXFinanceDto, list, "70", "其他综合收益", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
        paddingData(SXFinanceDto, list, "71", "专项储备", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
        paddingData(SXFinanceDto, list, "72", "盈余公积", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
        paddingData(SXFinanceDto, list, "73", "未分配利润", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
        paddingData(SXFinanceDto, list, "74", "所有者权益（或股东权益）合计", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
        paddingData(SXFinanceDto, list, "75", "负债和所有者权益（或股东权益）总计", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
        return list;
    }

    /**
     * è´¢åŠ¡æ•°æ®å°è£…
     *
     * @param common
     * @param list
     * @param zbxh
     * @param zbmc
     * @param zbz1
     * @param zbz2
     */
    private void paddingData(SXFinanceDto common, List<SXFinanceDto> list, String zbxh, String zbmc, String zbz1, String zbz2) {
        SXFinanceDto SXFinanceDto = new SXFinanceDto();
        BeanUtils.copyProperties(common, SXFinanceDto);
        SXFinanceDto.setZBXH(zbxh);
        SXFinanceDto.setZBMC(zbmc);
        SXFinanceDto.setZBZ1(zbz1);
        SXFinanceDto.setZBZ2(zbz2);
        list.add(SXFinanceDto);
    }

    /**
@@ -861,6 +963,8 @@
                return SX2024Constant.SX_2024_API_ODS_UP_ZMKCXXJK;
            case "1212":
                return SX2024Constant.SX_2024_API_ODS_UP_KHXXJK;
            case "1213":
                return SX2024Constant.SX_2024_API_ODS_UP_FCQRDXXJK;
            case "1301":
                return SX2024Constant.SX_2024_API_ODS_UP_AQGLXXJK;
            case "1302":
@@ -887,12 +991,20 @@
                return SX2024Constant.SX_2024_API_ODS_UP_LHJHXXJK;
            case "1404":
                return SX2024Constant.SX_2024_API_ODS_UP_LHJHMXXXJK;
            case "1501":
                return SX2024Constant.SX_2024_API_ODS_UP_CWBBXXJK;
            case "1502":
                return SX2024Constant.SX_2024_API_ODS_UP_CWBBXXJK;
            case "1503":
                return SX2024Constant.SX_2024_API_ODS_UP_CWBBXXJK;
            case "1504":
                return SX2024Constant.SX_2024_API_ODS_UP_ZTXXJK;
            case "1505":
                return SX2024Constant.SX_2024_API_ODS_UP_KMXXJK;
            case "1506":
                return SX2024Constant.SX_2024_API_ODS_UP_KMYEXXJK;
            case "1507":
                return SX2024Constant.SX_2024_API_ODS_UP_HJPZXXJK;
            case "1508":
                return SX2024Constant.SX_2024_API_ODS_UP_XJLLFPXXJK;
            case "1509":
                return SX2024Constant.SX_2024_API_ODS_UP_GDZCKPXXJK;
            case "1510":
                return SX2024Constant.SX_2024_API_ODS_UP_ZCZJXXJK;
            default:
                return inteId;
        }

 src/main/java/com/fzzy/push/sx2024/SX2024Constant.java

@@ -110,6 +110,11 @@
    public static String SX_2024_API_ODS_UP_KHXXJK = "ODS_UP_KHXXJK";

    /**
     * ODS_UP_KHXXJK å°ä»“确认单接口
     */
    public static String SX_2024_API_ODS_UP_FCQRDXXJK = "ODS_UP_FCQRDXXJK";

    /**
     * ODS_UP_AQGLXXJK å®‰å…¨ç®¡ç†æ•°æ®æŽ¥å£
     */
    public static String SX_2024_API_ODS_UP_AQGLXXJK = "ODS_UP_AQGLXXJK";
@@ -161,4 +166,32 @@
     * ODS_UP_LHJHMXXXJK è½®æ¢è®¡åˆ’明细信息数据接口
     */
    public static String SX_2024_API_ODS_UP_LHJHMXXXJK = "ODS_UP_LHJHMXXXJK";
    /**
     * ODS_UP_LHJHMXXXJK è´¦å¥—信息
     */
    public static String SX_2024_API_ODS_UP_ZTXXJK = "ODS_UP_ZTXXJK";
    /**
     * ODS_UP_LHJHMXXXJK ç§‘目信息
     */
    public static String SX_2024_API_ODS_UP_KMXXJK = "ODS_UP_KMXXJK";
    /**
     * ODS_UP_LHJHMXXXJK ç§‘目余额信息
     */
    public static String SX_2024_API_ODS_UP_KMYEXXJK = "ODS_UP_KMYEXXJK";
    /**
     * ODS_UP_LHJHMXXXJK ä¼šè®¡å‡­è¯ä¿¡æ¯
     */
    public static String SX_2024_API_ODS_UP_HJPZXXJK = "ODS_UP_HJPZXXJK";
    /**
     * ODS_UP_LHJHMXXXJK çŽ°é‡‘流量分配信息
     */
    public static String SX_2024_API_ODS_UP_XJLLFPXXJK = "ODS_UP_XJLLFPXXJK";
    /**
     * ODS_UP_LHJHMXXXJK å›ºå®šèµ„产卡片信息
     */
    public static String SX_2024_API_ODS_UP_GDZCKPXXJK = "ODS_UP_GDZCKPXXJK";
    /**
     * ODS_UP_LHJHMXXXJK èµ„产折旧信息
     */
    public static String SX_2024_API_ODS_UP_ZCZJXXJK = "ODS_UP_ZCZJXXJK";
}

 src/main/java/com/fzzy/push/sx2024/SX2024OrderServiceImpl.java

@@ -8,10 +8,7 @@
import com.fzzy.order.ordersx2023.OrderSxService;
import com.fzzy.order.ordersx2023.data.OrderSxConstant;
import com.fzzy.order.ordersx2023.data.OrderSxReq;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService12;
import com.fzzy.push.impl.ComPushService13;
import com.fzzy.push.impl.ComPushService14;
import com.fzzy.push.impl.*;
import com.fzzy.push.sx2023.SX2023ApiRemoteService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -42,6 +39,8 @@
    private ComPushService13 pushService13;
    @Autowired
    private ComPushService14 pushService14;
    @Autowired
    private ComPushService15 pushService15;

    @Override
    public String getProtocol() {
@@ -120,9 +119,6 @@
            case "ODS_UP_RYXXJK":
                pushService11.pushData1112(apiRemoteService, param);
                break;
            case "ODS_UP_CWBBXXJK":
                pushService11.pushData1114(apiRemoteService, param);
                break;
            case "ODS_UP_HTXXJK":
                pushService12.pushData1201(apiRemoteService, param);
                break;
@@ -198,6 +194,27 @@
            case "ODS_UP_LHJHMXXXJK":
                pushService14.pushData1404(apiRemoteService, param);
                break;
            case "ODS_UP_ZTXXJK":
                pushService15.pushData1504(apiRemoteService, param);
                break;
            case "ODS_UP_KMXXJK":
                pushService15.pushData1505(apiRemoteService, param);
                break;
            case "ODS_UP_KMYEXXJK":
                pushService15.pushData1506(apiRemoteService, param);
                break;
            case "ODS_UP_HJPZXXJK":
                pushService15.pushData1507(apiRemoteService, param);
                break;
            case "ODS_UP_XJLLFPXXJK":
                pushService15.pushData1508(apiRemoteService, param);
                break;
            case "ODS_UP_GDZCKPXXJK":
                pushService15.pushData1509(apiRemoteService, param);
                break;
            case "ODS_UP_ZCZJXXJK":
                pushService15.pushData1510(apiRemoteService, param);
                break;
            default:
                log.error("-----陕西省平台：未匹配到接口编码，不推送-----");
                break;

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1101.java

@@ -25,12 +25,17 @@
    private String dwdm;

    @PropertyDef(label = "单位编码--11位")
    @JsonProperty("DWBM")
    private String dwbm;

    @PropertyDef(label = "上级单位统一编码")
    @JsonProperty("SJDWTYBM")
    private String sjdwtybm;

    @PropertyDef(label = "统一单位名称")
    @JsonProperty("TYDWMC")
    private String tydwmc;

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

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1108.java

@@ -58,7 +58,7 @@
    private String bzw;

    @PropertyDef(label = "型号规格")
    @JsonProperty("BZW")
    @JsonProperty("GGXH")
    private String ggxh;

    @PropertyDef(label = "安全使用说明书")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1110.java

@@ -35,6 +35,10 @@
    @JsonProperty("HWDM")
    private String hwdm;

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

    @PropertyDef(label = "货位相对位置")
    @JsonProperty("HWXDWZ")
    private String hwxdwz;

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1111.java

@@ -40,10 +40,6 @@
    @JsonProperty("SPJKSBID")
    private String spjksbid;

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

    @PropertyDef(label = "视频监控设备相对位置")
    @JsonProperty("SPJKSBXDWZ")
    private String spjksbxdwz;

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1201.java

@@ -130,7 +130,7 @@

    @PropertyDef(label = "付款方式")
    @JsonProperty("FKFS")
    private BigDecimal FKFS;
    private String FKFS;

    @PropertyDef(label = "结算总金额")
    @JsonProperty("JSZJE")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1204.java

@@ -37,7 +37,7 @@
    private double jssl;

    @PropertyDef(label = "结算单价(元/公斤)")
    @JsonProperty("JSSL")
    @JsonProperty("JSDJ")
    private double jsdj;

    @PropertyDef(label = "结算金额(元)")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1206.java

@@ -33,7 +33,7 @@
    private double jssl;

    @PropertyDef(label = "结算单价(元/公斤)")
    @JsonProperty("JSSL")
    @JsonProperty("JSDJ")
    private double jsdj;

    @PropertyDef(label = "结算金额(元)")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1207.java

@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

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

@@ -73,6 +74,16 @@
    @JsonProperty("DCRQ")
    private Date dcrq;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "倒仓开始日期" )
    @JsonProperty("DCKSRQ")
    private Date dcksrq;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "倒仓结束日期" )
    @JsonProperty("DCJSRQ")
    private Date dcjsrq;

    @PropertyDef(label = "倒仓数量(公斤)")
    @JsonProperty("DCSL")
    private double dcsl;

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java

@@ -76,32 +76,28 @@
    private Double cksf;

    @PropertyDef(label = "出库杂质(%)")
    @JsonProperty("CKSF")
    @JsonProperty("CKZZ")
    private Double ckzz;

    @PropertyDef(label = "储存时长")
    @JsonProperty("CCSC")
    private Double ccsc;

    @PropertyDef(label = "净重损溢数量(公斤)")
    @JsonProperty("JZSYSL")
    private Double jzsysl;
    private Integer ccsc;

    @PropertyDef(label = "实际损溢数量(公斤)")
    @JsonProperty("SJSYSL")
    private Double sjsysl;

    @PropertyDef(label = "其中水杂减量(公斤)")
    @PropertyDef(label = "水杂减量(公斤)")
    @JsonProperty("QZSZKL")
    private Double qzszkl;

    @PropertyDef(label = "其中：自然损耗定额(公斤)")
    @PropertyDef(label = "自然损耗定额(公斤)")
    @JsonProperty("QZZRSHDE")
    private Double qzzrshde;

    @PropertyDef(label = "是否超耗")
    @JsonProperty("SFCH")
    private String sfch;
    private Integer sfch;

    @PropertyDef(label = "超耗数量(公斤)")
    @JsonProperty("CHSL")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1210.java

@@ -54,7 +54,7 @@

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "划转日期")
    @JsonProperty("HZHLSXZDM")
    @JsonProperty("HZRQ")
    private Date hzrq;

    @PropertyDef(label = "仓储审核人")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1213.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,107 @@
package com.fzzy.push.sx2024.data;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description 1212-封仓确认单
 * @Author CZT
 * @Date 2024/11/6 14:27
 */
@Data
public class SX2024Api1213 implements Serializable {

    @PropertyDef(label = "封仓确认单号", description = "2位业务编码(21代表封仓)+yyMMdd+4位顺序码，212405040001")
    @JsonProperty("FCQRDH")
    private String fcqrdh;

    @PropertyDef(label = "仓房代码" )
    @JsonProperty("CFDM")
    private String cfdm;

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

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

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

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

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

    @PropertyDef(label = "封仓日期")
    @JSONField(format = "yyyy-MM-dd")
    @JsonProperty("FCRQ")
    private Date fcrq;

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

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

    @PropertyDef(label = "粮食等级代码")
    @JsonProperty("LSDJDM")
    private String lsdjdm;

    @PropertyDef(label = "收获年度")
    @JsonProperty("SHND")
    private String shnd;

    @PropertyDef(label = "国别")
    @JsonProperty("GB")
    private String gb;

    @PropertyDef(label = "产地")
    @JsonProperty("CD")
    private String cd;

    @PropertyDef(label = "保管员")
    @JsonProperty("BGY")
    private String bgy;

    @PropertyDef(label = "封仓数量")
    @JsonProperty("FCSL")
    private Double fcsl;

    @PropertyDef(label = "封仓申请人")
    @JsonProperty("FCSQR")
    private String fcsqr;

    @PropertyDef(label = "部门审核人")
    @JsonProperty("BMSHR")
    private String bmshr;

    @PropertyDef(label = "领导审核人")
    @JsonProperty("LDSHR")
    private String ldshr;

    @PropertyDef(label = "备注")
    @JsonProperty("BZ")
    private String bz;

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

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

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1301.java

@@ -28,6 +28,10 @@
    @JsonProperty("KQDM")
    private String kqdm;

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

    @PropertyDef(label = "地点")
    @JsonProperty("DD")
    private String dd;

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1306.java

@@ -22,7 +22,7 @@
    private String tyajbm;

    @PropertyDef(label = "仓房代码")
    @JsonProperty("ZHGXSJ")
    @JsonProperty("CFDM")
    private String cfdm;

    @PropertyDef(label = "统一仓房编码")
@@ -209,7 +209,7 @@
    private Date sqrq;

    @PropertyDef(label = "散气方法")
    @JsonProperty("SQRQ")
    @JsonProperty("SQFF")
    private String sqff;

    @PropertyDef(label = "散气批准人")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1308.java

@@ -58,7 +58,7 @@
    private String ycgjsm;

    @PropertyDef(label = "视频文件流")
    @JsonProperty("YCGJSM")
    @JsonProperty("SPWJL")
    private String spwjl;

    @PropertyDef(label = "视频文件后缀名")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1310.java

@@ -20,6 +20,10 @@
    @JsonProperty("HWDM")
    private String hwdm;

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

    @PropertyDef(label = "质检报告单号")
    @JsonProperty("ZJBGDH")
    private String zjbgdh;

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1403.java

@@ -48,7 +48,7 @@

    @PropertyDef(label = "计划下达单位统一编码")
    @JsonProperty("JHXDDWTYBM")
    private String JHXDDWTYBM;
    private String jhxddwtybm;

    @PropertyDef(label = "计划下达单位名称")
    @JsonProperty("JHXDDWMC")

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,68 @@
package com.fzzy.push.sx2024.data;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description è´¦å¥—信息
 * @Author CZT
 * @Date 2024/11/6 16:15
 */
@Data
public class SX2024Api1504 implements Serializable {


    @PropertyDef(label = "账套号")
    private Double nAcctId;

    @PropertyDef(label = "账套名称")
    private String cAcctName;

    @PropertyDef(label = "本位币")
    private String cCurrency;

    @PropertyDef(label = "会计主管")
    private String cAcctChief;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "启用期间")
    private String cPeriodStart;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "启用日期")
    private String cYearBmd;

    @PropertyDef(label = "期间数")
    private Double nAcctPeriodNum;

    @PropertyDef(label = "会计制度代码", description = "11:企业会计准则制度(粮食2013版)(默认代码值)")
    private String cAccClassCode;

    @PropertyDef(label = "科目级次", description = "4-8:默认最小值为4")
    private Double nAccGrade;

    @PropertyDef(label = "科目编码规则", description = "4222XXXX:默认前四级级长规则为4222")
    private String cAccCodeStr;

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

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

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

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

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

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

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
package com.fzzy.push.sx2024.data;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description ç§‘目信息
 * @Author CZT
 * @Date 2024/11/6 16:20
 */
@Data
public class SX2024Api1505 implements Serializable {

    @PropertyDef(label = "账套号")
    private Double nAcctId;

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

    @PropertyDef(label = "科目编码")
    private String cCode;

    @PropertyDef(label = "科目名称")
    private String cName;

    @PropertyDef(label = "科目全称")
    private String cAllName;

    /**
     * 1:资产类
     * 2:负债类
     * 3:共同类
     * 4:所有者权益类
     * 5:成本费用类
     * 6:损益类
     */
    @PropertyDef(label = "科目类别")
    private String nClass;
    /**
     * (-1)-贷方；1-借方
     */
    @PropertyDef(label = "余额方向")
    private String cDc;

    @PropertyDef(label = "末级科目")
    private String bL;

    @PropertyDef(label = "科目级次")
    private Double nGrade;

    @PropertyDef(label = "数量科目")
    private String bQ;

    @PropertyDef(label = "数量单位")
    private String cQUnit;

    @PropertyDef(label = "现金类科目")
    private String bCash;

    @PropertyDef(label = "银行类科目")
    private String bBank;

    @PropertyDef(label = "现金流量类科目")
    private String bXjll;

    @PropertyDef(label = "冻结")
    private String bF;

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

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

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
package com.fzzy.push.sx2024.data;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description ç§‘目余额信息
 * @Author CZT
 * @Date 2024/11/6 16:25
 */
@Data
public class SX2024Api1506 implements Serializable {

    @PropertyDef(label = "账套号")
    private Double nAcctId;

    @PropertyDef(label = "期间")
    private String cYear;

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

    @PropertyDef(label = "期初本位币余额")
    private Double bM;

    @PropertyDef(label = "期末本位币余额")
    private Double eM;

    @PropertyDef(label = "期初数量")
    private Double bQty;

    @PropertyDef(label = "期末数量")
    private Double eQty;
    /**
     * 1:借方
     * -1:贷方
     */
    @PropertyDef(label = "余额方向")
    private String cDc;

    @PropertyDef(label = "借方本位币发生额")
    private Double dM;

    @PropertyDef(label = "贷方本位币发生额")
    private Double cM;

    @PropertyDef(label = "借方发生数量")
    private Double dQ;

    @PropertyDef(label = "贷方发生数量")
    private Double cQ;

    @PropertyDef(label = "期初外币余额")
    private Double bFm;

    @PropertyDef(label = "期末外币余额")
    private Double eFm;

    @PropertyDef(label = "借方外币发生额")
    private Double dFm;

    @PropertyDef(label = "贷方外币发生额")
    private Double cFm;

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

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

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,102 @@
package com.fzzy.push.sx2024.data;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description ä¼šè®¡å‡­è¯ä¿¡æ¯
 * @Author CZT
 * @Date 2024/11/6 16:30
 */
@Data
public class SX2024Api1507 implements Serializable {

    @PropertyDef(label = "账套号")
    private Double nAcctId;

    @PropertyDef(label = "凭证类型")
    private String cVKind;

    @PropertyDef(label = "期间")
    private Double cMon;

    @PropertyDef(label = "年度")
    private Double cYear;

    @PropertyDef(label = "凭证号")
    private Double nVNo;

    @PropertyDef(label = "分录序号")
    private Double nNo;

    @PropertyDef(label = "凭证分类")
    private Double bTmp;

    @PropertyDef(label = "摘要")
    private String Digest;

    @PropertyDef(label = "科目编码")
    private Double cCode;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "凭证日期")
    private String cVSmallDatetime;

    @PropertyDef(label = "制单人")
    private String cMaker;
    /**
     * 1:借方
     * -1:贷方
     */
    @PropertyDef(label = "方向")
    private String cDc;

    @PropertyDef(label = "审核人")
    private String cCkEr;

    @PropertyDef(label = "记账人")
    private String cPtEr;
    /**
     * 0:否
     * 1:是
     */
    @PropertyDef(label = "记账标志")
    private Double bPt;

    @PropertyDef(label = "附件张数")
    private Double nANum;

    @PropertyDef(label = "金额")
    private Double nM;

    @PropertyDef(label = "数量")
    private Double nQty;

    @PropertyDef(label = "单价")
    private Double nPrice;

    @PropertyDef(label = "结算号")
    private String cSettleNo;

    @PropertyDef(label = "出纳")
    private String cCashier;

    @PropertyDef(label = "汇率")
    private Double rate;

    @PropertyDef(label = "外币金额")
    private Double nFm;

    @PropertyDef(label = "计量单位",description = "计量单位汉字")
    private String meterUnitId;

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

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

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.fzzy.push.sx2024.data;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description çŽ°é‡‘流量分配信息
 * @Author CZT
 * @Date 2024/11/6 16:35
 */
@Data
public class SX2024Api1508 implements Serializable {


    @PropertyDef(label = "账套号")
    private Double nAcctId;

    @PropertyDef(label = "凭证类型")
    private String cVKind;

    @PropertyDef(label = "期间")
    private Double cMon;

    @PropertyDef(label = "年度")
    private Double cYear;

    @PropertyDef(label = "凭证号")
    private Double nVNo;

    @PropertyDef(label = "科目编码")
    private String cCode;

    @PropertyDef(label = "对方科目编码")
    private String cDFCode;

    @PropertyDef(label = "现金流量项目代码")
    private String cCashCode;

    @PropertyDef(label = "分录序号")
    private Double nNo;

    @PropertyDef(label = "金额")
    private Double nM;

    /**
     * 1:流入
     * -1:流出
     */
    @PropertyDef(label = "方向")
    private String cDc;


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

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

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,138 @@
package com.fzzy.push.sx2024.data;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description å›ºå®šèµ„产卡片信息
 * @Author CZT
 * @Date 2024/11/6 16:35
 */
@Data
public class SX2024Api1509 implements Serializable {

    @PropertyDef(label = "账套号")
    private Double nAcctId;

    @PropertyDef(label = "固定资产编码")
    private String fixAssetCode;

    @PropertyDef(label = "固定资产自编码")
    private String origFixAssetCode;

    @PropertyDef(label = "资产类别编码")
    private String groupCode;

    @PropertyDef(label = "固定资产名称")
    private String fixAssetName;

    @PropertyDef(label = "计量单位名称")
    private String unitName;

    @PropertyDef(label = "原值")
    private Double valueOrg;

    @PropertyDef(label = "当前原值")
    private Double dresentValueOrg;
    /**
     * 1:不提折旧法
     * 2:平均年限法
     * 3:动态平均年限法
     * 4:工作量法
     * 5:年数总和法
     * 6:双倍余额递减法
     */
    @PropertyDef(label = "折旧方法")
    private Double deprMethodId;

    @PropertyDef(label = "固定资产来源")
    private Double sourceid;
    /**
     * 1:投资
     * 2:自建
     * 3:è´­ä¹°
     * 4:融资租赁
     * 5:经营租入
     * 6:无偿调入
     * 7:捐赠
     * 8:换入
     */
    @PropertyDef(label = "对方科目编码")
    private String cDFCode;

    @PropertyDef(label = "型号")
    private String model;

    @PropertyDef(label = "规格")
    private String specs;

    @PropertyDef(label = "制造商")
    private String manufacturer;

    @PropertyDef(label = "产地")
    private String makingPlace;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "进单位日期")
    private String enterDay;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "开始使用日期")
    private String beginUseDay;

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "建卡日期")
    private String makinDay;

    @PropertyDef(label = "管理人")
    private String keeper;

    @PropertyDef(label = "建卡人")
    private String maker;

    @PropertyDef(label = "预计使用期间数")
    private Double usingPeriods;

    @PropertyDef(label = "预计净残值")
    private Double expecRemain;

    @PropertyDef(label = "固定资产对应科目编码")
    private String assetAcctCode;

    @PropertyDef(label = "累计折旧对应科目编码")
    private String deprAcctCode;


    @PropertyDef(label = "累计折旧")
    private Double accumulateDepr;
    /**
     * 0:否
     * 1:是
     */
    @PropertyDef(label = "是否报废清理")
    private String abadoned;

    /**
     * 1:在使用
     * 2:未使用
     * 3:停用
     * 4:出售
     * 5:报损
     * 6:盘亏
     */
    @PropertyDef(label = "当前使用状态名称")
    private String presentStatus;

    @PropertyDef(label = "备注")
    private String notes;

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

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

 src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
package com.fzzy.push.sx2024.data;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description èµ„产折旧信息
 * @Author CZT
 * @Date 2024/11/6 16:40
 */
@Data
public class SX2024Api1510 implements Serializable {

    @PropertyDef(label = "账套号")
    private Double nAcctId;

    @PropertyDef(label = "固定资产编码")
    private String fixAssetCode;

    @PropertyDef(label = "期间")
    private Double period;

    @PropertyDef(label = "年度")
    private Double AcctYear;

    @PropertyDef(label = "期初原值")
    private Double bValueOrg;

    @PropertyDef(label = "累计折旧")
    private Double bAccumDepr;

    @PropertyDef(label = "本期计提折旧")
    private Double deprAmmount;

    @PropertyDef(label = "本年累计计提折旧")
    private Double yAccumDepr;

    @PropertyDef(label = "本期数量增加")
    private Double qtyAdd;

    @PropertyDef(label = "本期数量减少")
    private Double qtyDecrease;

    @PropertyDef(label = "本期原值增加")
    private Double valueOrgAdd;

    @PropertyDef(label = "本期原值减少")
    private Double valueOrgDerease;

    @PropertyDef(label = "本期累计折旧调增")
    private Double accuDeprAdjustAdd;

    @PropertyDef(label = "本期累计折旧调减")
    private Double accuDeprAdjustDec;

    @PropertyDef(label = "本年累计数量增加")
    private Double yQtyIncrease;

    @PropertyDef(label = "本年累计数量减少")
    private Double yQtyDecrease;

    @PropertyDef(label = "本年原值累计增加")
    private Double yValueIncrease;

    @PropertyDef(label = "本年原值累计减少")
    private Double yValueDecrease;

    @PropertyDef(label = "本年累计折旧调增")
    private Double yAccuDeprIncrease;

    @PropertyDef(label = "本年累计折旧调减")
    private Double YAccuDeprDecrease;

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

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

 src/main/java/com/fzzy/push/sx2024/data/SXFinanceDto.java

ÎļþÒÑɾ³ý

 src/main/resources/templates/home/home.html

@@ -153,15 +153,6 @@
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1113.d">企业信用信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1501.d">财务报表-资产负债</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1502.d">财务报表-现金流量信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1503.d">财务报表-利润信息</a>
                            </dd>
                        </dl>
                    </li>

@@ -289,6 +280,48 @@
                        </dl>
                    </li>

                    <li data-name="template" class="layui-nav-item">
                        <a class="one" href="javascript:;" lay-tips="" lay-direction="2">
                            <!-- <i class="layui-icon layui-icon-template"></i>-->
                            <div class="g-icon">
                                <img th:src="@{/static/lib/layuiadmin/style/images/icon5.png}">
                            </div>
                            <cite>财税管理</cite>
                            <span class="layui-nav-more"></span>
                        </a>
                        <dl class="layui-nav-child">
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1501.d">财务报表-资产负债</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1502.d">财务报表-现金流量信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1503.d">财务报表-利润信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1504.d">账套信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1505.d">科目信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1506.d">科目余额信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1507.d">会计凭证信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1508.d">现金流量分配信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1509.d">固定资产卡片信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1510.d">资产折旧信息</a>
                            </dd>
                        </dl>
                    </li>

                    <li data-name="template" class="layui-nav-item">
                        <a class="one" href="javascript:;" lay-tips="" lay-direction="2">