From 882994504c53b2b62f61630e443d371204208029 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 07 十一月 2023 18:53:10 +0800
Subject: [PATCH] 调整行政管理接口信息

---
 src/main/java/com/fzzy/api/entity/Api1402.java                     |   41 +++++++++----
 src/main/java/com/fzzy/api/view/Api1202.view.xml                   |    9 +++
 src/main/java/com/fzzy/api/view/Api1402.view.xml                   |   42 +++++++++++++
 src/main/java/com/fzzy/api/view/Api1310.view.xml                   |   25 ++++++++
 src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java |    2 
 src/main/java/com/fzzy/api/view/Api1203.view.xml                   |    9 +++
 src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java            |    2 
 7 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/fzzy/api/entity/Api1402.java b/src/main/java/com/fzzy/api/entity/Api1402.java
index 7e29e22..1c685dd 100644
--- a/src/main/java/com/fzzy/api/entity/Api1402.java
+++ b/src/main/java/com/fzzy/api/entity/Api1402.java
@@ -27,56 +27,56 @@
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-
+    /*----------鍥芥爣瀛楁----------*/
 	@Id
     @PropertyDef(label = "璁″垝鍗曞彿" )
-    @Column(name = "jhdh", length = 21, nullable = false)
+    @Column(name = "jhdh", length = 21)
     private String jhdh;
 
     @PropertyDef(label = "璁″垝鏂囧彿" )
-    @Column(name = "jhwh", length = 128, nullable = false)
+    @Column(name = "jhwh", length = 128)
     private String jhwh;
 
     @PropertyDef(label = "璁″垝鍚嶇О" )
-    @Column(name = "jhmc", length = 256, nullable = false)
+    @Column(name = "jhmc", length = 256)
     private String jhmc;
 
     @PropertyDef(label = "璁″垝骞村害" )
-    @Column(name = "jhnd", length = 4, nullable = false)
+    @Column(name = "jhnd", length = 4)
     private String jhnd;
 
     @PropertyDef(label = "鍒跺畾璁″垝鍗曚綅" )
-    @Column(name = "jhzddw", length = 128, nullable = false)
+    @Column(name = "jhzddw", length = 128)
     private String jhzddw;
 
     @JSONField(format = "yyyy-MM-dd")
     @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿" )
-    @Column(name = "jhxdsj", nullable = false)
+    @Column(name = "jhxdsj")
     private Date jhxdsj;
 
     @PropertyDef(label = "绮鍝佺浠g爜" )
-    @Column(name = "lspzdm", length = 7, nullable = false)
+    @Column(name = "lspzdm", length = 7)
     private String lspzdm;
 
     @PropertyDef(label = "绮绛夌骇浠g爜" )
-    @Column(name = "lsdjdm", length = 2, nullable = false)
+    @Column(name = "lsdjdm", length = 2)
     private String lsdjdm;
 
     @PropertyDef(label = "绮鎬ц川浠g爜" )
-    @Column(name = "lsxzdm", length = 3, nullable = false)
+    @Column(name = "lsxzdm", length = 3)
     private String lsxzdm;
 
     @PropertyDef(label = "鏁伴噺" )
-    @Column(name = "sl", precision = 20, scale = 6, nullable = false)
-    private double sl;
+    @Column(name = "sl", precision = 20, scale = 6)
+    private Double sl;
 
     @PropertyDef(label = "鎿嶄綔鏍囧織" )
-    @Column(name = "czbz", length = 1, nullable = false)
+    @Column(name = "czbz", length = 1)
     private String czbz;
 
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
-    @Column(name = "zhgxsj", nullable = false)
+    @Column(name = "zhgxsj")
     private Date zhgxsj;
 
     @JSONField(serialize = false)
@@ -93,4 +93,17 @@
     @Column(name = "syncTime")
     private Date syncTime;
 
+    /*----------骞夸笢鐪佸钩鍙拌鑼冨瓧娈�----------*/
+    @PropertyDef(label = "鍗曚綅浠g爜" )
+    @Column(name = "dwdm")
+    private String dwdm;
+
+    @PropertyDef(label = "绮潈琛屾斂鍖哄垝浠g爜" )
+    @Column(name = "lqxzqhdm")
+    private String lqxzqhdm;
+
+    @PropertyDef(label = "杞崲绫诲瀷" )
+    @Column(name = "rotationType")
+    private String rotationType;
+
 }
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 430b5ef..76c44e9 100644
--- a/src/main/java/com/fzzy/api/view/Api1202.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1202.view.xml
@@ -59,6 +59,10 @@
         <Property></Property>
         <Property name="label">璇︾粏鍦板潃</Property>
       </PropertyDef>
