From 8fde5ca0ccbe3418160d0515f2822a633415ee16 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 04 八月 2023 09:52:59 +0800
Subject: [PATCH] 武汉军粮省平台-重新调整接口列表

---
 src/main/java/com/fzzy/whjl/dto/WhjlApi1109.java       |    2 
 src/main/java/com/fzzy/whjl/dto/WhjlApi1110.java       |    2 
 src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java       |    2 
 src/main/java/com/fzzy/whjl/dto/WhjlApi1210.java       |   28 +-
 src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java       |    2 
 src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java |   43 +-
 src/main/java/com/fzzy/whjl/dto/WhjlApi1114.java       |   38 ++
 src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java       |   58 ++++
 src/main/java/com/fzzy/whjl/dto/WhjlApi1113.java       |   49 +++
 src/main/resources/templates/home/home-whjl.html       |  138 ++++-----
 src/main/java/com/fzzy/whjl/dto/WhjlApi1303.java       |    2 
 src/main/java/com/fzzy/whjl/dto/WhjlApi1108.java       |   37 ++
 src/main/java/com/fzzy/whjl/dto/WhjlApi1112.java       |   47 +++
 src/main/java/com/fzzy/whjl/dto/WhjlApi1208.java       |   60 ++-
 src/main/java/com/fzzy/whjl/dto/WhjlApi1302.java       |    2 
 /dev/null                                              |   38 --
 src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java       |    2 
 src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java       |    2 
 src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java       |   38 +-
 src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java       |   53 +--
 src/main/java/com/fzzy/whjl/dto/WhjlApi1209.java       |   60 ++-
 src/main/java/com/fzzy/whjl/WhjlConstant.java          |   32 --
 src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java       |    2 
 23 files changed, 449 insertions(+), 288 deletions(-)

diff --git a/src/main/java/com/fzzy/whjl/WhjlConstant.java b/src/main/java/com/fzzy/whjl/WhjlConstant.java
index 8f53921..d31f5ee 100644
--- a/src/main/java/com/fzzy/whjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/whjl/WhjlConstant.java
@@ -19,45 +19,21 @@
     public static String YMDHMS = "yyyy-MM-dd HH:mm:ss";
 
     /**
-     * 鎺ュ彛鍒嗙被-鍐涚伯浼佷笟
+     * 鎺ュ彛鍒嗙被-鍩虹淇℃伅(鍐涚伯浼佷笟銆佷粨鍌ㄨ鏂借澶�)
      */
     public static String API_CATEGORY_11 = "11";
     /**
-     * 鎺ュ彛鍒嗙被-浠撳偍璁炬柦璁惧
+     * 鎺ュ彛鍒嗙被-绮璐攢(浜у搧淇℃伅銆佺粡钀ョ鐞嗐�佸嚭鍏ュ簱涓氬姟)
      */
     public static String API_CATEGORY_12 = "12";
     /**
-     * 鎺ュ彛鍒嗙被-浜у搧淇℃伅
+     * 鎺ュ彛鍒嗙被-绮绠$悊(璐ㄩ噺绠$悊銆佸偍杩愮幆澧�)
      */
     public static String API_CATEGORY_13 = "13";
     /**
-     * 鎺ュ彛鍒嗙被-缁忚惀绠$悊
+     * 鎺ュ彛鍒嗙被-琛屾斂绠$悊(鍔ㄥ憳浼佷笟銆佺敓浜у姞宸ャ�佸簲鎬ユ寚鎸�)
      */
     public static String API_CATEGORY_14 = "14";
