新增openVPN的日志导出
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.nis.web.controller.log.ntc;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -8,12 +9,14 @@ import java.util.Map;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.http.client.ClientProtocolException;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
@@ -21,7 +24,9 @@ import com.google.gson.reflect.TypeToken;
|
||||
import com.nis.domain.FunctionServiceDict;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.PageLog;
|
||||
import com.nis.domain.SysUser;
|
||||
import com.nis.domain.log.MmVoipLog;
|
||||
import com.nis.domain.log.NtcCollectRadiusLog;
|
||||
import com.nis.domain.log.NtcOpenVpnLog;
|
||||
import com.nis.domain.log.NtcOpenVpnLog;
|
||||
import com.nis.domain.maat.LogRecvData;
|
||||
@@ -29,6 +34,7 @@ import com.nis.util.Constants;
|
||||
import com.nis.util.DictUtils;
|
||||
import com.nis.util.httpclient.HttpClientUtil;
|
||||
import com.nis.web.controller.BaseController;
|
||||
import com.nis.web.security.UserUtils;
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "${adminPath}/log/ntc/ntcOpenvpnLogs")
|
||||
@@ -60,6 +66,7 @@ public class OpenVpnLogController extends BaseController{
|
||||
|
||||
String url = "";
|
||||
url = Constants.LOG_BASE_URL+Constants.NTC_OPENVPN_LOG;
|
||||
//url = Constants.LOG_BASE_URL+Constants.NTC_IP_LOG;
|
||||
String jsonString = HttpClientUtil.getMsg(url,params,request);
|
||||
|
||||
Gson gson = new GsonBuilder().create();
|
||||
@@ -86,4 +93,56 @@ public class OpenVpnLogController extends BaseController{
|
||||
return "/log/ntc/openVpnList";
|
||||
}
|
||||
|
||||
//radius配置导出
|
||||
@RequestMapping(value = "exportNtcOpenvpnLogs")
|
||||
public void exportRadius(@ModelAttribute("log") NtcOpenVpnLog log, Model model,String hColumns,String type, HttpServletRequest request, HttpServletResponse response,RedirectAttributes redirectAttributes){
|
||||
try {
|
||||
//export data info
|
||||
List<String> titleList=new ArrayList<String>();
|
||||
Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
|
||||
Map<String, List> dataMap=new HashMap<String, List>();
|
||||
Map<String, String> noExportMap=new HashMap<String, String>();
|
||||
//---------------------------
|
||||
PageLog<NtcOpenVpnLog> page = new PageLog<NtcOpenVpnLog>(request, response);
|
||||
page.setPageNo(1);
|
||||
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
|
||||
Map<String, Object> params = new HashMap<String, Object>();
|
||||
params.put("pageSize", page.getPageSize());
|
||||
params.put("pageNo", page.getPageNo());
|
||||
initLogSearchValue(log, params);
|
||||
List<NtcOpenVpnLog> list=new ArrayList<NtcOpenVpnLog>();
|
||||
String url =Constants.LOG_BASE_URL + Constants.NTC_OPENVPN_LOG;
|
||||
//String url =Constants.LOG_BASE_URL + Constants.NTC_IP_LOG;
|
||||
String recv = HttpClientUtil.getMsg(url, params, request);
|
||||
if (StringUtils.isNotBlank(recv)) {
|
||||
Gson gson = new GsonBuilder().create();
|
||||
LogRecvData<NtcOpenVpnLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcOpenVpnLog>>(){}.getType());
|
||||
if (fromJson.getStatus().intValue() == 200) {
|
||||
Page<NtcOpenVpnLog> data = fromJson.getData();
|
||||
list= data.getList();
|
||||
}
|
||||
}
|
||||
titleList.add("openVpn_log");
|
||||
classMap.put("openVpn_log", NtcOpenVpnLog.class);
|
||||
SysUser user =UserUtils.getUser();
|
||||
if (!user.isAdmin()){
|
||||
hColumns+=",scene_file,";
|
||||
}else{
|
||||
hColumns+=",";
|
||||
}
|
||||
String cfgIndexInfoNoExport=",cfg_id,action,"+hColumns;
|
||||
noExportMap.put("openVpn_log",cfgIndexInfoNoExport);
|
||||
dataMap.put("openVpn_log",list);
|
||||
/*}*/
|
||||
if("csv".equals(type)){
|
||||
this._exportCsv(model, request, response, redirectAttributes,"openVpn_log",titleList,classMap,dataMap,noExportMap);
|
||||
}else{
|
||||
this._export(model, request, response, redirectAttributes,"openVpn_log",titleList,classMap,dataMap,noExportMap);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("openVpn export failed",e);
|
||||
addMessage(redirectAttributes,"error","export_failed");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -90,6 +90,16 @@ $(document).ready(function(){
|
||||
</div>
|
||||
|
||||
<div class="pull-right">
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
|
||||
<i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
|
||||
<i class="fa fa-angle-down"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu pull-right" style="min-width: 110px;" >
|
||||
<li><sys:delRow url="${ctx}/log/ntc/ntcOpenvpnLogs/exportNtcOpenvpnLogs?type=excel" searchUrl="${ctx}/log/ntc/ntcOpenvpnLogs/list" id="contentTable" maxRow="10000" label="excel"></sys:delRow></li>
|
||||
<li><sys:delRow url="${ctx}/log/ntc/ntcOpenvpnLogs/exportNtcOpenvpnLogs?type=csv" searchUrl="${ctx}/log/ntc/ntcOpenvpnLogs/list" id="contentTable" maxRow="10000" label="csv"></sys:delRow></li>
|
||||
</ul>
|
||||
</div>
|
||||
<a class="btn btn-icon-only btn-default setfields tooltips"
|
||||
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
|
||||
<i class="icon-wrench"></i>
|
||||
@@ -170,41 +180,41 @@ $(document).ready(function(){
|
||||
<thead>
|
||||
<tr>
|
||||
<th><spring:message code="log"/></th>
|
||||
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
|
||||
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
|
||||
<th class="sort-column found_time"><spring:message code="found_time"/></th>
|
||||
<th class="sort-column recv_time" isVisible="false"><spring:message code="recv_time"/></th>
|
||||
<th class="sort-column cfg_id " isVisible="false" column="cfg_id" ><spring:message code="cfg_id"/></th>
|
||||
<th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th>
|
||||
<th class="sort-column found_time" column="found_time"><spring:message code="found_time"/></th>
|
||||
<th class="sort-column recv_time" isVisible="false" column="recv_time"><spring:message code="recv_time"/></th>
|
||||
|
||||
<th class="sort-column entrance_id" isVisible="false"><spring:message code="entrance_id"/></th>
|
||||
<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
|
||||
|
||||
<%-- <th class="sort-column version"><spring:message code='version'/></th>
|
||||
<th class="sort-column encrypt_mode"><spring:message code='encrypt_mode'/></th>
|
||||
<th class="sort-column hmac"><spring:message code='hmac'/></th>
|
||||
<th class="sort-column tunnel_type"><spring:message code='tunnel_type'/></th> --%>
|
||||
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
|
||||
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
|
||||
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
|
||||
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
|
||||
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>
|
||||
<th class="sort-column d_port"><spring:message code="server_port"/></th>
|
||||
<th class="sort-column s_port"><spring:message code="client_port"/></th>
|
||||
<th class="sort-column device_id" isVisible="false"><spring:message code="deviceid"/></th>
|
||||
<th class="sort-column link_id" isVisible="false"><spring:message code="link_id"/></th>
|
||||
<th class="sort-column encap_type"><spring:message code="encap_type"/></th>
|
||||
<th class="sort-column direction"><spring:message code="direction"/></th>
|
||||
<th class="sort-column inner_smac"><spring:message code="inner_smac"/></th>
|
||||
<th class="sort-column inner_dmac"><spring:message code="inner_dmac"/></th>
|
||||
<th class="sort-column stream_dir"><spring:message code="stream_type"/></th>
|
||||
<th class="sort-column cap_ip" isVisible="false" column="clj_ip"><spring:message code="clj_ip"/></th>
|
||||
<th class="sort-column trans_proto" column="transport_layer_protocol"><spring:message code="transport_layer_protocol"/></th>
|
||||
<th class="sort-column addr_type" column="addr_type"><spring:message code='addr_type'/></th>
|
||||
<th class="sort-column d_ip" column="server_ip"><spring:message code="server_ip"/></th>
|
||||
<th class="sort-column s_ip" column="client_ip"><spring:message code="client_ip"/></th>
|
||||
<th class="sort-column d_port" column="server_port"><spring:message code="server_port"/></th>
|
||||
<th class="sort-column s_port" column="client_port"><spring:message code="client_port"/></th>
|
||||
<th class="sort-column device_id" isVisible="false" column="deviceid"><spring:message code="deviceid"/></th>
|
||||
<th class="sort-column link_id" isVisible="false" column="link_id"><spring:message code="link_id"/></th>
|
||||
<th class="sort-column encap_type" column="encap_type"><spring:message code="encap_type"/></th>
|
||||
<th class="sort-column direction" column="direction"><spring:message code="direction"/></th>
|
||||
<th class="sort-column inner_smac" column="inner_smac"><spring:message code="inner_smac"/></th>
|
||||
<th class="sort-column inner_dmac" column="inner_dmac"><spring:message code="inner_dmac"/></th>
|
||||
<th class="sort-column stream_dir" column="stream_type"><spring:message code="stream_type"/></th>
|
||||
|
||||
<th class="sort-column addr_list"><spring:message code="nest_addr_list"/></th>
|
||||
<th class="sort-column server_locate"><spring:message code='server_locate'/></th>
|
||||
<th class="sort-column client_locate"><spring:message code='client_locate'/></th>
|
||||
<th class="sort-column s_asn" isVisible="false"><spring:message code='s_asn'/></th>
|
||||
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
|
||||
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
|
||||
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
|
||||
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
|
||||
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
|
||||
<th class="sort-column addr_list" column="nest_addr_list"><spring:message code="nest_addr_list"/></th>
|
||||
<th class="sort-column server_locate" column="server_locate"><spring:message code='server_locate'/></th>
|
||||
<th class="sort-column client_locate" column="client_locate"><spring:message code='client_locate'/></th>
|
||||
<th class="sort-column s_asn" isVisible="false" column="s_asn"><spring:message code='s_asn'/></th>
|
||||
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
|
||||
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
|
||||
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
|
||||
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
|
||||
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
Reference in New Issue
Block a user