武汉军粮省平台-推送粮食购销信息

YYC

2023-08-09 86db604887a24284512abe813ba9e235b3e0ec71

武汉军粮省平台-推送粮食购销信息

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

@@ -135,6 +135,10 @@
     * æŽ¥å£ç¼–码-1212 å®¢æˆ·ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String API_CODE_1212 = "1212";
    /**
     * æŽ¥å£ç¼–码-1214 å‡ºå…¥åº“记录信息数据接口
     */
    public static String API_CODE_1214 = "1214";

    /**
     * æŽ¥å£ç¼–码-1301 å®‰å…¨ç®¡ç†æ•°æ®æŽ¥å£
@@ -204,10 +208,10 @@
    /**
     * å›½æ ‡å‡ºå…¥åº“类型
     */
    public static String  INOUT_TYPE_14 = "14";
    public static String  INOUT_TYPE_2 = "2";
    public static String  INOUT_TYPE_15 = "15";
    public static String  INOUT_TYPE_1 = "1";
    public static String INOUT_TYPE_14 = "14";
    public static String INOUT_TYPE_2 = "2";
    public static String INOUT_TYPE_15 = "15";
    public static String INOUT_TYPE_1 = "1";

    /**
     * æ“ä½œæ ‡è®°
@@ -282,18 +286,18 @@
    /**
     * ç²®é£Ÿæ€§è´¨
     */
    public static String  TRIGGER_P_LSXZ = "LSXZ";
    public static String TRIGGER_P_LSXZ = "LSXZ";

    /**
     * ç»“算方式
     */
    public static String  TRIGGER_P_JSFS = "JSFS";
    public static String TRIGGER_P_JSFS = "JSFS";

    /**
     * ç»„织部门类型
     */
    public static String DEPT_TYPE_10 = "10";
//    public static String DEPT_TYPE_11 = "11";
    //    public static String DEPT_TYPE_11 = "11";
    public static String DEPT_TYPE_20 = "20";
    public static String DEPT_TYPE_30 = "30";


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

@@ -3,20 +3,30 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService11;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1204;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1207;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1214;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Date;

/**
 * @Desc: ç²®é£Ÿè´­é”€åŒæ­¥
 *
 * @author: czt
 * @update-time: 2023/08/04
 *
 */
@Slf4j
@Component
public class Fzzy40ToWhjlSyncService12 implements SyncService11 {

    @Autowired
    private Fz40ToWhjlSync1204 fz40ToWhjlSync1204;
    @Autowired
    private Fz40ToWhjlSync1207 fz40ToWhjlSync1207;
    @Autowired
    private Fz40ToWhjlSync1214 fz40ToWhjlSync1214;


    @Override
@@ -32,18 +42,18 @@
        Date start = param.getStart();
        Date end = param.getEnd();

        //TODO åŒæ­¥å®¢æˆ·ä¿¡æ¯

        //TODO åŒæ­¥åˆåŒä¿¡æ¯

        // åŒæ­¥å®¢æˆ·ä¿¡æ¯
        fz40ToWhjlSync1204.syncData(kqdm, deptId, start, end);
        // åŒæ­¥åˆåŒä¿¡æ¯
        fz40ToWhjlSync1207.syncData(kqdm, deptId, start, end);
        //TODO åŒæ­¥åº“存台账信息

        //TODO åŒæ­¥åº“存台账产品批次信息

        //TODO åŒæ­¥åº“存台账出入信息

        //TODO åŒæ­¥å‡ºå…¥åº“记录

        // åŒæ­¥å‡ºå…¥åº“记录
        fz40ToWhjlSync1214.syncData(kqdm, deptId, start, end);
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,230 @@
package com.fzzy.async.whhpjl.entity;

import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;

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

/**
 * åˆåŒç®¡ç†
 *
 * @Author:YAN
 */
@Data
@Entity
@Table(name = "D_INOUT_CONTRACT")
public class Fz40WhjlDefaultContract implements Serializable {

    private static final long serialVersionUID = 1L;

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "ID_")
    private String id;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Column(name = "DEPT_ID_", length = 40)
    @PropertyDef(label = "库区编码")
    private String deptId;

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

    @Column(name = "PLAN_ID_", length = 40)
    @PropertyDef(label = "计划编码")
    private String planId;

    @Column(name = "PLAN_NAME_", length = 50)
    @PropertyDef(label = "计划名称")
    private String planName;

    @Column(name = "TYPE_", length = 10)
    @PropertyDef(label = "业务类别", description = "1:销售合同 2:采购合同 3:代储合同")
    private String type;

    @Column(name = "CUSTOMER_TYPE_", length = 10)
    @PropertyDef(label = "客户类型", description = "1:企业 2:个人")
    private String customerType;

    @Column(name = "YEAR_", length = 10)
    @PropertyDef(label = "年份")
    private String year;

    @Column(name = "CUSTOMER_ID_", length = 20)
    @PropertyDef(label = "社会信用码", description = "如果是企业=客户统一社会信用代码")
    private String customerId;

    @Column(name = "CUSTOMER_NAME_", length = 50)
    @PropertyDef(label = "客户名称")
    private String customerName;

    @Column(name = "fddbr", length = 50)
    @PropertyDef(label = "法定代表人")
    private String fddbr;

    @Column(name = "txdz", length = 200)
    @PropertyDef(label = "通讯地址")
    private String txdz;

    @Column(name = "yzbm", length = 6)
    @PropertyDef(label = "邮政编码")
    private String yzbm;

    @PropertyDef(label = "联系人姓名")
    @Column(name = "lxrxm", length = 50)
    private String lxrxm;

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

    @PropertyDef(label = "身份证号")
    @Column(name = "sfzh", length = 20)
    private String sfzh;

    @PropertyDef(label = "电子信箱")
    @Column(name = "dzyx", length = 50)
    private String dzyx;

    @Column(name = "SIGNING_TIME_")
    @PropertyDef(label = "签订时间", description = "格式：yyyy-MM-dd")
    private Date signingTime;

    @Column(name = "SIGN_ADDRESS_", length = 100)
    @PropertyDef(label = "签约地点")
    private String signAddress;

    @Column(name = "BEGIN_TIME_")
    @PropertyDef(label = "约定开始时间")
    private Date beginTime;

    @Column(name = "END_TIME_")
    @PropertyDef(label = "约定完成时间")
    private Date endTime;

    @Column(name = "REL_END_TIME_")
    @PropertyDef(label = "实际完成时间")
    private Date relEndTime;

    @Column(name = "FOOD_VARIETY_", length = 20)
    @PropertyDef(label = "粮食品种")
    private String foodVariety;

    @Column(name = "FOOD_TYPE_", length = 20)
    @PropertyDef(label = "粮食性质")
    private String foodType;

    @Column(name = "PRICE_")
    @PropertyDef(label = "合同单价，元/吨")
    private Double price;

    @Column(name = "MONEY_")
    @PropertyDef(label = "合同总金额", description = "单位：元")
    private Double money;

    @Column(name = "CONTRACT_AMOUNT_")
    @PropertyDef(label = "合同数量", description = "单位：公斤")
    private Double contactAmount;

    @Column(name = "COMPLETE_NUM_")
    @PropertyDef(label = "履约数量", description = "单位：公斤")
    private Double completeNum;

    @Column(name = "lybzj")
    @PropertyDef(label = "履约保证金", description = "单位：元")
    private Double lybzj;

    @PropertyDef(label = "履约率", description = "单位：%")
    @Column(name = "lyl")
    private Double lyl;

