From 6b7ecb9a464de033e22991c9dd3facf3a7a2acf0 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 17 May 2018 19:43:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4CFG=5FREGION=5FCODE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/configuration/BaseCfg.java | 30 ++++++++++++++++++-
 .../dao/configuration/ComplexStringCfgDao.xml |  2 +-
 .../nis/web/dao/configuration/IpCfgDao.xml    |  4 +--
 .../web/dao/configuration/StringCfgDao.xml    |  2 +-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java
index d87506442..a200853b3 100644
--- a/src/main/java/com/nis/domain/configuration/BaseCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java
@@ -151,7 +151,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 配置域码
 	 */
-	protected String cfgRegionCode;
+	protected Integer cfgRegionCode;
 	/**
 	 * 内容类型
 	 */
@@ -161,6 +161,34 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 */
 	protected Integer functionId;
 	
+	/**
+	 * cfgRegionCode
+	 * @return  cfgRegionCode
+	*/
+	
+	public Integer getCfgRegionCode() {
+		return cfgRegionCode;
+	}
+	/**
+	 * @param cfgRegionCode the cfgRegionCode to set
+	 */
+	public void setCfgRegionCode(Integer cfgRegionCode) {
+		this.cfgRegionCode = cfgRegionCode;
+	}
+	/**
+	 * cfgType
+	 * @return  cfgType
+	*/
+	
+	public String getCfgType() {
+		return cfgType;
+	}
+	/**
+	 * @param cfgType the cfgType to set
+	 */
+	public void setCfgType(String cfgType) {
+		this.cfgType = cfgType;
+	}
 	/**
 	 * functionId
 	 * @return  functionId
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 284a1fa6d..6f8ff863a 100644
--- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
@@ -28,7 +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" />
+    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
   </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 888adb930..995d2fb9e 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -34,7 +34,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="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="BaseIpMapWithUser" type="com.nis.domain.configuration.BaseIpCfg" >
@@ -66,7 +66,7 @@
     <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_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="classify" property="classify" jdbcType="VARCHAR" />
     <result column="attribute" property="attribute" 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 17da466e9..38ef81136 100644
--- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
@@ -52,7 +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="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="expr_type" property="exprType" jdbcType="INTEGER" />
     <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />