From dbef4eea6194ffba3bd25f978b33e09d65f5a6de Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 01 十一月 2024 14:07:21 +0800
Subject: [PATCH] 根据国家局接口，调整基础表字段
---
src/main/java/com/fzzy/api/view/Api1202.view.xml | 79 ++++
src/main/java/com/fzzy/api/entity/Api1202.java | 28 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 7
src/main/java/com/fzzy/api/entity/Api1213.java | 115 ++++++
src/main/java/com/fzzy/api/entity/Api1205.java | 2
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 10
src/main/java/com/fzzy/api/view/Api1205.view.xml | 43 ++
src/main/resources/templates/home/home.html | 3
src/main/java/com/fzzy/api/view/Api1213.view.xml | 77 ++-
src/main/java/com/fzzy/api/view/Api1101.view.xml | 9
src/main/java/com/fzzy/api/entity/Api1201.java | 2
src/main/java/com/fzzy/push/impl/ComPushService12.java | 31 +
src/main/java/com/fzzy/api/entity/Api1101.java | 4
src/main/java/com/fzzy/api/entity/Api1212.java | 6
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java | 2
src/main/java/com/fzzy/api/entity/Api1207.java | 2
src/main/java/com/fzzy/api/view/Api1201.view.xml | 75 +++
src/main/java/com/fzzy/api/Constant.java | 4
src/main/java/com/fzzy/api/view/repository/Api1213Rep.java | 32 +
src/main/java/com/fzzy/api/view/Api1209.view.xml | 88 +++
/dev/null | 193 ----------
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java | 7
src/main/java/com/fzzy/api/view/pr/Api1213PR.java | 236 ++++++++++++
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java | 1
src/main/java/com/fzzy/api/entity/Api1209.java | 57 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 12
src/main/resources/application.yml | 2
27 files changed, 830 insertions(+), 297 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index a795e7d..ddd5a1f 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/src/main/java/com/fzzy/api/Constant.java
@@ -136,9 +136,9 @@
*/
public static String API_CODE_1212 = "1212";
/**
- * 鎺ュ彛缂栫爜-1214 鍑哄叆搴撹褰曚俊鎭暟鎹帴鍙�
+ * 鎺ュ彛缂栫爜-1213 灏佷粨纭鍗�
*/
- public static String API_CODE_1214 = "1214";
+ public static String API_CODE_1213 = "1213";
/**
* 鎺ュ彛缂栫爜-1301 瀹夊叏绠＄悊鏁版嵁鎺ュ彛
diff --git a/src/main/java/com/fzzy/api/entity/Api1101.java b/src/main/java/com/fzzy/api/entity/Api1101.java
index 3caa0e6..7462024 100644
--- a/src/main/java/com/fzzy/api/entity/Api1101.java
+++ b/src/main/java/com/fzzy/api/entity/Api1101.java
@@ -112,6 +112,10 @@
@Column(name = "sjdwdm", length = 18)
private String sjdwdm;
+ @PropertyDef(label = "涓婄骇鍗曚綅缁熶竴缂栫爜")
+ @Column(name = "sjdwtybm", length = 20)
+ private String sjdwtybm;
+
@PropertyDef(label = "搴撳尯鏁�")
@Column(name = "kqs")
private Integer kqs;
diff --git a/src/main/java/com/fzzy/api/entity/Api1201.java b/src/main/java/com/fzzy/api/entity/Api1201.java
index 38ceccc..34275dd 100644
--- a/src/main/java/com/fzzy/api/entity/Api1201.java
+++ b/src/main/java/com/fzzy/api/entity/Api1201.java
@@ -54,7 +54,7 @@
@Column(name = "ywlx", length = 1)
private String ywlx;
- @PropertyDef(label = "鍚堝悓绉嶇被")
+ @PropertyDef(label = "鍚堝悓绉嶇被" ,description = "1:閿�鍞悎鍚�,2:閲囪喘鍚堝悓,3锛氬鎵樻敹鍌ㄥ悎鍚�,4锛氬鎵樻敹璐悎鍚�")
@Column(name = "htzl", length = 1)
private String htzl;
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index e51a1fd..9bb9caa 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -97,6 +97,26 @@
@Column(name = "gch", length = 32)
private String gch;
+ @PropertyDef(label = "鍞伯浜�")
+ @Column(name = "slr", length = 200)
+ private String slr;
+
+ @PropertyDef(label = "鍞伯浜鸿仈绯绘柟寮�")
+ @Column(name = "slrlxfs", length = 32)
+ private String slrlxfs;
+
+ @PropertyDef(label = "鍞伯浜鸿韩浠借瘉鍙�")
+ @Column(name = "slrsfzh", length = 32)
+ private String slrsfzh;
+
+ @PropertyDef(label = "鍞伯浜鸿处鍙凤紙閾惰鍗℃垨璐︽埛锛�")
+ @Column(name = "slrzh", length = 32)
+ private String slrzh;
+
+ @PropertyDef(label = "鍞伯浜哄湴鍧�")
+ @Column(name = "slrdz", length = 32)
+ private String slrdz;
+
@PropertyDef(label = "瑁呯伯鍦扮偣")
@Column(name = "ldd", length = 256)
private String ldd;
@@ -269,6 +289,14 @@
@Column(name = "rkjsdh", length = 33)
private String rkjsdh;
+ @PropertyDef(label = "鐢熸垚鏂瑰紡")
+ @Column(name = "scfs")
+ private Integer scfs = 1;
+
+ @PropertyDef(label = "鎵嬪姩琛ュ綍鍘熷洜")
+ @Column(name = "sdblyy", length = 400)
+ private String sdblyy;
+
@PropertyDef(label = "澶囨敞")
@Column(name = "bz", length = 400)
private String bz;
diff --git a/src/main/java/com/fzzy/api/entity/Api1205.java b/src/main/java/com/fzzy/api/entity/Api1205.java
index fb8eee6..ae6e2b2 100644
--- a/src/main/java/com/fzzy/api/entity/Api1205.java
+++ b/src/main/java/com/fzzy/api/entity/Api1205.java
@@ -213,7 +213,7 @@
@PropertyDef(label = "鐢熸垚鏂瑰紡")
@Column(name = "scfs", length = 1)
- private String scfs;
+ private Integer scfs;
@PropertyDef(label = "鎵嬪姩琛ュ綍鍘熷洜")
@Column(name = "sdblyy", length = 400)
diff --git a/src/main/java/com/fzzy/api/entity/Api1207.java b/src/main/java/com/fzzy/api/entity/Api1207.java
index 2e9304f..f977a8d 100644
--- a/src/main/java/com/fzzy/api/entity/Api1207.java
+++ b/src/main/java/com/fzzy/api/entity/Api1207.java
@@ -35,7 +35,7 @@
@Column(name = "dcdh", length = 33)
private String dcdh;
- @PropertyDef(label = "鍊掍粨绫诲瀷" )
+ @PropertyDef(label = "鍊掍粨绫诲瀷",description = "0-鍊掍粨锛�1-绉诲簱锛�2-涓存椂璐т綅鍏ヤ粨")
@Column(name = "dclx", length = 1)
private String dclx;
diff --git a/src/main/java/com/fzzy/api/entity/Api1209.java b/src/main/java/com/fzzy/api/entity/Api1209.java
index 23859e4..96abc16 100644
--- a/src/main/java/com/fzzy/api/entity/Api1209.java
+++ b/src/main/java/com/fzzy/api/entity/Api1209.java
@@ -51,9 +51,21 @@
@Column(name = "ywrq")
private Date ywrq;
+ @PropertyDef(label = "鎹熸孩绫诲瀷", description = "1:鎹熷け锛�2锛氭崯鑰楋紝3锛氭孩浣欙紝4锛氬叾浠�")
+ @Column(name = "sylx", length = 1)
+ private String sylx;
+
+ @PropertyDef(label = "鎹熸孩鐜妭", description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
+ @Column(name = "syhj", length = 1)
+ private String syhj;
+
@PropertyDef(label = "鍏ュ簱鍑�閲�(鍏枻)")
@Column(name = "rkjz", precision = 20, scale = 6)
private double rkjz;
+
+ @PropertyDef(label = "鍏ュ簱鏁伴噺(鍏枻)")
+ @Column(name = "rksl")
+ private double rksl;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍏ュ簱鏃堕棿")
@@ -85,50 +97,47 @@
@Column(name = "ckzz", precision = 20, scale = 6)
private double ckzz;
- @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)")
+ @PropertyDef(label = "鍌ㄥ鏃堕暱")
+ @Column(name = "ccsc",precision = 3)
+ private BigDecimal ccsc;
+
+ @PropertyDef(label = "瀹為檯鎹熸孩鏁伴噺(鍏枻)")
@Column(name = "jzsysl", precision = 20, scale = 6)
private double jzsysl;
- @PropertyDef(label = "鍏朵腑锛氭垚璐т綅鍓嶆崯鑰�(鍏枻)")
- @Column(name = "qzchwqsh", precision = 20, scale = 6)
- private double qzchwqsh;
-
- @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)")
+ @PropertyDef(label = "姘存潅鍑忛噺(鍏枻)")
@Column(name = "qzszkl", precision = 20, scale = 6)
private double qzszkl;
- @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)")
+ @PropertyDef(label = "鑷劧鎹熻�楀畾棰�(鍏枻)")
@Column(name = "qzzrshde", precision = 20, scale = 6)
private double qzzrshde;
+
+ @PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
+ @Column(name = "sfch")
+ private Integer sfch;
@PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)")
@Column(name = "chsl", precision = 20, scale = 6)
private double chsl;
- @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父")
+ @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父",description = "0:姝ｅ父锛�1锛氫笉姝ｅ父")
@Column(name = "sysfzc", length = 1)
private String sysfzc;
-
- @PropertyDef(label = "鎹熸孩绫诲瀷", description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
- @Column(name = "sylx", length = 1)
- private String sylx;
-
- @PropertyDef(label = "鍌ㄥ鏃堕暱")
- @Column(name = "ccsc",precision = 3)
- private BigDecimal ccsc;
-
- @PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
- @Column(name = "sfch", length = 1)
- private String sfch;
-
- @PropertyDef(label = "鎹熸孩鐜妭", description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
- @Column(name = "syhj", length = 1)
- private String syhj;
@PropertyDef(label = "鎹熸孩鍘熷洜")
@Column(name = "syyy", length = 400)
private String syyy;
+ @PropertyDef(label = "鍑烘竻纭鏍囪瘑",description = "0锛氭湭瀹屾垚鍑烘竻纭锛�1锛氬凡瀹屾垚鍑烘竻纭")
+ @Column(name = "cqqrbs")
+ private Integer cqqrbs;
+
+ @PropertyDef(label = "鍑烘竻纭鏃堕棿")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "cqqrsj")
+ private Date cqqrsj;
+
@PropertyDef(label = "浠撳偍瀹℃牳浜�")
@Column(name = "ccshr", length = 64)
private String ccshr;
diff --git a/src/main/java/com/fzzy/api/entity/Api1212.java b/src/main/java/com/fzzy/api/entity/Api1212.java
index e909694..c86a853 100644
--- a/src/main/java/com/fzzy/api/entity/Api1212.java
+++ b/src/main/java/com/fzzy/api/entity/Api1212.java
@@ -4,15 +4,10 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-
import java.io.Serializable;
import java.util.Date;
@@ -22,7 +17,6 @@
@Data
@Entity
@Table(name = "API_1212")
-@EqualsAndHashCode(callSuper = false)
public class Api1212 implements Serializable {
diff --git a/src/main/java/com/fzzy/api/entity/Api1213.java b/src/main/java/com/fzzy/api/entity/Api1213.java
new file mode 100644
index 0000000..69469d3
--- /dev/null
+++ b/src/main/java/com/fzzy/api/entity/Api1213.java
@@ -0,0 +1,115 @@
+package com.fzzy.api.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 鎺ュ彛琛�-灏佷粨纭鍗�
+ * @Author CZT
+ * @Date 2024/11/1 10:26
+ */
+@Data
+@Entity
+@Table(name = "API_1213")
+public class Api1213 implements Serializable {
+
+ public static String SORT_PROP = "fcrq";
+
+ @Id
+ @PropertyDef(label = "灏佷粨纭鍗曞彿", description = "2浣嶄笟鍔＄紪鐮�(21浠ｈ〃灏佷粨)+yyMMdd+4浣嶉『搴忕爜锛�212405040001")
+ @Column(name = "fcqrdh", length = 14)
+ private String fcqrdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @Column(name = "hwdm", length = 30)
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ @Column(name = "tyhwbm", length = 28)
+ private String tyhwbm;
+
+ @PropertyDef(label = "灏佷粨鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ @Column(name = "fcrq")
+ private Date fcrq;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ @Column(name = "lspzdm", length = 7)
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ @Column(name = "lsxzdm", length = 3)
+ private String lsxzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ @Column(name = "lsdjdm", length = 2)
+ private String lsdjdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ @Column(name = "shnd", length = 4)
+ private String shnd;
+
+ @PropertyDef(label = "鍥藉埆")
+ @Column(name = "gb", length = 10)
+ private String gb;
+
+ @PropertyDef(label = "浜у湴")
+ @Column(name = "cd", length = 6)
+ private String cd;
+
+ @PropertyDef(label = "淇濈鍛�")
+ @Column(name = "bgy", length = 20)
+ private String bgy;
+
+ @PropertyDef(label = "灏佷粨鏁伴噺")
+ @Column(name = "fcsl")
+ private Double fcsl;
+
+ @PropertyDef(label = "灏佷粨鐢宠浜�")
+ @Column(name = "fcsrq", length = 40)
+ private String fcsrq;
+
+ @PropertyDef(label = "閮ㄩ棬瀹℃牳浜�")
+ @Column(name = "bmshr", length = 40)
+ private String bmshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ @Column(name = "ldshr", length = 40)
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞")
+ @Column(name = "bz", length = 200)
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @Column(name = "czbz", length = 1)
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ @Column(name = "syncTime")
+ private Date syncTime;
+
+}
diff --git a/src/main/java/com/fzzy/api/view/Api1101.view.xml b/src/main/java/com/fzzy/api/view/Api1101.view.xml
index cca1fdb..13c3865 100644
--- a/src/main/java/com/fzzy/api/view/Api1101.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1101.view.xml
@@ -103,6 +103,10 @@
<Property></Property>
<Property name="label">涓婄骇鍗曚綅浠ｇ爜</Property>
</PropertyDef>
+ <PropertyDef name="sjdwtybm">
+ <Property></Property>
+ <Property name="label">涓婄骇鍗曚綅缁熶竴缂栫爜</Property>
+ </PropertyDef>
<PropertyDef name="kqs">
<Property name="dataType">Integer</Property>
<Property name="label">搴撳尯鏁�</Property>
@@ -630,6 +634,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">sjdwtybm</Property>
+ <Property name="property">sjdwtybm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">kqs</Property>
<Property name="property">kqs</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/api/view/Api1201.view.xml b/src/main/java/com/fzzy/api/view/Api1201.view.xml
index aed5579..44daeaa 100644
--- a/src/main/java/com/fzzy/api/view/Api1201.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1201.view.xml
@@ -42,6 +42,34 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="htzl">
+ <Property></Property>
+ <Property name="label">鍚堝悓绉嶇被</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1:閿�鍞悎鍚�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2:閲囪喘鍚堝悓</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬鎵樻敹鍌ㄥ悎鍚�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛氬鎵樻敹璐悎鍚�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="khlx">
<Property></Property>
<Property name="label">瀹㈡埛绫诲瀷</Property>
@@ -211,6 +239,38 @@
<PropertyDef name="wcrq">
<Property name="dataType">Date</Property>
<Property name="label">瀹屾垚鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="ysfs">
+ <Property></Property>
+ <Property name="label">楠屾敹鏂瑰紡</Property>
+ </PropertyDef>
+ <PropertyDef name="fkfs">
+ <Property></Property>
+ <Property name="label">浠樻鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氬叏棰濆厛娆惧悗璐�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氭寜鍒版杩涘害閫愭壒鍙戣揣</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氳揣鍒板苟纭鍚庝竴娆℃�т粯娆�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛氭寜鍒拌揣鎵规閫愭壒纭銆侀�愭壒浠樻</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
<Property></Property>
@@ -503,6 +563,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">htzl</Property>
+ <Property name="property">htzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">khlx</Property>
<Property name="property">khlx</Property>
<Editor/>
@@ -678,6 +743,16 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">ysfs</Property>
+ <Property name="property">ysfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fkfs</Property>
+ <Property name="property">fkfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">zhgxsj</Property>
<Property name="property">zhgxsj</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/api/view/Api1202.view.xml b/src/main/java/com/fzzy/api/view/Api1202.view.xml
index 9ce8a4b..4d2feb8 100644
--- a/src/main/java/com/fzzy/api/view/Api1202.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1202.view.xml
@@ -84,6 +84,26 @@
<Property></Property>
<Property name="label">鎸傝溅鍙�</Property>
</PropertyDef>
+ <PropertyDef name="slr">
+ <Property></Property>
+ <Property name="label">鍞伯浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="slrlxfs">
+ <Property></Property>
+ <Property name="label">鍞伯浜鸿仈绯绘柟寮�</Property>
+ </PropertyDef>
+ <PropertyDef name="slrsfzh">
+ <Property></Property>
+ <Property name="label">鍞伯浜鸿韩浠借瘉鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="slrzh">
+ <Property></Property>
+ <Property name="label">鍞伯浜鸿处鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="slrdz">
+ <Property></Property>
+ <Property name="label">鍞伯浜哄湴鍧�</Property>
+ </PropertyDef>
<PropertyDef name="ldd">
<Property></Property>
<Property name="label">瑁呯伯鍦扮偣</Property>
@@ -267,6 +287,30 @@
<PropertyDef name="rkjsdh">
<Property></Property>
<Property name="label">鍏ュ簱缁撶畻鍗曞彿</Property>
+ </PropertyDef>
+ <PropertyDef name="scfs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鐢熸垚鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氭祦绋嬬敓鎴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氭墜鍔ㄨˉ褰�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="sdblyy">
+ <Property></Property>
+ <Property name="label">鎵嬪姩琛ュ綍鍘熷洜</Property>
</PropertyDef>
<PropertyDef name="bz">
<Property></Property>
@@ -642,6 +686,31 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">slr</Property>
+ <Property name="property">slr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">slrlxfs</Property>
+ <Property name="property">slrlxfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">slrsfzh</Property>
+ <Property name="property">slrsfzh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">slrzh</Property>
+ <Property name="property">slrzh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">slrdz</Property>
+ <Property name="property">slrdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">ldd</Property>
<Property name="property">ldd</Property>
<Editor/>
@@ -853,6 +922,16 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">scfs</Property>
+ <Property name="property">scfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sdblyy</Property>
+ <Property name="property">sdblyy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">bz</Property>
<Property name="property">bz</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/api/view/Api1205.view.xml b/src/main/java/com/fzzy/api/view/Api1205.view.xml
index c88d0a8..3167b3d 100644
--- a/src/main/java/com/fzzy/api/view/Api1205.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1205.view.xml
@@ -202,6 +202,34 @@
<Property></Property>
<Property name="label">鍑哄簱缁撶畻鍗曞彿</Property>
</PropertyDef>
+ <PropertyDef name="zjbgdh">
+ <Property></Property>
+ <Property name="label">璐ㄦ鎶ュ憡鍗曞彿</Property>
+ </PropertyDef>
+ <PropertyDef name="scfs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鐢熸垚鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氭祦绋嬬敓鎴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氭墜鍔ㄨˉ褰�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="sdblyy">
+ <Property></Property>
+ <Property name="label">鎵嬪姩琛ュ綍鍘熷洜</Property>
+ </PropertyDef>
<PropertyDef name="bz">
<Property></Property>
<Property name="label">澶囨敞</Property>
@@ -676,6 +704,21 @@
<Property name="property">ckjsdh</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zjbgdh</Property>
+ <Property name="property">zjbgdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">scfs</Property>
+ <Property name="property">scfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">sdblyy</Property>
+ <Property name="property">sdblyy</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">bz</Property>
<Property name="property">bz</Property>
diff --git a/src/main/java/com/fzzy/api/view/Api1209.view.xml b/src/main/java/com/fzzy/api/view/Api1209.view.xml
index d13d5bf..f6173a8 100644
--- a/src/main/java/com/fzzy/api/view/Api1209.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1209.view.xml
@@ -46,6 +46,10 @@
<Property name="dataType">double</Property>
<Property name="label">鍏ュ簱鍑�閲�(鍏枻)</Property>
</PropertyDef>
+ <PropertyDef name="rksl">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍏ュ簱鏁伴噺(鍏枻)</Property>
+ </PropertyDef>
<PropertyDef name="rksj">
<Property></Property>
<Property name="label">鍏ュ簱鏃堕棿</Property>
@@ -78,19 +82,15 @@
</PropertyDef>
<PropertyDef name="jzsysl">
<Property name="dataType">double</Property>
- <Property name="label">鍑�閲嶆崯婧㈡暟閲�(鍏枻)</Property>
- </PropertyDef>
- <PropertyDef name="qzchwqsh">
- <Property name="dataType">double</Property>
- <Property name="label">鍏朵腑锛氭垚璐т綅鍓嶆崯鑰�(鍏枻)</Property>
+ <Property name="label">瀹為檯鎹熸孩鏁伴噺(鍏枻)</Property>
</PropertyDef>
<PropertyDef name="qzszkl">
<Property name="dataType">double</Property>
- <Property name="label">鍏朵腑姘存潅鍑忛噺(鍏枻)</Property>
+ <Property name="label">姘存潅鍑忛噺(鍏枻)</Property>
</PropertyDef>
<PropertyDef name="qzzrshde">
<Property name="dataType">double</Property>
- <Property name="label">鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)</Property>
+ <Property name="label">鑷劧鎹熻�楀畾棰�(鍏枻)</Property>
</PropertyDef>
<PropertyDef name="chsl">
<Property name="dataType">double</Property>
@@ -143,15 +143,19 @@
<Collection>
<Entity>
<Property name="key">1</Property>
- <Property name="value">1:鎹熻��</Property>
+ <Property name="value">1:鎹熷け</Property>
</Entity>
<Entity>
<Property name="key">2</Property>
- <Property name="value">2:鎹熷け</Property>
+ <Property name="value">2:鎹熻��</Property>
</Entity>
<Entity>
<Property name="key">3</Property>
<Property name="value">3:婧綑</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4:鍏朵粬</Property>
</Entity>
</Collection>
</Property>
@@ -190,8 +194,48 @@
<Property name="label">鍌ㄥ鏃堕暱</Property>
</PropertyDef>
<PropertyDef name="sfch">
- <Property/>
+ <Property name="dataType">Integer</Property>
<Property name="label">鏄惁瓒呰��</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1:鏄�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2:鍚�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="cqqrbs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鍑烘竻纭鏍囪瘑</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">0</Property>
+ <Property name="value">0:鏈畬鎴愬嚭娓呯‘璁�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1:宸插畬鎴愬嚭娓呯‘璁�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="cqqrsj">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍑烘竻纭鏃堕棿</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -473,6 +517,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">rksl</Property>
+ <Property name="property">rksl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">rksj</Property>
<Property name="property">rksj</Property>
<Editor/>
@@ -513,11 +562,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qzchwqsh</Property>
- <Property name="property">qzchwqsh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">qzszkl</Property>
<Property name="property">qzszkl</Property>
<Editor/>
@@ -525,6 +569,11 @@
<AutoFormElement>
<Property name="name">qzzrshde</Property>
<Property name="property">qzzrshde</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfch</Property>
+ <Property name="property">sfch</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -598,8 +647,13 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sfch</Property>
- <Property name="property">sfch</Property>
+ <Property name="name">cqqrbs</Property>
+ <Property name="property">cqqrbs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cqqrsj</Property>
+ <Property name="property">cqqrsj</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/src/main/java/com/fzzy/otherview/gd2022/GdApi2001.view.xml b/src/main/java/com/fzzy/api/view/Api1213.view.xml
similarity index 91%
rename from src/main/java/com/fzzy/otherview/gd2022/GdApi2001.view.xml
rename to src/main/java/com/fzzy/api/view/Api1213.view.xml
index 6066764..a680c1c 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi2001.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1213.view.xml
@@ -4,26 +4,18 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.push.gd2022.dto.Gd2022Api2001</Property>
+ <Property name="creationType">com.fzzy.api.entity.Api1213</Property>
<PropertyDef name="fcqrdh">
<Property></Property>
<Property name="label">灏佷粨纭鍗曞彿</Property>
</PropertyDef>
- <PropertyDef name="cfdm">
+ <PropertyDef name="hwdm">
<Property></Property>
- <Property name="label">浠撴埧浠ｇ爜</Property>
+ <Property name="label">璐т綅浠ｇ爜</Property>
</PropertyDef>
- <PropertyDef name="tycfbm">
+ <PropertyDef name="tyhwbm">
<Property></Property>
- <Property name="label">缁熶竴浠撴埧缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="ajdm">
- <Property></Property>
- <Property name="label">寤掗棿浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="tyajbm">
- <Property></Property>
- <Property name="label">缁熶竴寤掗棿缂栫爜</Property>
+ <Property name="label">缁熶竴璐т綅缂栫爜</Property>
</PropertyDef>
<PropertyDef name="fcrq">
<Property name="dataType">Date</Property>
@@ -109,6 +101,14 @@
<Property name="dataType">DateTime</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="bizId">
+ <Property></Property>
+ <Property name="label">涓氬姟id</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtParam">
<Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -139,7 +139,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">gDApi2001PR#listData</Property>
+ <Property name="dataProvider">api1213PR#pageList</Property>
<Property name="pageSize">15</Property>
</DataSet>
<DataSet id="dsQuery">
@@ -278,13 +278,18 @@
<Property name="width">180</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="cfdm">
- <Property name="property">cfdm</Property>
+ <DataColumn name="kqdm">
+ <Property name="property">kqdm</Property>
<Property name="width">210</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajdm">
- <Property name="property">ajdm</Property>
+ <DataColumn name="hwdm">
+ <Property name="property">hwdm</Property>
+ <Property name="width">210</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="tyhwbm">
+ <Property name="property">tyhwbm</Property>
<Property name="width">230</Property>
<Property name="align">center</Property>
</DataColumn>
@@ -369,23 +374,13 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cfdm</Property>
- <Property name="property">cfdm</Property>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">tycfbm</Property>
- <Property name="property">tycfbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajdm</Property>
- <Property name="property">ajdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">tyajbm</Property>
- <Property name="property">tyajbm</Property>
+ <Property name="name">tyhwbm</Property>
+ <Property name="property">tyhwbm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -463,6 +458,16 @@
<Property name="property">zhgxsj</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
@@ -470,22 +475,22 @@
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">gDApi2001PR#saveData</Property>
+ <Property name="dataResolver">api1213PR#updateSave</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
</UpdateItem>
</UpdateAction>
<AjaxAction id="ajaxPush">
- <Property name="service">gDApi2001PR#pushData</Property>
+ <Property name="service">api1213PR#pushData</Property>
<Property name="confirmMessage">纭畾瑕佷笂鎶ヤ箞锛�</Property>
</AjaxAction>
<AjaxAction id="ajaxDel">
- <Property name="service">gDApi2001PR#delData</Property>
+ <Property name="service">api1213PR#delData</Property>
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
</AjaxAction>
<AjaxAction id="ajaxDelUpdate">
- <Property name="service">gDApi2001PR#delUpdate</Property>
+ <Property name="service">api1213PR#delUpdate</Property>
<Property name="confirmMessage">纭畾瑕佸皢鏁版嵁鏍囪涓哄垹闄や箞锛�</Property>
</AjaxAction>
</View>
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1213PR.java b/src/main/java/com/fzzy/api/view/pr/Api1213PR.java
new file mode 100644
index 0000000..3acca1c
--- /dev/null
+++ b/src/main/java/com/fzzy/api/view/pr/Api1213PR.java
@@ -0,0 +1,236 @@
+package com.fzzy.api.view.pr;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.Api1213;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1213Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 灏佷粨纭鍗�
+ * @Author CZT
+ * @Date 2024/11/1 10:40
+ */
+@Slf4j
+@Component
+public class Api1213PR {
+
+ @Autowired
+ private Api1213Rep apiRepository;
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+
+ /**
+ * api1213PR#pageList
+ *
+ * @return
+ */
+ @DataProvider
+ public void pageList(Page<Api1213> page, ApiParam param) {
+
+ //澶氬弬鏁板垎椤垫煡璇�
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, Api1213.SORT_PROP);
+
+ if (null == param) {
+ org.springframework.data.domain.Page<Api1213> japPage = apiRepository.findAll(pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ page.setEntities(japPage.getContent());
+
+ return;
+ }
+
+ Specification<Api1213> specification = new Specification<Api1213>() {
+ private static final long serialVersionUID = 1L;
+
+ public Predicate toPredicate(Root<Api1213> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = cb.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = cb.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = cb.greaterThan(root.get("zhgxsj"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = cb.lessThan(root.get("zhgxsj"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ return cb.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+
+ log.debug("---------鍒嗛〉鍙傛暟鏌ヨ----------{}", param.toString());
+ org.springframework.data.domain.Page<Api1213> japPage = apiRepository.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ page.setEntities(japPage.getContent());
+ }
+
+
+ /**
+ * Api1213PR#updateSave
+ *
+ * @param entity
+ */
+ @DataResolver
+ public void updateSave(Api1213 entity) {
+
+ if (StringUtils.isEmpty(entity.getCzbz())) {
+ entity.setCzbz(Constant.CZBZ_I);
+ }
+
+ //鎵嬪姩灏哾oradoEntity瀵硅薄杞崲涓烘爣鍑咮ean瀵硅薄
+ Api1213 data = new Api1213();
+ BeanUtils.copyProperties(entity, data);
+
+ if(StringUtils.isEmpty(data.getFcqrdh())){
+ data.setFcqrdh(ContextUtil.getUUID());
+ }
+ apiRepository.save(data);
+ }
+
+
+ /**
+ * Api1213PR#delData
+ *
+ * @param data
+ */
+ @Expose
+ public String delData(Api1213 data) {
+ if(null == data) return "鏃犳暟鎹墽琛�";
+ apiRepository.deleteById(data.getFcqrdh());
+
+ return null;
+ }
+
+ /**
+ * 鏇存柊鍒犻櫎鏍囪 Api1213PR#delUpdate
+ *
+ * @param entity
+ */
+ @Expose
+ public String delUpdate(Api1213 entity) {
+ if(null == entity) return "鏃犳暟鎹墽琛�";
+
+ entity.setCzbz(Constant.CZBZ_D);
+
+ Api1213 data = new Api1213();
+ BeanUtils.copyProperties(entity, data);
+
+ apiRepository.save(data);
+
+ return null;
+ }
+
+ /**
+ * Api1213PR#pushData
+ *
+ * @param items
+ */
+ @Expose
+ public String pushData(List<Api1213> items) {
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1213> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);
+ Api1213 d;
+ for (Api1213 data : items) {
+ d = new Api1213();
+ BeanUtils.copyProperties(data, d);
+ responseDto = apiService.pushData(param, apiConf, d);
+ result += responseDto.toString();
+ if (responseDto.getSuccess() == 0) {
+ //todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
+ if ("i".equals(d.getCzbz())) {
+ apiRepository.updateStatus(d.getFcqrdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1213> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1213 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ apiRepository.updateStatus(data.getFcqrdh(), Constant.CZBZ_U);
+ }
+ }
+ }
+ return responseDto.toString();
+ }
+
+}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1213Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1213Rep.java
new file mode 100644
index 0000000..452f0a5
--- /dev/null
+++ b/src/main/java/com/fzzy/api/view/repository/Api1213Rep.java
@@ -0,0 +1,32 @@
+package com.fzzy.api.view.repository;
+
+import com.fzzy.api.entity.Api1213;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @Description 灏佷粨纭鍗�
+ * @Author CZT
+ * @Date 2024/11/1 10:42
+ */
+public interface Api1213Rep extends JpaRepository<Api1213, String>, JpaSpecificationExecutor<Api1213> {
+
+ @Transactional
+ @Modifying
+ @Query("update Api1213 set czbz =:czbz where fcqrdh=:fcqrdh")
+ void updateStatus(@Param("fcqrdh") String fcqrdh, @Param("czbz") String czbz);
+
+ @Query("from Api1213 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1213> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+ @Query("from Api1213 where fcqrdh=:fcqrdh ")
+ List<Api1213> getDataById(@Param("fcqrdh") String fcqrdh);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index ff4b9d5..e831c2a 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -160,6 +160,13 @@
apiData.setDjsj(sysData.getRegisterTime());
+ //鐢熸垚鏂瑰紡
+ apiData.setScfs(1);
+ if(StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")){
+ apiData.setScfs(2);
+ apiData.setSdblyy("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�");
+ }
+
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
apiData.setLspzdm(mappingCode);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index eb98ad2..701e781 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -164,11 +164,11 @@
apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());
//鐢熸垚鏂瑰紡
- apiData.setScfs(sysData.getRecordStatus().equals("ADD") ? "2" : "1");
-
- //鎵嬪姩琛ュ綍鍘熷洜
- apiData.setSdblyy("搴撳尯鍋滅數锛屾棤娉曚笂浼�");
-
+ apiData.setScfs(1);
+ if(StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")){
+ apiData.setScfs(2);
+ apiData.setSdblyy("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�");
+ }
//绮鎬ц川
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
index a58a370..bc3127e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -110,12 +110,14 @@
apiData.setRkzz(sysData.getRkzz());
apiData.setCksf(sysData.getCksf());
apiData.setCkzz(sysData.getCkzz());
- apiData.setQzchwqsh(0);
- apiData.setQzszkl(0);
- apiData.setQzzrshde(0);
- apiData.setChsl(0);
+ apiData.setQzszkl(sysData.getQzszkl());
+ apiData.setQzzrshde(sysData.getQzzrshde());
+ apiData.setChsl(sysData.getChsl());
apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
- apiData.setSfch("0".equals(apiData.getSysfzc()) ? "2" : "1");
+ apiData.setSfch(2);
+ if(apiData.getJzsysl() > apiData.getQzszkl()){
+ apiData.setSfch(1);
+ }
apiData.setSyyy(sysData.getSyyy());
apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃牳浜�" : sysData.getCcshr());
apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃牳浜�" : sysData.getZjshr());
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
index 7cdeb19..b57ad85 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
@@ -50,7 +50,7 @@
apiLog.setType(ApiLog.TYPE_SYNC);
apiLog.setKqdm(deptId);
apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1214);
+ apiLog.setInteId("1214");
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
diff --git a/src/main/java/com/fzzy/otherview/gd2022/GdApi2002.view.xml b/src/main/java/com/fzzy/otherview/gd2022/GdApi2002.view.xml
deleted file mode 100644
index 92e06ab..0000000
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi2002.view.xml
+++ /dev/null
@@ -1,400 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewConfig>
- <Arguments/>
- <Context/>
- <Model>
- <DataType name="dtMain">
- <Property name="creationType">com.fzzy.push.gd2022.dto.Gd2022Api2002</Property>
- <PropertyDef name="cqqrdh">
- <Property></Property>
- <Property name="label">鍑烘竻纭鍗曞彿</Property>
- </PropertyDef>
- <PropertyDef name="cfdm">
- <Property></Property>
- <Property name="label">浠撴埧浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="tycfbm">
- <Property></Property>
- <Property name="label">缁熶竴浠撴埧缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="ajdm">
- <Property></Property>
- <Property name="label">寤掗棿浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="tyajbm">
- <Property></Property>
- <Property name="label">缁熶竴寤掗棿缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="cqrq">
- <Property name="dataType">Date</Property>
- <Property name="label">鍑烘竻鏃ユ湡</Property>
- </PropertyDef>
- <PropertyDef name="srq">
- <Property></Property>
- <Property name="label">鐢宠浜�</Property>
- </PropertyDef>
- <PropertyDef name="bmshr">
- <Property></Property>
- <Property name="label">閮ㄩ棬瀹℃牳浜�</Property>
- </PropertyDef>
- <PropertyDef name="ldshr">
- <Property></Property>
- <Property name="label">棰嗗瀹℃牳浜�</Property>
- </PropertyDef>
- <PropertyDef name="bz">
- <Property></Property>
- <Property name="label">澶囨敞</Property>
- </PropertyDef>
- <PropertyDef name="czbz">
- <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="zhgxsj">
- <Property name="dataType">DateTime</Property>
- <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtParam">
- <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
- <PropertyDef name="kqdm">
- <Property></Property>
- <Property name="label">鎵�灞炲簱鍖�</Property>
- </PropertyDef>
- <PropertyDef name="start">
- <Property name="dataType">Date</Property>
- <Property name="label">寮�濮嬫椂闂�</Property>
- </PropertyDef>
- <PropertyDef name="end">
- <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>
- </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">gDApi2002PR#listData</Property>
- <Property name="pageSize">15</Property>
- </DataSet>
- <DataSet id="dsQuery">
- <ClientEvent name="onReady">self.insert();</ClientEvent>
- <Property name="dataType">dtParam</Property>
- </DataSet>
- <ToolBar>
- <ToolBarLabel>
- <Property name="text">宸ュ叿鏍忥細</Property>
- <Property name="style">
- <Property name="font-weight">bold</Property>
- </Property>
- </ToolBarLabel>
- <ToolBarButton>
- <ClientEvent name="onClick">var query = view.get("#dsQuery").getData();
-view.get("#dsMain").set("parameter",query).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- <Property name="width">100</Property>
- <Property name="exClassName">toolbar-button-push</Property>
- </ToolBarButton>
- <ToolBarButton id="btnAdd">
- <ClientEvent name="onClick">view.get("#dsMain").insert();
-view.get("#dialogMain").show();</ClientEvent>
- <Property name="caption">鏂板</Property>
- <Property name="iconClass">fa fa-plus</Property>
- <Property name="width">100</Property>
- <Property name="exClassName">toolbar-button</Property>
- <Property name="hideMode">display</Property>
- </ToolBarButton>
- <ToolBarButton id="btnUpdate">
- <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
-if(cur){
- view.get("#dialogMain").show();
-}</ClientEvent>
- <Property name="caption">淇敼</Property>
- <Property name="iconClass">fa fa-pencil</Property>
- <Property name="width">100</Property>
- <Property name="exClassName">toolbar-button-warm</Property>
- <Property name="hideMode">display</Property>
- </ToolBarButton>
- <ToolBarButton>
- <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
-view.get("#ajaxDelUpdate").set("parameter",cur).execute(function(result){
- if(result){
- $alert(result);
- } else{
- cur.set("czbz","d")
- }
-});
-</ClientEvent>
- <Property name="caption">鏍囪鍒犻櫎</Property>
- <Property name="iconClass">fa fa-minus</Property>
- <Property name="exClassName">toolbar-button-warn</Property>
- <Property name="width">100</Property>
- </ToolBarButton>
- <ToolBarButton id="btnDel">
- <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
-view.get("#ajaxDel").set("parameter",cur).execute(function(result){
- if(result){
- $alert(result);
- } else{
- cur.remove();
- }
-});
-</ClientEvent>
- <Property name="caption">鐩存帴鍒犻櫎</Property>
- <Property name="iconClass">fa fa-minus</Property>
- <Property name="exClassName">toolbar-button-warn</Property>
- <Property name="width">100</Property>
- <Property name="hideMode">display</Property>
- </ToolBarButton>
- <ToolBarButton>
- <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">toolbar-button-push</Property>
- <Property name="width">100</Property>
- </ToolBarButton>
- <Fill/>
- <ToolBarButton>
- <Property name="caption">涓婁紶璁板綍</Property>
- <Property name="iconClass">fa fa-bars</Property>
- <Property name="exClassName">toolbar-button</Property>
- <Property name="width">100</Property>
- </ToolBarButton>
- </ToolBar>
- <AutoForm>
- <Property name="dataSet">dsQuery</Property>
- <Property name="cols">*,*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">90</Property>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">start</Property>
- <Property name="property">start</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">end</Property>
- <Property name="property">end</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- <DataGrid id="dgMain">
- <ClientEvent name="onDataRowDoubleClick">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="cqqrdh">
- <Property name="property">cqqrdh</Property>
- <Property name="width">180</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="cfdm">
- <Property name="property">cfdm</Property>
- <Property name="width">210</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ajdm">
- <Property name="property">ajdm</Property>
- <Property name="width">230</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="cqrq">
- <Property name="property">cqrq</Property>
- <Property name="width">150</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="srq">
- <Property name="property">srq</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="bmshr">
- <Property name="property">bmshr</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ldshr">
- <Property name="property">ldshr</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="bz">
- <Property name="property">bz</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="czbz">
- <Property name="property">czbz</Property>
- <Property name="width">70</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="zhgxsj">
- <Property name="property">zhgxsj</Property>
- <Property name="width">160</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- <ToolBar layoutConstraint="bottom">
- <Fill/>
- <DataPilot>
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
- </ToolBar>
- <Dialog id="dialogMain" layout="regionPadding:5">
- <Property name="width">80%</Property>
- <Property name="caption">鍑烘竻纭鍗曚俊鎭�</Property>
- <Property name="iconClass">fa fa-sliders</Property>
- <Property name="closeable">false</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
-view.get("#updateSave").execute(function(){
- self.get("parent").hide();
-});</ClientEvent>
- <Property name="caption">淇濆瓨淇敼</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">toolbar-button</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>
- <Property name="exClassName">toolbar-button-warn</Property>
- </Button>
- </Buttons>
- <Children>
- <FieldSet layout="regionPadding:5">
- <Property name="caption">鍩烘湰淇℃伅</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">160</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">left</Property>
- <AutoFormElement>
- <Property name="name">cqqrdh</Property>
- <Property name="property">cqqrdh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cfdm</Property>
- <Property name="property">cfdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">tycfbm</Property>
- <Property name="property">tycfbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajdm</Property>
- <Property name="property">ajdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">tyajbm</Property>
- <Property name="property">tyajbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cqrq</Property>
- <Property name="property">cqrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">srq</Property>
- <Property name="property">srq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bmshr</Property>
- <Property name="property">bmshr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ldshr</Property>
- <Property name="property">ldshr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- </Children>
- <Tools/>
- </Dialog>
- <UpdateAction id="updateSave">
- <Property name="dataResolver">gDApi2002PR#saveData</Property>
- <UpdateItem>
- <Property name="dataPath">[#current]</Property>
- <Property name="dataSet">dsMain</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxPush">
- <Property name="service">gDApi2002PR#pushData</Property>
- <Property name="confirmMessage">纭畾瑕佷笂鎶ヤ箞锛�</Property>
- </AjaxAction>
- <AjaxAction id="ajaxDel">
- <Property name="service">gDApi2002PR#delData</Property>
- <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- </AjaxAction>
- <AjaxAction id="ajaxDelUpdate">
- <Property name="service">gDApi2002PR#delUpdate</Property>
- <Property name="confirmMessage">纭畾瑕佸皢鏁版嵁鏍囪涓哄垹闄や箞锛�</Property>
- </AjaxAction>
- </View>
-</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi2001PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi2001PR.java
deleted file mode 100644
index 78eb502..0000000
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi2001PR.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.fzzy.otherview.gd2022.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.bstek.dorado.data.provider.Page;
-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.utils.ContextUtil;
-import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.push.gd2022.ApiCodeConstant;
-import com.fzzy.push.gd2022.dto.Gd2022Api2001;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Component;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description 灏佷粨纭椤甸潰绠＄悊
- * @Author CZT
- * @Date 2024/6/29 14:57
- */
-@Component(value = "gDApi2001PR")
-public class GDApi2001PR {
-
- @Autowired
- private ApiInfoDataRep apiInfoDataRep;
- @Autowired
- private ApiCommonService apiCommonService;
- @Autowired
- private ApiPushManager apiPushManager;
-
- /**
- * 鑾峰彇淇℃伅
- * gDApi2001PR#listData
- *
- * @return
- */
- @DataProvider
- public void listData(Page<Gd2022Api2001> page, ApiParam param) {
-
- Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
-
- Specification specification = new Specification<ApiInfoData>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
- List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
-
- Predicate predicate = criteriaBuilder.equal(root.get("inteId"), ApiCodeConstant.API_2001);
- predicates.add(predicate);
-
- if (null != param) {
- if (StringUtils.isNotBlank(param.getKqdm())) {
- Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
- predicates.add(predicate1);
- }
-
- if (StringUtils.isNotBlank(param.getCzbz())) {
- Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
- predicates.add(predicate2);
- }
- if (null != param.getStart()) {
- Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
- predicates.add(predicate3);
- }
-
- if (null != param.getEnd()) {
- Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
- predicates.add(predicate4);
- }
- }
- return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
- }
- };
- org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
- page.setEntityCount((int) japPage.getTotalElements());
- List<Gd2022Api2001> list = new ArrayList<>();
- Gd2022Api2001 Gd2022Api2001;
-
- for (ApiInfoData infoData : japPage.getContent()) {
- Gd2022Api2001 = JSONObject.parseObject(infoData.getData(), Gd2022Api2001.class);
- list.add(Gd2022Api2001);
- }
- page.setEntities(list);
-
- }
-
- /**
- * gDApi2001PR#saveData
- */
- @DataResolver
- public void saveData(Gd2022Api2001 data) {
- ApiInfoData infoData = new ApiInfoData();
- infoData.setId(data.getFcqrdh());
- infoData.setKqdm(data.getCfdm().substring(0, 21));
- infoData.setInteId(ApiCodeConstant.API_2001);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(infoData.getId());
- infoData.setData(JSON.toJSONString(data));
- infoData.setCzbz(data.getCzbz());
- infoData.setRemarks("澶囨敞淇℃伅");
-
- apiInfoDataRep.save(infoData);
- }
-
- /**
- * gDApi2001PR#delData
- */
- @Expose
- public void delData(Gd2022Api2001 data) {
- apiInfoDataRep.deleteById(data.getFcqrdh());
- }
-
- /**
- * gDApi2001PR#delUpdate
- */
- @Expose
- public String delUpdate(Gd2022Api2001 entity) {
- if (null == entity) {
- return "鏃犳暟鎹墽琛�";
- }
- apiInfoDataRep.updateStatus(entity.getFcqrdh(), JSON.toJSONString(entity), Constant.CZBZ_D);
- return null;
- }
-
- @Expose
- public String pushData(List<Gd2022Api2001> items) {
-
- String result = "";
-
- String kqdm = items.get(0).getCfdm().substring(0, 21);
- ApiConfs apiConf = apiCommonService.getConf(kqdm);
-
- if (null == apiConf) {
- return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- }
-
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, "21", ApiCodeConstant.API_2001);
-
- //鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
- if (null == apiService) {
- return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
- }
-
- ResponseDto responseDto;
- ApiInfoData infoData;
- for (Gd2022Api2001 data : items) {
- responseDto = apiService.pushData(param, apiConf, data);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
- infoData = new ApiInfoData();
- infoData.setId(data.getFcqrdh());
- infoData.setKqdm(data.getCfdm().substring(0, 21));
- infoData.setInteType("21");
- infoData.setInteId(ApiCodeConstant.API_2001);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(infoData.getId());
-
- infoData.setCzbz(Constant.CZBZ_U);
- data.setCzbz(Constant.CZBZ_U);
- infoData.setData(JSON.toJSONString(data));
- apiInfoDataRep.save(infoData);
- }
- }
- result += responseDto.toString();
- }
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi2002PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi2002PR.java
deleted file mode 100644
index fe22009..0000000
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi2002PR.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.fzzy.otherview.gd2022.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.bstek.dorado.data.provider.Page;
-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.utils.ContextUtil;
-import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.push.gd2022.ApiCodeConstant;
-import com.fzzy.push.gd2022.dto.Gd2022Api2002;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Component;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description 鍑烘竻纭椤甸潰绠＄悊
- * @Author CZT
- * @Date 2024/6/29 15:25
- */
-@Component(value = "gDApi2002PR")
-public class GDApi2002PR {
-
- @Autowired
- private ApiInfoDataRep apiInfoDataRep;
- @Autowired
- private ApiCommonService apiCommonService;
- @Autowired
- private ApiPushManager apiPushManager;
-
- /**
- * 鑾峰彇淇℃伅
- * gDApi2002PR#listData
- *
- * @return
- */
- @DataProvider
- public void listData(Page<Gd2022Api2002> page, ApiParam param) {
-
- Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
-
- Specification specification = new Specification<ApiInfoData>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
- List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
-
- Predicate predicate = criteriaBuilder.equal(root.get("inteId"), ApiCodeConstant.API_2002);
- predicates.add(predicate);
-
- if (null != param) {
- if (StringUtils.isNotBlank(param.getKqdm())) {
- Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
- predicates.add(predicate1);
- }
-
- if (StringUtils.isNotBlank(param.getCzbz())) {
- Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
- predicates.add(predicate2);
- }
- if (null != param.getStart()) {
- Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
- predicates.add(predicate3);
- }
-
- if (null != param.getEnd()) {
- Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
- predicates.add(predicate4);
- }
- }
- return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
- }
- };
- org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
- page.setEntityCount((int) japPage.getTotalElements());
- List<Gd2022Api2002> list = new ArrayList<>();
- Gd2022Api2002 Gd2022Api2002;
-
- for (ApiInfoData infoData : japPage.getContent()) {
- Gd2022Api2002 = JSONObject.parseObject(infoData.getData(), Gd2022Api2002.class);
- list.add(Gd2022Api2002);
- }
- page.setEntities(list);
-
- }
-
- /**
- * gDApi2002PR#saveData
- */
- @DataResolver
- public void saveData(Gd2022Api2002 data) {
- ApiInfoData infoData = new ApiInfoData();
- infoData.setId(data.getCqqrdh());
- infoData.setKqdm(data.getCfdm().substring(0, 21));
- infoData.setInteId(ApiCodeConstant.API_2002);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(infoData.getId());
- infoData.setData(JSON.toJSONString(data));
- infoData.setCzbz(data.getCzbz());
- infoData.setRemarks("澶囨敞淇℃伅");
-
- apiInfoDataRep.save(infoData);
- }
-
- /**
- * gDApi2002PR#delData
- */
- @Expose
- public void delData(Gd2022Api2002 data) {
- apiInfoDataRep.deleteById(data.getCqqrdh());
- }
-
- /**
- * gDApi2002PR#delUpdate
- */
- @Expose
- public String delUpdate(Gd2022Api2002 entity) {
- if (null == entity) {
- return "鏃犳暟鎹墽琛�";
- }
- apiInfoDataRep.updateStatus(entity.getCqqrdh(), JSON.toJSONString(entity), Constant.CZBZ_D);
- return null;
- }
-
- @Expose
- public String pushData(List<Gd2022Api2002> items) {
-
- String result = "";
-
- String kqdm = items.get(0).getCfdm().substring(0, 21);
- ApiConfs apiConf = apiCommonService.getConf(kqdm);
-
- if (null == apiConf) {
- return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- }
-
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, "21", ApiCodeConstant.API_2002);
-
- //鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
- if (null == apiService) {
- return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
- }
-
- ResponseDto responseDto;
- ApiInfoData infoData;
- for (Gd2022Api2002 data : items) {
- responseDto = apiService.pushData(param, apiConf, data);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
- infoData = new ApiInfoData();
- infoData.setId(data.getCqqrdh());
- infoData.setKqdm(data.getCfdm().substring(0, 21));
- infoData.setInteType("21");
- infoData.setInteId(ApiCodeConstant.API_2002);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(infoData.getId());
-
- infoData.setCzbz(Constant.CZBZ_U);
- data.setCzbz(Constant.CZBZ_U);
- infoData.setData(JSON.toJSONString(data));
- apiInfoDataRep.save(infoData);
- }
- }
- result += responseDto.toString();
- }
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
index 78c74cb..b6f71fe 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
@@ -119,6 +119,7 @@
if (apiInfoList.size() != 0) {
infoData = apiInfoList.get(0);
infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
} else {
infoData = new ApiInfoData();
infoData.setId(ContextUtil.getUUID());
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
index 5b34020..1663263 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
@@ -85,7 +85,7 @@
private Double qzzrshde;
@PropertyDef(label = "鏄惁瓒呰��" )
- private String sfch;
+ private Integer sfch;
@PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)" )
private Double chsl;
@@ -97,10 +97,11 @@
private String syyy;
@PropertyDef(label = "鍑烘竻纭鏍囪瘑" )
- private String cqqrbs;
+ private Integer cqqrbs;
@PropertyDef(label = "鍑烘竻纭鏃堕棿" )
- private String cqqrsj;
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date cqqrsj;
@PropertyDef(label = "浠撳偍瀹℃牳浜�" )
private String ccshr;
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService12.java b/src/main/java/com/fzzy/push/impl/ComPushService12.java
index 3860790..d18ea29 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService12.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService12.java
@@ -46,7 +46,8 @@
private Api1211Rep api1211Rep;
@Autowired
private Api1212Rep api1212Rep;
-
+ @Autowired
+ private Api1213Rep api1213Rep;
/**
* 1109 鏂囦欢淇℃伅鍚屾
*/
@@ -427,4 +428,32 @@
}
}
}
+
+ /**
+ * 1213 灏佷粨纭鍗�
+ */
+ public void pushData1213(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇瀹㈡埛淇℃伅
+ List<Api1213> list = api1213Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌瀹㈡埛淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_12);
+ param.setInteId(Constant.API_CODE_1213);
+
+ ResponseDto responseDto;
+ for (Api1213 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1213Rep.save(data);
+ }
+ }
+ }
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86a70b3..bbeeabd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: pro
+ active: dev
application:
name: igds-api
main:
diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html
index a73e81b..3d215f2 100644
--- a/src/main/resources/templates/home/home.html
+++ b/src/main/resources/templates/home/home.html
@@ -211,6 +211,9 @@
<dd>
<a lay-href="com.fzzy.api.view.Api1212.d">瀹㈡埛淇℃伅</a>
</dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1213.d">灏佷粨纭鍗�</a>
+ </dd>
</dl>
</li>
--
Gitblit v1.9.3