    @Column(name = "jsjg")
    @PropertyDef(label = "结算价格，元/吨")
    private Double jsjg;

    @PropertyDef(label = "结算总金额", description = "单位：元")
    @Column(name = "jszje")
    private Double jszje;

    @PropertyDef(label = "结算与合同一致性", description = "1：符合 2：不符合")
    @Column(name = "jsyhtyzx", length = 1)
    private String jsyhtyzx;

    @PropertyDef(label = "不一致原因")
    @Column(name = "jsyhtbyzyy", length = 250)
    private String jsyhtbyzyy;

    @Column(name = "CUSTOMER_BANK_", length = 10)
    @PropertyDef(label = "客户开户行")
    private String customerBank;

    @Column(name = "CUSTOMER_BANK_ACCOUNT_", length = 40)
    @PropertyDef(label = "客户方账号")
    private String customerBankAccount;

    @Column(name = "CUSTOMER_SIGN_USER_", length = 50)
    @PropertyDef(label = "客户签约人")
    private String customerSignUser;

    @Column(name = "BANK_", length = 50)
    @PropertyDef(label = "本方开户行")
    private String bank;

    @Column(name = "BANK_ACCOUNT_", length = 40)
    @PropertyDef(label = "本方账号")
    private String bankAccount;

    @Column(name = "SIGN_USER_", length = 50)
    @PropertyDef(label = "本方签约人")
    private String signUser;

    @Column(name = "PAY_TYPE_", length = 6)
    @PropertyDef(label = "支付方式")
    private String payType;

    /**
     * --------审批信息--------
     **/

    @Column(name = "CREATE_USER_", length = 50)
    @PropertyDef(label = "创建人")
    private String createUser;

    @Column(name = "AUDIT_USER_", length = 50)
    @PropertyDef(label = "审批人")
    private String auditUser;

    @Column(name = "AUDIT_DATE_")
    @PropertyDef(label = "审批时间", description = "格式：yyyy-MM-dd HH:mm:ss")
    private String auditDate;

    @Column(name = "AUDIT_STATUS_", length = 10)
    @PropertyDef(label = "审批状态")
    private String auditStatus;

    @Column(name = "CREATE_TIME_")
    @PropertyDef(label = "创建时间")
    private Date createTime;

    @Column(name = "wcrq")
    @PropertyDef(label = "完成时间")
    private Date wcrq;

    @Column(name = "hqzz", length = 30)
    @PropertyDef(label = "货权组织")
    private String hqzz;

    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "更新时间")
    private Date updateTime;

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.fzzy.async.whhpjl.entity;

import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;

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

/**
 * å®¢æˆ·ä¿¡æ¯
 *
 * @Author:YAN
 */
@Data
@Entity
@Table(name = "D_INOUT_CUSTOMER")
public class Fz40WhjlDefaultCustomer implements Serializable {

    private static final long serialVersionUID = 1L;

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "主键id编码", description = "系统内编码")
    private String id;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Column(name = "DEPT_ID_", length = 40)
    @PropertyDef(label = "所属分库")
    private String deptId;

    @Column(name = "TYPE_", length = 4)
    @PropertyDef(label = "业务分类", description = "系统内使用：提货商、供货商")
    private String type;

    @Column(name = "khlx", length = 50)
    @PropertyDef(label = "客户类型", description = "1-企业，2-个人")
    private String khlx;

    @PropertyDef(label = "客户编码：企业客户填写统一社会信用代码，个人客户填写身份证号")
    @Column(name = "khbh", length = 18)
    private String khbh;

    @Column(name = "NAME_", length = 50)
    @PropertyDef(label = "客户名称")
    private String name;

    @PropertyDef(label = "法定代表人")
    @Column(name = "fddbr", length = 64)
    private String fddbr;

    @Column(name = "ADDRESS_", length = 200)
    @PropertyDef(label = "通讯地址")
    private String address;

    @PropertyDef(label = "邮政编码")
    @Column(name = "yzbm", length = 6)
    private String yzbm;

    @Column(name = "CONTACT_USER_", length = 50)
    @PropertyDef(label = "联系人")
    private String contactUser;

    @Column(name = "PHONE_", length = 20)
    @PropertyDef(label = "联系电话")
    private String phone;

    @Column(name = "CARD_ID_", length = 20)
    @PropertyDef(label = "联系人身份证号")
    private String cardId;

    @PropertyDef(label = "电子信箱")
    @Column(name = "dzyx", length = 64)
    private String dzyx;

    @Column(name = "BANK_", length = 50)
    @PropertyDef(label = "开户银行")
    private String bank;

    @Column(name = "BANK_NUM_", length = 30)
    @PropertyDef(label = "银行账号")
    private String bankNum;

    @Column(name = "FOOD_AREA_", length = 30)
    @PropertyDef(label = "种植面积")
    private Double foodArea = 0.0;

    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "数据更新时间")
    private Date updateTime;

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,287 @@
package com.fzzy.async.whhpjl.entity;

import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;

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

/**
 * å‡ºå…¥åº“记录
 *
 * @Author:YAN
 */
