更改ddos 配置为maat提交

2018-11-13 20:19:49 +08:00
parent fe6698e71e
commit 3100cd07c6
4 changed files with 162 additions and 28 deletions
--- a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java
@@ -18,9 +18,17 @@ import com.nis.domain.callback.InlineIp;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.DdosIpCfg;
 import com.nis.domain.configuration.IpPortCfg;
+import com.nis.domain.maat.MaatCfg;
+import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
+import com.nis.domain.maat.MaatCfg.DigestCfg;
+import com.nis.domain.maat.MaatCfg.GroupCfg;
+import com.nis.domain.maat.MaatCfg.IpCfg;
+import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
+import com.nis.domain.maat.MaatCfg.StringCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
+import com.nis.util.Constants;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.DdosCfgDao;
 import com.nis.web.security.UserUtils;
@@ -141,7 +149,7 @@ public class DdosCfgService extends BaseService{
 	 * @param ids cfgId
 	 * @param functionId
 	 */
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	/*	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void audit(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
 		DdosIpCfg entity = new DdosIpCfg();
 		
@@ -211,5 +219,111 @@ public class DdosCfgService extends BaseService{
 			}
 		}
 		
+	}*/
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void audit(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime) throws Exception{
+		DdosIpCfg entity = new DdosIpCfg();
+		
+		entity=ddosCfgDao.getDdosIpCfg(Long.valueOf(id));
+		List<DdosIpCfg> list = new ArrayList();
+		
+		entity.setCfgId(Long.valueOf(id));
+		entity.setIsAudit(isAudit);
+		entity.setIsValid(isValid);
+		entity.setAuditorId(UserUtils.getUser().getId());
+		entity.setAuditTime(auditTime);
+		
+		ddosCfgDao.update(entity);
+		
+		
+		String antiddosProtocol = entity.getAntiddosProtocol();
+		Long bpsThreadshold = entity.getBpsThreadshold();
+		Long ppsThreadshold = entity.getPpsThreadshold();
+		Map umap= new HashMap();
+		if(StringUtil.isBlank(antiddosProtocol)) {
+			antiddosProtocol="";
+		}
+		if(bpsThreadshold==null) {
+			bpsThreadshold=0l;
+		}
+		if(ppsThreadshold==null) {
+			ppsThreadshold=0l;
+		}
+		umap.put("protocol", antiddosProtocol);
+		umap.put("bps_threadshold", bpsThreadshold);
+		umap.put("pps_threadshold", ppsThreadshold);
+		String userRegion = new Gson().toJson(umap);
+		
+		ToMaatBean maatBean = new ToMaatBean();		
+		MaatCfg maatCfg = new MaatCfg();
+		List<MaatCfg> configCompileList = new ArrayList();
+		List<GroupCfg> groupRelationList = new ArrayList();
+		List<IpCfg> ipRegionList = new ArrayList();
+		List<StringCfg> strRegionList = new ArrayList();
+		List<NumBoundaryCfg> numRegionList = new ArrayList();
+		List<DigestCfg> digestRegionList = new ArrayList();
+		List<IpCfg> areaIpRegionList = new ArrayList();		
+		
+		
+		entity=this.getDdosIpCfg(entity.getCfgId());
+		
+		if(entity.getIsAudit()==1){
+			List<DdosIpCfg> ipList=new ArrayList<DdosIpCfg>();
+			ipList.add(entity);
+			if(!StringUtil.isEmpty(ipList)){
+				Map<String,List> ipMap = cfgConvert(ipRegionList,ipList,1,entity,groupRelationList);
+				groupRelationList=ipMap.get("groupList");
+				ipRegionList=ipMap.get("dstList");
+				if(ipMap.get("numRegionList")!=null){
+					numRegionList.addAll(ipMap.get("numRegionList"));
+
+				}
+			}
+			
+			//调用服务接口下发配置数据
+			maatCfg.initDefaultValue();
+			BeanUtils.copyProperties(entity, maatCfg);
+			maatCfg.setAction(entity.getAction());
+			maatCfg.setAuditTime(auditTime);
+			maatCfg.setIpRegionList(ipRegionList);
+			maatCfg.setStrRegionList(strRegionList);
+			maatCfg.setNumRegionList(numRegionList);
+			maatCfg.setDigestRegionList(digestRegionList);
+			maatCfg.setGroupRelationList(groupRelationList);
+			maatCfg.setGroupNum(groupRelationList.size());
+			maatCfg.setAreaIpRegionList(areaIpRegionList);
+			maatCfg.setIsValid(entity.getIsValid());
+			maatCfg.setUserRegion(userRegion);// 自定义域
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(auditTime);
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			//调用服务接口下发配置数据
+			String json=gsonToJson(maatBean);
+			logger.info("ddos 配置下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+			logger.info("ddos 配置下发响应信息："+result.getMsg());
+			
+		}else if(entity.getIsAudit()==3){
+			maatCfg.setCompileId(entity.getCompileId());
+			maatCfg.setServiceId(entity.getServiceId());
+			maatCfg.setIsValid(0);//无效
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(auditTime);
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
+			//调用服务接口取消配置
+			String json=gsonToJson(maatBean);
+			logger.info("ddos 配置下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.put(json,1);
+			logger.info("ddos 配置取消配置响应信息："+result.getMsg());
+		}
+		
 	}
 }
--- a/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp
@@ -30,6 +30,20 @@
 	            <div for="ipType"></div>
 	        </div>
 	    </div>
+	    <div class="col-md-6">
+	        <div class="form-group ">
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
+	            <div class="col-md-6">
+           				<select name="protocol" class="selectpicker show-tick form-control required">
+           					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+								<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+            				</c:forEach>
+           				</select>
+	                <input type="hidden" name="protocolId" value="0">
+	            </div>
+	            <div for="protocol"></div>
+	        </div>
+	    </div>
 	</div>
 	<div class="row">
 	    <div class="col-md-6">
@@ -94,20 +108,7 @@
 			<div class="row destPort">
 		</c:otherwise>
 	</c:choose>
-		<div class="col-md-6">
-	        <div class="form-group ">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
-	            <div class="col-md-6">
-           				<select name="protocol" class="selectpicker show-tick form-control required">
-           					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-								<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
-            				</c:forEach>
-           				</select>
-	                <input type="hidden" name="protocolId" value="0">
-	            </div>
-	            <div for="protocol"></div>
-	        </div>
-	    </div>
+		
 	    <div class="col-md-6">
 	        <div class="form-group">
 	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
@@ -91,23 +91,27 @@ $(function(){
 								            </div>
 								        </div>
 								    </div>
-								    <div class="col-md-6 hidden">
+								    <div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
 													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																regionCode="${service.regionCode }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
-														</c:if>
-													</label>
+														<label class="radio-inline"> <c:if
+																test="${_cfg.functionId eq service.functionId}">
+																<input type="radio" name="action"
+																	serviceId="${service.serviceId }"
+																	protocolId="${service.protocolId }"
+																	regionCode="${service.regionCode }"
+																	value="${service.action }" class="required action"
+																	<c:if test="${_cfg.serviceId==service.serviceId || (_cfg.serviceId==null && satus.index==0)}">checked</c:if>>
+																	<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																		<c:if test="${dict.itemCode eq service.action }">
+																			<spring:message code="${dict.itemValue }"/>
+																		</c:if>
+																	</c:forEach>
+															</c:if>
+														</label>
 												</c:forEach>
 								            </div>
 								            <div for="action"></div>
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -70,6 +70,7 @@
 	</div>
 </div>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
 <%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
 <script type="text/javascript">
 $(document).ready(function(){
@@ -78,7 +79,6 @@ $(document).ready(function(){
 });

 function showIpActiveChart(rs){
-	console.log(rs)
 	var data=new Array();
 	var xData=new Array();
 		xData=rs[0].statTime;
@@ -90,6 +90,21 @@ function showIpActiveChart(rs){
 	});
 	})
 	var chart = Highcharts.chart('chart', {
+		exporting: {
+			allowHTML:true,
+			url:'saveAsImage',
+			filename:'Active-IP',
+			chartOptions: {
+				plotOptions: {
+					series: {
+						dataLabels: {
+							enabled: true,
+							allowOverlap: true, // 允许数据标签重叠
+						},
+					},
+				}
+			}
+		},
 	    title: {
 	        text: null
 	    },