基础信息页面功能调整

YYC

2023-08-08 a9a9977e1713cbe911da7701147e8c7be45a36d9

基础信息页面功能调整

 pom.xml

@@ -222,31 +222,6 @@
            <systemPath>${project.basedir}/src/main/resources/lib/SM2Crypto-1.0.jar</systemPath>
        </dependency>

        <!-- BDF2-->
        <dependency>
            <groupId>com.bstek.bdf2</groupId>
            <artifactId>bdf2-orm-hibernate4</artifactId>
            <version>2.1.0</version>
            <exclusions>
                <exclusion>
                    <artifactId>servlet-api</artifactId>
                    <groupId>javax.servlet</groupId>
                </exclusion>
                <exclusion>
                    <groupId>org.hibernate</groupId>
                    <artifactId>hibernate-core</artifactId>
                </exclusion>
                <exclusion>
                    <artifactId>slf4j-log4j12</artifactId>
                    <groupId>org.slf4j</groupId>
                </exclusion>
                <exclusion>
                    <artifactId>log4j</artifactId>
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>


        <!--广东省平台对接 -->
        <dependency>

 src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java

@@ -32,6 +32,8 @@
    private Fz40ToWhjlSync1106 fz40ToWhjlSync1106;
    @Autowired
    private Fz40ToWhjlSync1107 fz40ToWhjlSync1107;
    @Autowired
    private Fz40ToWhjlSync1111 fz40ToWhjlSync1111;

    @Override
    public String getProtocol() {
@@ -61,7 +63,7 @@
        //TODO åŒæ­¥è´§ä½ä¿¡æ¯
        fz40ToWhjlSync1107.syncData(kqdm, deptId, start, end);
        //TODO åŒæ­¥ä»“储设备信息

        fz40ToWhjlSync1111.syncData(kqdm, deptId, start, end);
    }

}

 src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java

ÎļþÃû´Ó src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuilding.java ÐÞ¸Ä
@@ -1,22 +1,23 @@
package com.fzzy.async.whhpjl.entity;

import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.async.fzzy35.entity.Fz35PestKey;
import lombok.Data;

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

/**
 * ä»“房信息
 *
 * @Author:YAN
 */
@Data
@Entity
@Table(name = "D_BUILDING")
public class Fz40WhjlDefaultBuilding implements Serializable {
@IdClass(Fz40WhjlDefaultBuild.class)
public class Fz40WhjlDefaultBuild implements Serializable {

    /**
     *

 src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java

@@ -9,6 +9,8 @@
import java.util.Date;

/**
 * è´§ä½ä¿¡æ¯
 *
 * @Author:YAN
 */
@Data

 src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDevice.java

@@ -35,7 +35,7 @@

    @Column(name = "kqmc", length = 256)
    @PropertyDef(label = "库区名称")
    private int kqmc;
    private String kqmc;

    @Column(name = "sbbh", length = 20)
    @PropertyDef(label = "设备编号")

 src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java

@@ -1,9 +1,6 @@
package com.fzzy.async.whhpjl.entity;

import com.bstek.bdf2.core.business.IDept;
import com.bstek.bdf2.core.business.IPosition;
import com.bstek.bdf2.core.model.Group;
import com.bstek.bdf2.core.model.Role;

import lombok.Data;

import javax.persistence.*;
@@ -77,28 +74,28 @@
    @Transient
    private String roleId;

    /**
     * ç”¨äºŽBDF2系统
     */
    @Transient
    private List<IDept> depts;

    /**
     * ç”¨äºŽBDF2系统
     */
    @Transient
    private List<Role> roles;

    /**
     * ç”¨äºŽBDF2系统
     */
    @Transient
    private List<IPosition> positions;