@Data
@Entity
@Table(name = "D_INOUT_RECORD")
public class Fz40WhjlDefaultInoutRecord implements Serializable {

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "流水号", description = "根据一定的规则生成")
    private String id;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Column(name = "DEPT_ID_", length = 50)
    @PropertyDef(label = "库区编码")
    private String deptId;

    @Column(name = "NOTICE_ID_", length = 40)
    @PropertyDef(label = "通知单编码")
    private String noticeId;

    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "装卸仓库")
    private String depotId;

    @Column(name = "TYPE_", length = 10)
    @PropertyDef(label = "出入库类型", description = "IN=入库，OUT=出库")
    private String type;

    @Column(name = "PROGRESS_", length = 20)
    @PropertyDef(label = "流程进度")
    private String progress;

    @Column(name = "RECORD_STATUS_", length = 10)
    @PropertyDef(label = "数据状态", description = "数据状态，正常，异常（2小时内重复出入库等），补录")
    private String recordStatus;

    @Column(name = "CUSTOMER_NAME_", length = 50)
    @PropertyDef(label = "往来单位", description = "关联通知单获取")
    private String customerName;

    @Column(name = "INTEL_CARD_", length = 20)
    @PropertyDef(label = "智慧卡号")
    private String intelCard;

    /*** ------------------------登记-------------------------------------**/
    @Column(name = "REGISTER_TIME_")
    @PropertyDef(label = "登记时间")
    private Date registerTime;

    @Column(name = "REGISTER_USER_", length = 50)
    @PropertyDef(label = "登记人")
    private String registerUser;

    @Column(name = "USER_NAME_", length = 40)
    @PropertyDef(label = "承运人")
    private String userName;

    @Column(name = "USER_CONTACT_", length = 20)
    @PropertyDef(label = "联系方式")
    private String userContact;

    @Column(name = "USER_ID_", length = 20)
    @PropertyDef(label = "身份证号")
    private String userId;

    @Column(name = "USER_ADDRESS_", length = 100)
    @PropertyDef(label = "承运人地址")
    private String userAddress;

    @Column(name = "USER_BIRTHDAY_")
    @PropertyDef(label = "出生日期")
    private Date userBirthday;

    @Column(name = "USER_SEX_", length = 10)
    @PropertyDef(label = "性别")
    private String userSex;

    @Column(name = "USER_NATION_", length = 10)
    @PropertyDef(label = "民族")
    private String userNation;

    @Column(name = "PLATE_NUM_", length = 20)
    @PropertyDef(label = "车船号", description = "车牌号+标识符")
    private String plateNum;

    @Column(name = "TRANS_TYPE_", length = 6)
    @PropertyDef(label = "运输工具")
    private String transType;


    /*** ------------------------粮食基础信息-------------------------------------**/
    @Column(name = "FOOD_VARIETY_", length = 20)
    @PropertyDef(label = "粮食品种")
    private String foodVariety;

    @Column(name = "FOOD_TYPE_", length = 20)
    @PropertyDef(label = "粮食性质")
    private String foodType;

    @Column(name = "FOOD_LOCATION_ID_", length = 20)
    @PropertyDef(label = "产地名称代码")
    private String foodLocationId;

    @Column(name = "FOOD_LOCATION_", length = 40)
    @PropertyDef(label = "产地名称")
    private String foodLocation;

    @Column(name = "FOOD_YEAR_", length = 10)
    @PropertyDef(label = "收货年度")
    private String foodYear;

    /*** ------------------------扦样质检信息-------------------------------------**/
    @Column(name = "FOOD_LEVEL_", length = 20)
    @PropertyDef(label = "粮食定等")
    private String foodLevel;

    @Column(name = "CHECK_STATUS_", length = 10)
    @PropertyDef(label = "质检结果")
    private String checkStatus;

    @Column(name = "CHECK_USER_", length = 50)
    @PropertyDef(label = "质检人")
    private String checkUser;

    @Column(name = "CHECK_TIME_")
    @PropertyDef(label = "质检时间")
    private Date checkTime;

    @Column(name = "SAMPLE_USER_", length = 50)
    @PropertyDef(label = "扦样人")
    private String sampleUser;

    @Column(name = "SAMPLE_TIME_")
    @PropertyDef(label = "扦样时间")
    private Date sampleTime;

    @Column(name = "SAMPLE_TYPE_", length = 1)
    @PropertyDef(label = "扦样方式", description = "0-人工，1=自动，2=智能随机")
    private String sampleType;

    @Column(name = "CHECK_ID_", length = 12)
    @PropertyDef(label = "质检单号")
    private String checkId;

    @Column(name = "DE_CHECK_")
    @PropertyDef(label = "质检扣重", description = "单位KG")
    private double deCheck = 0.0;

    @Column(name = "ADD_CHECK_")
    @PropertyDef(label = "质检增重", description = "单位KG")
    private double addCheck = 0.0;

    /*** ------------------------称重环节-------------------------------------**/

    @Column(name = "jjlx", length = 2)
    @PropertyDef(label = "检斤类型", description = "0：称重入库 1：标准包入库 é»˜è®¤ä¸ºç§°é‡å…¥åº“，标准包入库相关字段可为空")
    private String jjlx = "0";

    @Column(name = "FULL_WEIGHT_")
    @PropertyDef(label = "满车称重", description = "入库时候表示第一次称重，出库时候表示第二次称重，单位KG")
    private Double fullWeight = 0.0;

    @Column(name = "FULL_WEIGHT_TIME_")
    @PropertyDef(label = "满车称重时间")
    private Date fullWeightTime;

    @Column(name = "FULL_WEIGHT_USER_", length = 40)
    @PropertyDef(label = "满车称重人")
    private String fullWeightUser;

    @Column(name = "EMPTY_WEIGHT_")
    @PropertyDef(label = "空车称重", description = "入库时表示第二次称重，出库时候表示第一次称重，单位KG")
    private Double emptyWeight = 0.0;

    @Column(name = "EMPTY_WEIGHT_TIME_")
    @PropertyDef(label = "空车称重时间")
    private Date emptyWeightTime;

    @Column(name = "EMPTY_WEIGHT_USER_", length = 50)
    @PropertyDef(label = "空车称重人")
    private String emptyWeightUser;

    @Column(name = "NET_WEIGHT_")
    @PropertyDef(label = "净毛重", description = "单位KG，等于满车 - ç©ºè½¦")
    private double netWeight = 0.0;

    @Column(name = "DE_HANDLE_")
    @PropertyDef(label = "现场扣重", description = "单位KG")
    private double deHandle = 0.0;

    @Column(name = "DE_PACKAGE_")
    @PropertyDef(label = "包装扣重", description = "单位KG")
    private double dePackage = 0.0;

    @Column(name = "DE_OTHER_")
    @PropertyDef(label = "其他扣重", description = "单位KG")
    private double deOther = 0.0;

    @Column(name = "DE_OTHER_INTO_", length = 200)
    @PropertyDef(label = "其他扣重原因")
    private String deOtherInfo;

    @Column(name = "SETTLE_WEIGHT_")
    @PropertyDef(label = "结算重量", description = "扣重后净重，结算净重，单位KG")
    private Double settleWeight = 0.0;

    @Column(name = "RECORD_WEIGHT_")
    @PropertyDef(label = "入库重量", description = "扣重后净重，结算净重，补包括增重，单位KG")
    private Double recordWeight = 0.0;


    /**
     * -----------结算信息-----------------------
     **/
    @Column(name = "PRICE_")
    @PropertyDef(label = "单价", description = "单位：元/公斤")
    private Double price = 0.0;

    @Column(name = "SETTLE_MONEY_")
    @PropertyDef(label = "结算金额", description = "单位：元")
    private Double settleMoney = 0.00;

    @Column(name = "SETTLE_ID_", length = 50)
    @PropertyDef(label = "结算单号", description = "如果是单车结算必填")
    private String settleId;

    /**
     * ----------- å€¼ä»“信息-----------------------
     **/
    @Column(name = "HANDLE_USER_", length = 40)
    @PropertyDef(label = "值仓操作人")
    private String handleUser;

    // å‡ºåº“
    @Column(name = "COMPLETE_TIME_")
    @PropertyDef(label = "完成时间")
    private Date completeTime;

    @Column(name = "COMPLETE_USER_", length = 40)
    @PropertyDef(label = "完成确认人")
    private String completeUser;

    // å¤‡æ³¨
    @Column(name = "REMARKS_", length = 200)
    @PropertyDef(label = "备注信息")
    private String remarks;


    /**
     * ----------- å…¶ä»–信息，针对检斤类型标准包入库填写-----------------------
     **/
    @Column(name = "bzw", length = 2)
    @PropertyDef(label = "包装物", description = "1：麻袋2：编织袋3：散装9：其他")
    private String bzw;

    @Column(name = "dbz")
    @PropertyDef(label = "单包重", description = "单位：公斤")
    private Double dbz;

    @Column(name = "bzbjs")
    @PropertyDef(label = "包件数", description = "单位：件")
    private int bzbjs;

    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "数据更新时间")
    private Date updateTime;

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
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.Fz40WhjlDefaultCustomer;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1204Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1204;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

/**
 * å®¢æˆ·ä¿¡æ¯
 *
 * @Author:YAN
 */