-    /**
-     * 鎺ュ彛鍒嗙被-鍑哄叆搴撲笟鍔�
-     */
-    public static String API_CATEGORY_15 = "15";
-    /**
-     * 鎺ュ彛鍒嗙被-璐ㄩ噺绠$悊
-     */
-    public static String API_CATEGORY_16 = "16";
-    /**
-     * 鎺ュ彛鍒嗙被-鍔ㄥ憳浼佷笟
-     */
-    public static String API_CATEGORY_17 = "17";
-    /**
-     * 鎺ュ彛鍒嗙被-鐢熶骇鍔犲伐
-     */
-    public static String API_CATEGORY_18 = "18";
-    /**
-     * 鎺ュ彛鍒嗙被-鍌ㄨ繍鐜
-     */
-    public static String API_CATEGORY_19 = "19";
-    /**
-     * 鎺ュ彛鍒嗙被-搴旀�ユ寚鎸�
-     */
-    public static String API_CATEGORY_20 = "20";
 
     /**
      * 鎺ュ彛缂栫爜-1101 鍗曚綅淇℃伅鏁版嵁鎺ュ彛
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1201.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1201.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java
index 994d0a0..4fe9712 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1201.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1201 implements Serializable {
+public class WhjlApi1105 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1202.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java
similarity index 95%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1202.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java
index 67799f4..21ed150 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1202.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1202 implements Serializable {
+public class WhjlApi1106 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1203.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java
similarity index 94%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1203.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java
index 5de0b3c..ffbb8e5 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1203.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1203 implements Serializable {
+public class WhjlApi1107 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1108.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1108.java
new file mode 100644
index 0000000..f050d77
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1108.java
@@ -0,0 +1,37 @@
+package com.fzzy.whjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁炬柦鐢靛瓙妗f
+ *
+ * @author czt
+ * @date 2023/8/2  17:25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1108 implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private String dadm;  //妗f浠g爜
+    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
+    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
+    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
+    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
+    private String cfbh;  //浠撴埧缂栧彿
+    private String sscfmc;  //浠撴埧鍚嶇О
+    private String dalx;  //妗f绫诲瀷
+    private String damc;  //妗f鍚嶇О
+    private String dawj;  //妗f鏂囦欢
+    private String sfyx;  //鏄惁鏈夋晥
+    private String bz;  //澶囨敞
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1205.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1109.java
similarity index 95%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1205.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1109.java
index 174cc12..548c793 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1205.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1109.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1205 implements Serializable {
+public class WhjlApi1109 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1206.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1110.java
similarity index 94%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1206.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1110.java
index 31f753b..71a0cb4 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1206.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1110.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1206 implements Serializable {
+public class WhjlApi1110 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java
new file mode 100644
index 0000000..98f993e
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java
@@ -0,0 +1,58 @@
+package com.fzzy.whjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁惧淇℃伅
+ *
+ * @author czt
+ * @date 2023/8/2  17:55
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1111 implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private String sbbh;  //璁惧缂栧彿
+    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
+    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
+    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
+    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
+    private String cfbh;  //浠撴埧缂栧彿
+    private String sscfmc;  //浠撴埧鍚嶇О
+    private String sblxbh;  //璁惧绫诲瀷缂栧彿
+    private String sbmc;  //璁惧鍚嶇О
+    private String sbzt;  //璁惧鐘舵��
+    private String ggxh;  //瑙勬牸鍨嬪彿
+    private String zzdw;  //鍒堕�犲崟浣�
+    private String cgsj;  //閲囪喘鏃堕棿
+    private String gl;  //鍔熺巼
+    private String cl;  //浜ч噺
+    private String wxcc;  //澶栧舰灏哄
+    private String zygn;  //涓昏鍔熻兘
+    private String bgfzrmc;  //淇濈璐熻矗浜�
+    private String whgzrmc;  //缁存姢璐熻矗浜�
+    private String czfzrmc;  //鎿嶄綔璐熻矗浜�
+    private String zynhyq;  //涓昏淇濈瑕佹眰
+    private String xgrq;  //淇敼鏃ユ湡
+    private String tbrmc;  //濉〃浜哄悕绉�
+    private String Sfytkk;  //鏄惁浜戝彴鍙帶
+    private String ipdz;  //IP鍦板潃
+    private Integer Gldk;  //绠$悊绔彛
+    private String sdkdk;  //Sdk绔彛
+    private String zh;  //甯愬彿
+    private String mm;  //瀵嗙爜
+    private Integer rstpdz;  //Rtsp鍦板潃
+    private String rtspdk;  //rtsp绔彛
+    private String sbxlh;  //璁惧搴忓垪鍙�
+    private String Jklx;  //鐩戞帶绫诲瀷
+    private String sfyx;  //鏄惁鏈夋晥
+    private String bz;  //澶囨敞
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1112.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1112.java
new file mode 100644
index 0000000..f5410c2
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1112.java
@@ -0,0 +1,47 @@
+package com.fzzy.whjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁存姢璁板綍
+ *
+ * @author czt
+ * @date 2023/8/2  18:20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1112 implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private String sbwhjlbh;  //璁惧缁存姢璁板綍缂栧彿
+    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
+    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
+    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
+    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
+    private String sbbh;  //璁惧缂栧彿
+    private String sbmc;  //璁惧鍚嶇О
+    private String wbrq;  //缁翠繚鏃ユ湡
+    private String wbdw;  //缁翠繚鍗曚綅
+    private String wbr;  //缁翠繚浜�
+    private String lxdh;  //鑱旂郴鐢佃瘽
+    private String whlr;  //缁存姢鍐呭
+    private String whjl;  //缁存姢璁板綍
+    private String fxwt;  //鍙戠幇闂
+    private String jjcs;  //瑙e喅鎺柦
+    private String xcwbrq;  //涓嬫缁翠繚鏃ユ湡
+    private String ysr;  //楠屾敹浜�
+    private String whjy;  //缁存姢寤鸿
+    private String whjlzp;  //缁存姢璁板綍鐓х墖
+    private String bz;  //澶囨敞
+    private String zpid;  //鐓х墖id
+    private String zpmc;  //鐓х墖鍚嶇О
+    private String zplj;  //鐓х墖璺緞
+    private String zpdx;  //鐓х墖澶у皬
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1113.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1113.java
new file mode 100644
index 0000000..db77b5b
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1113.java
@@ -0,0 +1,49 @@
+package com.fzzy.whjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁翠慨璁板綍
+ *
+ * @author czt
+ * @date 2023/8/2  18:40
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1113 implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private String sbwxjlbh;  //璁惧缁翠慨璁板綍缂栧彿
+    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
+    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
+    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
+    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
+    private String sbbh;  //璁惧缂栧彿
+    private String sbmc;  //璁惧鍚嶇О
+    private String wxkssj;  //寮�濮嬬淮淇椂闂�
+    private String wxjssj;  //缁撴潫缁翠慨鏃堕棿
+    private String wxdw;  //缁翠慨鍗曚綅
+    private String lxr;  //鑱旂郴浜�
+    private String lxdh;  //鑱旂郴鐢佃瘽
+    private String gzxx;  //鏁呴殰鐜拌薄
+    private String gzyy;  //鏁呴殰鍘熷洜
+    private String wxff;  //缁翠慨鏂规硶
+    private String gxpjxx;  //鏇存柊閰嶄欢淇℃伅
+    private String wxhyxzt;  //缁翠慨鍚庤繍琛岀姸鎬�
+    private String sysj;  //璇曠敤鏃堕棿
+    private String wxfy;  //缁翠慨璐圭敤
+    private String ysr;  //楠屾敹浜�
+    private String jl;  //缁撹
+    private String wxjlzp;  //缁存姢璁板綍鐓х墖
+    private String bz;  //澶囨敞
+    private String zpid;  //鐓х墖id
+    private String zpmc;  //鐓х墖鍚嶇О
+    private String zplj;  //鐓х墖璺緞
+    private String zpdx;  //鐓х墖澶у皬
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1114.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1114.java
new file mode 100644
index 0000000..b9daa40
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1114.java
@@ -0,0 +1,38 @@
+package com.fzzy.whjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁惧鎶ュ簾璁板綍
+ *
+ * @author czt
+ * @date 2023/8/2  18:50
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1114 implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private String sbbfjlbh;  //璁惧鎶ュ簾璁板綍缂栧彿
+    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
+    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
+    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
+    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
+    private String sbbh;  //璁惧缂栧彿
+    private String sbmc;  //璁惧鍚嶇О
+    private String bfsqsj;  //鎶ュ簾鐢宠鏃ユ湡
+    private String sqr;  //鐢宠浜�
+    private String ysynx;  //宸蹭娇鐢ㄥ勾闄�
+    private String bfyy;  //鎶ュ簾鍘熷洜
+    private String pzr;  //鎵瑰噯浜�
+    private String pzrq;  //鎵瑰噯鏃ユ湡
+    private String sm;  //璇存槑
+    private String bz;  //澶囨敞
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java
index f939a49..04ece3b 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java
@@ -6,10 +6,10 @@
 import java.io.Serializable;
 
 /**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁炬柦鐢靛瓙妗f
+ * 缁忚惀绠$悊-瀹㈡埛淇℃伅
  *
  * @author czt
- * @date 2023/8/2  17:25
+ * @date 2023/8/2  19::55
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -19,19 +19,27 @@
      */
     private static final long serialVersionUID = 1L;
 