    /**
     * ç”¨äºŽBDF2系统
     */
    @Transient
    private List<Group> groups;
//    /**
//     * ç”¨äºŽBDF2系统
//     */
//    @Transient
//    private List<IDept> depts;
//
//    /**
//     * ç”¨äºŽBDF2系统
//     */
//    @Transient
//    private List<Role> roles;
//
//    /**
//     * ç”¨äºŽBDF2系统
//     */
//    @Transient
//    private List<IPosition> positions;
//
//    /**
//     * ç”¨äºŽBDF2系统
//     */
//    @Transient
//    private List<Group> groups;

}

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java

@@ -1,11 +1,15 @@
package com.fzzy.async.whhpjl.impl;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1101Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1102;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -28,6 +32,8 @@
    private Fz40ToWhjlSync1101Rep fz40ToWhjlSync1101Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * å†›ä¾›ç«™ç‚¹ä¿¡æ¯
@@ -54,6 +60,7 @@
                log.info("-------------没有获取到单位信息------------------");
                return;
            }
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1102 apiData;
            for (Fz40WhjlDefaultDept sysData : list) {
                apiData = new WhjlApi1102();
@@ -89,8 +96,28 @@
                apiData.setBizId(sysData.getId());
                apiData.setUpdateTime(new Date());

                //TODO æŒä¹…化保存待实现
                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getId());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                infoData.setInteId(WhjlConstant.API_CODE_1102);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(sysData.getId());
                infoData.setRemarks("备注信息");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
                    infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
                }

                infoData.setData(JSON.toJSONString(apiData));
                apiInfoDataRep.save(infoData);

                log.info("1102---军供站点-同步数据：{}", apiData.toString());
            }

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java

@@ -1,15 +1,18 @@
package com.fzzy.async.whhpjl.impl;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultUser;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1103Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1103;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -28,6 +31,8 @@
    private Fz40ToWhjlSync1103Rep fz40ToWhjlSync1103Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * å†›å·¥äººå‘˜ä¿¡æ¯
@@ -55,6 +60,7 @@
                log.info("-------------没有获取到单位信息------------------");
                return;
            }
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1103 apiData;
            for (Fz40WhjlDefaultUser sysData : list) {
                apiData = new WhjlApi1103();
@@ -72,10 +78,31 @@
                if (!sysData.isEnabled()) {
                    apiData.setSfyx("否");
                }

                apiData.setBizId(sysData.getUsername());
                apiData.setUpdateTime(new Date());

                //TODO æŒä¹…化保存待实现
                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getUsername());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                infoData.setInteId(WhjlConstant.API_CODE_1103);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(sysData.getUsername());
                infoData.setRemarks("备注信息");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
                    infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
                }

                infoData.setData(JSON.toJSONString(apiData));
                apiInfoDataRep.save(infoData);


                log.info("1103---军工人员-同步数据：{}", apiData.toString());

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java

@@ -1,13 +1,15 @@
package com.fzzy.async.whhpjl.impl;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuilding;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultUser;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1103Rep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuild;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1105Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1105;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +30,8 @@
    private Fz40ToWhjlSync1105Rep fz40ToWhjlSync1105Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * ä»“房信息
@@ -50,13 +54,14 @@
        apiLog.setId(ContextUtil.getUUID());

        try {
            List<Fz40WhjlDefaultBuilding> list = fz40ToWhjlSync1105Rep.listApi1105(deptId.substring(0, 4));
            List<Fz40WhjlDefaultBuild> list = fz40ToWhjlSync1105Rep.listApi1105(deptId.substring(0, 4));
            if (null == list || list.isEmpty()) {
                log.info("-------------没有获取到单位信息------------------");
                return;
            }
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1105 apiData;
            for (Fz40WhjlDefaultBuilding sysData : list) {
            for (Fz40WhjlDefaultBuild sysData : list) {
                apiData = new WhjlApi1105();
                apiData.setCfbh(sysData.getId());  //仓房编号
                apiData.setJlqybh("");  //军粮企业编号
@@ -81,11 +86,34 @@
                apiData.setZp(null);  //罩棚
                apiData.setJyd(null);  //简易囤
                apiData.setJyc(null);  //简易仓
                apiData.setSfyx("是");  //是否有效
                apiData.setSfyx("");  //是否有效


                apiData.setBizId(sysData.getId());
                apiData.setUpdateTime(new Date());

                //TODO æŒä¹…化保存待实现
                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getId());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                infoData.setInteId(WhjlConstant.API_CODE_1105);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(sysData.getId());
                infoData.setRemarks("备注信息");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
                    infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
                }

                infoData.setData(JSON.toJSONString(apiData));
                apiInfoDataRep.save(infoData);


                log.info("1105---仓房-同步数据：{}", apiData.toString());

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java

@@ -1,14 +1,15 @@
package com.fzzy.async.whhpjl.impl;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuilding;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1105Rep;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
import com.fzzy.whjl.dto.WhjlApi1105;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1106;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,8 @@
    private Fz40ToWhjlSync1106Rep fz40ToWhjlSync1106Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * å»’间信息
@@ -56,6 +59,7 @@
                log.info("-------------没有获取到单位信息------------------");
                return;
            }
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1106 apiData;
            for (Fz40WhjlDefaultGranary sysData : list) {
                apiData = new WhjlApi1106();
@@ -80,10 +84,31 @@
                apiData.setAjsyzt("");  //廒间使用状态
                apiData.setSfyx("");  //是否有效


                apiData.setBizId(sysData.getAjdh());
                apiData.setUpdateTime(new Date());

                //TODO æŒä¹…化保存待实现
                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getAjdh());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                infoData.setInteId(WhjlConstant.API_CODE_1106);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(sysData.getAjdh());
                infoData.setRemarks("备注信息");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
                    infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
                }

                infoData.setData(JSON.toJSONString(apiData));
                apiInfoDataRep.save(infoData);


                log.info("1106---廒间-同步数据：{}", apiData.toString());

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java