@Slf4j
@Component
public class Fz40ToWhjlSync1204 {
    @Autowired
    private Fz40ToWhjlSync1204Rep fz40ToWhjlSync1204Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * å®¢æˆ·ä¿¡æ¯
     *
     * @param kqdm
     * @param deptId
     * @param start
     * @param end
     */
    public void syncData(String kqdm, String deptId, Date start, Date end) {
        log.info("-------------1204接口数据开始同步------------------");

        //同步数据，只记录失败的信息
        ApiLog apiLog = new ApiLog();
        apiLog.setType(ApiLog.TYPE_SYNC);
        apiLog.setKqdm(deptId);
        apiLog.setUploadTime(new Date());
        apiLog.setInteId(Constant.API_CODE_1204);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            List<Fz40WhjlDefaultCustomer> list = fz40ToWhjlSync1204Rep.listApi1204(deptId.substring(0, 4));
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1204 apiData;
            for (Fz40WhjlDefaultCustomer sysData : list) {
                apiData = new WhjlApi1204();
                apiData.setKhbh(sysData.getKhbh());  //客户编号
                apiData.setKhlx("1".equals(sysData.getKhlx()) ? "企业客户" : "个人客户");  //客户类型
                apiData.setGlzxm(sysData.getName());  //客户姓名
                apiData.setJlqytyshxydm(sysData.getKhbh());  //企业统一社会信用代码
                apiData.setXzqhbm("");  //行政区划编码
                apiData.setXzqhmc("");  //企业行政区划名称
                apiData.setFddbr(sysData.getFddbr());  //法定代表人
                apiData.setQyxz("");  //企业性质
                apiData.setQydz(sysData.getAddress());  //企业地址
                apiData.setQydh("");  //企业电话
                apiData.setQycz("");  //企业传真
                apiData.setQydzyx(sysData.getDzyx());  //企业电子邮箱
                apiData.setQywz("");  //企业网址
                apiData.setQyyzbm(sysData.getYzbm());  //企业邮政编码
                apiData.setKhyh(sysData.getBank());  //开户银行
                apiData.setYhzh(sysData.getBankNum());  //银行账号
                apiData.setFpxx("");  //开票信息（发票抬头）
                apiData.setShdz(sysData.getAddress());  //收货地址
                apiData.setLxr(sysData.getContactUser());  //联系人
                apiData.setLxdh(sysData.getPhone());  //联系电话
                apiData.setLxrsfzhm(sysData.getCardId());  //联系人身份证号码
                apiData.setSfyx("是");  //是否有效

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

                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getId());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_12);
                infoData.setInteId(WhjlConstant.API_CODE_1204);
                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("1204---客户-同步数据：{}", apiData.toString());

            }
        } catch (Exception e) {
            log.error("---1204客户-同步数据执行失败----{}", e.getMessage());
            apiLog.setResult("1204客户信息同步失败：" + e.getMessage());
            apiLogRep.save(apiLog);
        }
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,147 @@
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.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultCustomer;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1207Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1207;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

/**
 * åˆåŒä¿¡æ¯
 *
 * @Author:YAN
 */
@Slf4j
@Component
public class Fz40ToWhjlSync1207 {

    @Autowired
    private Fz40ToWhjlSync1207Rep fz40ToWhjlSync1207Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * å®¢æˆ·ä¿¡æ¯
     *
     * @param kqdm
     * @param deptId
     * @param start
     * @param end
     */
    public void syncData(String kqdm, String deptId, Date start, Date end) {
        log.info("-------------1207接口数据开始同步------------------");

        //同步数据，只记录失败的信息
        ApiLog apiLog = new ApiLog();
        apiLog.setType(ApiLog.TYPE_SYNC);
        apiLog.setKqdm(deptId);
        apiLog.setUploadTime(new Date());
        apiLog.setInteId(Constant.API_CODE_1207);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            List<Fz40WhjlDefaultContract> list = fz40ToWhjlSync1207Rep.listApi1207(deptId.substring(0, 4));
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1207 apiData;
            for (Fz40WhjlDefaultContract sysData : list) {
                apiData = new WhjlApi1207();
                apiData.setHtid(sysData.getId());  //合同ID
                apiData.setJlqybh("");  //军粮企业编号
                apiData.setSsqymc("");  //军粮企业名称
                apiData.setJgzdbh("");  //军供站点编号
                apiData.setJgzdmc("");  //军供站点名称
                if ("1".equals(sysData.getType())) { //合同类型
                    apiData.setHtlx("销售合同");
                } else if ("2".equals(sysData.getType())) {
                    apiData.setHtlx("采购合同");
                } else if ("3".equals(sysData.getType())) {
                    apiData.setHtlx("代储合同");
                }
                apiData.setHtbh(sysData.getId()); //合同编号
                apiData.setHtbt(sysData.getName()); //合同标题
                apiData.setJljgqybh(sysData.getCustomerId());  //加工企业编号
                apiData.setJljgqymc(sysData.getCustomerName());  //加工企业名称
                apiData.setHtkhbh(sysData.getCustomerId());  //合同客户编号
                apiData.setHtkhmc(sysData.getCustomerName());   //合同客户名称
                apiData.setHtspdj(sysData.getPrice()); //合同商品单价
                apiData.setHtspsl(sysData.getContactAmount());  //合同商品数量
                apiData.setSpbm(sysData.getFoodType());  //商品编码
                apiData.setZje(sysData.getMoney());  //总金额
                apiData.setHtqdr(sysData.getSignUser());  //合同签订人
                apiData.setHtqdsj(sysData.getSigningTime());  //合同签订时间
                apiData.setHtsxrq(sysData.getBeginTime());  //合同生效日期
                apiData.setHtjzrq(sysData.getEndTime());  //合同截止时间
                apiData.setHtcjr(sysData.getCreateUser());  //合同创建人
                apiData.setHtcjsj(sysData.getCreateTime());  //合同创建时间
                apiData.setHtdbgjlbz("");  //合同的变更记录标志
                apiData.setHtbgyy("");  //合同变更原因
                apiData.setHtgylx("");  //合同供应类型
                apiData.setYhtbh(sysData.getId());  //原合同编号
                if ("ALIPAY".equals(sysData.getPayType())) {
                    apiData.setZffs("支付宝支付");
                } else if ("BANK".equals(sysData.getPayType())) {
                    apiData.setZffs("银行转账");
                } else if ("CASH".equals(sysData.getPayType())) {
                    apiData.setZffs("现金支付");
                } else if ("WECHAT".equals(sysData.getPayType())) {
                    apiData.setZffs("微信支付");
                }
                apiData.setZffs(sysData.getPayType());  //支付方式
                apiData.setYwcsl(sysData.getCompleteNum());  //已完成数量
                apiData.setYwcslje(sysData.getJszje());  //已完成数量金额
                apiData.setHtbz("");  //合同备注
                apiData.setXh(null);  //序号
                apiData.setSfyx("");  //是否有效

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

                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getId());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_12);
                infoData.setInteId(WhjlConstant.API_CODE_1207);
                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("1207---合同-同步数据：{}", apiData.toString());

            }
        } catch (Exception e) {
            log.error("---1207合同-同步数据执行失败----{}", e.getMessage());
            apiLog.setResult("1207合同信息同步失败：" + e.getMessage());
            apiLogRep.save(apiLog);
        }
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,124 @@
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.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultInoutRecord;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1214Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1214;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

/**
 * å‡ºå…¥åº“记录
 *
 * @Author:YAN
 */
@Slf4j
@Component
public class Fz40ToWhjlSync1214 {

    @Autowired
    private Fz40ToWhjlSync1214Rep fz40ToWhjlSync1214Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * å‡ºå…¥åº“记录
     *
     * @param kqdm
     * @param deptId
     * @param start
     * @param end
     */
    public void syncData(String kqdm, String deptId, Date start, Date end) {
        log.info("-------------1214接口数据开始同步------------------");

        //同步数据，只记录失败的信息
        ApiLog apiLog = new ApiLog();
        apiLog.setType(ApiLog.TYPE_SYNC);
        apiLog.setKqdm(deptId);
        apiLog.setUploadTime(new Date());
        apiLog.setInteId(Constant.API_CODE_1214);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            List<Fz40WhjlDefaultInoutRecord> list = fz40ToWhjlSync1214Rep.listApi1214(deptId.substring(0, 4));
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1214 apiData;
            for (Fz40WhjlDefaultInoutRecord sysData : list) {
                apiData = new WhjlApi1214();
                apiData.setCrkid(sysData.getId());  //出入库记录ID
                apiData.setJlqybh("");  //军粮企业编号
                apiData.setSsqymc("");  //军粮企业名称
                apiData.setJgzdbh("");  //军供站点编号
                apiData.setJgzdmc("");  //军供站点名称
                apiData.setYwrq(ContextUtil.getCurZero(sysData.getRegisterTime()));  //业务日期
                apiData.setCrklx("IN".equals(sysData.getType()) ? "入库" : "出库");  //出入库类型
                apiData.setYwlx("");  //业务类型
                apiData.setCrkpz(sysData.getIntelCard());  //出入库凭证
                apiData.setJljgqybh("");  //加工企业编号
                apiData.setJljgqymc(sysData.getCustomerName());  //加工企业名称
                apiData.setKhbh("");  //客户编号
                apiData.setGlzxm(sysData.getCustomerName());  //客户姓名
                apiData.setShdw("");  //收货单位
                apiData.setShlxr("");  //收货联系人
                apiData.setShlxrdh("");  //收货联系电话
                apiData.setRjfaid("");  //应急方案id
                apiData.setJhid("");  //筹措计划ID
                apiData.setHtid("");  //合同ID
                apiData.setPsrwid("");  //配送任务id
                apiData.setYscch(sysData.getPlateNum());  //运输车船号
                apiData.setCyr(sysData.getUserName());  //承运人
                apiData.setCyrdh(sysData.getUserContact());  //承运人电话
                apiData.setBz(sysData.getRemarks());  //备注

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

                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getId());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_12);
                infoData.setInteId(WhjlConstant.API_CODE_1214);
                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("1214---出入库记录-同步数据：{}", apiData.toString());

            }
        } catch (Exception e) {
            log.error("---1214出入库记录-同步数据执行失败----{}", e.getMessage());
            apiLog.setResult("1214出入库记录信息同步失败：" + e.getMessage());
            apiLogRep.save(apiLog);
        }
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.fzzy.async.whhpjl.repository;

import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultCustomer;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import java.util.List;

/**
 * å®¢æˆ·ä¿¡æ¯
 *
 * @Author:YAN
 */

public interface Fz40ToWhjlSync1204Rep extends JpaRepository<Fz40WhjlDefaultCustomer, String> {
    /**
     * å®¢æˆ·ä¿¡æ¯
     *
     * @return
     */
    @Query("from Fz40WhjlDefaultCustomer where companyId=:companyId ")
    List<Fz40WhjlDefaultCustomer> listApi1204(@Param("companyId") String companyId);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.fzzy.async.whhpjl.repository;

import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultCustomer;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import java.util.List;

/**
 * åˆåŒä¿¡æ¯
 *
 * @Author:YAN
 */
public interface Fz40ToWhjlSync1207Rep extends JpaRepository<Fz40WhjlDefaultContract, String> {
    /**
     * åˆåŒä¿¡æ¯
     *
     * @return
     */
    @Query("from Fz40WhjlDefaultContract where companyId=:companyId ")
    List<Fz40WhjlDefaultContract> listApi1207(@Param("companyId") String companyId);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.fzzy.async.whhpjl.repository;

import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultInoutRecord;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import java.util.List;

/**
 * å‡ºå…¥åº“记录
 *
 * @Author:YAN
 */
public interface Fz40ToWhjlSync1214Rep extends JpaRepository<Fz40WhjlDefaultInoutRecord, String> {
    /**
     * å‡ºå…¥åº“记录
     *
     * @return
     */
    @Query("from Fz40WhjlDefaultInoutRecord where companyId=:companyId ")
    List<Fz40WhjlDefaultInoutRecord> listApi1214(@Param("companyId") String companyId);
}

 src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java

@@ -1,11 +1,25 @@
package com.fzzy.push.whhpjl;

import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1101;
import com.fzzy.whjl.dto.WhjlApi1204;
import com.fzzy.whjl.dto.WhjlApi1207;
import com.fzzy.whjl.dto.WhjlApi1214;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

/**
 * æ­¦æ±‰å†›ç²®çœå¹³å°-粮食购销数据推送
@@ -19,6 +33,8 @@

    @Autowired
    private WhjlApiRemoteService apiRemoteService;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    @Override
    public String getProtocol() {
@@ -29,21 +45,135 @@
    public void pushData(ApiParam param) {
        log.info("武汉军粮省平台--->>>粮食购销 ä¸ŠæŠ¥å¼€å§‹");

        //TODO æŽ¨é€å®¢æˆ·ä¿¡æ¯

        //TODO æŽ¨é€åˆåŒä¿¡æ¯

        // æŽ¨é€å®¢æˆ·ä¿¡æ¯
        this.pushData1204(apiRemoteService, param);
        // æŽ¨é€åˆåŒä¿¡æ¯
        this.pushData1207(apiRemoteService, param);
        //TODO æŽ¨é€åº“存台账信息

        //TODO æŽ¨é€åº“存台账产品批次信息

        //TODO æŽ¨é€åº“存台账出入信息

        //TODO æŽ¨é€å‡ºå…¥åº“记录

        // æŽ¨é€å‡ºå…¥åº“记录
        this.pushData1214(apiRemoteService, param);

        log.info("武汉军粮省平台--->>>粮食购销 ä¸ŠæŠ¥ç»“束");
    }

    /**
     * 1204 å®¢æˆ·ä¿¡æ¯
     */
    private void pushData1204(ApiRemoteService apiRemoteService, ApiParam param) {

        //获取军工企业信息
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1204);

        if (null == items || items.isEmpty()) {
            return;
        }
        param.setInteCategory(WhjlConstant.API_CATEGORY_12);
        param.setInteId(WhjlConstant.API_CODE_1204);
        List<WhjlApi1204> list = new ArrayList<>();
        WhjlApi1204 whjlApi1204;
        for (ApiInfoData infoData : items) {
            whjlApi1204 = JSONObject.parseObject(infoData.getData(), WhjlApi1204.class);
            whjlApi1204.setKqdm(infoData.getKqdm());
            whjlApi1204.setCzbz(infoData.getCzbz());
            whjlApi1204.setUpdateTime(infoData.getUpdateTime());
            whjlApi1204.setBizId(infoData.getDataId());
            list.add(whjlApi1204);
        }

        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, list);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            for (ApiInfoData data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    apiInfoDataRep.save(data);
                }
            }
        }
    }

    /**
     * 1207 åˆåŒä¿¡æ¯
     */
    private void pushData1207(ApiRemoteService apiRemoteService, ApiParam param) {

        //获取军工企业信息
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1207);

        if (null == items || items.isEmpty()) {
            return;
        }
        param.setInteCategory(WhjlConstant.API_CATEGORY_12);
        param.setInteId(WhjlConstant.API_CODE_1207);
        List<WhjlApi1207> list = new ArrayList<>();
        WhjlApi1207 whjlApi1207;
        for (ApiInfoData infoData : items) {
            whjlApi1207 = JSONObject.parseObject(infoData.getData(), WhjlApi1207.class);
            whjlApi1207.setKqdm(infoData.getKqdm());
            whjlApi1207.setCzbz(infoData.getCzbz());
            whjlApi1207.setUpdateTime(infoData.getUpdateTime());
            whjlApi1207.setBizId(infoData.getDataId());
            list.add(whjlApi1207);
        }

        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, list);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            for (ApiInfoData data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    apiInfoDataRep.save(data);
                }
            }
        }
    }

    /**
     * 1214 åˆåŒä¿¡æ¯
     */
    private void pushData1214(ApiRemoteService apiRemoteService, ApiParam param) {

        //获取军工企业信息
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1214);

        if (null == items || items.isEmpty()) {
            return;
        }
        param.setInteCategory(WhjlConstant.API_CATEGORY_12);
        param.setInteId(WhjlConstant.API_CODE_1214);
        List<WhjlApi1214> list = new ArrayList<>();
        WhjlApi1214 whjlApi1214;
        for (ApiInfoData infoData : items) {
            whjlApi1214 = JSONObject.parseObject(infoData.getData(), WhjlApi1214.class);
            whjlApi1214.setKqdm(infoData.getKqdm());
            whjlApi1214.setCzbz(infoData.getCzbz());
            whjlApi1214.setUpdateTime(infoData.getUpdateTime());
            whjlApi1214.setBizId(infoData.getDataId());
            list.add(whjlApi1214);
        }

        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, list);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            for (ApiInfoData data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    apiInfoDataRep.save(data);
                }
            }
        }
    }


}

 src/main/java/com/fzzy/whjl/WhjlConstant.java