-    private String dadm;  //妗f浠g爜
-    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
-    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
-    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
-    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
-    private String cfbh;  //浠撴埧缂栧彿
-    private String sscfmc;  //浠撴埧鍚嶇О
-    private String dalx;  //妗f绫诲瀷
-    private String damc;  //妗f鍚嶇О
-    private String dawj;  //妗f鏂囦欢
+    private String khbh;  //瀹㈡埛缂栧彿
+    private String khlx;  //瀹㈡埛绫诲瀷
+    private String glzxm;  //瀹㈡埛濮撳悕
+    private String jlqytyshxydm;  //浼佷笟缁熶竴绀句細淇$敤浠g爜
+    private String xzqhbm;  //琛屾斂鍖哄垝缂栫爜
+    private String xzqhmc;  //浼佷笟琛屾斂鍖哄垝鍚嶇О
+    private String fddbr;  //娉曞畾浠h〃浜�
+    private String qyxz;  //浼佷笟鎬ц川
+    private String qydz;  //浼佷笟鍦板潃
+    private String qydh;  //浼佷笟鐢佃瘽
+    private String qycz;  //浼佷笟浼犵湡
+    private String qydzyx;  //浼佷笟鐢靛瓙閭
+    private String qywz;  //浼佷笟缃戝潃
+    private String qyyzbm;  //浼佷笟閭斂缂栫爜
+    private String khyh;  //寮�鎴烽摱琛�
+    private String yhzh;  //閾惰璐﹀彿
+    private String fpxx;  //寮�绁ㄤ俊鎭紙鍙戠エ鎶ご锛�
+    private String shdz;  //鏀惰揣鍦板潃
+    private String lxr;  //鑱旂郴浜�
+    private String lxdh;  //鑱旂郴鐢佃瘽
+    private String lxrsfzhm;  //鑱旂郴浜鸿韩浠借瘉鍙风爜
     private String sfyx;  //鏄惁鏈夋晥
     private String bz;  //澶囨敞
-
-
-
 }
\ 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 5fc17bc..5ca450e 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java
@@ -6,10 +6,10 @@
 import java.io.Serializable;
 
 /**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁惧淇℃伅
+ * 缁忚惀绠$悊-鍚堝悓淇℃伅
  *
  * @author czt
- * @date 2023/8/2  17:55
+ * @date 2023/8/2  20:10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -19,40 +19,23 @@
      */
     private static final long serialVersionUID = 1L;
 
-    private String sbbh;  //璁惧缂栧彿
-    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
-    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
-    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
-    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
-    private String cfbh;  //浠撴埧缂栧彿
-    private String sscfmc;  //浠撴埧鍚嶇О
-    private String sblxbh;  //璁惧绫诲瀷缂栧彿
-    private String sbmc;  //璁惧鍚嶇О
-    private String sbzt;  //璁惧鐘舵��
-    private String ggxh;  //瑙勬牸鍨嬪彿
-    private String zzdw;  //鍒堕�犲崟浣�
-    private String cgsj;  //閲囪喘鏃堕棿
-    private String gl;  //鍔熺巼
-    private String cl;  //浜ч噺
-    private String wxcc;  //澶栧舰灏哄
-    private String zygn;  //涓昏鍔熻兘
-    private String bgfzrmc;  //淇濈璐熻矗浜�
-    private String whgzrmc;  //缁存姢璐熻矗浜�
-    private String czfzrmc;  //鎿嶄綔璐熻矗浜�
-    private String zynhyq;  //涓昏淇濈瑕佹眰
-    private String xgrq;  //淇敼鏃ユ湡
-    private String tbrmc;  //濉〃浜哄悕绉�
-    private String Sfytkk;  //鏄惁浜戝彴鍙帶
-    private String ipdz;  //IP鍦板潃
-    private Integer Gldk;  //绠$悊绔彛
-    private String sdkdk;  //Sdk绔彛
-    private String zh;  //甯愬彿
-    private String mm;  //瀵嗙爜
-    private Integer rstpdz;  //Rtsp鍦板潃
-    private String rtspdk;  //rtsp绔彛
-    private String sbxlh;  //璁惧搴忓垪鍙�
-    private String Jklx;  //鐩戞帶绫诲瀷
+    private String htbz;  //鍚堝悓澶囨敞
+    private String htspqd;  //鍟嗗搧娓呭崟
+    private String xh;  //搴忓彿
     private String sfyx;  //鏄惁鏈夋晥
     private String bz;  //澶囨敞
+    private String htspid;  //鍚堝悓鍟嗗搧ID
+    private String htid;  //鍚堝悓ID
+    private String ddid;  //璁㈠崟ID
+    private String lspzbm;  //鍝佺缂栧彿
+    private String lspzmc;  //鍝佺鍚嶇О
+    private String cpbh;  //浜у搧缂栧彿
+    private String cpmc;  //浜у搧鍚嶇О
+    private String spsl;  //鍟嗗搧鏁伴噺
+    private String spdj;  //鍟嗗搧鍗曚环
+    private String je;  //閲戦
+    private String ywcsl;  //宸插畬鎴愭暟閲�
+    private String ywcje;  //宸插畬鎴愰噾棰�
+//    private String bz;  //澶囨敞
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1208.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1208.java
index 702c129..1e9dac3 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1208.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1208.java
@@ -6,10 +6,10 @@
 import java.io.Serializable;
 
 /**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁存姢璁板綍
+ * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处
  *
  * @author czt
- * @date 2023/8/2  18:20
+ * @date 2023/8/2  20:15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -19,29 +19,45 @@
      */
     private static final long serialVersionUID = 1L;
 
