From 27c5f7a9ba1ffed61cb815cb9cfe50e495c82725 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Wed, 12 Sep 2018 19:16:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E3=80=81dns=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E7=AD=96=E7=95=A5=E7=AD=89=E6=96=B0=E5=A2=9E=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=20=E7=9A=84code=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B8=8D=E5=81=9A?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/dao/configuration/DnsResStrategyDao.xml |  2 --
 .../configuration/DnsResStrategyService.java    |  6 +++++-
 .../WEB-INF/views/basics/serviceDictForm.jsp    |  4 ++--
 .../WEB-INF/views/basics/serviceDictInfo.jsp    |  4 ++--
 .../WEB-INF/views/basics/serviceDictList.jsp    | 10 +++++-----
 .../cfg/maintenance/dnsResStrategy/form.jsp     | 17 ++++++++++-------
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml
index a93256c13..c957eb53d 100644
--- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml
@@ -166,7 +166,6 @@
 	</select>
 	<insert id="insert" parameterType="com.nis.domain.configuration.DnsResStrategy" >
     insert into dns_res_strategy (
-     CFG_ID,
      CFG_DESC,
      ACTION,
      IS_VALID,
@@ -201,7 +200,6 @@
 	compile_Id,
     cfg_region_code
     )values (
-   		#{cfgId,jdbcType=VARCHAR},
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
     	0,
diff --git a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java
index d68664a77..9b9967d30 100644
--- a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java
+++ b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java
@@ -15,6 +15,7 @@ import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
+import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.DnsResStrategyDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
@@ -62,7 +63,10 @@ public class DnsResStrategyService extends BaseService{
 	public void saveOrUpdate(DnsResStrategy entity){
 		Date createTime=new Date();
 		setAreaEffectiveIds(entity);
-		 List<DnsResStrategy> list=dnsResStrategyDao.findList(entity.getCfgId(),null,null);
+		List<DnsResStrategy> list = new ArrayList<DnsResStrategy>();
+		if( entity.getCfgId()!=null && !"".equals(entity.getCfgId())){
+			list=dnsResStrategyDao.findList(entity.getCfgId(),null,null);
+		}
 		//新增
 		if(list==null || list.size()==0){
 			entity.initDefaultValue();
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
index 5eb34e86d..b3bf7c6c4 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
@@ -214,12 +214,12 @@ label.errorShow {
 				                    </select>
 								</div>
 							</div>
-							 <div class="form-group">
+							 <%-- <div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
 								<div class="col-md-4">
 									<form:input path="itemCode" htmlEscape="false" maxlength="64" class="form-control required noBlankSpace"/>
 								</div>
-							</div> 
+							</div>  --%>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
 								<div class="col-md-4">
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp
index 9a768d55f..12ebb72ff 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp
@@ -57,12 +57,12 @@
 								  <input value=<spring:message code="${fns:getDictLabel('SERVICE_DICT_ITM_TYPE',serviceDictInfo.itemType,'0')}"/> maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
-							<div class="form-group">
+						<%-- 	<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
 								<div class="col-md-4">
 								  <input value="${serviceDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
-							</div>
+							</div> --%>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_value"/>:</label>
 								<div class="col-md-4">
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
index 0b6215941..6635d08cc 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
@@ -163,12 +163,12 @@
 										<div class="input-group">
                                             <div class="input-group-btn">
                                                 <select id="seltype"  class="selectpicker select2 input-small" >
-													<option value="itemCode"><spring:message code="item_code"></spring:message></option>
+													<%-- <option value="itemCode"><spring:message code="item_code"></spring:message></option> --%>
 													<option value="itemValue"><spring:message code="config_content"></spring:message></option>
 												</select>
                                             </div>
                                             
-                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='item_code'></spring:message>" type="text" maxlength="60">
+                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='config_content'></spring:message>" type="text" maxlength="60">
                                      
                                             
                                         </div>
@@ -279,7 +279,7 @@
 								<tr>
 								   <th><input type="checkbox" class="ckboxs" id="selAll" onclick="selectAll()"></th>
 								   <!-- <th>序号</th> -->
-								   <th><spring:message code="item_code"/></th>
+								   <%-- <th><spring:message code="item_code"/></th> --%>
 								   <th><spring:message code="config_content"/></th>
 								   <th><spring:message code="desc"/></th>
 								   <th><spring:message code="item_type"/></th>
@@ -296,8 +296,8 @@
 											<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
 												<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
 												<%-- <td>${serviceDictInfo.showSequence}</td> --%>
-												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td>
-												<td>${serviceDictInfo.itemValue}</td>
+												<%-- <td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td> --%>
+												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
 												<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
 												<td><spring:message code='${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}'/></td>
 												<td><spring:message code='${fns:getDictLabel("INT_YES_NO",serviceDictInfo.isLeaf,"0")}'/></td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
index 5f6932316..9e632db4e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
@@ -19,9 +19,9 @@ $(function(){
 		},
 		submitHandler: function(form){
 			var flag = true;
-			var cfgId=$("#cfgId").val();
+			//var cfgId=$("#cfgId").val();
 			var message="";
-			if(flag){
+			/* if(flag){
 				if($("#isAdd").val() == 'true'){
 					$.ajax({
 						type:'post',
@@ -38,15 +38,15 @@ $(function(){
 					
 					});
 				}
-			}
-			if(flag){
+			} */
+			/* if(flag){
 				$("#cfgId").removeClass("error");
 				$("#cfgId").attr("aria-invalid","false");
 			}else{
 				$("div[for=cfgId]").html("<label for=\"cfgId\" class=\"error\" id=\"cfgId-error\">"+message+"</label>");
 				$("#cfgId").addClass("error");
 				$("#cfgId").attr("aria-invalid","true");
-			}
+			} */
 			if(flag){
 				var maxTtl=$("[name=maxTtl]").val();
 				maxTtl = parseInt(maxTtl);
@@ -93,6 +93,9 @@ $(function(){
                        	<input type="hidden" id="compileId" name="compileId" value="${_cfg.compileId}">
                        	<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
                        	<input type="hidden" id="isAdd" name="isAdd" value="${isAdd}">
+                       	
+                       	<input type="hidden" id="cfgId" name="cfgId" value="${_cfg.cfgId}">
+                       	
                        	<!-- 配置域类型 -->
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
@@ -102,7 +105,7 @@ $(function(){
                    		</c:forEach>
                           <div class="form-body">
                               <div class="row">
-								    <div class="col-md-6">
+								   <%--  <div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="policy_number"/></label>
 								            <div class="col-md-6">
@@ -110,7 +113,7 @@ $(function(){
 								            </div>
 									    <div for="cfgId"></div>
 								        </div>
-								    </div>
+								    </div> --%>
 								    <div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="policy_name"/></label>