From 97ae9af60f8ab63c6e3cf71fd8cf098d008a0ef1 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Thu, 25 Oct 2018 16:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=88=86=E7=BB=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0description.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/basics/PolicyGroupInfo.java     |  7 +++++++
 .../maintenance/IpMultiplexPoolCfgController.java  |  2 +-
 .../com/nis/web/dao/basics/PolicyGroupInfoDao.xml  | 14 ++++++++++----
 .../WEB-INF/views/basics/policyGroupForm.jsp       | 14 ++++++++++++--
 .../WEB-INF/views/basics/policyGroupList.jsp       |  3 ++-
 .../cfg/maintenance/ipMultiplexPool/snatlist.jsp   | 12 ++++++++++++
 6 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/domain/basics/PolicyGroupInfo.java b/src/main/java/com/nis/domain/basics/PolicyGroupInfo.java
index 54c8d8a65..8148b6464 100644
--- a/src/main/java/com/nis/domain/basics/PolicyGroupInfo.java
+++ b/src/main/java/com/nis/domain/basics/PolicyGroupInfo.java
@@ -21,6 +21,7 @@ public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Seriali
 	private String groupName;
 	private Integer groupType;
 	private Integer serviceGroupId;
+	private String description;
 	
 	public Integer getServiceGroupId() {
 		return serviceGroupId;
@@ -58,4 +59,10 @@ public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Seriali
 	public void setGroupType(Integer groupType) {
 		this.groupType = groupType;
 	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
 }
diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
index 7bc16fcc9..256e3ffa6 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
@@ -131,7 +131,7 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		//查询时left join policyGroup
 		Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(new Page<IpMultiplexPoolCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model,entity);
+		initFormCondition(model,entity);
 		return "/cfg/maintenance/ipMultiplexPool/snatlist";
 	}
 	
diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
index 218d135a8..cfa15196a 100644
--- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
@@ -12,10 +12,11 @@
     <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
     <result column="editor_id" property="editorId" jdbcType="INTEGER" />
     <result column="service_group_id" property="serviceGroupId" jdbcType="INTEGER" />
+    <result column="description" property="description" jdbcType="VARCHAR" />
   </resultMap>
     <sql id="PolicyGroupInfoColumns">
-		r.group_id,r.group_name,r.group_type,r.is_valid,
-		r.create_time,r.edit_time,r.creator_id,r.editor_id,r.service_group_id
+		r.group_id,r.group_name,r.group_type,r.is_valid,r.create_time,
+		r.edit_time,r.creator_id,r.editor_id,r.service_group_id,r.description
 	</sql>
   
    <!-- 查出所有 有效数据-->
@@ -95,14 +96,16 @@
     CREATE_TIME,
     GROUP_NAME,
     GROUP_TYPE,
-    SERVICE_GROUP_ID
+    SERVICE_GROUP_ID,
+    DESCRIPTION
     )values (
     	1,
     	#{creatorId,jdbcType=INTEGER}, 
    		#{createTime,jdbcType=TIMESTAMP},
     	#{groupName,jdbcType=VARCHAR}, 
     	#{groupType,jdbcType=INTEGER},
-    	#{serviceGroupId,jdbcType=INTEGER}
+    	#{serviceGroupId,jdbcType=INTEGER},
+    	#{description,jdbcType=VARCHAR}
     )
   </insert>
   <update id="update" parameterType="com.nis.domain.basics.PolicyGroupInfo" >
@@ -115,6 +118,9 @@
       <if test="groupType != null" >
         group_type = #{groupType,jdbcType=INTEGER},
       </if>
+      <if test="description != null" >
+        description = #{description,jdbcType=VARCHAR},
+      </if>
       <if test="isValid != null" >
         is_valid = #{isValid,jdbcType=INTEGER},
       </if>
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
index 3edce7495..63d1f17d8 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
@@ -53,7 +53,7 @@ $(function(){
                   </div>
                   <div class="portlet-body form">
                       <!-- BEGIN FORM-->
-                      <form id="cfgFrom" action="${ctx}/basics/policyGroup/saveOrUpdate" method="post" class="form-horizontal">
+                      <form:form id="cfgFrom" modelAttribute="_cfg" action="${ctx}/basics/policyGroup/saveOrUpdate" method="post" class="form-horizontal">
                       	<input type="hidden" name="groupId" value="${_cfg.groupId}">
                           <div class="form-body">
                               <div class="row">
@@ -79,6 +79,16 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
+											<div class="col-md-6">
+												<form:textarea path="description" htmlEscape="false" maxlength="128" class="form-control" />
+											</div>
+										</div>
+									</div>
+								</div>
                           </div>
                           <div class="form-actions">
                               <div class="row">
@@ -93,7 +103,7 @@ $(function(){
                                   <div class="col-md-6"> </div>
                               </div>
                           </div>
-                      </form>
+                      </form:form>
                       <!-- END FORM-->
                   </div>
               </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
index cd72e267d..59cdaf382 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
@@ -216,6 +216,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th><spring:message code="group_name"/></th>
 									<th><spring:message code="group_type"/></th>
+									<th><spring:message code="desc"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -238,7 +239,7 @@
 											<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
 				               			</c:forEach>
 									</td>
-									
+									<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
index 303209335..73691b27d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
@@ -278,6 +278,7 @@
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="group"/></th>
+									<th><spring:message code="isp"/></th>
 									<th><spring:message code="server_ip"/></th>
 									<%-- <th><spring:message code="port"/></th> --%>
 									<%-- <th><spring:message code="protocol"/></th>
@@ -317,6 +318,17 @@
 											${fns:abbr(cfg.groupName,20)}
 										</a>
 									</td>
+									<td>
+										<c:set value="${cfg.areaEffectiveIds }" var="isp"></c:set>
+										<c:if test="${fn:contains(cfg.areaEffectiveIds,':') }">
+											<c:set value="${fns:substringAfterLast(cfg.areaEffectiveIds,':') }" var="isp"></c:set>
+										</c:if>
+										<c:forEach items="${isps}" var="dict">
+											<c:if test="${dict.itemCode eq isp }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
 									<%-- <td>${cfg.port }</td> --%>
 									<%-- <td>