-    private String sbwhjlbh;  //璁惧缁存姢璁板綍缂栧彿
+    private String kctzbh;  //搴撳瓨鍙板笎ID
     private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
-    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
+    private String ssqymc;  //鍐涚伯浼佷笟鍚嶇О
     private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
     private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
-    private String sbbh;  //璁惧缂栧彿
-    private String sbmc;  //璁惧鍚嶇О
-    private String wbrq;  //缁翠繚鏃ユ湡
-    private String wbdw;  //缁翠繚鍗曚綅
-    private String wbr;  //缁翠繚浜�
-    private String lxdh;  //鑱旂郴鐢佃瘽
-    private String whlr;  //缁存姢鍐呭
-    private String whjl;  //缁存姢璁板綍
-    private String fxwt;  //鍙戠幇闂
-    private String jjcs;  //瑙e喅鎺柦
-    private String xcwbrq;  //涓嬫缁翠繚鏃ユ湡
-    private String ysr;  //楠屾敹浜�
-    private String whjy;  //缁存姢寤鸿
-    private String whjlzp;  //缁存姢璁板綍鐓х墖
+    private String cfbh;  //浠撴埧缂栧彿
+    private String cfmc;  //浠撴埧鍚嶇О
+    private String ajbh;  //寤掗棿缂栧彿
+    private String ajmc;  //寤掗棿鍚嶇О
+    private String hwbh;  //璐т綅缂栧彿
+    private String hwmc;  //璐т綅鍚嶇О
+    private String lspzbm;  //鍝佺缂栧彿
+    private String lspzmc;  //鍝佺鍚嶇О
+    private String cpbm;  //浜у搧缂栧彿
+    private String cpmc;  //浜у搧鍚嶇О
+    private String lqdw;  //绮潈鍗曚綅
+    private String bgms;  //淇濈妯″紡
+    private String sjsl;  //瀹為檯鏁伴噺
+    private String jldwbm;  //璁¢噺鍗曚綅缂栫爜
+    private String jldwmc;  //璁¢噺鍗曚綅鍚嶇О
+    private String jsdwbm;  //璁℃暟鍗曚綅缂栫爜
+    private String jsdwmc;  //璁℃暟鍗曚綅鍚嶇О
+    private String clfs;  //鍌ㄧ伯鏂瑰紡
+    private String kcsbm;  //搴撳瓨璇嗗埆鐮�
+    private String jkrq;  //寤哄崱鏃ユ湡
+    private String sfgd;  //鏄惁褰掓。
+    private String gdsj;  //褰掓。鏃堕棿
+    private String kczt;  //搴撳瓨鐘舵��
+    private String rksl;  //鍏ュ簱鏁伴噺
+    private String cksl;  //鍑哄簱鏁伴噺
+    private String kcsl;  //搴撳瓨鏁伴噺
+    private String rkzl;  //鍏ュ簱閲嶉噺
+    private String ckzl;  //鍑哄簱閲嶉噺
+    private String kczl;  //搴撳瓨閲嶉噺
+    private String ztsl;  //鍦ㄩ�旀暟閲�
+    private String ztzl;  //鍦ㄩ�旈噸閲�
+    private String zssl;  //鍦ㄥ敭鏁伴噺
+    private String zszl;  //鍦ㄥ敭鏁伴噺
+    private String sxh;  //椤哄簭鍙�
     private String bz;  //澶囨敞
-    private String zpid;  //鐓х墖id
-    private String zpmc;  //鐓х墖鍚嶇О
-    private String zplj;  //鐓х墖璺緞
-    private String zpdx;  //鐓х墖澶у皬
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1209.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1209.java
index 24ee329..0651e98 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1209.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1209.java
@@ -6,10 +6,10 @@
 import java.io.Serializable;
 
 /**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁翠慨璁板綍
+ * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处浜у搧鎵规
  *
  * @author czt
- * @date 2023/8/2  18:40
+ * @date 2023/8/2  20:25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -19,31 +19,41 @@
      */
     private static final long serialVersionUID = 1L;
 
-    private String sbwxjlbh;  //璁惧缁翠慨璁板綍缂栧彿
+    private String kctzcppcid;  //搴撳瓨鍙颁骇鍝佹壒娆D
+    private String kctzbh;  //搴撳瓨鍙板笎ID
     private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
-    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
+    private String ssqymc;  //鍐涚伯浼佷笟鍚嶇О
     private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
     private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
-    private String sbbh;  //璁惧缂栧彿
-    private String sbmc;  //璁惧鍚嶇О
-    private String wxkssj;  //寮�濮嬬淮淇椂闂�
-    private String wxjssj;  //缁撴潫缁翠慨鏃堕棿
-    private String wxdw;  //缁翠慨鍗曚綅
-    private String lxr;  //鑱旂郴浜�
-    private String lxdh;  //鑱旂郴鐢佃瘽
-    private String gzxx;  //鏁呴殰鐜拌薄
-    private String gzyy;  //鏁呴殰鍘熷洜
-    private String wxff;  //缁翠慨鏂规硶
-    private String gxpjxx;  //鏇存柊閰嶄欢淇℃伅
-    private String wxhyxzt;  //缁翠慨鍚庤繍琛岀姸鎬�
-    private String sysj;  //璇曠敤鏃堕棿
-    private String wxfy;  //缁翠慨璐圭敤
-    private String ysr;  //楠屾敹浜�
-    private String jl;  //缁撹
-    private String wxjlzp;  //缁存姢璁板綍鐓х墖
+    private String cpbm;  //浜у搧缂栧彿
+    private String cpmc;  //浜у搧鍚嶇О
+    private String cpnd;  //浜у搧骞村害
+    private String cpcd;  //浜у搧浜у湴
+    private String yssj;  //楠屾敹鏃堕棿
+    private String cppc;  //浜у搧鎵规
+    private String scrq;  //鐢熶骇鏃ユ湡
+    private String bzq;  //淇濊川鏈�
+    private String bzjzrq;  //淇濊川鎴鏃ユ湡
+    private String rksl;  //鍏ュ簱鏁伴噺
+    private String cksl;  //鍑哄簱鏁伴噺
+    private String kcsl;  //搴撳瓨鏁伴噺
+    private String rkzl;  //鍏ュ簱閲嶉噺
+    private String ckzl;  //鍑哄簱閲嶉噺
+    private String kczl;  //搴撳瓨閲嶉噺
+    private String dj;  //鍗曚环
+    private String je;  //閲戦
+    private String jldwbm;  //璁¢噺鍗曚綅缂栫爜
+    private String jldwmc;  //璁¢噺鍗曚綅鍚嶇О
+    private String jsdwbm;  //璁℃暟鍗曚綅缂栫爜
+    private String jsdwmc;  //璁℃暟鍗曚綅鍚嶇О
+    private String rkkssj;  //鍏ュ簱寮�濮嬫椂闂�
+    private String rkjssj;  //鍏ュ簱缁撴潫鏃堕棿
+    private String ckkssj;  //鍑哄簱寮�濮嬫椂闂�
+    private String ckjssj;  //鍑哄簱缁撴潫鏃堕棿
+    private String sjsl;  //瀹為檯鏁伴噺
+    private String zlzt;  //璐ㄩ噺鐘舵��
+    private String kczt;  //搴撳瓨鐘舵��
+    private String sxh;  //椤哄簭鍙�
     private String bz;  //澶囨敞
-    private String zpid;  //鐓х墖id
-    private String zpmc;  //鐓х墖鍚嶇О
-    private String zplj;  //鐓х墖璺緞
-    private String zpdx;  //鐓х墖澶у皬
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1210.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1210.java
index 4890e14..13763be 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1210.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1210.java
@@ -6,10 +6,10 @@
 import java.io.Serializable;
 
 /**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁惧鎶ュ簾璁板綍
+ * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处鍑哄叆搴撹褰�
  *
  * @author czt
- * @date 2023/8/2  18:50
+ * @date 2023/8/2  20:35
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -19,20 +19,20 @@
      */
     private static final long serialVersionUID = 1L;
 
-    private String sbbfjlbh;  //璁惧鎶ュ簾璁板綍缂栧彿
+    private String kctzcpcrjlid;  //搴撳瓨鍙拌处鍑哄叆璁板綍ID
+    private String kctzcppcid;  //搴撳瓨鍙拌处浜у搧鎵规ID
     private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
-    private String jlqymc;  //鍐涚伯浼佷笟鍚嶇О
+    private String ssqymc;  //鍐涚伯浼佷笟鍚嶇О
     private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
     private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
-    private String sbbh;  //璁惧缂栧彿
-    private String sbmc;  //璁惧鍚嶇О
-    private String bfsqsj;  //鎶ュ簾鐢宠鏃ユ湡
-    private String sqr;  //鐢宠浜�
-    private String ysynx;  //宸蹭娇鐢ㄥ勾闄�
-    private String bfyy;  //鎶ュ簾鍘熷洜
-    private String pzr;  //鎵瑰噯浜�
-    private String pzrq;  //鎵瑰噯鏃ユ湡
-    private String sm;  //璇存槑
-    private String bz;  //澶囨敞
+    private String crlx;  //鍑哄叆绫诲瀷
+    private String jllx;  //璁板綍绫诲瀷
+    private String jlsj;  //璁板綍鏃堕棿
+    private String crqsl;  //鍑哄叆搴撳墠鏁伴噺
+    private String crqzl;  //鍑哄叆搴撳墠閲嶉噺
+    private String crsl;  //鍑哄叆鏁伴噺
+    private String crzl;  //鍑哄叆閲嶉噺
+    private String crhsl;  //鍑哄叆搴撳悗鏁伴噺
+    private String crhzl;  //鍑哄叆搴撳悗閲嶉噺
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1506.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java
similarity index 98%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1506.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java
index 5005158..fffd956 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1506.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1506 implements Serializable {
+public class WhjlApi1214 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1602.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1302.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1602.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1302.java
index 3559ff7..9d3a906 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1602.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1302.java
@@ -14,7 +14,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1602 implements Serializable {
+public class WhjlApi1302 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1901.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1303.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1901.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1303.java
index 70295cf..f138074 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1901.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1303.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1901 implements Serializable {
+public class WhjlApi1303 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1902.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java
similarity index 94%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1902.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java
index 284eaf6..42b4cc7 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1902.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1902 implements Serializable {
+public class WhjlApi1304 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1401.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1401.java
deleted file mode 100644
index f7a6017..0000000
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1401.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.fzzy.whjl.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * 缁忚惀绠$悊-瀹㈡埛淇℃伅
- *
- * @author czt
- * @date 2023/8/2  19::55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class WhjlApi1401 implements Serializable {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    private String khbh;  //瀹㈡埛缂栧彿
-    private String khlx;  //瀹㈡埛绫诲瀷
-    private String glzxm;  //瀹㈡埛濮撳悕
-    private String jlqytyshxydm;  //浼佷笟缁熶竴绀句細淇$敤浠g爜
-    private String xzqhbm;  //琛屾斂鍖哄垝缂栫爜
-    private String xzqhmc;  //浼佷笟琛屾斂鍖哄垝鍚嶇О
-    private String fddbr;  //娉曞畾浠h〃浜�
-    private String qyxz;  //浼佷笟鎬ц川
-    private String qydz;  //浼佷笟鍦板潃
-    private String qydh;  //浼佷笟鐢佃瘽
-    private String qycz;  //浼佷笟浼犵湡
-    private String qydzyx;  //浼佷笟鐢靛瓙閭
-    private String qywz;  //浼佷笟缃戝潃
-    private String qyyzbm;  //浼佷笟閭斂缂栫爜
-    private String khyh;  //寮�鎴烽摱琛�
-    private String yhzh;  //閾惰璐﹀彿
-    private String fpxx;  //寮�绁ㄤ俊鎭紙鍙戠エ鎶ご锛�
-    private String shdz;  //鏀惰揣鍦板潃
-    private String lxr;  //鑱旂郴浜�
-    private String lxdh;  //鑱旂郴鐢佃瘽
-    private String lxrsfzhm;  //鑱旂郴浜鸿韩浠借瘉鍙风爜
-    private String sfyx;  //鏄惁鏈夋晥
-    private String bz;  //澶囨敞
-}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1404.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1404.java
deleted file mode 100644
index ffd33aa..0000000
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1404.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.fzzy.whjl.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * 缁忚惀绠$悊-鍚堝悓淇℃伅
- *
- * @author czt
- * @date 2023/8/2  20:10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class WhjlApi1404 implements Serializable {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    private String htbz;  //鍚堝悓澶囨敞
-    private String htspqd;  //鍟嗗搧娓呭崟
-    private String xh;  //搴忓彿
-    private String sfyx;  //鏄惁鏈夋晥
-    private String bz;  //澶囨敞
-    private String htspid;  //鍚堝悓鍟嗗搧ID
-    private String htid;  //鍚堝悓ID
-    private String ddid;  //璁㈠崟ID
-    private String lspzbm;  //鍝佺缂栧彿
-    private String lspzmc;  //鍝佺鍚嶇О
-    private String cpbh;  //浜у搧缂栧彿
-    private String cpmc;  //浜у搧鍚嶇О
-    private String spsl;  //鍟嗗搧鏁伴噺
-    private String spdj;  //鍟嗗搧鍗曚环
-    private String je;  //閲戦
-    private String ywcsl;  //宸插畬鎴愭暟閲�
-    private String ywcje;  //宸插畬鎴愰噾棰�
-//    private String bz;  //澶囨敞
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1501.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1501.java
deleted file mode 100644
index e1703b2..0000000
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1501.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.fzzy.whjl.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处
- *
- * @author czt
- * @date 2023/8/2  20:15
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class WhjlApi1501 implements Serializable {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    private String kctzbh;  //搴撳瓨鍙板笎ID
-    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
-    private String ssqymc;  //鍐涚伯浼佷笟鍚嶇О
-    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
-    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
-    private String cfbh;  //浠撴埧缂栧彿
-    private String cfmc;  //浠撴埧鍚嶇О
-    private String ajbh;  //寤掗棿缂栧彿
-    private String ajmc;  //寤掗棿鍚嶇О
-    private String hwbh;  //璐т綅缂栧彿
-    private String hwmc;  //璐т綅鍚嶇О
-    private String lspzbm;  //鍝佺缂栧彿
-    private String lspzmc;  //鍝佺鍚嶇О
-    private String cpbm;  //浜у搧缂栧彿
-    private String cpmc;  //浜у搧鍚嶇О
-    private String lqdw;  //绮潈鍗曚綅
-    private String bgms;  //淇濈妯″紡
-    private String sjsl;  //瀹為檯鏁伴噺
-    private String jldwbm;  //璁¢噺鍗曚綅缂栫爜
-    private String jldwmc;  //璁¢噺鍗曚綅鍚嶇О
-    private String jsdwbm;  //璁℃暟鍗曚綅缂栫爜
-    private String jsdwmc;  //璁℃暟鍗曚綅鍚嶇О
-    private String clfs;  //鍌ㄧ伯鏂瑰紡
-    private String kcsbm;  //搴撳瓨璇嗗埆鐮�
-    private String jkrq;  //寤哄崱鏃ユ湡
-    private String sfgd;  //鏄惁褰掓。
-    private String gdsj;  //褰掓。鏃堕棿
-    private String kczt;  //搴撳瓨鐘舵��
-    private String rksl;  //鍏ュ簱鏁伴噺
-    private String cksl;  //鍑哄簱鏁伴噺
-    private String kcsl;  //搴撳瓨鏁伴噺
-    private String rkzl;  //鍏ュ簱閲嶉噺
-    private String ckzl;  //鍑哄簱閲嶉噺
-    private String kczl;  //搴撳瓨閲嶉噺
-    private String ztsl;  //鍦ㄩ�旀暟閲�
-    private String ztzl;  //鍦ㄩ�旈噸閲�
-    private String zssl;  //鍦ㄥ敭鏁伴噺
-    private String zszl;  //鍦ㄥ敭鏁伴噺
-    private String sxh;  //椤哄簭鍙�
-    private String bz;  //澶囨敞
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1502.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1502.java
deleted file mode 100644
index 16bb759..0000000
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1502.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fzzy.whjl.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处浜у搧鎵规
- *
- * @author czt
- * @date 2023/8/2  20:25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class WhjlApi1502 implements Serializable {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    private String kctzcppcid;  //搴撳瓨鍙颁骇鍝佹壒娆D
-    private String kctzbh;  //搴撳瓨鍙板笎ID
-    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
-    private String ssqymc;  //鍐涚伯浼佷笟鍚嶇О
-    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
-    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
-    private String cpbm;  //浜у搧缂栧彿
-    private String cpmc;  //浜у搧鍚嶇О
-    private String cpnd;  //浜у搧骞村害
-    private String cpcd;  //浜у搧浜у湴
-    private String yssj;  //楠屾敹鏃堕棿
-    private String cppc;  //浜у搧鎵规
-    private String scrq;  //鐢熶骇鏃ユ湡
-    private String bzq;  //淇濊川鏈�
-    private String bzjzrq;  //淇濊川鎴鏃ユ湡
-    private String rksl;  //鍏ュ簱鏁伴噺
-    private String cksl;  //鍑哄簱鏁伴噺
-    private String kcsl;  //搴撳瓨鏁伴噺
-    private String rkzl;  //鍏ュ簱閲嶉噺
-    private String ckzl;  //鍑哄簱閲嶉噺
-    private String kczl;  //搴撳瓨閲嶉噺
-    private String dj;  //鍗曚环
-    private String je;  //閲戦
-    private String jldwbm;  //璁¢噺鍗曚綅缂栫爜
-    private String jldwmc;  //璁¢噺鍗曚綅鍚嶇О
-    private String jsdwbm;  //璁℃暟鍗曚綅缂栫爜
-    private String jsdwmc;  //璁℃暟鍗曚綅鍚嶇О
-    private String rkkssj;  //鍏ュ簱寮�濮嬫椂闂�
-    private String rkjssj;  //鍏ュ簱缁撴潫鏃堕棿
-    private String ckkssj;  //鍑哄簱寮�濮嬫椂闂�
-    private String ckjssj;  //鍑哄簱缁撴潫鏃堕棿
-    private String sjsl;  //瀹為檯鏁伴噺
-    private String zlzt;  //璐ㄩ噺鐘舵��
-    private String kczt;  //搴撳瓨鐘舵��
-    private String sxh;  //椤哄簭鍙�
-    private String bz;  //澶囨敞
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1503.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1503.java
deleted file mode 100644
index 5810d52..0000000
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1503.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.fzzy.whjl.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处鍑哄叆搴撹褰�
- *
- * @author czt
- * @date 2023/8/2  20:35
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class WhjlApi1503 implements Serializable {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    private String kctzcpcrjlid;  //搴撳瓨鍙拌处鍑哄叆璁板綍ID
-    private String kctzcppcid;  //搴撳瓨鍙拌处浜у搧鎵规ID
-    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
-    private String ssqymc;  //鍐涚伯浼佷笟鍚嶇О
-    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
-    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
-    private String crlx;  //鍑哄叆绫诲瀷
-    private String jllx;  //璁板綍绫诲瀷
-    private String jlsj;  //璁板綍鏃堕棿
-    private String crqsl;  //鍑哄叆搴撳墠鏁伴噺
-    private String crqzl;  //鍑哄叆搴撳墠閲嶉噺
-    private String crsl;  //鍑哄叆鏁伴噺
-    private String crzl;  //鍑哄叆閲嶉噺
-    private String crhsl;  //鍑哄叆搴撳悗鏁伴噺
-    private String crhzl;  //鍑哄叆搴撳悗閲嶉噺
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java b/src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java
index d07185d..83b8f66 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java
+++ b/src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java
@@ -62,30 +62,23 @@
 
 		return null;
 	}
-	
-	
-    /**
-     * 
-     * 鎺ュ彛鍒嗙被涓嬫潵妗�
-     * 
-     * ${dorado.getDataProvider("apiListWhjlPR#triggerCategory").getResult()}
-     *
-     * @return
-     */
-    @DataProvider
-    public List<ApiTrigger> triggerCategory() {
-    	List<ApiTrigger> list = new ArrayList<ApiTrigger>();
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_11,"鍐涚伯浼佷笟"));
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_12,"浠撳偍璁炬柦璁惧"));
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_13,"浜у搧淇℃伅"));
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_14,"缁忚惀绠$悊"));
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_15,"鍑哄叆搴撲笟鍔�"));
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_16,"璐ㄩ噺绠$悊"));
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_17,"鍔ㄥ憳浼佷笟"));
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_18,"鐢熶骇鍔犲伐"));
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_19,"鍌ㄨ繍鐜"));
-    	list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_20,"搴旀�ユ寚鎸�"));
-    	return list;
-    }
 