@@ -131,9 +131,9 @@
     */
    public static String API_CODE_1212 = "1212";
    /**
     * æŽ¥å£ç¼–码-1213 å‡ºå…¥åº“记录数据接口
     * æŽ¥å£ç¼–码-1214 å‡ºå…¥åº“记录数据接口
     */
    public static String API_CODE_1213 = "1213";
    public static String API_CODE_1214 = "1214";
    /**
     * æŽ¥å£ç¼–码-1301 è´¨æ£€æœºæž„数据接口
     */

 src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java

@@ -1,9 +1,11 @@
package com.fzzy.whjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;

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

/**
 * ç»è¥ç®¡ç†-客户信息
@@ -42,4 +44,14 @@
    private String lxrsfzhm;  //联系人身份证号码
    private String sfyx;  //是否有效
    private String bz;  //备注

    //单独增加，不进行上传
    @JSONField(serialize = false)
    private String bizId;  //业务ID
    @JSONField(serialize = false)
    private Date updateTime;  //最后更新时间
    @JSONField(serialize = false)
    private String czbz;  //操作标志
    @JSONField(serialize = false)
    private String kqdm;  //库区代码
}

 src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java

@@ -1,5 +1,6 @@
package com.fzzy.whjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -34,7 +35,7 @@
    private String jljgqymc;  //加工企业名称
    private String htkhbh;  //合同客户编号
    private String htkhmc;  //合同客户名称
    private String htspdj;  //合同商品单价
    private Double htspdj;  //合同商品单价
    private Double htspsl;  //合同商品数量
    private String spbm;  //商品编码
    private Double zje;  //总金额
@@ -50,12 +51,20 @@
    private String yhtbh;  //原合同编号
    private String zffs;  //支付方式
    private Double ywcsl;  //已完成数量
    private String ywcslje;  //已完成数量金额
    private Double ywcslje;  //已完成数量金额
    private String htbz;  //合同备注
    private Integer xh;  //序号
    private String sfyx;  //是否有效
    private String bz;  //备注
    private List<WhjlQDItem> htspqd;  //商品清单


    //单独增加，不进行上传
    @JSONField(serialize = false)
    private String bizId;  //业务ID
    @JSONField(serialize = false)
    private Date updateTime;  //最后更新时间
    @JSONField(serialize = false)
    private String czbz;  //操作标志
    @JSONField(serialize = false)
    private String kqdm;  //库区代码
}

 src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java

@@ -1,9 +1,11 @@
package com.fzzy.whjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;

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

/**
 * å‡ºå…¥åº“业务-出入库记录
@@ -24,7 +26,7 @@
    private String ssqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String ywrq;  //业务日期
    private Date ywrq;  //业务日期
    private String crklx;  //出入库类型
    private String ywlx;  //业务类型
    private String crkpz;  //出入库凭证
@@ -45,6 +47,16 @@
    private String bz;  //备注
    private String crkmx;  //出入库明细
    private String zjbgwj;  //质检报告文件

    //单独增加，不进行上传
    @JSONField(serialize = false)
    private String bizId;  //业务ID
    @JSONField(serialize = false)
    private Date updateTime;  //最后更新时间
    @JSONField(serialize = false)
    private String czbz;  //操作标志
    @JSONField(serialize = false)
    private String kqdm;  //库区代码

    private String crkmxid;  //出入库明细ID
    private String ajbh;  //廒间编号
@@ -77,7 +89,7 @@
    private String qkxm;  //欠款项目
    private String dj;  //单价
    private String je;  //金额
//    private String dj;  //等级
    //    private String dj;  //等级
    private String cd;  //产地
    private String sccj;  //生产厂家
    private String gg;  //规格型号

 src/main/java/com/fzzy/whjl/view/WhjlApi1204.view.xml

@@ -12,11 +12,6 @@
      <PropertyDef name="khlx">
        <Property></Property>
        <Property name="label">客户类型</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;KHLX&quot;)}</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">code</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="glzxm">
        <Property></Property>
@@ -150,6 +145,27 @@
      <PropertyDef name="bz">
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property></Property>
        <Property name="label">业务ID</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">更新时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtGBArea">
@@ -339,7 +355,7 @@
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*</Property>
          <Property name="cols">*,*,*,*</Property>
          <Property name="labelPosition">top</Property>
          <Property name="labelSeparator">:</Property>
          <Property name="labelAlign">left</Property>
@@ -351,6 +367,7 @@
          <AutoFormElement>
            <Property name="name">khlx</Property>
            <Property name="property">khlx</Property>
            <Property name="trigger">listDropType</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -457,6 +474,26 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>
            <Editor/>
@@ -494,7 +531,12 @@
      <Children>
        <Container>
          <IFrame id="iFrame">
            <Property name="userData"></Property>
            <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
            <Property name="userData">
              <Entity>
                <Property name="deptId">deptId</Property>
              </Entity>
            </Property>
          </IFrame>
        </Container>
      </Children>
@@ -550,5 +592,8 @@
    <ListDropDown id="listDropYN">
      <Property name="items">是,否</Property>
    </ListDropDown>
    <ListDropDown id="listDropType">
      <Property name="items">个人客户,企业客户</Property>
    </ListDropDown>
  </View>
</ViewConfig>

 src/main/java/com/fzzy/whjl/view/WhjlApi1207.view.xml

@@ -149,6 +149,27 @@
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property></Property>
        <Property name="label">业务ID</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">更新时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <Reference name="htspqd">
        <Property name="parameter">$${this.htid}</Property>
        <Property name="dataProvider">whjlApi1207PR#listItem</Property>
@@ -584,6 +605,26 @@
                <Property name="property">bz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bizId</Property>
                <Property name="property">bizId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">updateTime</Property>
                <Property name="property">updateTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">czbz</Property>
                <Property name="property">czbz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">kqdm</Property>
                <Property name="property">kqdm</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
@@ -712,7 +753,12 @@
      <Children>
        <Container>
          <IFrame id="iFrame">
            <Property name="userData"></Property>
            <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
            <Property name="userData">
              <Entity>
                <Property name="deptId">deptId</Property>
              </Entity>
            </Property>
          </IFrame>
        </Container>
      </Children>

 src/main/java/com/fzzy/whjl/view/WhjlApi1214.view.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,511 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1214</Property>
      <PropertyDef name="crkid">
        <Property/>
        <Property name="label">出入库记录ID</Property>
      </PropertyDef>
      <PropertyDef name="jlqybh">
        <Property/>
        <Property name="label">军粮企业编号</Property>
      </PropertyDef>
      <PropertyDef name="ssqymc">
        <Property/>
        <Property name="label">军粮企业名称</Property>
      </PropertyDef>
      <PropertyDef name="jgzdbh">
        <Property/>
        <Property name="label">军供站点编号</Property>
      </PropertyDef>
      <PropertyDef name="jgzdmc">
        <Property/>
        <Property name="label">军供站点名称</Property>
      </PropertyDef>
      <PropertyDef name="ywrq">
        <Property/>
        <Property name="label">业务日期</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
      <PropertyDef name="crklx">
        <Property/>
        <Property name="label">出入库类型</Property>
      </PropertyDef>
      <PropertyDef name="ywlx">
        <Property/>
        <Property name="label">业务类型</Property>
      </PropertyDef>
      <PropertyDef name="crkpz">
        <Property/>
        <Property name="label">出入库凭证</Property>
      </PropertyDef>
      <PropertyDef name="jljgqybh">
        <Property/>
        <Property name="label">加工企业编号</Property>
      </PropertyDef>
      <PropertyDef name="jljgqymc">
        <Property/>
        <Property name="label">加工企业名称</Property>
      </PropertyDef>
      <PropertyDef name="khbh">
        <Property/>
        <Property name="label">客户编号</Property>
      </PropertyDef>
      <PropertyDef name="glzxm">
        <Property/>
        <Property name="label">客户姓名</Property>
      </PropertyDef>
      <PropertyDef name="shdw">
        <Property/>
        <Property name="label">收货单位</Property>
      </PropertyDef>
      <PropertyDef name="shlxr">
        <Property/>
        <Property name="label">收货联系人</Property>
      </PropertyDef>
      <PropertyDef name="shlxrdh">
        <Property/>
        <Property name="label">收货联系电话</Property>
      </PropertyDef>
      <PropertyDef name="rjfaid">
        <Property/>
        <Property name="label">应急方案ID</Property>
      </PropertyDef>
      <PropertyDef name="jhid">
        <Property/>
        <Property name="label">筹措计划ID</Property>
      </PropertyDef>
      <PropertyDef name="htid">
        <Property/>
        <Property name="label">合同ID</Property>
      </PropertyDef>
      <PropertyDef name="psrwid">
        <Property/>
        <Property name="label">配送任务id</Property>
      </PropertyDef>
      <PropertyDef name="yscch">
        <Property/>
        <Property name="label">运输车船号</Property>
      </PropertyDef>
      <PropertyDef name="cyr">
        <Property/>
        <Property name="label">承运人</Property>
      </PropertyDef>
      <PropertyDef name="cyrdh">
        <Property/>
        <Property name="label">承运人电话</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property></Property>
        <Property name="label">业务ID</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">更新时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="bz">
        <Property/>
        <Property name="label">备注</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="regionPadding:10">
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">whjlApi1214PR#listData</Property>
    </DataSet>
    <Container layout="regionPadding:10" layoutConstraint="top">
      <Property name="exClassName">bg-color</Property>
      <Property name="height">55</Property>
      <Property name="contentOverflow">hidden</Property>
      <Label layoutConstraint="left">
        <Property name="text">菜单栏：</Property>
      </Label>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
        <Property name="iconClass">fa fa-plus</Property>
        <Property name="caption">新增</Property>
        <Property name="exClassName">btn-default</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
if(cur){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}else{&#xD;
    $alert(&quot;请勾选需要修改的数据！&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">编辑</Property>
        <Property name="iconClass">fa fa-pencil</Property>
        <Property name="exClassName">btn-warm</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
if(cur){&#xD;
    view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
        if(result){&#xD;
            $alert(result);&#xD;
        } else{&#xD;
            cur.remove();&#xD;
        }&#xD;
    });&#xD;
}else{&#xD;
    $alert(&quot;请勾选需要删除的数据！&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">删除</Property>
        <Property name="iconClass">fa fa-minus</Property>
        <Property name="exClassName">btn-warn</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).flushAsync();</ClientEvent>
        <Property name="caption">刷新</Property>
        <Property name="iconClass">fa fa-search</Property>
        <Property name="exClassName">btn-flush</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var select = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
if(select &amp;&amp; select.length > 0){&#xD;
    view.get(&quot;#ajaxPush&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
        view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
        $notify(result);&#xD;
    });&#xD;
}else{&#xD;
    $alert(&quot;请勾选需要上报的数据！&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">手动上传</Property>
        <Property name="iconClass">fa fa-hand-o-up</Property>
        <Property name="exClassName">btn-default</Property>
      </Button>
      <Button layoutConstraint="right">
        <ClientEvent name="onClick">//显示记录&#xD;
view.get(&quot;#iFrame&quot;).reload();&#xD;
view.get(&quot;#dialogLog&quot;).show();</ClientEvent>
        <Property name="caption">上传记录</Property>
        <Property name="iconClass">fa fa-bars</Property>
        <Property name="exClassName">btn-flush</Property>
      </Button>
    </Container>
    <Container layoutConstraint="center">
      <Property name="exClassName">bg-color</Property>
      <DataGrid id="dgMain">
        <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(data){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}</ClientEvent>
        <Property name="dataSet">dsMain</Property>
        <Property name="selectionMode">multiRows</Property>
        <Property name="readOnly">true</Property>
        <RowNumColumn/>
        <RowSelectorColumn>
          <Property name="caption">上传</Property>
        </RowSelectorColumn>
        <DataColumn name="crkid">
          <Property name="property">crkid</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ssqymc">
          <Property name="property">ssqymc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jgzdmc">
          <Property name="property">jgzdmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ywrq">
          <Property name="property">ywrq</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="crklx">
          <Property name="property">crklx</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ywlx">
          <Property name="property">ywlx</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="crkpz">
          <Property name="property">crkpz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="glzxm">
          <Property name="property">glzxm</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="cyr">
          <Property name="property">cyr</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="cyrdh">
          <Property name="property">cyrdh</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="yscch">
          <Property name="property">yscch</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Dialog id="dialogMain">
      <Property name="width">85%</Property>
      <Property name="closeable">false</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="caption">客户信息</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
view.get(&quot;#updateSave&quot;).execute(function(){&#xD;
    self.get(&quot;parent&quot;).hide();&#xD;
    view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
});</ClientEvent>
          <Property name="caption">确定</Property>
          <Property name="iconClass">fa fa-check</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
self.get(&quot;parent&quot;).hide();&#xD;
if(cur) cur.cancel();</ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="iconClass">fa fa-times</Property>
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*,*</Property>
          <Property name="labelPosition">top</Property>
          <Property name="labelSeparator">:</Property>
          <Property name="labelAlign">left</Property>
          <AutoFormElement>
            <Property name="name">crkid</Property>
            <Property name="property">crkid</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jlqybh</Property>
            <Property name="property">jlqybh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ssqymc</Property>
            <Property name="property">ssqymc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jgzdbh</Property>
            <Property name="property">jgzdbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jgzdmc</Property>
            <Property name="property">jgzdmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ywrq</Property>
            <Property name="property">ywrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">crklx</Property>
            <Property name="property">crklx</Property>
            <Property name="trigger">listDropInOut</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ywlx</Property>
            <Property name="property">ywlx</Property>
            <Property name="trigger">listDropType</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">crkpz</Property>
            <Property name="property">crkpz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jljgqybh</Property>
            <Property name="property">jljgqybh</Property>
            <Editor>
              <TextEditor>
                <Property name="blankText">-----用于入库-----</Property>
              </TextEditor>
            </Editor>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jljgqymc</Property>
            <Property name="property">jljgqymc</Property>
            <Editor>
              <TextEditor>
                <Property name="blankText">-----用于入库-----</Property>
              </TextEditor>
            </Editor>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">khbh</Property>
            <Property name="property">khbh</Property>
            <Editor>
              <TextEditor>
                <Property name="blankText">-----用于出库-----</Property>
              </TextEditor>
            </Editor>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">glzxm</Property>
            <Property name="property">glzxm</Property>
            <Editor>
              <TextEditor>
                <Property name="blankText">-----用于出库-----</Property>
              </TextEditor>
            </Editor>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">shdw</Property>
            <Property name="property">shdw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">shlxr</Property>
            <Property name="property">shlxr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">shlxrdh</Property>
            <Property name="property">shlxrdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">rjfaid</Property>
            <Property name="property">rjfaid</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jhid</Property>
            <Property name="property">jhid</Property>
            <Editor>
              <TextEditor>
                <Property name="blankText">-----用于入库-----</Property>
              </TextEditor>
            </Editor>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">htid</Property>
            <Property name="property">htid</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">psrwid</Property>
            <Property name="property">psrwid</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">yscch</Property>
            <Property name="property">yscch</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">cyr</Property>
            <Property name="property">cyr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">cyrdh</Property>
            <Property name="property">cyrdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">whjlApi1214PR#saveData</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="confirmMessage">当前数据删除后无法恢复，请确认要删除么？</Property>
      <Property name="service">whjlApi1214PR#delData</Property>
    </AjaxAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">whjlApi1214PR#pushData</Property>
    </AjaxAction>
    <Dialog id="dialogLog">
      <Property name="width">90%</Property>
      <Property name="height">90%</Property>
      <Property name="caption">上传记录</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">关闭</Property>
          <Property name="iconClass">fa fa-times</Property>
        </Button>
      </Buttons>
      <Children>
        <Container>
          <IFrame id="iFrame">
            <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
            <Property name="userData">
              <Entity>
                <Property name="deptId">deptId</Property>
              </Entity>
            </Property>
          </IFrame>
        </Container>
      </Children>
      <Tools/>
    </Dialog>
    <ListDropDown id="listDropYN">
      <Property name="items">是,否</Property>
    </ListDropDown>
    <ListDropDown id="listDropType">
      <Property name="items">日常出库,日常入库,应急出库,应急入库</Property>
    </ListDropDown>
    <ListDropDown id="listDropInOut">
      <Property name="items">入库,出库</Property>
    </ListDropDown>
  </View>
</ViewConfig>

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

@@ -1,15 +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.WhjlApi1111;
import com.fzzy.whjl.dto.WhjlApi1204;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

/**
@@ -34,7 +46,21 @@
     */
    @DataProvider
    public List<WhjlApi1204> listData() {
        return null;
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1204);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1204> list = new ArrayList<>();
        WhjlApi1204 whjlApi1204;
        for (ApiInfoData infoData : result) {
            whjlApi1204 = JSONObject.parseObject(infoData.getData(), WhjlApi1204.class);
            whjlApi1204.setKqdm(infoData.getKqdm());
            whjlApi1204.setCzbz(infoData.getCzbz());
            whjlApi1204.setUpdateTime(infoData.getUpdateTime());
            whjlApi1204.setBizId(infoData.getDataId());
            list.add(whjlApi1204);
        }
        return list;
    }

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

        apiInfoDataRep.save(infoData);
    }

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

