From f90d3dbf32a210f87b80668a289ba6694c8f8ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Fri, 15 Mar 2019 17:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=95=8C=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=9A=84=E5=9B=9E=E4=BC=A0=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=9A=E5=90=8C=E6=AD=A5=E4=B8=9A=E5=8A=A1=E4=BB=8Exml?=
 =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/DictUtils.java     | 19 +++++++++++++++++++
 .../ConfigSynchronizationController.java      |  1 +
 src/main/resources/service/service_config.xml |  6 ------
 src/main/webapp/WEB-INF/tlds/fns.tld          |  2 +-
 .../WEB-INF/views/sys/configSyncInfo.jsp      |  9 ++++++---
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/util/DictUtils.java b/src/main/java/com/nis/util/DictUtils.java
index 97babfe1e..f0e2e5918 100644
--- a/src/main/java/com/nis/util/DictUtils.java
+++ b/src/main/java/com/nis/util/DictUtils.java
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.dom4j.Node;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -246,6 +247,24 @@ public class DictUtils {
 		
 		return allDictList;		
 	}
+	
+	/**
+	 * 功能业务字典，获取相应功能菜单对应的业务信息
+	 * @param functionId
+	 * @return
+	 */
+	public static List<FunctionServiceDict> getAllServiceList(){
+		List<FunctionServiceDict> serviceList = new ArrayList();
+		ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil();
+		List<Node> serviceNodeList= serviceTemplate.getServiceNodeList();
+		for (Node node : serviceNodeList) {
+			FunctionServiceDict service=new FunctionServiceDict();
+			service.setServiceId(Integer.valueOf(node.valueOf("@id")));
+			service.setServiceName(node.valueOf("@desc"));
+			serviceList.add(service);
+		}
+		return serviceList;		
+	}
 	/**
 	 * 功能配置域字典，获取相应功能菜单对应的配置域信息
 	 * @param functionId
diff --git a/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java b/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java
index 533d23b5f..5d6a8d3c3 100644
--- a/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java
@@ -79,6 +79,7 @@ public class ConfigSynchronizationController  extends BaseController {
 				
 			}
 		}
+		model.addAttribute("serviceId", serviceId);
 		return "/sys/configSyncInfo";
 	}
 	
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 36777f9a4..db898858b 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -138,12 +138,6 @@
 	<service id="67" functionId="6" serviceType="1" tableName="cfg_index_info"  className="CfgIndexInfo" desc="URL白名单">
     	<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
 	</service>
-	<service id="129" functionId="6" serviceType="1" tableName="cfg_index_info"  className="CfgIndexInfo" desc="URL监测">
-    	<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
-	</service>
-	<service id="17" functionId="6" serviceType="1" tableName="cfg_index_info"  className="CfgIndexInfo" desc="URL阻断">
-    	<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
-	</service>
     <!-- <service id="129" functionId="6" serviceType="1" tableName="cfg_index_info"  className="CfgIndexInfo">
     	<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
 	</service>
diff --git a/src/main/webapp/WEB-INF/tlds/fns.tld b/src/main/webapp/WEB-INF/tlds/fns.tld
index cc25b572c..0fb8f26b0 100644
--- a/src/main/webapp/WEB-INF/tlds/fns.tld
+++ b/src/main/webapp/WEB-INF/tlds/fns.tld
@@ -229,7 +229,7 @@
     <description>获取service列表</description>
     <name>getAllFunctionServiceDictList</name>
     <function-class>com.nis.util.DictUtils</function-class>
-    <function-signature>java.util.List getFunctionServiceDictList()</function-signature>
+    <function-signature>java.util.List getAllServiceList()</function-signature>
     <example>${fns:getAllFunctionServiceDictList()}</example>  
   </function>
  <function>
diff --git a/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp b/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp
index 6b3ca2d1d..061ed5be5 100644
--- a/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp
@@ -5,6 +5,7 @@
 <title></title>
 <script type="text/javascript">
 	$(document) .ready(function() {
+		changeService();
 		top.$.jBox.closeTip();
 		$("#cfgFrom").validate({
 				submitHandler : function(form) {
@@ -46,11 +47,13 @@
 		</h2>
 		<div class="col-md-2">
 			<div class="col-md-12">
-				<select name="service" id="service" data-live-search="true" class="selectpicker show-tick form-control required " onchange="changeService()">
-					<option value="" ><spring:message code="all" /></option>
+				<select name="service" id="service" data-live-search="true" class="selectpicker show-tick form-control " onchange="changeService()">
+					<option value="" <c:if test="${empty serviceId }">selected</c:if>><spring:message code="all" /></option>
 					<c:forEach items="${fns:getAllFunctionServiceDictList()}"
 						var="_service">
-						<option value="${_service.serviceId }" ><spring:message code="${_service.serviceName }" /></option>
+						<option value="${_service.serviceId }" <c:if test="${_service.serviceId eq serviceId }">selected</c:if>>
+						<spring:message code="${_service.serviceName }" />
+						</option>
 					</c:forEach>
 				</select>
 			</div>