+      <PropertyDef name="lqgsdwdm">
+        <Property></Property>
+        <Property name="label">绮潈褰掑睘鍗曚綅浠g爜</Property>
+      </PropertyDef>
       <PropertyDef name="ysgj">
         <Property></Property>
         <Property name="label">杩愯緭宸ュ叿</Property>
@@ -821,6 +825,11 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
+            <Property name="name">lqgsdwdm</Property>
+            <Property name="property">lqgsdwdm</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/Api1203.view.xml b/src/main/java/com/fzzy/api/view/Api1203.view.xml
index 1f00d95..f08c799 100644
--- a/src/main/java/com/fzzy/api/view/Api1203.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1203.view.xml
@@ -50,6 +50,10 @@
         <Property></Property>
         <Property name="label">澧炴墸閲�(鍏枻,闅斿紑)</Property>
       </PropertyDef>
+      <PropertyDef name="spaqzbsfhg">
+        <Property></Property>
+        <Property name="label">椋熷搧瀹夊叏鎸囨爣鏄惁鍚堟牸</Property>
+      </PropertyDef>
       <PropertyDef name="jyrxm">
         <Property></Property>
         <Property name="label">妫�楠屼汉濮撳悕</Property>
@@ -435,6 +439,11 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
+            <Property name="name">spaqzbsfhg</Property>
+            <Property name="property">spaqzbsfhg</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
             <Property name="name">bgyfh</Property>
             <Property name="property">bgyfh</Property>
             <Editor/>
diff --git a/src/main/java/com/fzzy/api/view/Api1310.view.xml b/src/main/java/com/fzzy/api/view/Api1310.view.xml
index fe67c9a..497fba4 100644
--- a/src/main/java/com/fzzy/api/view/Api1310.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1310.view.xml
@@ -156,6 +156,26 @@
         <Property></Property>
         <Property name="label">鏍峰搧绛夌骇</Property>
       </PropertyDef>
+      <PropertyDef name="spaqzbsfhg">
+        <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">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="sfzcccnx">
         <Property></Property>
         <Property name="label">鏄惁姝e父瀛樺偍骞撮檺</Property>
@@ -496,6 +516,11 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
+            <Property name="name">spaqzbsfhg</Property>
+            <Property name="property">spaqzbsfhg</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
             <Property name="name">qydbh</Property>
             <Property name="property">qydbh</Property>
             <Editor/>
diff --git a/src/main/java/com/fzzy/api/view/Api1402.view.xml b/src/main/java/com/fzzy/api/view/Api1402.view.xml
index 5f5b635..1b14545 100644
--- a/src/main/java/com/fzzy/api/view/Api1402.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1402.view.xml
@@ -53,7 +53,32 @@
       </PropertyDef>
       <PropertyDef name="sl">
         <Property name="label">鏁伴噺</Property>
-        <Property name="dataType">double</Property>
+        <Property name="dataType">Double</Property>
+      </PropertyDef>
+      <PropertyDef name="dwdm">
+        <Property name="label">鍗曚綅浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="lqxzqhdm">
+        <Property name="label">绮潈琛屾斂鍖哄垝浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="rotationType">
+        <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="czbz">
         <Property></Property>
@@ -377,6 +402,21 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
+            <Property name="name">dwdm</Property>
+            <Property name="property">dwdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">lqxzqhdm</Property>
+            <Property name="property">lqxzqhdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">rotationType</Property>
+            <Property name="property">rotationType</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
             <Property name="name">czbz</Property>
             <Property name="property">czbz</Property>
             <Editor/>
diff --git a/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java b/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java
index 10656c8..12a6045 100644
--- a/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java
+++ b/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java
@@ -167,7 +167,7 @@
     /**
      * 鎺ュ彛缂栫爜-1040 鍌ㄥ璁″垝淇℃伅鎺ュ彛
      */
-    public static String API_CODE_CBJHXX = "cbjhxx";
+    public static String API_CODE_CBJH = "cbjh";
     /**
      * 鎺ュ彛缂栫爜-1041 璐㈠姟鎶ヨ〃淇℃伅鎺ュ彛
      */
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 77d1b80..1411e34 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -703,7 +703,7 @@
             case "1401":
                 return ApiCodeConstant.API_CODE_CBGM;
             case "1402":
-                return ApiCodeConstant.API_CODE_CBJHXX;
+                return ApiCodeConstant.API_CODE_CBJH;
             case "1403":
                 return ApiCodeConstant.API_CODE_LHJH;
             case "1404":

--
Gitblit v1.9.3