@@ -1,13 +1,17 @@
package com.fzzy.async.whhpjl.impl;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1106;
import com.fzzy.whjl.dto.WhjlApi1107;
import lombok.extern.slf4j.Slf4j;
@@ -30,6 +34,8 @@
    private Fz40ToWhjlSync1107Rep fz40ToWhjlSync1107Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * è´§ä½ä¿¡æ¯
@@ -57,6 +63,7 @@
                log.info("-------------没有获取到单位信息------------------");
                return;
            }
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1107 apiData;
            for (Fz40WhjlDefaultDepot sysData : list) {
                apiData = new WhjlApi1107();
@@ -76,10 +83,31 @@
                apiData.setHwrl(sysData.getStorageMax());  //货位容量
                apiData.setSfyx("");  //是否有效


                apiData.setBizId(sysData.getId());
                apiData.setUpdateTime(new Date());

                //TODO æŒä¹…化保存待实现
                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getId());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                infoData.setInteId(WhjlConstant.API_CODE_1107);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(sysData.getId());
                infoData.setRemarks("备注信息");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
                    infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
                }

                infoData.setData(JSON.toJSONString(apiData));
                apiInfoDataRep.save(infoData);


                log.info("1107---货位-同步数据：{}", apiData.toString());

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java

@@ -1,14 +1,15 @@
package com.fzzy.async.whhpjl.impl;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDevice;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1111Rep;
import com.fzzy.whjl.dto.WhjlApi1107;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1111;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,8 @@
    private Fz40ToWhjlSync1111Rep fz40ToWhjlSync1111Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * ä»“储设备信息
@@ -57,6 +60,7 @@
                log.info("-------------没有获取到单位信息------------------");
                return;
            }
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1111 apiData;
            for (Fz40WhjlDefaultDevice sysData : list) {
                apiData = new WhjlApi1111();
@@ -68,7 +72,7 @@
                apiData.setCfbh("");  //仓房编号
                apiData.setSscfmc("");  //仓房名称
                apiData.setSblxbh(""); //设备类型编号
                apiData.setSbmc("");  //设备名称
                apiData.setSbmc(sysData.getSbyqmc());  //设备名称
                apiData.setSbzt(sysData.getSbzt());  //设备状态
                apiData.setGgxh(sysData.getSbggxh());  //规格型号
                apiData.setZzdw(sysData.getSccj());  //制造单位
@@ -95,10 +99,31 @@
                apiData.setJklx("");  //监控类型
                apiData.setSfyx("");  //是否有效


                apiData.setBizId(sysData.getKqdm());
                apiData.setUpdateTime(new Date());

                //TODO æŒä¹…化保存待实现
                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getKqdm());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                infoData.setInteId(WhjlConstant.API_CODE_1111);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(sysData.getKqdm());
                infoData.setRemarks("备注信息");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
                    infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
                }

                infoData.setData(JSON.toJSONString(apiData));
                apiInfoDataRep.save(infoData);


                log.info("1111---仓储设备-同步数据：{}", apiData.toString());

 src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1105Rep.java

