Stream限速配置导入模板增加'丢包率'属性，修正APP策略配置导入并下发isValid为0(无效)bug

src/main/java/com/nis/util/excel/ImportBigExcel.java

@@ -423,7 +423,7 @@ public class ImportBigExcel extends XLSXCovertCSVReader{
 			throw new RuntimeException("regionDict is null!");
 		}
 		if(dataList.size()==0) {
-			throw new ServiceException(props.getProperty("noneData", "noneData"));
+			throw new ServiceException(props.getProperty("no_data", "no_data"));
 		}else if(this.hasImportLimit&&dataList.size()>(Constants.IMPORT_LIMIT+1)) {
 			throw new ServiceException(props.getProperty("import_limit_is", "The maximum import size is")+" "+Constants.IMPORT_LIMIT);
 		}

src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java

@@ -132,10 +132,16 @@ public class CheckIpFormatThread implements Callable<String>{
 			
 			// 特殊字段验证
 			// packet ip ratelimit
-			if (serviceDict!=null&&serviceDict.getFunctionId().intValue() == 5 && serviceDict.getAction().intValue() == 64) {
+			if (serviceDict!=null && serviceDict.getAction().intValue() == 64 && (serviceDict.getFunctionId().intValue() == 5 
+					|| serviceDict.getFunctionId().intValue() == 63
+					|| serviceDict.getFunctionId().intValue() == 407
+					|| serviceDict.getFunctionId().intValue() == 408) ) {
 				String userRegion1 = IpRateLimitTemplate.userRegion1;
 				baseIpCfg.setUserRegion1(userRegion1);
 				if("0".equals(userRegion1)) {
+					if(StringUtils.isBlank(baseIpCfg.getUserRegion2())) {
+						baseIpCfg.setUserRegion2("0.1");
+					}
 					String userRegion2 = baseIpCfg.getUserRegion2();
 					try {
 						// Double ratelimt= Double.parseDouble(userRegion2);

src/main/java/com/nis/web/controller/BaseController.java

@@ -1534,6 +1534,9 @@ public class BaseController {
 								|| regionDict.getFunctionId().equals(566)) { // APP Feature IP
 							BlockingQueue<IpAllNotDoLogTemplate> list = ei.getDataList(IpAllNotDoLogTemplate.class );
 							ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list);
+						}else if((regionDict.getFunctionId().equals(63) || regionDict.getFunctionId().equals(407) || regionDict.getFunctionId().equals(408)) && serviceDict!=null && serviceDict.getAction().equals(64)) { // Policies -> Stream
+							BlockingQueue<IpRateLimitTemplate> list = ei.getDataList(IpRateLimitTemplate.class);
+							ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list);
 						}else {
 							BlockingQueue<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class );
 							ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list);
@@ -1628,6 +1631,9 @@ public class BaseController {
 					String isSend = request.getParameter("isSend")==null?"":request.getParameter("isSend");
 					SpecificServiceCfg specificServiceCfg = null;
 					if (serviceDict!=null&&(serviceDict.getServiceId().intValue() == 33 || serviceDict.getServiceId().intValue() == 145
+							|| serviceDict.getServiceId().intValue() == 1056
+							|| serviceDict.getServiceId().intValue() == 1059
+							|| serviceDict.getServiceId().intValue() == 1060
 							|| serviceDict.getServiceId().intValue() == 35
 							|| serviceDict.getServiceId().intValue() == 147
 							|| serviceDict.getServiceId().intValue() == 36
@@ -1902,6 +1908,9 @@ public class BaseController {
 									}
 									if (serviceDict!=null&&(serviceDict.getServiceId().intValue() == 33
 											|| serviceDict.getServiceId().intValue() == 145
+											|| serviceDict.getServiceId().intValue() == 1056
+											|| serviceDict.getServiceId().intValue() == 1059
+											|| serviceDict.getServiceId().intValue() == 1060
 											|| serviceDict.getServiceId().intValue() == 35
 											|| serviceDict.getServiceId().intValue() == 147
 											|| serviceDict.getServiceId().intValue() == 36
@@ -2487,7 +2496,9 @@ public class BaseController {
 			} else if(regionDict.getFunctionId().equals(405) || regionDict.getFunctionId().equals(563) || regionDict.getFunctionId().equals(565)
 					|| regionDict.getFunctionId().equals(566)) { // APP Feature IP
 					ei.loadInitParams(IpAllNotDoLogTemplate.class, msgProp, regionDict, serviceDict);
-			} else {
+			} else if((regionDict.getFunctionId().equals(63) || regionDict.getFunctionId().equals(407) || regionDict.getFunctionId().equals(408)) && serviceDict.getAction().equals(64)){ // Policies -> Stream
+				ei.loadInitParams(IpRateLimitTemplate.class, msgProp, regionDict, serviceDict);
+			}else {
 				ei.loadInitParams(IpAllTemplate.class, msgProp, regionDict, serviceDict);
 			}
 		} else if (regionDict.getRegionType().equals(2)) {// 字符串类

src/main/java/com/nis/web/controller/configuration/ntc/IpController.java

@@ -429,6 +429,11 @@ public class IpController extends BaseController{
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllNotDoLogTemplate.class, 2);
 				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
+			}else if((regionDict.getFunctionId().equals(63)|| regionDict.getFunctionId().equals(407) || regionDict.getFunctionId().equals(408)) && serviceDict.getAction().equals(64)){// Policies -> Stream
+				List<IpRateLimitTemplate> classList=new ArrayList<IpRateLimitTemplate>();
+				ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpRateLimitTemplate.class, 2);
+				excel.setDataList(pro,classList,null).
+		    	write(request,response, fileName).dispose();
 			}else{
 				List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllTemplate.class, 2);

src/main/java/com/nis/web/service/BaseService.java

@@ -2344,7 +2344,8 @@ public abstract class BaseService {
 		try{
 			batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
 			for(int index = 0; index < appPolicyCfgs.size();index++){
-				AppPolicyCfg _cfg = appPolicyCfgs.get(index);
+				AppPolicyCfg _cfg = new AppPolicyCfg();
+				BeanUtils.copyProperties(appPolicyCfgs.get(index), _cfg);
 				((AppCfgDao) batchSqlSession.getMapper(AppCfgDao.class)).insertAppPolicyCfgForBatch(_cfg);
 				
 			}

src/main/webapp/static/pages/scripts/importExcel.js

@@ -67,6 +67,16 @@ function switchService(){
 		$(".service").removeClass("hidden");
 	}
 	
+	// App Identify -> RateLimit隐藏SubscribeID
+	if(functionId == 63){
+		var action = $("input[name='serviceDictId']:checked").attr("action");
+		var label = $(".region").find("input[configservicetype='subscribe_id']").parents("label:first");
+		if(action == 64){
+			$(label).hide();
+		}else{
+			$(label).show();
+		}
+	}
 }
 /**
  * 模板下载