+
+	/**
+	 *
+	 * 鎺ュ彛鍒嗙被涓嬫潵妗�
+	 *
+	 * ${dorado.getDataProvider("apiListWhjlPR#triggerCategory").getResult()}
+	 *
+	 * @return
+	 */
+	@DataProvider
+	public List<ApiTrigger> triggerCategory() {
+		List<ApiTrigger> list = new ArrayList<ApiTrigger>();
+		list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_11,"鍩虹淇℃伅(鍐涚伯浼佷笟銆佷粨鍌ㄨ鏂借澶�)"));
+		list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_12,"绮璐攢(浜у搧淇℃伅銆佺粡钀ョ鐞嗐�佸嚭鍏ュ簱涓氬姟)"));
+		list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_13,"绮绠$悊(璐ㄩ噺绠$悊銆佸偍杩愮幆澧�)"));
+		list.add(new ApiTrigger(WhjlConstant.API_CATEGORY_14,"琛屾斂绠$悊(鍔ㄥ憳浼佷笟銆佺敓浜у姞宸ャ�佸簲鎬ユ寚鎸�)"));
+		return list;
+	}
 }
diff --git a/src/main/resources/templates/home/home-whjl.html b/src/main/resources/templates/home/home-whjl.html
index 23dc180..cff2720 100644
--- a/src/main/resources/templates/home/home-whjl.html
+++ b/src/main/resources/templates/home/home-whjl.html
@@ -104,7 +104,7 @@
                         <div class="g-icon">
                             <img th:src="@{/static/lib/layuiadmin/style/images/icon2.png}">
                         </div>