@@ -1,7 +1,6 @@
package com.fzzy.async.whhpjl.repository;

import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuilding;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultUser;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuild;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -13,13 +12,13 @@
 *
 * @Author:YAN
 */
public interface Fz40ToWhjlSync1105Rep extends JpaRepository<Fz40WhjlDefaultBuilding, String> {
public interface Fz40ToWhjlSync1105Rep extends JpaRepository<Fz40WhjlDefaultBuild, String> {
    /**
     * èŽ·å–仓房信息
     *
     * @return
     */
    @Query("from Fz40WhjlDefaultBuilding where companyId=:companyId ")
    List<Fz40WhjlDefaultBuilding> listApi1105(@Param("companyId") String companyId);
    @Query("from Fz40WhjlDefaultBuild where companyId=:companyId ")
    List<Fz40WhjlDefaultBuild> listApi1105(@Param("companyId") String companyId);

}

 src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1106Rep.java

@@ -1,6 +1,5 @@
package com.fzzy.async.whhpjl.repository;

import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuilding;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;

 src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java

@@ -1,20 +1,26 @@
package com.fzzy.whjl.view.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1102;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -29,6 +35,8 @@
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * èŽ·å–列表信息
@@ -38,7 +46,21 @@
     */
    @DataProvider
    public List<WhjlApi1102> listData() {
        return null;
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1102);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1102> list = new ArrayList<>();
        WhjlApi1102 whjlApi1102;
        for (ApiInfoData infoData : result) {
            whjlApi1102 = JSONObject.parseObject(infoData.getData(), WhjlApi1102.class);
            whjlApi1102.setKqdm(infoData.getKqdm());
            whjlApi1102.setCzbz(infoData.getCzbz());
            whjlApi1102.setUpdateTime(infoData.getUpdateTime());
            whjlApi1102.setBizId(infoData.getDataId());
            list.add(whjlApi1102);
        }
        return list;
    }

    /**
@@ -49,8 +71,19 @@
     * @return
     */
    @DataResolver
    public String saveData(WhjlApi1102 data) {
        return null;
    public void saveData(WhjlApi1102 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1102);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");

        apiInfoDataRep.save(infoData);
    }

    /**
@@ -62,6 +95,7 @@
     */
    @Expose
    public String delData(WhjlApi1102 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }

@@ -97,14 +131,23 @@
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            WhjlApi1102 d;
            ApiInfoData infoData;
            for (WhjlApi1102 data : items) {
                d = new WhjlApi1102();
                BeanUtils.copyProperties(data, d);
                if ("i".equals(d.getCzbz())) {
                    d.setCzbz("u");
                    //TODO æ›´æ–°çŠ¶æ€ï¼Œå¾…实现
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1102);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());

                    data.setCzbz(Constant.CZBZ_U);
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));

                    apiInfoDataRep.save(infoData);
                }
            }
            result += responseDto.toString();

 src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java

@@ -1,20 +1,27 @@
package com.fzzy.whjl.view.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1103;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -29,6 +36,8 @@
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * èŽ·å–列表信息
@@ -38,7 +47,21 @@
     */
    @DataProvider
    public List<WhjlApi1103> listData() {
        return null;
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1103);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1103> list = new ArrayList<>();
        WhjlApi1103 whjlApi1103;
        for (ApiInfoData infoData : result) {
            whjlApi1103 = JSONObject.parseObject(infoData.getData(), WhjlApi1103.class);
            whjlApi1103.setKqdm(infoData.getKqdm());
            whjlApi1103.setCzbz(infoData.getCzbz());
            whjlApi1103.setUpdateTime(infoData.getUpdateTime());
            whjlApi1103.setBizId(infoData.getDataId());
            list.add(whjlApi1103);
        }
        return list;
    }

    /**
@@ -49,8 +72,19 @@
     * @return
     */
    @DataResolver
    public String saveData(WhjlApi1103 data) {
        return null;
    public void saveData(WhjlApi1103 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1103);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");

        apiInfoDataRep.save(infoData);
    }

    /**
@@ -62,6 +96,7 @@
     */
    @Expose
    public String delData(WhjlApi1103 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }

@@ -97,14 +132,23 @@
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            WhjlApi1103 d;
            ApiInfoData infoData;
            for (WhjlApi1103 data : items) {
                d = new WhjlApi1103();
                BeanUtils.copyProperties(data, d);
                if ("i".equals(d.getCzbz())) {
                    d.setCzbz("u");
                    //TODO æ›´æ–°çŠ¶æ€ï¼Œå¾…实现
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1103);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());

                    data.setCzbz(Constant.CZBZ_U);
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));

                    apiInfoDataRep.save(infoData);
                }
            }
            result += responseDto.toString();

 src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java

@@ -1,21 +1,27 @@
package com.fzzy.whjl.view.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1103;
import com.fzzy.whjl.dto.WhjlApi1105;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -30,6 +36,8 @@
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * èŽ·å–列表信息
@@ -39,7 +47,21 @@
     */
    @DataProvider
    public List<WhjlApi1105> listData() {
        return null;
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1105);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1105> list = new ArrayList<>();
        WhjlApi1105 whjlApi1105;
        for (ApiInfoData infoData : result) {
            whjlApi1105 = JSONObject.parseObject(infoData.getData(), WhjlApi1105.class);
            whjlApi1105.setKqdm(infoData.getKqdm());
            whjlApi1105.setCzbz(infoData.getCzbz());
            whjlApi1105.setUpdateTime(infoData.getUpdateTime());
            whjlApi1105.setBizId(infoData.getDataId());
            list.add(whjlApi1105);
        }
        return list;
    }

    /**
@@ -50,8 +72,19 @@
     * @return
     */
    @DataResolver
    public String saveData(WhjlApi1105 data) {
        return null;
    public void saveData(WhjlApi1105 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1104);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");

        apiInfoDataRep.save(infoData);
    }

    /**
@@ -63,6 +96,7 @@
     */
    @Expose
    public String delData(WhjlApi1105 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }

@@ -98,14 +132,23 @@
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            WhjlApi1105 d;
            ApiInfoData infoData;
            for (WhjlApi1105 data : items) {
                d = new WhjlApi1105();
                BeanUtils.copyProperties(data, d);
                if ("i".equals(d.getCzbz())) {
                    d.setCzbz("u");
                    //TODO æ›´æ–°çŠ¶æ€ï¼Œå¾…实现
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1105);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());

                    data.setCzbz(Constant.CZBZ_U);
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));

                    apiInfoDataRep.save(infoData);
                }
            }
            result += responseDto.toString();

 src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java

@@ -1,20 +1,27 @@
package com.fzzy.whjl.view.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1106;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -29,6 +36,8 @@
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * èŽ·å–列表信息
@@ -38,7 +47,21 @@
     */
    @DataProvider
    public List<WhjlApi1106> listData() {
        return null;
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1106> list = new ArrayList<>();
        WhjlApi1106 whjlApi1106;
        for (ApiInfoData infoData : result) {
            whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1106.class);
            whjlApi1106.setKqdm(infoData.getKqdm());
            whjlApi1106.setCzbz(infoData.getCzbz());
            whjlApi1106.setUpdateTime(infoData.getUpdateTime());
            whjlApi1106.setBizId(infoData.getDataId());
            list.add(whjlApi1106);
        }
        return list;
    }

    /**
@@ -49,8 +72,19 @@
     * @return
     */
    @DataResolver
    public String saveData(WhjlApi1106 data) {
        return null;
    public void saveData(WhjlApi1106 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1106);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");

        apiInfoDataRep.save(infoData);
    }

    /**
@@ -62,6 +96,7 @@
     */
    @Expose
    public String delData(WhjlApi1106 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }

@@ -97,14 +132,23 @@
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            WhjlApi1106 d;
            ApiInfoData infoData;
            for (WhjlApi1106 data : items) {
                d = new WhjlApi1106();
                BeanUtils.copyProperties(data, d);
                if ("i".equals(d.getCzbz())) {
                    d.setCzbz("u");
                    //TODO æ›´æ–°çŠ¶æ€ï¼Œå¾…实现
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1106);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());

                    data.setCzbz(Constant.CZBZ_U);
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));

                    apiInfoDataRep.save(infoData);
                }
            }
            result += responseDto.toString();

 src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java

