IP REUSE POLICY Group Name修改为Group 非空

字典标识删除失败bug更改

src/main/java/com/nis/web/controller/sys/DictController.java

@@ -24,23 +24,16 @@ import com.nis.web.controller.BaseController;
 public class DictController extends BaseController {
 	
 	
-	@ModelAttribute
-	public SysDataDictionaryName get(@RequestParam(required=false) Integer id) {
-		if (!StringUtil.isEmpty(id)){
-			return dictService.getDictByIdWithRelation(id);
-		}else{
-			return new SysDataDictionaryName();
-		}
-		
-		
-	}
-	
 	@RequiresPermissions("sys:dict:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(SysDataDictionaryName sysDictName,HttpServletRequest request, HttpServletResponse response, Model model) {
+		if(sysDictName ==null){
+			sysDictName=new SysDataDictionaryName();
+		}
 		
 		Page<SysDataDictionaryName> page = dictService.findDictList(new Page<SysDataDictionaryName>(request, response), sysDictName);
         model.addAttribute("page", page);
+        model.addAttribute("sysDataDictionaryName",sysDictName);
        
 		return "/sys/dictList";
 	}
@@ -54,8 +47,14 @@ public class DictController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(value={"form"})
-	public String form(SysDataDictionaryName sysDictName, Model model) {
+	public String form(@RequestParam(required=false) Integer id, Model model) {
-		
+		SysDataDictionaryName sysDictName=null;
+		if (!StringUtil.isEmpty(id)){
+			sysDictName= dictService.getDictByIdWithRelation(id);
+		}else{
+			sysDictName=new SysDataDictionaryName();
+		}
+		model.addAttribute("sysDataDictionaryName",sysDictName);
 		return "/sys/dictForm";
 	}
 	

src/main/java/com/nis/web/dao/SysDictDao.xml

@@ -145,7 +145,6 @@
       mark = #{mark,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       revision = #{revision,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}

src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp

@@ -166,9 +166,10 @@ $(function(){
 	           			   		<div class="row">
 								    <div class="col-md-6">
 								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
 								            <div class="col-md-6">
 								            	<select id="dnsStrategyId" name="dnsStrategyId" class="selectpicker show-tick form-control required">
+				               						<option value="" <c:if test="${empty _cfg.dnsStrategyId }">selected</c:if>><spring:message code="select"/></option>
 				               						<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.groupId}" <c:if test="${_cfg.dnsStrategyId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>

src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp

@@ -296,7 +296,7 @@
 									<th exportColumn="whether_area_block"><spring:message code="whether_area_block"/></th>
 									</c:if>
 									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
-									<th exportColumn="group_name"><spring:message code="group_name"/></th>
+									<th exportColumn="group_name"><spring:message code="group"/></th>
 									<th exportColumn="ir_type"><spring:message code="ir_type"/></th>
 									</c:if>
 									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipratelimit'}">

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp

@@ -90,7 +90,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option>
-												<form:option value="groupName"><spring:message code="group_name"></spring:message></form:option>
+												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
@@ -262,7 +262,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
-									<th><spring:message code="group_name"/></th>
+									<th><spring:message code="group"/></th>
 									<th><spring:message code="ip"/></th>
 									<th><spring:message code="port"/></th>
 									<%-- <th><spring:message code="protocol"/></th>

src/main/webapp/WEB-INF/views/sys/dictForm.jsp

@@ -41,7 +41,6 @@
 			
 				},
 				submitHandler: function(form){
-					
 					if(!validateItem()) {
 						return false;
 					}