@@ -70,6 +108,50 @@
     */
    @Expose
    public String pushData(List<WhjlApi1204> items) {
        return null;
        ResponseDto responseDto;
        String result = "";

        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);

        if (null == apiConf) {
            return "系统没有获取到当前库区配置信息，执行失败";
        }

        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1204);

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
        if (null == apiService) {
            return "系统没有当前推送协议配置，执行失败";
        }

        //推送，数据为集合形式
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            ApiInfoData infoData;
            for (WhjlApi1204 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_12);
                    infoData.setInteId(WhjlConstant.API_CODE_1204);
                    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();
        }
        return result;
    }
}

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

@@ -1,16 +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.WhjlApi1207;
import com.fzzy.whjl.dto.WhjlQDItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

/**
@@ -35,7 +46,21 @@
     */
    @DataProvider
    public List<WhjlApi1207> listData() {
        return null;
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1207);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1207> list = new ArrayList<>();
        WhjlApi1207 whjlApi1207;
        for (ApiInfoData infoData : result) {
            whjlApi1207 = JSONObject.parseObject(infoData.getData(), WhjlApi1207.class);
            whjlApi1207.setKqdm(infoData.getKqdm());
            whjlApi1207.setCzbz(infoData.getCzbz());
            whjlApi1207.setUpdateTime(infoData.getUpdateTime());
            whjlApi1207.setBizId(infoData.getDataId());
            list.add(whjlApi1207);
        }
        return list;
    }

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

        apiInfoDataRep.save(infoData);
    }


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

