From 78fb41ef2213346a412ca490b71187bda54def61 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Tue, 4 Dec 2018 10:24:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E6=A0=B7=E4=BE=8B=E5=85=A8=E9=87=8F=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?;=202.=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E5=BA=A6=E5=80=BC=E5=A4=A7=E4=BA=8E10?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E9=99=A4=E4=BB=A510;=203.=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E7=BB=93=E6=9D=9F=E6=A0=87=E8=AF=86=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E4=B8=9A=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=B7=B2=E6=9C=89?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=A0=87=E8=AF=86=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=EF=BC=8C=E6=97=A0=E8=AE=BA=E8=AF=A5=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=98=AF=E5=90=A6=E6=9C=89=E9=85=8D=E7=BD=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E9=83=BD=E4=B8=8B=E5=8F=91=E4=B8=80=E6=9D=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A0=87=E8=AE=B0=E6=9C=AC=E6=AC=A1?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=BB=93=E6=9D=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigSynchronizationDao.java             |  2 +
 .../ConfigSynchronizationDao.xml              | 19 ++++++++-
 .../ConfigSynchronizationService.java         | 41 +++++++++++++++----
 src/main/resources/service/service_config.xml |  2 +
 4 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
index 906c35149..d3793a831 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
@@ -24,6 +24,7 @@ import com.nis.domain.configuration.AppStringCfg;
 import com.nis.domain.configuration.AppTcpCfg;
 import com.nis.domain.configuration.AppTopicDomainCfg;
 import com.nis.domain.configuration.AvFileSampleCfg;
+import com.nis.domain.configuration.AvSignSampleCfg;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
@@ -78,6 +79,7 @@ public interface ConfigSynchronizationDao {
 	public List<FileDigestCfg> getFileDigestListByService(BaseCfg entity);
 	
 	public List<AvFileSampleCfg> getAvFileCfgList(BaseCfg entity);
+	public List<AvSignSampleCfg> getAvSignCfgList(BaseCfg entity);
 	public List<PxyObjKeyring> getPxyObjKeyringCfgList(BaseCfg entity);
 	public List<PxyObjTrustedCaCert> getPxyObjTrustedCertCfgList(BaseCfg entity);
 	public List<PxyObjTrustedCaCrl> getPxyObjTrustedCrlCfgList(BaseCfg entity);
diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
index ca6b6c9f5..1a5d6eb58 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
@@ -1216,11 +1216,26 @@
 	    </trim>
 		ORDER BY a.CFG_ID
   </select>
-   <select id="getAvSignSampleById" resultMap="AvSignSampleMap" parameterType="java.lang.Long" >
+   <select id="getAvSignCfgList" resultMap="AvSignSampleMap" parameterType="com.nis.domain.configuration.BaseCfg" >
     SELECT 
     <include refid="AvSignSample_Column" />
     FROM av_sign_sample_cfg a
-    WHERE a.CFG_ID = #{cfgId,jdbcType=BIGINT}
+    left join sys_user s on a.creator_id=s.id
+	left join sys_user u on a.auditor_id=u.id
+    <trim prefix="WHERE" prefixOverrides="AND |OR ">
+    	<if test="serviceId != null">
+    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+    	</if>
+    	<if test="functionId != null">
+    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+    	</if>
+    	<if test="action != null">
+    		AND a.action=#{action,jdbcType=INTEGER}
+    	</if>
+    	and a.is_valid=#{isValid} and a.is_audit=#{isAudit}
+    	and a.is_valid!=-1
+    </trim>
+	ORDER BY a.CFG_ID
   </select>
   <select id="getDnsStrategyList" resultMap="DnsResStrategyMap">
 		SELECT
diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index 115882bb9..31243a972 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -81,6 +81,7 @@ public class ConfigSynchronizationService  extends BaseService{
 	@Autowired
 	protected ConfigGroupInfoDao configGroupInfoDao;
 	private boolean lastServiceTag = false;//标识是否是最后一个同步业务
+	private boolean isFinished = false;
 	/**
 	 * 配置全量更新下发
 	 * @param request
@@ -134,6 +135,15 @@ public class ConfigSynchronizationService  extends BaseService{
 					Page<BaseCfg> page=new Page<BaseCfg>(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
 					handleCallbackData(className,page,entity,request,response,false);
 				}
+				if(!isFinished && lastServiceTag){//如果业务没有配置数据，并且为最后一个业务，需要发送给服务接口一个结束标识
+					String json = "";
+					if("1".equals(serviceType)){
+						json="{}";
+					}else{
+						json="[]";
+					}
+					JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED");
+				}
 			}
 			long end = System.currentTimeMillis();
 			logger.info("本次配置全量同步,开始时间："+start
@@ -434,8 +444,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 		}
 		return hasData;
@@ -482,6 +493,9 @@ public class ConfigSynchronizationService  extends BaseService{
 		List<Integer> compileIds = new ArrayList();
 		for(FileDigestCfg cfg:list){
 			compileIds.add(cfg.getCompileId());
+			if(!StringUtil.isEmpty(cfg.getCfdsLevel()) && (cfg.getCfdsLevel() > 10)){
+				cfg.setCfdsLevel((int)(cfg.getCfdsLevel()/10));//文件摘要置信度界面显示为70,80,90,100，下发为7,8,9,10
+			}
 			fileList.add(cfg);
 		}
 		
@@ -602,8 +616,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 		}
 		return hasData;
@@ -791,8 +806,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 		}
 		return hasData;
@@ -951,8 +967,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 		}
 		return hasData;
@@ -1160,8 +1177,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 			
 		}
@@ -1343,8 +1361,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 			
 		}
@@ -1461,8 +1480,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 			
 		}
@@ -1535,6 +1555,10 @@ public class ConfigSynchronizationService  extends BaseService{
 		}else{
 			if(className.equals("AvFileSampleCfg")){
 				list = configSynchronizationDao.getAvFileCfgList(entity);
+				newList.addAll(list);
+			}else if(className.equals("AvSignSampleCfg")){
+				list = configSynchronizationDao.getAvSignCfgList(entity);
+				newList.addAll(list);
 			}else if(className.equals("PxyObjKeyring")){
 				list = configSynchronizationDao.getPxyObjKeyringCfgList(entity);
 				for(int i=0;i<list.size();i++){
@@ -1591,7 +1615,8 @@ public class ConfigSynchronizationService  extends BaseService{
 			}else {
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
 				//调用服务接口同步回调类配置
-				JSONObject result = ConfigServiceUtil.configSync(json,2,entity.getServiceId(),entity.getTableName(),(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
+				JSONObject result = ConfigServiceUtil.configSync(json,2,entity.getServiceId(),entity.getTableName(),isFinished?"FINISHED":null);
 			}
 		}
 		
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index dfb941c41..8f5fafcf0 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -373,6 +373,8 @@
 	 
 	 <service id="65" functionId="400" serviceType="2" tableName="dns_res_strategy" className="DnsResStrategy"  desc="DNS响应策略"/>
 	 <service id="64" functionId="400" serviceType="2" tableName="dns_ip_cfg" className="DnsIpCfg"  desc="DNS欺骗IP"/>
+	 <service id="266" functionId="33" serviceType="2" tableName="av_sign_sample_cfg" className="AvSignSampleCfg"  desc="色情场景封堵"></service>
+	 <service id="394" functionId="33" serviceType="2" tableName="av_sign_sample_cfg" className="AvSignSampleCfg"  desc="色情场景监测"></service>
 	<!-- 回调类配置结束-->
     
 </serviceList>
\ No newline at end of file