From 447604c07b8e57ef19ac3ee8b7e22bd20fa44f9c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 03 八月 2023 18:02:12 +0800
Subject: [PATCH] 武汉军粮省平台-提交配置3

---
 src/main/java/com/fzzy/whjl/dto/WhjlApi1902.java                |    2 
 src/main/java/com/fzzy/whjl/dto/WhjlApi1401.java                |   66 +---
 src/main/java/com/fzzy/whjl/dto/WhjlApi1501.java                |   63 ++++
 src/main/java/com/fzzy/whjl/dto/WhjlApi1901.java                |    2 
 src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java          |   91 ++++++
 src/main/java/com/fzzy/whjl/dto/WhjlApi1503.java                |    2 
 src/main/java/com/fzzy/whjl/view/ApiListWhjl.view.xml           |    8 
 velocity.log                                                    |    0 
 src/main/resources/templates/home/home-whjl.html                |   14 
 /dev/null                                                       |   59 ----
 src/main/java/com/fzzy/api/entity/ApiList.java                  |    4 
 src/main/java/com/fzzy/whjl/view/repository/ApiListWhjlRep.java |   18 +
 src/main/java/com/fzzy/whjl/dto/WhjlApi1502.java                |   74 ++---
 src/main/java/com/fzzy/whjl/dto/WhjlApi1506.java                |    2 
 src/main/java/com/fzzy/whjl/dto/WhjlApi1602.java                |   73 +++++
 src/main/resources/application-dev.yml                          |    6 
 src/main/java/com/fzzy/conf/JpaConfigPrimary.java               |    2 
 src/main/java/com/fzzy/whjl/WhjlConstant.java                   |  330 +++++++++++++++++++++++
 src/main/java/com/fzzy/whjl/dto/WhjlApi1404.java                |    2 
 19 files changed, 654 insertions(+), 164 deletions(-)

diff --git a/src/main/java/com/fzzy/api/entity/ApiList.java b/src/main/java/com/fzzy/api/entity/ApiList.java
index e8c7902..4c5c6cc 100644
--- a/src/main/java/com/fzzy/api/entity/ApiList.java
+++ b/src/main/java/com/fzzy/api/entity/ApiList.java
@@ -64,4 +64,8 @@
     @Column(name = "REMARK_", length = 100)
     @PropertyDef(label = "澶囨敞璇存槑")
     private String remark;
+
+    @Column(name = "BIZ_TYPE_", length = 20)
+    @PropertyDef(label = "涓氬姟绫诲瀷", description = "GB-鍥芥爣锛汮L-鍐涚伯")
+    private String bizType = "GB";
 }
diff --git a/src/main/java/com/fzzy/conf/JpaConfigPrimary.java b/src/main/java/com/fzzy/conf/JpaConfigPrimary.java
index cbd0818..7c37cbd 100644
--- a/src/main/java/com/fzzy/conf/JpaConfigPrimary.java
+++ b/src/main/java/com/fzzy/conf/JpaConfigPrimary.java
@@ -20,7 +20,7 @@
 @Configuration
 @EnableTransactionManagement
 @EnableJpaRepositories(
-        basePackages = {"com.fzzy.api.*.repository", "com.fzzy.sys.repository"},
+        basePackages = {"com.fzzy.api.*.repository", "com.fzzy.sys.repository", "com.fzzy.whjl.*.repository"},
         entityManagerFactoryRef = "primaryEntityManagerFactory",
         transactionManagerRef = "primaryTransactionManager"
 )
