From 86db604887a24284512abe813ba9e235b3e0ec71 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 09 八月 2023 16:49:52 +0800
Subject: [PATCH] 武汉军粮省平台-推送粮食购销信息
---
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java | 124 +++
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultInoutRecord.java | 287 +++++++
src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java | 142 +++
src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java | 16
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java | 147 +++
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1207Rep.java | 24
src/main/java/com/fzzy/whjl/view/WhjlApi1207.view.xml | 48 +
src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java | 26
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultCustomer.java | 98 ++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1204.java | 120 +++
src/main/java/com/fzzy/api/Constant.java | 18
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1204PR.java | 90 ++
src/main/java/com/fzzy/whjl/view/WhjlApi1214.view.xml | 511 +++++++++++++
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultContract.java | 230 ++++++
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1207PR.java | 89 ++
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1204Rep.java | 24
src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java | 12
src/main/java/com/fzzy/whjl/view/WhjlApi1204.view.xml | 59 +
src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java | 15
src/main/java/com/fzzy/whjl/WhjlConstant.java | 4
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1214PR.java | 159 ++++
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1214Rep.java | 24
22 files changed, 2,223 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index 5b8ee8c..ac53084 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/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";
diff --git a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java
index 90b90fe..65caab2 100644
--- a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java
+++ b/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);
}
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultContract.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultContract.java
new file mode 100644
index 0000000..d6d2247
--- /dev/null
+++ b/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 = "鏍煎紡锛歽yyy-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 = "鏍煎紡锛歽yyy-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;
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultCustomer.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultCustomer.java
new file mode 100644
index 0000000..ae5836f
--- /dev/null
+++ b/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;
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultInoutRecord.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultInoutRecord.java
new file mode 100644
index 0000000..ae31b07
--- /dev/null
+++ b/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=鍏ュ簱锛孫UT=鍑哄簱")
+ 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 = "鍏ュ簱鏃跺�欒〃绀虹涓�娆＄О閲嶏紝鍑哄簱鏃跺�欒〃绀虹浜屾绉伴噸锛屽崟浣岾G")
+ 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;
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1204.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1204.java
new file mode 100644
index 0000000..340cd8e
--- /dev/null
+++ b/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);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
new file mode 100644
index 0000000..5ff6516
--- /dev/null
+++ b/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);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
new file mode 100644
index 0000000..c93b1b1
--- /dev/null
+++ b/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()); //鍑哄叆搴撹褰旾D
+ 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(""); //搴旀�ユ柟妗坕d
+ apiData.setJhid(""); //绛规帾璁″垝ID
+ apiData.setHtid(""); //鍚堝悓ID
+ apiData.setPsrwid(""); //閰嶉�佷换鍔d
+ 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);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1204Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1204Rep.java
new file mode 100644
index 0000000..9be7a03
--- /dev/null
+++ b/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);
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1207Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1207Rep.java
new file mode 100644
index 0000000..b8df7a0
--- /dev/null
+++ b/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);
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1214Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1214Rep.java
new file mode 100644
index 0000000..e87c2a6
--- /dev/null
+++ b/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);
+}
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
index cf32958..89813d9 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
+++ b/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);
+ }
+ }
+ }
+ }
+
}
diff --git a/src/main/java/com/fzzy/whjl/WhjlConstant.java b/src/main/java/com/fzzy/whjl/WhjlConstant.java
index 9a9528c..f64aafa 100644
--- a/src/main/java/com/fzzy/whjl/WhjlConstant.java
+++ b/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 璐ㄦ鏈烘瀯鏁版嵁鎺ュ彛
*/
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java
index 04ece3b..09ad5f0 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java
+++ b/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; //搴撳尯浠ｇ爜
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java
index a5f78b5..ed3e97b 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java
+++ b/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; //搴撳尯浠ｇ爜
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java
index fffd956..99abe96 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java
+++ b/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; //鍑哄叆搴撴槑缁咺D
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; //瑙勬牸鍨嬪彿
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1204.view.xml b/src/main/java/com/fzzy/whjl/view/WhjlApi1204.view.xml
index b9f8110..7310762 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1204.view.xml
+++ b/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("apiTriggerService#trigger").getResult("KHLX")}</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("apiTriggerService#trigger").getResult("CZBZ")}</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>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1207.view.xml b/src/main/java/com/fzzy/whjl/view/WhjlApi1207.view.xml
index 078033f..2385a82 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1207.view.xml
+++ b/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("apiTriggerService#trigger").getResult("CZBZ")}</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>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1214.view.xml b/src/main/java/com/fzzy/whjl/view/WhjlApi1214.view.xml
new file mode 100644
index 0000000..d19aa35
--- /dev/null
+++ b/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">鍑哄叆搴撹褰旾D</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">搴旀�ユ柟妗圛D</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">閰嶉�佷换鍔d</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("apiTriggerService#trigger").getResult("CZBZ")}</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("#dsMain").insert();
+view.get("#dialogMain").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("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</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("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.remove();
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
+}</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("#dsMain").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("#dgMain").get("selection");
+if(select && select.length > 0){
+ view.get("#ajaxPush").set("parameter",select).execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷笂鎶ョ殑鏁版嵁锛�");
+}</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">//鏄剧ず璁板綍
+view.get("#iFrame").reload();
+view.get("#dialogLog").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("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</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("#dgMain").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
+ view.get("#dsMain").flushAsync();
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+self.get("parent").hide();
+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("parent").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>
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1204PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1204PR.java
index 87816d0..027d19c 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1204PR.java
+++ b/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;
}
}
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1207PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1207PR.java
index 66b8ab2..a6d88b6 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1207PR.java
+++ b/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;
}
}
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1214PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1214PR.java
new file mode 100644
index 0000000..5e8859d
--- /dev/null
+++ b/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;
+ }
+}
--
Gitblit v1.9.3