-                        <cite>鍐涚伯浼佷笟</cite>
+                        <cite>鍩虹淇℃伅</cite>
                         <span class="layui-nav-more"></span>
                     </a>
                         <dl class="layui-nav-child">
@@ -120,68 +120,86 @@
                             <dd>
                                 <a lay-href="com.fzzy.whjl.view.WhjlApi1104.d">鏀惧績绮补搴�</a>
                             </dd>
-                        </dl>
-                    </li>
-
-                    <li data-name="template" class="layui-nav-item"><a class="one"
-                                                                       href="javascript:;" lay-tips=""
-                                                                       lay-direction="2">
-                        <!--                        <i class="layui-icon layui-icon-template"></i>-->
-                        <div class="g-icon">
-                            <img th:src="@{/static/lib/layuiadmin/style/images/icon1.png}">
-                        </div>
-                        <cite>浠撳偍璁炬柦璁惧</cite>
-                        <span class="layui-nav-more"></span>
-                    </a>
-                        <dl class="layui-nav-child">
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1201.d">浠撴埧淇℃伅</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1105.d">浠撴埧淇℃伅</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1202.d">寤掗棿淇℃伅</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1106.d">寤掗棿淇℃伅</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1203.d">璐т綅淇℃伅</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1107.d">璐т綅淇℃伅</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1204.d">浠撳偍璁炬柦鐢靛瓙妗f</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1108.d">浠撳偍璁炬柦鐢靛瓙妗f</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1205.d">浠撳偍璁炬柦缁存姢璁板綍</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1109.d">浠撳偍璁炬柦缁存姢璁板綍</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1206.d">浠撳偍璁惧鎶ュ簾璁板綍</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1110.d">浠撳偍璁惧鎶ュ簾璁板綍</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1207.d">浠撳偍璁惧淇℃伅</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1111.d">浠撳偍璁惧淇℃伅</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1208.d">浠撳偍璁惧缁存姢璁板綍</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1112.d">浠撳偍璁惧缁存姢璁板綍</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1209.d">浠撳偍璁惧缁翠慨璁板綍</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1113.d">浠撳偍璁惧缁翠慨璁板綍</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1210.d">浠撳偍璁惧鎶ュ簾璁板綍</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1114.d">浠撳偍璁惧鎶ュ簾璁板綍</a>
                             </dd>
                         </dl>
                     </li>
 
                     <li data-name="template" class="layui-nav-item">
                         <a class="one" href="javascript:;" lay-tips="" lay-direction="2">