diff --git a/src/main/java/com/fzzy/whjl/WhjlConstant.java b/src/main/java/com/fzzy/whjl/WhjlConstant.java
new file mode 100644
index 0000000..8f53921
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/WhjlConstant.java
@@ -0,0 +1,330 @@
+package com.fzzy.whjl;
+
+/**
+ * 鍏ㄥ眬闈欐�佺被
+ */
+public class WhjlConstant {
+
+    public static final String API_BIZ_TYPE = "JL";
+    public static final String DEFAULT_CODE = "0";
+    public static final String YN_N = "N";
+    public static final String YN_Y = "Y";
+    public static final String APP_NAME = "API";
+
+    /**
+     * 榛樿椤剁骇鑺傜偣缂栫爜
+     */
+    public static final String DEFAULT_PARENT_CODE = "0";
+
+    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 鍗曚綅淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1101 = "1101";
+    /**
+     * 鎺ュ彛缂栫爜-1102 搴撳尯淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1102 = "1102";
+    /**
+     * 鎺ュ彛缂栫爜-1103 浠撴埧淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1103 = "1103";
+    /**
+     * 鎺ュ彛缂栫爜-1104 寤掗棿淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1104 = "1104";
+    /**
+     * 鎺ュ彛缂栫爜-1105 璐т綅淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1105 = "1105";
+    /**
+     * 鎺ュ彛缂栫爜-1106 娌圭綈淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1106 = "1106";
+    /**
+     * 鎺ュ彛缂栫爜-1107 璁惧淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1107 = "1107";
+    /**
+     * 鎺ュ彛缂栫爜-1108 鑽墏淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1108 = "1108";
+    /**
+     * 鎺ュ彛缂栫爜-1109 鏂囦欢淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1109 = "1109";
+    /**
+     * 鎺ュ彛缂栫爜-1110 搴撳尯鍥句粨鎴跨偣浣嶆爣娉ㄦ暟鎹帴鍙�
+     */
+    public static String API_CODE_1110 = "1110";
+    /**
+     * 鎺ュ彛缂栫爜-1111 搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉ㄦ暟鎹帴鍙�
+     */
+    public static String API_CODE_1111 = "1111";
+    /**
+     * 鎺ュ彛缂栫爜-1112 浜哄憳淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1112 = "1112";
+    /**
+     * 鎺ュ彛缂栫爜-1113 浼佷笟淇$敤淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1113 = "1113";
+
+    /**
+     * 鎺ュ彛缂栫爜-1201 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1201 = "1201";
+    /**
+     * 鎺ュ彛缂栫爜-1202 绮鍏ュ簱淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1202 = "1202";
+    /**
+     * 鎺ュ彛缂栫爜-1203 绮鍏ュ簱妫�楠屼俊鎭暟鎹帴鍙�
+     */
+    public static String API_CODE_1203 = "1203";
+    /**
+     * 鎺ュ彛缂栫爜-1204 绮鍏ュ簱缁撶畻淇℃伅鏁版嵁鍙�
+     */
+    public static String API_CODE_1204 = "1204";
+    /**
+     * 鎺ュ彛缂栫爜-1205 绮鍑哄簱淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1205 = "1205";
+    /**
+     * 鎺ュ彛缂栫爜-1206 绮鍑哄簱缁撶畻淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1206 = "1206";
+    /**
+     * 鎺ュ彛缂栫爜-1207 鍊掍粨淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1207 = "1207";
+    /**
+     * 鎺ュ彛缂栫爜-1208 绮搴撳瓨鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1208 = "1208";
+    /**
+     * 鎺ュ彛缂栫爜-1209 鎹熸孩鍗曟暟鎹帴鍙�
+     */
+    public static String API_CODE_1209 = "1209";
+    /**
+     * 鎺ュ彛缂栫爜-1210 绮鎬ц川杞彉鍗曟暟鎹帴鍙�
+     */
+    public static String API_CODE_1210 = "1210";
+    /**
+     * 鎺ュ彛缂栫爜-1211 璐﹂潰搴撳瓨鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1211 = "1211";
+    /**
+     * 鎺ュ彛缂栫爜-1212 瀹㈡埛淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1212 = "1212";
+
+    /**
+     * 鎺ュ彛缂栫爜-1301 瀹夊叏绠$悊鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1301 = "1301";
+    /**
+     * 鎺ュ彛缂栫爜-1302 娓╂箍搴︽娴嬫暟鎹帴鍙�
+     */
+    public static String API_CODE_1302 = "1302";
+    /**
+     * 鎺ュ彛缂栫爜-1303 瀹宠櫕妫�娴嬫暟鎹帴鍙�
+     */
+    public static String API_CODE_1303 = "1303";
+    /**
+     * 鎺ュ彛缂栫爜-1304 姘斾綋妫�娴嬫暟鎹帴鍙�
+     */
+    public static String API_CODE_1304 = "1304";
+    /**
+     * 鎺ュ彛缂栫爜-1305 閫氶浣滀笟鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1305 = "1305";
+    /**
+     * 鎺ュ彛缂栫爜-1306 鐔忚捀浣滀笟鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1306 = "1306";
+    /**
+     * 鎺ュ彛缂栫爜-1307 浠撳唴瑙嗛鍥惧儚鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1307 = "1307";
+    /**
+     * 鎺ュ彛缂栫爜-1308 瑙嗛鐩戞帶寮傚父浜嬩欢鍛婅鍩烘湰淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1308 = "1308";
+    /**
+     * 鎺ュ彛缂栫爜-1309 杩濊棰勮淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1309 = "1309";
+    /**
+     * 鎺ュ彛缂栫爜-1310 璐ㄦ鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1310 = "1310";
+
+    /**
+     * 鎺ュ彛缂栫爜-1401 鍌ㄥ瑙勬ā鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1401 = "1401";
+    /**
+     * 鎺ュ彛缂栫爜-1402 鍌ㄥ璁″垝淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1402 = "1402";
+    /**
+     * 鎺ュ彛缂栫爜-1403 杞崲璁″垝淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1403 = "1403";
+    /**
+     * 鎺ュ彛缂栫爜-1404 杞崲璁″垝鏄庣粏淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1404 = "1404";
+    /**
+     * 鎺ュ彛缂栫爜-1405 椤圭洰淇℃伅鏁版嵁鎺ュ彛
+     */
+    public static String API_CODE_1405 = "1405";
+
+    public static String API_CODE_1501 = "1501";
+    public static String API_CODE_1502 = "1502";
+    public static String API_CODE_1503 = "1503";
+    /**
+     * 鍥芥爣鍑哄叆搴撶被鍨�
+     */
+    public static String  INOUT_TYPE_14 = "14";
+    public static String  INOUT_TYPE_2 = "2";
+    public static String  INOUT_TYPE_15 = "15";
+    public static String  INOUT_TYPE_1 = "1";
+
+    /**
+     * 鎿嶄綔鏍囪
+     */
+    public static String CZBZ_D = "d";
+    public static String CZBZ_I = "i";
+    public static String CZBZ_U = "u";
+
+    /**
+     * 鍥剧墖绫诲瀷
+     */
+    public static String IMG_NAME_TYPE_PMT = "PMT";
+    public static String IMG_NAME_TYPE_GL = "GL";
+    public static String IMG_NAME_TYPE_GR = "GR";
+    public static String IMG_NAME_TYPE_GT = "GT";
+    public static String IMG_NAME_TYPE_TL = "TL";
+    public static String IMG_NAME_TYPE_TR = "TR";
+    public static String IMG_NAME_TYPE_TT = "TT";
+    public static String IMG_NAME_TYPE_SL = "SL";
+    public static String IMG_NAME_TYPE_SF = "SF";
+
+    /**
+     * 瀛楀吀鐖剁紪鐮�-鎿嶄綔鏍囧織
+     */
+    public static String TRIGGER_P_CZBZ = "CZBZ";
+
+    /**
+     * 瀛楀吀鐖剁紪鐮�-鏄惁
+     */
+    public static String TRIGGER_P_YN = "YN";
+
+    /**
+     * 鎺ュ彛1201-鍚堝悓 -涓氬姟绫诲瀷
+     */
+    public static String TRIGGER_P_HT_YWLX = "HT_YWLX";
+
+    /**
+     * 鎺ュ彛1201-瀹㈡埛绫诲瀷
+     */
+    public static String TRIGGER_P_KHLX = "KHLX";
+
+    /**
+     * 鎺ュ彛1201-缁撶畻涓庡悎鍚屼竴 鑷存��
+     */
+    public static String TRIGGER_P_JSYHTYZX = "JSYHTYZX";
+
+    /**
+     * 鎺ュ彛1201-寮�鎴疯
+     */
+    public static String TRIGGER_P_BANK = "BANK";
+
+    /**
+     * 璐т綅鐘舵��
+     */
+    public static String TRIGGER_P_HWZT = "HWZT";
+
+    /**
+     * 鍥藉埆
+     */
+    public static String TRIGGER_P_GB = "GB";
+
+    /**
+     * 绮鍝佺
+     */
+    public static String TRIGGER_P_LSPZ = "LSPZ";
+
+    /**
+     * 绮鍝佺
+     */
+    public static String TRIGGER_P_LSDJ = "LSDJ";
+
+    /**
+     * 绮鎬ц川
+     */
+    public static String  TRIGGER_P_LSXZ = "LSXZ";
+
+    /**
+     * 缁撶畻鏂瑰紡
+     */
+    public static String  TRIGGER_P_JSFS = "JSFS";
+
+    /**
+     * 缁勭粐閮ㄩ棬绫诲瀷
+     */
+    public static String DEPT_TYPE_10 = "10";
+//    public static String DEPT_TYPE_11 = "11";
+    public static String DEPT_TYPE_20 = "20";
+    public static String DEPT_TYPE_30 = "30";
+
+    /**
+     * 榛樿鐢ㄦ埛瀵嗙爜锛岀敤鎴风淮鎶ら噸缃瘑鐮佷娇鐢�
+     */
+    public static final String DEFAULT_USER_PASSWORD = "123456";
+
+}
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1301.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1301.java
deleted file mode 100644
index d3a8ae5..0000000
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1301.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 WhjlApi1301 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/WhjlApi1401.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1401.java
index f4ace67..f7a6017 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1401.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1401.java
@@ -6,10 +6,10 @@
 import java.io.Serializable;
 
 /**
- * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处
+ * 缁忚惀绠$悊-瀹㈡埛淇℃伅
  *
  * @author czt
- * @date 2023/8/2  20:15
+ * @date 2023/8/2  19::55
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -19,45 +19,27 @@
      */
     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 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/WhjlApi1402.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1402.java