@@ -95,6 +132,50 @@
     */
    @Expose
    public String pushData(List<WhjlApi1207> items) {
        return null;
        ResponseDto responseDto;
        String result = "";

        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);

        if (null == apiConf) {
            return "系统没有获取到当前库区配置信息，执行失败";
        }

        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1207);

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
        if (null == apiService) {
            return "系统没有当前推送协议配置，执行失败";
        }

        //推送，数据为集合形式
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            ApiInfoData infoData;
            for (WhjlApi1207 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_12);
                    infoData.setInteId(WhjlConstant.API_CODE_1207);
                    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();
        }
        return result;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,159 @@
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.WhjlApi1214;
import com.fzzy.whjl.dto.WhjlQDItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

/**
 * åˆåŒä¿¡æ¯
 *
 * @Author:YAN
 */
@Component
public class WhjlApi1214PR {
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

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


    /**
     * æ›´æ–°æˆ–修改
     * whjlApi1214PR#saveData
     *
     * @param data
     * @return
     */
    @DataResolver
    public void saveData(WhjlApi1214 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_12);
        infoData.setInteId(WhjlConstant.API_CODE_1214);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");

        apiInfoDataRep.save(infoData);
    }


    /**
     * åˆ é™¤
     * whjlApi1214PR#delData
     *
     * @param data
     * @return
     */
    @Expose
    public String delData(WhjlApi1214 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }

    /**
     * ä¸Šä¼ 
     * whjlApi1214PR#pushData
     *
     * @param items
     * @return
     */
    @Expose
    public String pushData(List<WhjlApi1214> items) {
        ResponseDto responseDto;
        String result = "";

        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);

        if (null == apiConf) {
            return "系统没有获取到当前库区配置信息，执行失败";
        }

        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1214);

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
        if (null == apiService) {
            return "系统没有当前推送协议配置，执行失败";
        }

        //推送，数据为集合形式
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            ApiInfoData infoData;
            for (WhjlApi1214 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_12);
                    infoData.setInteId(WhjlConstant.API_CODE_1214);
                    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();
        }
        return result;
    }
}