-                        <!-- <i class="layui-icon layui-icon-template"></i>-->
                         <div class="g-icon">
-                            <img th:src="@{/static/lib/layuiadmin/style/images/icon4.png}">
+                            <img th:src="@{/static/lib/layuiadmin/style/images/icon1.png}">
                         </div>
-                        <cite>缁忚惀绠$悊</cite>
+                        <cite>绮璐攢</cite>
                         <span class="layui-nav-more"></span>
                     </a>
                         <dl class="layui-nav-child">
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1301.d">瀹㈡埛淇℃伅</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi120.d">瀹㈡埛淇℃伅</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1304.d">鍚堝悓淇℃伅</a>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1207.d">鍚堝悓淇℃伅</a>
+                            </dd>
+                            <dd>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1208.d">搴撳瓨鍙拌处</a>
+                            </dd>
+                            <dd>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1209.d">搴撳瓨鍙拌处浜у搧鎵规</a>
+                            </dd>
+                            <dd>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1210.d">搴撳瓨鍙拌处鍑哄叆璁板綍</a>
+                            </dd>
+                            <dd>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1214.d">鍑哄叆搴撹褰�</a>
+                            </dd>
+                        </dl>
+                    </li>
+
+                    <li data-name="template" class="layui-nav-item">
+                        <a class="one" href="javascript:;" lay-tips="" lay-direction="2">
+                        <div class="g-icon">
+                            <img th:src="@{/static/lib/layuiadmin/style/images/icon4.png}">
+                        </div>
+                        <cite>绮绠$悊</cite>
+                        <span class="layui-nav-more"></span>
+                    </a>
+                        <dl class="layui-nav-child">
+                            <dd>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1302.d">璐ㄦ鎶ュ憡</a>
+                            </dd>
+                            <dd>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1303.d">绮儏妫�娴嬭褰�</a>
+                            </dd>
+                            <dd>
+                                <a lay-href="com.fzzy.whjl.view.WhjlApi1304.d">鑳借�楄褰�</a>
                             </dd>
                         </dl>
                     </li>
@@ -193,56 +211,22 @@
                             <div class="g-icon">
                                 <img th:src="@{/static/lib/layuiadmin/style/images/icon5.png}">
                             </div>
-                            <cite>鍑哄叆搴撲笟鍔�</cite>
+                            <cite>琛屾斂绠$悊</cite>
                             <span class="layui-nav-more"></span>
                         </a>
                         <dl class="layui-nav-child">
-                            <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1401.d">搴撳瓨鍙拌处</a>
-                            </dd>
-                            <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1402.d">搴撳瓨鍙拌处浜у搧鎵规</a>
-                            </dd>
-                            <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1403.d">搴撳瓨鍙拌处鍑哄叆璁板綍</a>
-                            </dd>
-                            <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1406.d">鍑哄叆搴撹褰�</a>
-                            </dd>
-                        </dl>
-                    </li>
-
-
-                    <li data-name="template" class="layui-nav-item">
-                        <a class="one" href="javascript:;" lay-tips="" lay-direction="2">
-                            <!-- <i class="layui-icon layui-icon-template"></i>-->
-                            <div class="g-icon">
-                                <img th:src="@{/static/lib/layuiadmin/style/images/icon3.png}">
-                            </div>
-                            <cite>璐ㄩ噺绠$悊</cite>
-                            <span class="layui-nav-more"></span>
-                        </a>
-                        <dl class="layui-nav-child">
-                            <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1502.d">璐ㄦ鎶ュ憡</a>
-                            </dd>
-                        </dl>
-                    </li>
-                    <li data-name="template" class="layui-nav-item">
-                        <a class="one" href="javascript:;" lay-tips="" lay-direction="2">
-                            <div class="g-icon">
-                                <img th:src="@{/static/lib/layuiadmin/style/images/icon3.png}">
-                            </div>
-                            <cite>鍌ㄨ繍鐜</cite>
-                            <span class="layui-nav-more"></span>
-                        </a>
-                        <dl class="layui-nav-child">
-                            <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1801.d">绮儏妫�娴嬭褰�</a>
-                            </dd>
-                            <dd>
-                                <a lay-href="com.fzzy.whjl.view.WhjlApi1802.d">鑳借�楄褰�</a>
-                            </dd>
+<!--                            <dd>-->
+<!--                                <a lay-href="com.fzzy.whjl.view.WhjlApi1401.d">搴撳瓨鍙拌处</a>-->
+<!--                            </dd>-->
+<!--                            <dd>-->
+<!--                                <a lay-href="com.fzzy.whjl.view.WhjlApi1402.d">搴撳瓨鍙拌处浜у搧鎵规</a>-->
+<!--                            </dd>-->
+<!--                            <dd>-->
+<!--                                <a lay-href="com.fzzy.whjl.view.WhjlApi1403.d">搴撳瓨鍙拌处鍑哄叆璁板綍</a>-->
+<!--                            </dd>-->
+<!--                            <dd>-->
+<!--                                <a lay-href="com.fzzy.whjl.view.WhjlApi1406.d">鍑哄叆搴撹褰�</a>-->
+<!--                            </dd>-->
                         </dl>
                     </li>
                 </ul>

--
Gitblit v1.9.3