@@ -1,21 +1,26 @@
package com.fzzy.whjl.view.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1106;
import com.fzzy.whjl.dto.WhjlApi1107;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -31,6 +36,8 @@
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * èŽ·å–列表信息
@@ -40,7 +47,21 @@
     */
    @DataProvider
    public List<WhjlApi1107> listData() {
        return null;
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1107> list = new ArrayList<>();
        WhjlApi1107 whjlApi1107;
        for (ApiInfoData infoData : result) {
            whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
            whjlApi1107.setKqdm(infoData.getKqdm());
            whjlApi1107.setCzbz(infoData.getCzbz());
            whjlApi1107.setUpdateTime(infoData.getUpdateTime());
            whjlApi1107.setBizId(infoData.getDataId());
            list.add(whjlApi1107);
        }
        return list;
    }

    /**
@@ -51,8 +72,19 @@
     * @return
     */
    @DataResolver
    public String saveData(WhjlApi1107 data) {
        return null;
    public void saveData(WhjlApi1107 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1107);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");

        apiInfoDataRep.save(infoData);
    }

    /**
@@ -64,6 +96,7 @@
     */
    @Expose
    public String delData(WhjlApi1107 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }

@@ -99,14 +132,23 @@
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            WhjlApi1107 d;
            ApiInfoData infoData;
            for (WhjlApi1107 data : items) {
                d = new WhjlApi1107();
                BeanUtils.copyProperties(data, d);
                if ("i".equals(d.getCzbz())) {
                    d.setCzbz("u");
                    //TODO æ›´æ–°çŠ¶æ€ï¼Œå¾…实现
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1107);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());

                    data.setCzbz(Constant.CZBZ_U);
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));

                    apiInfoDataRep.save(infoData);
                }
            }
            result += responseDto.toString();

 src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java

@@ -1,20 +1,26 @@
package com.fzzy.whjl.view.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1111;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -30,6 +36,8 @@
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * èŽ·å–列表信息
@@ -39,7 +47,21 @@
     */
    @DataProvider
    public List<WhjlApi1111> listData() {
        return null;
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1111);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1111> list = new ArrayList<>();
        WhjlApi1111 whjlApi1111;
        for (ApiInfoData infoData : result) {
            whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1111.class);
            whjlApi1111.setKqdm(infoData.getKqdm());
            whjlApi1111.setCzbz(infoData.getCzbz());
            whjlApi1111.setUpdateTime(infoData.getUpdateTime());
            whjlApi1111.setBizId(infoData.getDataId());
            list.add(whjlApi1111);
        }
        return list;
    }

    /**
@@ -50,8 +72,19 @@
     * @return
     */
    @DataResolver
    public String saveData(WhjlApi1111 data) {
        return null;
    public void saveData(WhjlApi1111 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1111);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");

        apiInfoDataRep.save(infoData);
    }

    /**
@@ -63,6 +96,7 @@
     */
    @Expose
    public String delData(WhjlApi1111 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }

@@ -98,14 +132,23 @@
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            WhjlApi1111 d;
            ApiInfoData infoData;
            for (WhjlApi1111 data : items) {
                d = new WhjlApi1111();
                BeanUtils.copyProperties(data, d);
                if ("i".equals(d.getCzbz())) {
                    d.setCzbz("u");
                    //TODO æ›´æ–°çŠ¶æ€ï¼Œå¾…实现
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1111);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());

                    data.setCzbz(Constant.CZBZ_U);
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));

                    apiInfoDataRep.save(infoData);
                }
            }
            result += responseDto.toString();

 src/main/java/com/fzzy/whjl/view/pr/WhjlApi1204PR.java

@@ -3,7 +3,11 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.dto.WhjlApi1204;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.List;
@@ -15,6 +19,13 @@
 */
@Component
public class WhjlApi1204PR {
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * èŽ·å–列表信息
     * whjlApi1204PR#listData

 src/main/java/com/fzzy/whjl/view/pr/WhjlApi1207PR.java

@@ -3,8 +3,12 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.dto.WhjlApi1207;
import com.fzzy.whjl.dto.WhjlQDItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.List;
@@ -16,6 +20,13 @@
 */
@Component
public class WhjlApi1207PR {
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * èŽ·å–列表信息
     * whjlApi1207PR#listData
@@ -49,7 +60,7 @@
    public String saveData(WhjlApi1207 data) {
        return null;
    }
    


    /**
     * åˆ é™¤