deleted file mode 100644
index dd7335e..0000000
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1402.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 WhjlApi1402 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/WhjlApi1304.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1404.java
similarity index 95%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1404.java
index 4414fb3..ffd33aa 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1404.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1304 implements Serializable {
+public class WhjlApi1404 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1501.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1501.java
new file mode 100644
index 0000000..e1703b2
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1501.java
@@ -0,0 +1,63 @@
+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
index 8ab84ee..16bb759 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1502.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1502.java
@@ -4,13 +4,12 @@
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
- * 璐ㄩ噺绠$悊-璐ㄦ鎶ュ憡
+ * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处浜у搧鎵规
  *
  * @author czt
- * @date 2023/8/2  20:45
+ * @date 2023/8/2  20:25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -20,54 +19,41 @@
      */
     private static final long serialVersionUID = 1L;
 
-    private String jcbgid;  //妫�娴嬫姤鍛奍D
-    private String jcbgbh;  //妫�娴嬫姤鍛婄紪鍙�
+    private String kctzcppcid;  //搴撳瓨鍙颁骇鍝佹壒娆D
+    private String kctzbh;  //搴撳瓨鍙板笎ID
     private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
     private String ssqymc;  //鍐涚伯浼佷笟鍚嶇О
     private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
     private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
-    private String zjjgbm;  //璐ㄦ鏈烘瀯缂栧彿
-    private String zjjgmc;  //璐ㄦ鏈烘瀯鍚嶇О
-    private String cpbh;  //浜у搧缂栧彿
+    private String cpbm;  //浜у搧缂栧彿
     private String cpmc;  //浜у搧鍚嶇О
+    private String cpnd;  //浜у搧骞村害
+    private String cpcd;  //浜у搧浜у湴
+    private String yssj;  //楠屾敹鏃堕棿
     private String cppc;  //浜у搧鎵规
-    private String cpdj;  //浜у搧绛夌骇
-    private String dhrq;  //鍒拌揣鏃ユ湡
-    private String sccj;  //鐢熶骇鍘傚
     private String scrq;  //鐢熶骇鏃ユ湡
-    private String cppl;  //浜у搧鎵归噺
-    private String cysm;  //鎶芥牱璇存槑
-    private String cysj;  //鎶芥牱鏃堕棿
-    private String cyr;  //鎶芥牱浜�
-    private String cydd;  //鎶芥牱鍦扮偣
-    private String cybh;  //鏍峰搧缂栧彿
-    private String cybzid;  //閲囩敤鏍囧噯ID
-    private String jyca;  //妫�楠屾柟妗�
-    private String jyjg;  //妫�楠岀粨鏋�
-    private String djr;  //鐧昏浜�
-    private String djsj;  //鐧昏鏃堕棿
-    private String yplx;  //鏍峰搧绫诲瀷
-    private String jyzt;  //妫�楠岀姸鎬�
-    private String cyjs;  //鎶芥牱鍩烘暟
-    private String cysl;  //鎶芥牱鏁伴噺
-    private String jysj;  //妫�楠屾椂闂�
-    private String jybglx;  //妫�娴嬫姤鍛婄被鍨�
-    private String jyr;  //妫�楠屼汉
-    private String scxkzh;  //鐢熶骇璁稿彲璇佸彿
-    private String jggy;  //鍔犲伐宸ヨ壓
-    private String cd;  //浜у湴
-    private String shsj;  //鏀惰幏鏃堕棿
-    private String xxh;  //椤哄簭鍙�
-    private String sfyx;  //鏄惁鏈夋晥
+    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 jcmx;  //妫�娴嬫槑缁�
-    private String jcbgwj;  //妫�娴嬫姤鍛婃枃浠�
-
-    private List<WhjlCheckItm> checkItmList;
-
-    private String jybgwjid;  //妫�楠屾姤鍛婃枃浠秈d
-    private String wjm;  //鏂囦欢鍚�
-    private String wjlj;  //鏂囦欢璺緞
-    private String wjdx;  //鏂囦欢澶у皬
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1403.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1503.java
similarity index 95%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1403.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1503.java
index 3c1f402..5810d52 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1403.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1503.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1403 implements Serializable {
+public class WhjlApi1503 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1406.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1506.java
similarity index 98%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1406.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1506.java
index fc5f1e6..5005158 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1406.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1506.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1406 implements Serializable {
+public class WhjlApi1506 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1602.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1602.java
new file mode 100644
index 0000000..3559ff7
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1602.java
@@ -0,0 +1,73 @@
+package com.fzzy.whjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 璐ㄩ噺绠$悊-璐ㄦ鎶ュ憡
+ *
+ * @author czt
+ * @date 2023/8/2  20:45
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1602 implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private String jcbgid;  //妫�娴嬫姤鍛奍D
+    private String jcbgbh;  //妫�娴嬫姤鍛婄紪鍙�
+    private String jlqybh;  //鍐涚伯浼佷笟缂栧彿
+    private String ssqymc;  //鍐涚伯浼佷笟鍚嶇О
+    private String jgzdbh;  //鍐涗緵绔欑偣缂栧彿
+    private String jgzdmc;  //鍐涗緵绔欑偣鍚嶇О
+    private String zjjgbm;  //璐ㄦ鏈烘瀯缂栧彿
+    private String zjjgmc;  //璐ㄦ鏈烘瀯鍚嶇О
+    private String cpbh;  //浜у搧缂栧彿
+    private String cpmc;  //浜у搧鍚嶇О
+    private String cppc;  //浜у搧鎵规
+    private String cpdj;  //浜у搧绛夌骇
+    private String dhrq;  //鍒拌揣鏃ユ湡
+    private String sccj;  //鐢熶骇鍘傚
+    private String scrq;  //鐢熶骇鏃ユ湡
+    private String cppl;  //浜у搧鎵归噺
+    private String cysm;  //鎶芥牱璇存槑
+    private String cysj;  //鎶芥牱鏃堕棿
+    private String cyr;  //鎶芥牱浜�
+    private String cydd;  //鎶芥牱鍦扮偣
+    private String cybh;  //鏍峰搧缂栧彿
+    private String cybzid;  //閲囩敤鏍囧噯ID
+    private String jyca;  //妫�楠屾柟妗�
+    private String jyjg;  //妫�楠岀粨鏋�
+    private String djr;  //鐧昏浜�
+    private String djsj;  //鐧昏鏃堕棿
+    private String yplx;  //鏍峰搧绫诲瀷
+    private String jyzt;  //妫�楠岀姸鎬�
+    private String cyjs;  //鎶芥牱鍩烘暟
+    private String cysl;  //鎶芥牱鏁伴噺
+    private String jysj;  //妫�楠屾椂闂�
+    private String jybglx;  //妫�娴嬫姤鍛婄被鍨�
+    private String jyr;  //妫�楠屼汉
+    private String scxkzh;  //鐢熶骇璁稿彲璇佸彿
+    private String jggy;  //鍔犲伐宸ヨ壓
+    private String cd;  //浜у湴
+    private String shsj;  //鏀惰幏鏃堕棿
+    private String xxh;  //椤哄簭鍙�
+    private String sfyx;  //鏄惁鏈夋晥
+    private String bz;  //澶囨敞
+    private String jcmx;  //妫�娴嬫槑缁�
+    private String jcbgwj;  //妫�娴嬫姤鍛婃枃浠�
+
+    private List<WhjlCheckItm> checkItmList;
+
+    private String jybgwjid;  //妫�楠屾姤鍛婃枃浠秈d
+    private String wjm;  //鏂囦欢鍚�
+    private String wjlj;  //鏂囦欢璺緞
+    private String wjdx;  //鏂囦欢澶у皬
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1801.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1901.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1801.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1901.java
index e29cd0c..70295cf 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1801.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1901.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1801 implements Serializable {
+public class WhjlApi1901 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1802.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1902.java
similarity index 94%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1802.java
rename to src/main/java/com/fzzy/whjl/dto/WhjlApi1902.java
index 2556bd1..284eaf6 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1802.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1902.java
@@ -13,7 +13,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WhjlApi1802 implements Serializable {
+public class WhjlApi1902 implements Serializable {
     /**
      *
      */
diff --git a/src/main/java/com/fzzy/whjl/view/ApiList-whjl.view.xml b/src/main/java/com/fzzy/whjl/view/ApiListWhjl.view.xml
similarity index 97%
rename from src/main/java/com/fzzy/whjl/view/ApiList-whjl.view.xml
rename to src/main/java/com/fzzy/whjl/view/ApiListWhjl.view.xml
index eaca165..3ac6bff 100644
--- a/src/main/java/com/fzzy/whjl/view/ApiList-whjl.view.xml
+++ b/src/main/java/com/fzzy/whjl/view/ApiListWhjl.view.xml
@@ -23,7 +23,7 @@
         <Property name="label">鎺ュ彛鍒嗙被</Property>
         <Property name="required">true</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;apiListPR#triggerCategory&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;apiListWhjlPR#triggerCategory&quot;).getResult()}</Property>
           <Property name="keyProperty">code</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -86,7 +86,7 @@
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsMain">
       <Property name="dataType">[dtMain]</Property>
-      <Property name="dataProvider">apiListPR#listAll</Property>
+      <Property name="dataProvider">apiListWhjlPR#listAll</Property>
     </DataSet>
     <ToolBar>
       <ToolBarLabel>
@@ -276,14 +276,14 @@
       <Tools/>
     </Dialog>
     <UpdateAction id="updateSave">
-      <Property name="dataResolver">apiListPR#updateSave</Property>
+      <Property name="dataResolver">apiListWhjlPR#updateSave</Property>
       <UpdateItem>
         <Property name="dataPath">[#current]</Property>
         <Property name="dataSet">dsMain</Property>
       </UpdateItem>
     </UpdateAction>
     <AjaxAction id="ajaxDel">
-      <Property name="service">apiListPR#delData</Property>
+      <Property name="service">apiListWhjlPR#delData</Property>
       <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
     </AjaxAction>
   </View>
diff --git a/src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java b/src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java
new file mode 100644
index 0000000..d07185d
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java
@@ -0,0 +1,91 @@
+package com.fzzy.whjl.view.pr;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.entity.ApiList;
+import com.fzzy.api.entity.ApiTrigger;
+import com.fzzy.whjl.WhjlConstant;
+import com.fzzy.whjl.view.repository.ApiListWhjlRep;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 
+ * 鎺ュ彛鍒楄〃
+ * @author czt
+ */
+@Component
+public class ApiListWhjlPR {
+
+	@Autowired
+	private ApiListWhjlRep apiListWhjlRep;
+
+	/**
+	 * apiListWhjlPR#listAll
+	 *
+	 * @return
+	 */
+	@DataProvider
+	public List<ApiList> listAll() {
+		return apiListWhjlRep.findAllByBizType(WhjlConstant.API_BIZ_TYPE);
+	}
+
+	/**
+	 * apiListWhjlPR#updateSave
+	 *
+	 * @param entity
+	 */
+	@DataResolver
+	public void updateSave(ApiList entity) {
+
+		// 鎵嬪姩灏哾oradoEntity瀵硅薄杞崲涓烘爣鍑咮ean瀵硅薄
+		ApiList data = new ApiList();
+		BeanUtils.copyProperties(entity, data);
+
+		data.setBizType(WhjlConstant.API_BIZ_TYPE);
+		apiListWhjlRep.save(data);
+	}
+
+	/**
+	 * apiListWhjlPR#delData
+	 *
+	 * @param data
+	 */
+	@Expose
+	public String delData(ApiList data) {
+
+		apiListWhjlRep.deleteById(data.getId());
+
+		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;
+    }
+
+}
diff --git a/src/main/java/com/fzzy/whjl/view/repository/ApiListWhjlRep.java b/src/main/java/com/fzzy/whjl/view/repository/ApiListWhjlRep.java
new file mode 100644
index 0000000..bccf2ae
--- /dev/null
+++ b/src/main/java/com/fzzy/whjl/view/repository/ApiListWhjlRep.java
@@ -0,0 +1,18 @@
+package com.fzzy.whjl.view.repository;
+
+import com.fzzy.api.entity.ApiList;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import java.util.List;
+
+public interface ApiListWhjlRep extends JpaRepository<ApiList, Integer> {
+
+    /**
+     * 鏍规嵁涓氬姟绫诲瀷鏌ヨ鎺ュ彛鍒楄〃
+     * @param bizType
+     * @return
+     */
+    @Query("from ApiList where bizType=:bizType ")
+    List<ApiList> findAllByBizType(@Param("bizType") String bizType);
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 48d14af..a98e364 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -19,10 +19,11 @@
 #      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_7?useUnicode=true&useSSL=false&characterEncoding=utf-8 #绮补杞繍绔�
 #      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_8?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娌虫邯绮墍
 #      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_9?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娴烽棬绮墍
-      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鍜屽钩绮墍
+#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鍜屽钩绮墍
 #      url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
 #      url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8  #骞夸笢闊跺叧
 #      url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8   #鎯犲窞鎯犳柊
+      url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8   #姝︽眽榛勯檪鍐涚伯
       username: root
       password: Abc123..
       driver-class-name: com.mysql.jdbc.Driver
@@ -34,7 +35,8 @@
 #      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
 #      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
 #      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
-      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8  #鎯犲窞鎯犳柊
+#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8  #鎯犲窞鎯犳柊
+      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8  #姝︽眽榛勯檪鍐涚伯
       username: root
       password: Abc123..
       driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/resources/templates/home/home-whjl.html b/src/main/resources/templates/home/home-whjl.html
index d407120..23dc180 100644
--- a/src/main/resources/templates/home/home-whjl.html
+++ b/src/main/resources/templates/home/home-whjl.html
@@ -81,19 +81,19 @@
 
                         <dl class="layui-nav-child">
                             <dd class="layui-this">
-                                <a lay-href="com.fzzy.whjl.view.ApiList-whjl.d">鎺ュ彛鍒楄〃</a>
+                                <a lay-href="com.fzzy.whjl.view.ApiListWhjl.d">鎺ュ彛鍒楄〃</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.ApiConfs.d">鎺ュ彛閰嶇疆</a>
+                                <a lay-href="com.fzzy.api.view.ApiConfs.d">鎺ュ彛閰嶇疆</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.ApiLog.d">涓婁紶璁板綍</a>
+                                <a lay-href="com.fzzy.api.view.ApiLog.d">涓婁紶璁板綍</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.ApiTrigger.d">瀛楀吀琛ㄩ厤缃�</a>
+                                <a lay-href="com.fzzy.api.view.ApiTrigger.d">瀛楀吀琛ㄩ厤缃�</a>
                             </dd>
                             <dd>
-                                <a lay-href="com.fzzy.whjl.view.GbCheckItem.d">妫�楠岄」閰嶇疆</a>
+                                <a lay-href="com.fzzy.api.view.GbCheckItem.d">妫�楠岄」閰嶇疆</a>
                             </dd>
                         </dl>
                     </li>
@@ -278,7 +278,7 @@
                  lay-filter="layadmin-layout-tabs">
                 <ul class="layui-tab-title" id="LAY_app_tabsheader">
                     <li lay-id="ApiList"
-                        lay-attr="com.fzzy.whjl.view.ApiList.d" class="layui-this"><i
+                        lay-attr="com.fzzy.whjl.view.ApiListWhjl.d" class="layui-this"><i
                             class="layui-icon layui-icon-home"></i></li>
                 </ul>
             </div>
@@ -287,7 +287,7 @@
         <!-- 涓讳綋鍐呭 -->
         <div class="layui-body" id="LAY_app_body">
             <div class="layadmin-tabsbody-item layui-show">
-                <iframe src="com.fzzy.whjl.view.ApiList.d" frameborder="0"
+                <iframe src="com.fzzy.whjl.view.ApiListWhjl.d" frameborder="0"
                         class="layadmin-iframe"></iframe>
             </div>
         </div>
diff --git a/velocity.log b/velocity.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/velocity.log

--
Gitblit v1.9.3