From af704de60a66e901ea9e1b08f1bef4b23b4055fa Mon Sep 17 00:00:00 2001 From: duandongmei Date: Sat, 18 Aug 2018 20:47:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=BC=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9F=9F=E7=9A=84region=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=B8=BA=E5=8A=A8=E6=80=81=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/FunctionRegionDict.java | 29 ++ .../com/nis/web/dao/FunctionRegionDictDao.xml | 5 + .../sql/function_region_dict_add_colunm.sql | 4 + .../WEB-INF/views/cfg/complexCfgForm.jsp | 307 ++++++++++++------ 4 files changed, 249 insertions(+), 96 deletions(-) create mode 100644 src/main/resources/sql/function_region_dict_add_colunm.sql diff --git a/src/main/java/com/nis/domain/FunctionRegionDict.java b/src/main/java/com/nis/domain/FunctionRegionDict.java index de8dc0f9c..6414d22fd 100644 --- a/src/main/java/com/nis/domain/FunctionRegionDict.java +++ b/src/main/java/com/nis/domain/FunctionRegionDict.java @@ -16,6 +16,10 @@ public class FunctionRegionDict extends BaseCfg { private String configDesc; private Integer isMaat; private Integer regionType; + private String configMultiKeywords; + private String configHex; + private String configExprType; + private String configMatchMethod; public Integer getDictId() { return dictId; } @@ -64,5 +68,30 @@ public class FunctionRegionDict extends BaseCfg { public void setRegionType(Integer regionType) { this.regionType = regionType; } + public String getConfigMultiKeywords() { + return configMultiKeywords; + } + public void setConfigMultiKeywords(String configMultiKeywords) { + this.configMultiKeywords = configMultiKeywords; + } + public String getConfigHex() { + return configHex; + } + public void setConfigHex(String configHex) { + this.configHex = configHex; + } + public String getConfigExprType() { + return configExprType; + } + public void setConfigExprType(String configExprType) { + this.configExprType = configExprType; + } + public String getConfigMatchMethod() { + return configMatchMethod; + } + public void setConfigMatchMethod(String configMatchMethod) { + this.configMatchMethod = configMatchMethod; + } + } diff --git a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml index 9d39bbd61..88add3ae8 100644 --- a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml +++ b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml @@ -11,10 +11,15 @@ + + + + dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type + ,config_multi_keywords,config_hex,config_expr_type,config_match_method + <%-- --%> @@ -22,116 +23,206 @@ onClick="delContent('${tabName}${status.index}','${tabName}Add');" /> + +
+
+
+ +
+ + +
+
+
+
+
+
-
-
- -
- - -
-
-
-
-
- -
+ + +
+ +
+ + + +
+ +
+ +
-
-
- -
- +
+
+ + +
+ + + + + + > + + + + + + + + + + + + + +
+
+
-
-
-
-
- -
- + +
+
+ +
+ +
+
-
-
- -
-
- -
- - -
-
-
-
-
-
- -
- - -
-
-
-
- -
+ +
+
+ +
+ + +
+
+
+
+
+
+ +
+ + +
+
+
+
+ + +
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+ +