From 71038b0911e25217db360187f6e7fc723ea64d61 Mon Sep 17 00:00:00 2001 From: intraUser Date: Thu, 3 Jan 2019 12:25:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E4=B8=AA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/controller/BaseController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 5a438b059..35f5dbfc8 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2079,6 +2079,9 @@ public class BaseController { * @return */ public void auditAll(Page page,Integer auditType,Object entity)throws Exception { + page.setOrderBy(""); + page.setPageSize(Constants.MAAT_JSON_SEND_SIZE); + page.setPageNo(1); //携带审核状态信息的BaseCfg BaseCfg auditBatchCfg=new BaseCfg(); //携带审核条件的BaseCfg From 330b6f6bc18cdbbe12983467d68f63c55c904e9c Mon Sep 17 00:00:00 2001 From: intraUser Date: Thu, 3 Jan 2019 12:27:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=97=A0=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigSynchronizationService.java | 4 + src/main/resources/nis.properties | 191 +++++++++--------- src/main/webapp/WEB-INF/tags/sys/delRow.tag | 23 +-- 3 files changed, 112 insertions(+), 106 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 9dbbe6dd3..c86306af7 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -38,6 +38,7 @@ import com.nis.domain.configuration.DnsResStrategy; import com.nis.domain.configuration.FileDigestCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.PxyObjKeyring; +import com.nis.domain.configuration.PxyObjSpoofingIpPool; import com.nis.domain.configuration.PxyObjTrustedCaCert; import com.nis.domain.configuration.PxyObjTrustedCaCrl; import com.nis.domain.configuration.WebsiteDomainTopic; @@ -1737,6 +1738,9 @@ public class ConfigSynchronizationService extends BaseService{ IpPortCfg cfg = (IpPortCfg) list.get(i); newList.add(convertCallBackIp(cfg,cfg.getGroupId())); } + }else if(className.equals("PxyObjSpoofingIpPool")){ + list = configSynchronizationDao.getSpoofingIpPoolList(entity); + newList.addAll(list); } } diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 8e50734bb..2e68a553d 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -219,75 +219,72 @@ clusterBStartTime=1503504000725 isCommit=true ############################################################################################################################################ ############################################################################################################################################ -httpUrl=http://192.168.10.204:9999/galaxy-service/service/cfg/v1/ -maatCfg=configSources -fileUploadCfg=fileUploadSources -callbackCfg=commonSources -fileDigestCfg=fileDigestSources -configIdSources=configPzIdSources +httpUrl=http://10.0.7.14:9999/galaxy-service/service/cfg/ +maatCfg=v1/configSources +fileUploadCfg=v1/fileUploadSources +callbackCfg=v1/commonSources +fileDigestCfg=v1/fileDigestSources +configIdSources=v1/configPzIdSources #logBaseUrl=http://10.0.6.242:8080/galaxy-service/service/log/v1/ -logBaseUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ -ntcPzReport=ntcPzReport -ntcServiceReport=ntcServiceReport -ntcTagReport=ntcTagReport -ntcAttrTypeReport=ntcAttrTypeReport -ntcLwhhReport=ntcLwhhReport -ntcSrcipDomesticReport=ntcSrcipDomesticReport -ntcDestipCountryReport=ntcDestipCountryReport -ntcEntranceReport=ntcEntranceReport -ntcIpLog=ntcIpLogs -ntcBgpLog=ntcBgpLogs -ntcP2pLog=ntcP2pLogs -ntcHttpLog=ntcHttpLogs -ntcDnsLog=ntcDnsLogs -ntcSslLog=ntcSslLogs -ntcPptpLog=ntcPptpLogs -ntcL2tpLog=ntcL2tpLogs -ntcOpenvpnLog=ntcOpenvpnLogs -ntcIpsecLog=ntcIpsecLogs -ntcSshLog=ntcSshLogs -ntcMailLog=ntcMailLogs -ntcFtpLog=ntcFtpLogs -ntcAppLog=ntcAppLogs -ntcDdosLog=ntcDdosLogs -dkBehaviorLog=ntcAppLogs -mmVoipLog=ntcVoipLogs -mmAvIpLog=mmAvIpLogs -mmAvUrlLog=mmAvUrlLogs -mmPicIpLog=mmPicIpLogs -mmPicUrlLog=mmPicUrlLogs -mmVoipIpLog=ntcVoipLogs -mmVoipAccountLog=mmVoipAccountLogs -mmSampleAudioLog=mmSampleAudioLogs -mmSampleVideoLog=mmSampleVideoLogs -mmPornAudioLevelLog=mmPornAudioLevelLogs -mmPornVideoLevelLog=mmPornVideoLevelLogs -mmSamplePicLog=mmSamplePicLogs -mmSampleVoipLog=mmSampleVoipLogs -pxyHttpLog=pxyHttpLogs -mmSpeakerRecognizationLog=mmSpeakerRecognizationLogs -mmLogoDetectionLog=mmLogoDetectionLogs -mmFaceRecognizationLog=mmFaceRecognizationLogs -trafficAreaStat=trafficAreaStat -logServiceTopn=logServiceTopn -blockAndDropStat=blockAndDropStat +logBaseUrl=http://10.0.7.14:9999/galaxy-service/service/log/ +ntcPzReport=v1/ntcPzReport +ntcServiceReport=v1/ntcServiceReport +ntcTagReport=v1/ntcTagReport +ntcAttrTypeReport=v1/ntcAttrTypeReport +ntcLwhhReport=v1/ntcLwhhReport +ntcSrcipDomesticReport=v1/ntcSrcipDomesticReport +ntcDestipCountryReport=v1/ntcDestipCountryReport +ntcEntranceReport=v1/ntcEntranceReport +ntcIpLog=v1/ntcIpLogs +ntcBgpLog=v1/ntcBgpLogs +ntcP2pLog=v1/ntcP2pLogs +ntcHttpLog=v1/ntcHttpLogs +ntcDnsLog=v1/ntcDnsLogs +ntcSslLog=v1/ntcSslLogs +ntcPptpLog=v1/ntcPptpLogs +ntcL2tpLog=v1/ntcL2tpLogs +ntcOpenvpnLog=v1/ntcOpenvpnLogs +ntcIpsecLog=v1/ntcIpsecLogs +ntcSshLog=v1/ntcSshLogs +ntcMailLog=v1/ntcMailLogs +ntcFtpLog=v1/ntcFtpLogs +ntcAppLog=v1/ntcAppLogs +ntcDdosLog=v1/ntcDdosLogs +dkBehaviorLog=v1/ntcAppLogs +mmVoipLog=v1/ntcVoipLogs +mmAvIpLog=v1/mmAvIpLogs +mmAvUrlLog=v1/mmAvUrlLogs +mmPicIpLog=v1/mmPicIpLogs +mmPicUrlLog=v1/mmPicUrlLogs +mmVoipIpLog=v1/ntcVoipLogs +mmVoipAccountLog=v1/mmVoipAccountLogs +mmSampleAudioLog=v1/mmSampleAudioLogs +mmSampleVideoLog=v1/mmSampleVideoLogs +mmPornAudioLevelLog=v1/mmPornAudioLevelLogs +mmPornVideoLevelLog=v1/mmPornVideoLevelLogs +mmSamplePicLog=v1/mmSamplePicLogs +mmSampleVoipLog=v1/mmSampleVoipLogs +pxyHttpLog=v1/pxyHttpLogs +mmSpeakerRecognizationLog=v1/mmSpeakerRecognizationLogs +mmLogoDetectionLog=v1/mmLogoDetectionLogs +mmFaceRecognizationLog=v1/mmFaceRecognizationLogs ######################################## #\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3 -dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ -trafficIpActive=trafficIpActive -trafficProtocol=trafficProtocol -trafficApp=trafficApp -trafficOsList=trafficOsList -trafficBrowserChart=trafficBrowserChart -trafficBsList=trafficBsList -trafficSystemChart=trafficSystemChart -trafficWebsiteList=trafficWebsiteList -trafficWebTypeChart=trafficWebTypeChart -trafficPortActive=trafficPortActive -trafficTopicAndDomainChart=trafficTopicAndDomainChart -ntcTotalReport=ntcTotalReport -trafficIpActiveFiveMinute=trafficIpActiveFiveMinute -trafficIpActiveOneHour=trafficIpActiveOneHour +dashboardUrl=http://10.0.7.14:9999/galaxy-service/service/log/ +trafficIpActive=v1/trafficIpActive +trafficProtocol=v1/trafficProtocol +trafficApp=v1/trafficApp +trafficOsList=v1/trafficOsList +trafficBrowserChart=v1/trafficBrowserChart +trafficBsList=v1/trafficBsList +trafficSystemChart=v1/trafficSystemChart +trafficWebsiteList=v1/trafficWebsiteList +trafficWebTypeChart=v1/trafficWebTypeChart +trafficPortActive=v1/trafficPortActive +trafficTopicAndDomainChart=v1/trafficTopicAndDomainChart +ntcTotalReport=v1/ntcTotalReport +trafficIpActiveFiveMinute=v1/trafficIpActiveFiveMinute +trafficIpActiveOneHour=v1/trafficIpActiveOneHour client_connect_timeout=300000 client_read_timeout=300000 @@ -310,7 +307,7 @@ jdbc.hive.BName=xa_z2_mesalog_hive maxPageSize=100000 #\u5bfc\u51fa\u6700\u5927\u6761\u6570 -maxExportSize=100000 +maxExportSize=5000 #\u5141\u8bb8\u914d\u7f6e\u6700\u5927\u5c42\u7ea7 maxLevelNo=4 #\u4e0a\u4e0b\u7ea7\u663e\u793a\u95f4\u9694\u6807\u8bc6\u7b26 @@ -550,9 +547,9 @@ domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA- maat_json_send_size=20000 #\u5bfc\u5165\u9a8c\u8bc1\u7684\u7ebf\u7a0b\u6570\u91cf mulity_thread_size=5 -ntcRadiusReport=ntcRadiusReport -ntcCollectVoipLog=ntcCollectVoipLogs -ntcKeywordsUrlLog=ntcKeywordsUrlLogs +ntcRadiusReport=v2/ntcRadiusReport +ntcCollectVoipLog=v1/ntcCollectVoipLogs +ntcKeywordsUrlLog=v1/ntcKeywordsUrlLogs save_and_del_thread_size=5 #mysql \u5355\u4e2asql\u5927\u5c0f\u9650\u5236,\u6839\u636emariadb\u76f8\u5173\u53c2\u6570\u914d\u7f6e max_allowed_packet=1048576 @@ -568,38 +565,50 @@ userPasswordSet=UserPasswordSet userDelete=UserDelete userGet=UserGet userList=UserList -ip_reuse_call_cgi_url=http://192.168.11.137:8090/command +ip_reuse_call_cgi_url=http://10.4.10.32:8090/command ipNumGet=IpNumGet allIpGet=AllIpGet #\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5 -trafficBandwidthTrans=trafficBandwidthTrans -trafficProtocolList=trafficProtocolList +trafficBandwidthTrans=v1/trafficBandwidthTrans +trafficProtocolList=v1/trafficProtocolList irSnatLog=irSnatLogs irDnatLog=irDnatLogs -trafficBandwidthTrans=trafficBandwidthTrans -trafficProtocolList=trafficProtocolList -trafficAppList=trafficAppList -ntcActionEntranceReport=ntcActionEntranceReport -redis.host=192.168.10.192:6379 +trafficBandwidthTransv1/=trafficBandwidthTrans +trafficProtocolList=v1/trafficProtocolList +trafficAppList=v1/trafficAppList +ntcActionEntranceReport=v1/ntcActionEntranceReport +redis.host=10.0.4.2:6379 redis.expire=1800 redis.timeout=10000 dns_spoofing_ip_desc=Default Spoofing IP dns_spoofing_ip_ip=1.1.1.1 -trafficBandwidthTransTwo=trafficBandwidthTransTwo -trafficBandwidthTransThree=trafficBandwidthTransThree -trafficBandwidthTransFour=trafficBandwidthTransFour -ntcCollectRadiusLog=ntcCollectRadiusLogs -ntcConnRecordLog=ntcConnRecordLogs -ntcConnRecordPercent=ntcConnRecordPercent +trafficBandwidthTransTwo=v1/trafficBandwidthTransTwo +trafficBandwidthTransThree=v1/trafficBandwidthTransThree +trafficBandwidthTransFour=v1/trafficBandwidthTransFour +ntcCollectRadiusLog=v1/ntcCollectRadiusLogs +ntcConnRecordLog=v1/ntcConnRecordLogs +ntcConnRecordPercent=v1/ntcConnRecordPercent #\u5bfc\u51fa\u6700\u5927\u6761\u6570 maxLogExportSize=2000 pxy_crtl_subscribe_id_region=PXY_CTRL_SUBSCRIBE_ID ntc_subscribe_id_region=NTC_SUBSCRIBE_ID -ntcAsnRecord=ntcAsnRecord -ntcURLReport=ntcURLReport -ntcIpRangeReport=ntcIpRangeReport -trafficWebsiteListNoTime=trafficWebsiteListNoTime -trafficTopicList=trafficTopicList -trafficDomainTrans=trafficDomainTrans +ntcAsnRecord=v1/ntcAsnRecord +ntcURLReport=v1/ntcURLReport +ntcIpRangeReport=v1/ntcIpRangeReport +trafficWebsiteListNoTime=v1/trafficWebsiteListNoTime +trafficTopicList=v1/trafficTopicList +trafficDomainTrans=v1/trafficDomainTrans #maximum number to import -import_limit=10 \ No newline at end of file +import_limit=10 +trafficPortActiveFiveMinute=v1/trafficPortActiveFiveMinute +trendTotalReport=v1/trendTotalReport +#\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835 +ntcEventsMonitorOrBlock=v1/ntcEventsMonitorOrBlock +#\u91cd\u70b9\u4fdd\u969c\u4e8b\u4ef6 +ntcEventKeyProtection=v1/ntcEventKeyProtection +dashboardUrlV2=http://10.0.7.14:9999/galaxy-service/service/log/v2/ +trafficAreaStat=v1/trafficAreaStat +logServiceTopn=v1/logServiceTopn +blockAndDropStat=v1/blockAndDropStat +#配置启停接口 +configStartStop=v2/configStartStop \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index b4ec2e83d..0592efb96 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -26,27 +26,27 @@ - + - + - + - + - + @@ -400,7 +400,7 @@ function cancelPassOpt(url){ return flag; } //导出 - function exportData(url,maxRow,searchUrl){ + function exportData(url,maxRow,searchUrl,exType){ var column=[]; var hColumn=[]; //隐藏列名 $("#${id} ${value} thead tr th").each(function(){ @@ -428,7 +428,7 @@ function cancelPassOpt(url){ //导出检索条件下所有数据 }else{ var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim(); - if (!confirmEnding(url,"excel")&&!confirmEnding(url,"csv")) { + if (exType!='log') { if(totalCount > maxRow){ top.$.jBox.confirm(""+maxRow+"!","",function(v,h,f){ if(v=="ok"){ @@ -453,12 +453,5 @@ function cancelPassOpt(url){ } } - function confirmEnding(str, target) { - var result=true; - var num=str.indexOf(target); - if (-1==num) { - result=false; - } - return result; - } + \ No newline at end of file From c640d5a44c2ec6aa0bbbf8932ccb3a9665e80026 Mon Sep 17 00:00:00 2001 From: intraUser Date: Fri, 4 Jan 2019 12:10:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?page.setOrderBy("");=20page.setPageSize(Con?= =?UTF-8?q?stants.MAAT=5FJSON=5FSEND=5FSIZE);=20page.setPageNo(1);=20?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/BaseController.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 300264f7f..f447f9c34 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2040,7 +2040,6 @@ public class BaseController { cfg.setBehavCode(Integer.parseInt(behaviorId)); } - AppFeatureIndex appfeature = new AppFeatureIndex(); BeanUtils.copyProperties(cfg, appfeature,new String[] {"cfgId"}); if(regionDict!=null){ @@ -2049,7 +2048,6 @@ public class BaseController { appfeature.setCfgRegionType(String.valueOf(regionDict.getRegionType())); } appFeatureIndexs.add(appfeature); - ind++; } ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _complexkeywordCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,isSend.equals("1")); @@ -2279,6 +2277,24 @@ public class BaseController { ByteArrayOutputStream out = new ByteArrayOutputStream(); ExcelCsv.writeCSVFile(response,titleList,headMap,dataList,fileName,titleTime,msgProp); } + + + public void _ajaxExport(HttpServletRequest request, HttpServletResponse response, + String code,String titleTime,List headerList, List> dataList) + throws Exception{ + Properties msgProp = getMsgProp(); + String fileName = msgProp.getProperty(code, code) + "_" + DateUtils.getDate("yyyyMMddHHmmss") + + ".xlsx"; + fileName = fileName.replaceAll(" ", "_"); + if (request.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) { + fileName = URLEncoder.encode(fileName, "UTF-8"); + } else { + fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); + } + new ExportExcel(msgProp.getProperty(code, code),code,titleTime, headerList).ajaxDataList(dataList, code).write(response, fileName).dispose(); + + } + public String initLogMap(BaseLogEntity log,String title){ Properties msgProp = getMsgProp(); String logTime=msgProp.getProperty(title,title);; From 295b3800dfc27e7ba4b282b6efdd4cf380affbf1 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Fri, 4 Jan 2019 17:49:18 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/BaseController.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index f447f9c34..e8a04b7a7 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2273,8 +2273,7 @@ public class BaseController { } String titleTime=noExportMap.get("timeRange"); Map> headMap=ExcelCsv.ExcelCsvHeader(msgProp, titleList, noExportMap, classMap, 1); - Map> dataList=ExcelCsv.setDataList(msgProp, dataMap, map); - ByteArrayOutputStream out = new ByteArrayOutputStream(); + Map>> dataList=ExcelCsv.setDataList(msgProp, dataMap, map); ExcelCsv.writeCSVFile(response,titleList,headMap,dataList,fileName,titleTime,msgProp); } @@ -2612,7 +2611,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg, cfgIndexList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2639,7 +2638,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,baseCfgList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2666,7 +2665,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgAppList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2692,9 +2691,6 @@ public class BaseController { } hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgFeatrureList, hasData); } - if(hasData) { - page.setPageNo(1); - } }else{ hasData = false; } @@ -2724,7 +2720,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2761,7 +2757,7 @@ public class BaseController { hasData=configSynchronizationService.auditAppIpData(userRegionList, page,auditBatchCfg,list,hasData,true); if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2799,7 +2795,7 @@ public class BaseController { hasData=configSynchronizationService.auditAppIpData(userRegionList, page,auditBatchCfg,list,hasData,true); if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2848,7 +2844,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; From e7f870116676e91b94c46e0554785c104612fea5 Mon Sep 17 00:00:00 2001 From: intraUser Date: Fri, 4 Jan 2019 20:24:26 +0600 Subject: [PATCH 5/6] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87=EF=BC=8C=E4=BF=AE=E6=94=B9lastPageBUG?= =?UTF-8?q?=EF=BC=8C=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8Aapp=20IP=E7=9A=84?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91=EF=BC=8C=E9=9C=80=E5=86=8D?= =?UTF-8?q?=E8=80=83=E8=99=91=E5=AE=9E=E7=8E=B0=EF=BC=9B=20findAllListByGr?= =?UTF-8?q?oupIno=E4=BF=AE=E6=94=B9=E4=B8=BAfindAllListByGroupInfo?= =?UTF-8?q?=EF=BC=9B=20delRow=E6=97=A0=E5=8F=98=E6=9B=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/BaseController.java | 250 ++++++++++-------- .../web/dao/specific/ConfigGroupInfoDao.xml | 9 +- src/main/webapp/WEB-INF/tags/sys/delRow.tag | 8 +- 3 files changed, 148 insertions(+), 119 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index e8a04b7a7..7d17ac449 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -12,6 +12,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Properties; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -44,6 +45,7 @@ import com.nis.domain.FunctionRegionDict; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.SysDataDictionaryItem; +import com.nis.domain.basics.AsnGroupInfo; import com.nis.domain.basics.AsnIpCfg; import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.basics.SysDictInfo; @@ -115,14 +117,13 @@ import com.nis.domain.maat.ToMaatBean; import com.nis.domain.specific.ConfigGroupInfo; import com.nis.domain.specific.SpecificServiceCfg; import com.nis.exceptions.MaatConvertException; -import com.nis.util.AsnCacheUtils; +//import com.nis.util.AsnCacheUtils; import com.nis.util.ConfigServiceUtil; import com.nis.util.Configurations; //import com.nis.main.ConvertTool; import com.nis.util.Constants; import com.nis.util.DateUtils; import com.nis.util.DictUtils; -import com.nis.util.FileUtils; import com.nis.util.JsonMapper; import com.nis.util.ServiceConfigTemplateUtil; import com.nis.util.StringUtil; @@ -145,6 +146,7 @@ import com.nis.web.service.OfficeService; import com.nis.web.service.RoleService; import com.nis.web.service.SystemService; import com.nis.web.service.UserService; +import com.nis.web.service.basics.AsnGroupInfoService; import com.nis.web.service.basics.AsnIpCfgService; import com.nis.web.service.basics.IpReuseIpCfgService; import com.nis.web.service.basics.PolicyGroupInfoService; @@ -317,6 +319,8 @@ public class BaseController { @Autowired protected PxyObjSpoofingIpPoolService pxyObjSpoofingIpPoolService;// 欺骗IP池 + @Autowired + protected AsnGroupInfoService asnGroupInfoService;// asn组 /** * 管理基础路径 */ @@ -944,7 +948,7 @@ public class BaseController { * @throws InterruptedException * @throws ExecutionException */ - public BlockingQueue checkIpCfgMulity(StringBuffer _msg,FunctionServiceDict serviceDict, FunctionRegionDict regionDict,List> asnNos, BlockingQueue list) throws ServiceException, InterruptedException, ExecutionException{ + public BlockingQueue checkIpCfgMulity(StringBuffer _msg,FunctionServiceDict serviceDict, FunctionRegionDict regionDict,List> asnNos,Map asnGroupInfos, BlockingQueue list) throws ServiceException, InterruptedException, ExecutionException{ logger.warn("start checkIpCfgMulity ,size "+list.size()); long start=System.currentTimeMillis(); BlockingQueue queue=new ArrayBlockingQueue<>(list.size()); @@ -953,6 +957,7 @@ public class BaseController { for(int i=0;i cfgIndexInfos = new ArrayList(); List appPolicyCfgs = new ArrayList(); List appFeatureIndexs= new ArrayList(); - List> asnNoMaps=Lists.newArrayList(); - Map newAsnNoMap=Maps.newConcurrentMap(); - Map OldAsnNoMap=Maps.newConcurrentMap(); + List> asnNoMaps=Lists.newArrayList(); + Map newAsnNoMap=Maps.newConcurrentMap(); + Map OldAsnNoMap=Maps.newConcurrentMap(); + Map asnGroupInfos=null; asnNoMaps.add(newAsnNoMap); asnNoMaps.add(OldAsnNoMap); FunctionRegionDict appRegion = null; @@ -1319,44 +1325,48 @@ public class BaseController { if (serviceDict!=null&&serviceDict.getAction().equals(64)) { BlockingQueue list = ei.getDataList(IpRateLimitTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list); } else { BlockingQueue list = ei.getDataList(IpAllTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); } } else if (regionDict.getFunctionId().equals(7)&&serviceDict!=null&&serviceDict.getAction().intValue()==16) { BlockingQueue list = ei.getDataList(DnsIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); }else if(regionDict.getFunctionId().equals(401)) { BlockingQueue list = ei.getDataList(DnsFakeIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); }else if (regionDict.getFunctionId().equals(212)) { BlockingQueue list = ei.getDataList(IpPayloadTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); } else if (regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())) { // P2p IP BlockingQueue list = ei.getDataList(P2pIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); } else if (regionDict.getFunctionId().equals(600)) {// ASN IP //加载asn缓存 - AsnCacheUtils.init(true); + //AsnCacheUtils.init(true); + //从数据库中读取 + asnGroupInfos=asnGroupInfoService.getGroupList(); + //OldAsnNoMap.putAll(asnGroupInfoService.getGroupList()); BlockingQueue list = ei.getDataList(AsnIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, asnNoMaps, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, asnNoMaps,asnGroupInfos, list); + }else if (regionDict.getFunctionId().equals(301)) {// DDOS IP BlockingQueue list = ei.getDataList(DdosIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); }else if(regionDict.getFunctionId().equals(207)){// HTTP(s)阻断 BlockingQueue list = ei.getDataList(HttpsRejectIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); }else if(regionDict.getFunctionId().equals(208)){// HTTP(s)重定向 BlockingQueue list = ei.getDataList(HttpsRedirectIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); }else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换 BlockingQueue list = ei.getDataList(HttpsReplaceIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); } else { BlockingQueue list = ei.getDataList(IpAllTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list); } } else if (regionDict.getRegionType().equals(2)) {// 字符串类 if (regionDict.getFunctionId().equals(510) @@ -1454,88 +1464,20 @@ public class BaseController { } if (regionDict.getRegionType().equals(1)) {// IP if(regionDict.getFunctionId().intValue()==600) {//ans ip - if(asnNoMaps.get(0).size()>0) { - try { - //将未在缓存中找到对应config的asn no分配group ID - List groupIds = ConfigServiceUtil.getId(2,asnNoMaps.get(0).size()); - int ind=0; - for(Long key:asnNoMaps.get(0).keySet()) { - asnNoMaps.get(0).put(key, groupIds.get(ind)); - ind++; - } - } catch (Exception e) { - e.printStackTrace(); - logger.info("获取编译ID出错"); - throw new MaatConvertException(":"+e.getMessage()); - } - } List isImportAll=DictUtils.getDictList("IS_ASN_IP_IMPORT_ALL"); //处理组,新的组会在这里保存 - asnIpCfgService.processGroup(asnNoMaps.get(0)); + if(!asnNoMaps.get(0).isEmpty()) { + asnIpCfgService.processGroup(asnNoMaps.get(0)); + } //全量下发，删除asnNo对应的已有的IP if(isImportAll.get(0).getItemCode().equals("1")) { logger.warn("Delete and send ip reuse regions start"); long _start=System.currentTimeMillis(); - asnIpCfgService.deleteIps(asnNoMaps.get(1)); -// List> list=Lists.newArrayList(); -// ExecutorService service=Executors.newFixedThreadPool(Constants.SAVE_AND_DEL_THREAD_SIZE); -// BlockingQueue queue=new ArrayBlockingQueue<>(asnNoMaps.get(1).size()); -// queue.addAll(asnNoMaps.get(1).keySet()); -// for(int j=0;j e:list) { -// if(e.get()!=null) { -// try { -// throw e.get(); -// } catch (Throwable e1) { -// // TODO Auto-generated catch block -// e1.printStackTrace(); -// } -// } -// } + deleteIps(asnNoMaps.get(1)); long _end=System.currentTimeMillis(); logger.warn("Delete and send ip reuse regions end,cost:"+(_end-_start)); } - Map fullMap=Maps.newConcurrentMap(); - for(Long asnNo:asnNoMaps.get(0).keySet()) { - fullMap.put(asnNo, false); - } - for(Long asnNo:asnNoMaps.get(1).keySet()) { - ConfigGroupInfo info=AsnCacheUtils.get(asnNo); - if(info==null) { - info=asnIpCfgService.getConfigGroupInfoByAsnNo(asnNo); - } - fullMap.put(asnNo, info.getIsIssued().intValue()==1); - } -// List> list=Lists.newArrayList(); -// ExecutorService service=Executors.newFixedThreadPool(Constants.SAVE_AND_DEL_THREAD_SIZE); -// for(int j=0;j e:list) { -// if(e.get()!=null) { -// try { -// throw e.get(); -// } catch (Throwable e1) { -// // TODO Auto-generated catch block -// e1.printStackTrace(); -// } -// } -// } List asnIpCfgs=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE); List _ipPortCfgs=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE); while(!ipPortCfgs.isEmpty()) { @@ -1553,17 +1495,21 @@ public class BaseController { AsnIpCfg _cfg=new AsnIpCfg(); BeanUtils.copyProperties(cfg, _cfg,new String[] {"cfgId"}); _cfg.setTableName(AsnIpCfg.getTablename()); - _cfg.setAction(0); + _cfg.setAction(serviceDict==null?0:serviceDict.getAction()); _cfg.setCfgRegionCode(regionDict.getConfigRegionCode()); _cfg.setCfgType(regionDict.getConfigRegionValue()); _cfg.setCreateTime(date); _cfg.setCreatorId(UserUtils.getUser().getId()); _cfg.setDoLog(2); _cfg.setFunctionId(regionDict.getFunctionId()); - _cfg.setIsAudit(0); - if(fullMap.get(Long.parseLong(_cfg.getUserRegion1()))) { + if(isSend.equals("1")) { + _cfg.setIsAudit(Constants.AUDIT_YES); _cfg.setIsValid(Constants.VALID_YES); + _cfg.setAuditorId(UserUtils.getUser().getId()); + _cfg.setAuditTime(date); + }else { + _cfg.setIsAudit(Constants.AUDIT_NOT_YET); _cfg.setIsValid(Constants.VALID_NO); } _cfg.setIsAreaEffective(0); @@ -1571,27 +1517,31 @@ public class BaseController { _cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); _cfg.setAttribute(attribute); _cfg.setClassify(classify); - _cfg.setServiceId(0); +// _cfg.setServiceId(0); + _cfg.setServiceId(serviceDict==null?0:serviceDict.getServiceId()); //设置region id if(regionIds!=null&®ionIds.size()==_ipPortCfgs.size()) { _cfg.setRegionId(regionIds.get(ind)); } - //设置group id + //设置group id,compileId if(asnNoMaps.get(0).containsKey(Long.parseLong(_cfg.getUserRegion1()))) { - _cfg.setAsnIpGroup(asnNoMaps.get(0).get(Long.parseLong(_cfg.getUserRegion1()))); + _cfg.setAsnIpGroup(asnNoMaps.get(0).get(Long.parseLong(_cfg.getUserRegion1())).getGroupId()); + _cfg.setCompileId(asnNoMaps.get(0).get(Long.parseLong(_cfg.getUserRegion1())).getCompileId()); }else if(asnNoMaps.get(1).containsKey(Long.parseLong(_cfg.getUserRegion1()))) { - _cfg.setAsnIpGroup(asnNoMaps.get(1).get(Long.parseLong(_cfg.getUserRegion1()))); + _cfg.setAsnIpGroup(asnNoMaps.get(1).get(Long.parseLong(_cfg.getUserRegion1())).getGroupId()); + _cfg.setCompileId(asnNoMaps.get(1).get(Long.parseLong(_cfg.getUserRegion1())).getCompileId()); }else { - ConfigGroupInfo info=AsnCacheUtils.get(Long.parseLong(_cfg.getUserRegion1())); - if(info==null) { - info=asnIpCfgService.getConfigGroupInfoByAsnNo(Long.parseLong(_cfg.getUserRegion1())); + //AsnGroupInfo info=AsnCacheUtils.get(Long.parseLong(_cfg.getUserRegion1())); + AsnGroupInfo info=asnGroupInfos.get(Long.parseLong(_cfg.getUserRegion1())); + if(info!=null) { + _cfg.setAsnIpGroup(info.getGroupId()); + _cfg.setCompileId(info.getCompileId()); } - _cfg.setAsnIpGroup(info.getGroupId()); } asnIpCfgs.add(_cfg); ind++; } - ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, asnIpCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,isSend.equals("1")); + ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, asnIpCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,asnNoMaps,isSend.equals("1")); cfgIndexInfos.clear(); appPolicyCfgs.clear(); _ipPortCfgs.clear(); @@ -1734,7 +1684,7 @@ public class BaseController { } ind++; } - ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _ipPortCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,isSend.equals("1")); + ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _ipPortCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,asnNoMaps,isSend.equals("1")); cfgIndexInfos.clear(); appPolicyCfgs.clear(); _ipPortCfgs.clear(); @@ -1859,7 +1809,7 @@ public class BaseController { } ind++; } - ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _stringCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,isSend.equals("1")); + ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _stringCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,asnNoMaps,isSend.equals("1")); cfgIndexInfos.clear(); appPolicyCfgs.clear(); _stringCfgs.clear(); @@ -1970,7 +1920,7 @@ public class BaseController { } ind++; } - ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _complexkeywordCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,isSend.equals("1")); + ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _complexkeywordCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,asnNoMaps,isSend.equals("1")); cfgIndexInfos.clear(); appPolicyCfgs.clear(); _complexkeywordCfgs.clear(); @@ -2050,7 +2000,7 @@ public class BaseController { appFeatureIndexs.add(appfeature); ind++; } - ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _complexkeywordCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,isSend.equals("1")); + ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _complexkeywordCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,asnNoMaps,isSend.equals("1")); cfgIndexInfos.clear(); appPolicyCfgs.clear(); _complexkeywordCfgs.clear(); @@ -2092,7 +2042,7 @@ public class BaseController { cfg.setCompileId(compileIds.get(ind)); ind++; } - ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _dnsResStrategies, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,isSend.equals("1")); + ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _dnsResStrategies, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,asnNoMaps,isSend.equals("1")); _dnsResStrategies.clear(); cfgIndexInfos.clear(); appPolicyCfgs.clear(); @@ -2123,6 +2073,48 @@ public class BaseController { long end=System.currentTimeMillis(); logger.warn("import finish,cost:"+(end-start)); } + + public void deleteIps(Map asnNoMap){ + List toDelAndSendAsnIpCfgs=Lists.newArrayList(); + List asnIds=Lists.newArrayList(asnNoMap.size()); + for(Entry e:asnNoMap.entrySet()) { + AsnGroupInfo asnGroupInfo=e.getValue(); + if(asnGroupInfo==null) { + asnGroupInfo=asnIpCfgService.getAsnGroupInfoByAsnNo(e.getKey()); + } + if(asnGroupInfo.getIsValid()==1) {//已下发 + List _toDelAsnIpCfgs=asnIpCfgService.getByAsnNo(asnGroupInfo.getAsnId()); + toDelAndSendAsnIpCfgs.addAll(_toDelAsnIpCfgs); + }else { + asnIds.add(e.getKey()); + } + } + if(asnIds.size()>0) { + asnIpCfgService.deleteByAsnNo(asnIds); + } + if(toDelAndSendAsnIpCfgs.size()>0) { + int pointsDataLimit = Constants.MAAT_JSON_SEND_SIZE;//限制条数 + Integer size = toDelAndSendAsnIpCfgs.size(); + //判断是否有必要分批 + if(pointsDataLimit listPage = toDelAndSendAsnIpCfgs.subList(0, pointsDataLimit); + asnIpCfgService.delAndSend(listPage); + //剔除 + toDelAndSendAsnIpCfgs.subList(0, pointsDataLimit).clear(); + } + //最后剩下的 + if(!toDelAndSendAsnIpCfgs.isEmpty()){ + asnIpCfgService.delAndSend(toDelAndSendAsnIpCfgs); + + } + }else { + asnIpCfgService.delAndSend(toDelAndSendAsnIpCfgs); + } + } + } /** * 加载模板 * @param ei @@ -2291,7 +2283,22 @@ public class BaseController { fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); } new ExportExcel(msgProp.getProperty(code, code),code,titleTime, headerList).ajaxDataList(dataList, code).write(response, fileName).dispose(); - + } + + + public void _ajaxCsv(HttpServletRequest request, HttpServletResponse response, + String code,String titleTime,List headerList, List> dataList) + throws Exception{ + Properties msgProp = getMsgProp(); + String fileName = msgProp.getProperty(code, code) + "_" + DateUtils.getDate("yyyyMMddHHmmss") + + ".csv"; + fileName = fileName.replaceAll(" ", "_"); + if (request.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) { + fileName = URLEncoder.encode(fileName, "UTF-8"); + } else { + fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); + } + ExcelCsv.ajaxCSVFile(response,headerList,dataList,fileName,titleTime,msgProp); } public String initLogMap(BaseLogEntity log,String title){ @@ -2350,6 +2357,7 @@ public class BaseController { page.setOrderBy(""); page.setPageSize(Constants.MAAT_JSON_SEND_SIZE); page.setPageNo(1); + page.setLastPage(false); //携带审核状态信息的BaseCfg BaseCfg auditBatchCfg=new BaseCfg(); //携带审核条件的BaseCfg @@ -2691,6 +2699,9 @@ public class BaseController { } hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgFeatrureList, hasData); } + if(hasData) { + page.setPageNo(page.getNext()); + } }else{ hasData = false; } @@ -2727,13 +2738,19 @@ public class BaseController { } } }else{ - //批量下发时，未下发过的app需要下发正常配置;已下发过的app需要下发ip复用配置（为保证事物，分两种方式下发） //1028 app_ip_cfg + //TODO 批量审核通过APP IP需要处理的问题：一批中存在一个APP 所有IP均未下发过的问题？待解决 + //批量下发时，未下发过的app需要下发正常配置;已下发过的app需要下发ip复用配置（为保证事物，分两种方式下发） if(auditBatchCfg.getServiceId().equals(1028)) { - if(true) { + /*if(true) { + page.setOrderBy(""); + page.setPageSize(Constants.MAAT_JSON_SEND_SIZE); + page.setPageNo(1); + page.setLastPage(false); + boolean hasData = true; while(hasData){ - /************预先获取已下发的groupid和compileid，且每批次重新获取，避免上一批次有新的compileId下发*************/ + *//************预先获取已下发的groupid和compileid，且每批次重新获取，避免上一批次有新的compileId下发*************//* Map isIssuedCompileIds=new HashMap<>(); //分组复用组信息1:app ip，2：内容，3：区域 ,4 asn ConfigGroupInfo groupInfo=new ConfigGroupInfo(); @@ -2768,9 +2785,14 @@ public class BaseController { } } if(auditBatchCfg.getIsValid().equals(1)) { + page.setOrderBy(""); + page.setPageSize(Constants.MAAT_JSON_SEND_SIZE); + page.setPageNo(1); + page.setLastPage(false); + boolean hasData = true; while(hasData){ - /************预先获取未下发的groupid和compileid，********************/ + *//************预先获取未下发的groupid和compileid，********************//* //获取已下发的appcompileid Map notIssuedCompileIds=new HashMap<>(); //分组复用组信息1:app ip，2：内容，3：区域 ,4 asn @@ -2804,7 +2826,7 @@ public class BaseController { hasData = false; } } - } + }*/ }else { boolean hasData = true; while(hasData){ diff --git a/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.xml b/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.xml index c3fd2c166..252839bd5 100644 --- a/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.xml @@ -22,7 +22,7 @@ from config_group_info where group_type =#{groupType} - select from config_group_info @@ -70,6 +70,10 @@ select id,group_id,group_name,is_issued,insert_time,update_time,group_type,compile_id,asn_id from config_group_info where group_id= #{groupId} +