From c02af9efb2d9db2f397bed7f521ffc1dccd46aa2 Mon Sep 17 00:00:00 2001 From: DuanDongmei Date: Wed, 5 Dec 2018 09:32:16 +0800 Subject: [PATCH] =?UTF-8?q?ddos=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigSynchronizationService.java | 52 +++++++++++--- src/main/webapp/WEB-INF/views/report/list.jsp | 68 ++++++++----------- 2 files changed, 73 insertions(+), 47 deletions(-) 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..ad646e5db 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 page=new Page(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 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; @@ -1065,8 +1082,9 @@ public class ConfigSynchronizationService extends BaseService{ List areaIpRegionList; maatBean = new ToMaatBean(); configCompileList = new ArrayList(); + List compileIds=new ArrayList(); //批量获取regionId,groupId - List regionIds = ConfigServiceUtil.getId(3, list.size()); + List regionIds = ConfigServiceUtil.getId(3, list.size()); List groupIds = ConfigServiceUtil.getId(2, list.size()); for(int i=0;i0){ Map map = cfgToMaatConvert(ipRegionList,list1,1,groupRelationList); @@ -1139,6 +1160,11 @@ public class ConfigSynchronizationService extends BaseService{ } configCompileList.add(maatCfg); } + if(isUpdateCfg) { + if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) { + commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,compileIds,null); + } + } page.setList(list); if(page.isLastPage()){ hasData = false; @@ -1160,8 +1186,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 +1370,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 +1489,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 +1564,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
- --%>

@@ -416,15 +415,8 @@ white-space:nowrap; <%-- --%> <%-- --%> - - + - - - - - - <%-- --%> @@ -486,8 +478,13 @@ white-space:nowrap;
    +
  • + class="active" + + >" >
  • + class="active" >">
    • @@ -496,11 +493,6 @@ white-space:nowrap; class="active" >" > -
  • - class="active" - - >" >
  • class="active" @@ -518,18 +510,18 @@ white-space:nowrap; >">
+
+ in active + ">
+ in active ">
in active ">
-
- in active - ">
in active