From b1e9328906be5147edafd9af8688e91daccee4ed Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 17 May 2018 19:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5cfg=5Fregion=5Fcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/configuration/BaseCfg.java  | 11 +++++++++++
 .../domain/configuration/BaseStringCfg.java    | 18 ------------------
 .../configuration/ComplexkeywordCfg.java       | 16 ----------------
 .../dao/configuration/ComplexStringCfgDao.xml  |  1 +
 .../com/nis/web/dao/configuration/IpCfgDao.xml |  4 ++++
 .../nis/web/dao/configuration/StringCfgDao.xml |  4 +++-
 6 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java
index 4d4274aeb..d87506442 100644
--- a/src/main/java/com/nis/domain/configuration/BaseCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java
@@ -148,6 +148,17 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected Date search_edit_time_end;
 	protected Date search_audit_time_start;
 	protected Date search_audit_time_end;
+	/**
+	 * 配置域码
+	 */
+	protected String cfgRegionCode;
+	/**
+	 * 内容类型
+	 */
+	protected String cfgType;
+	/**
+	 * 菜单ID
+	 */
 	protected Integer functionId;
 	
 	/**
diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java
index 5f7ec63e8..6140c00f5 100644
--- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java
@@ -34,24 +34,6 @@ public class BaseStringCfg extends BaseCfg<BaseStringCfg> {
 	@SerializedName("keywords")
 	protected String cfgKeywords;
 	protected String cfgKeywordsShowName;
-	protected String cfgType;
-	
-	/**
-	 * cfgType
-	 * @return  cfgType
-	*/
-	
-	public String getCfgType() {
-		return cfgType;
-	}
-	/**
-	 * cfgKeywords
-	 * @return  cfgKeywords
-	*/
-	
-	public String getCfgKeywords() {
-		return cfgKeywords;
-	}
 	/**
 	 * @param cfgKeywords the cfgKeywords to set
 	 */
diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java
index d1076ca7c..22435b107 100644
--- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java
+++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java
@@ -58,22 +58,6 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
 	@Expose
 	@SerializedName("isHexbin")
 	protected Integer isHexbin ;
-	protected String cfgType;
-	
-	/**
-	 * cfgType
-	 * @return  cfgType
-	*/
-	
-	public String getCfgType() {
-		return cfgType;
-	}
-	/**
-	 * @param cfgType the cfgType to set
-	 */
-	public void setCfgType(String cfgType) {
-		this.cfgType = cfgType;
-	}
 	/**
 	 * district
 	 * @return  district
diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
index 530dbfc61..284a1fa6d 100644
--- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
@@ -28,6 +28,7 @@
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="ComplexStringMapWithUser" type="com.nis.domain.configuration.ComplexkeywordCfg" extends="ComplexStringMap">
     <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index 2bb8c0314..888adb930 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -34,6 +34,8 @@
     <result column="lable" property="lable" jdbcType="VARCHAR" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="VARCHAR" />
+    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="BaseIpMapWithUser" type="com.nis.domain.configuration.BaseIpCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -64,6 +66,8 @@
     <result column="compile_id" property="compileId" jdbcType="INTEGER" />
     <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="VARCHAR" />
+    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="classify" property="classify" jdbcType="VARCHAR" />
     <result column="attribute" property="attribute" jdbcType="VARCHAR" />
     <result column="lable" property="lable" jdbcType="VARCHAR" />
diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
index 9dfb1af2b..17da466e9 100644
--- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
@@ -26,7 +26,8 @@
     <result column="expr_type" property="exprType" jdbcType="INTEGER" />
     <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
-     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="BaseStringMapWithUser" type="com.nis.domain.configuration.BaseStringCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -51,6 +52,7 @@
     <result column="lable" property="lable" jdbcType="VARCHAR" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="VARCHAR" />
     <result column="expr_type" property="exprType" jdbcType="INTEGER" />
     <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />