diff --git a/src/main/java/com/nis/domain/log/ReportLog.java b/src/main/java/com/nis/domain/log/ReportLog.java new file mode 100644 index 000000000..d912e813b --- /dev/null +++ b/src/main/java/com/nis/domain/log/ReportLog.java @@ -0,0 +1,91 @@ +/** + *@Title: ReportLog.java + *@Package com.nis.domain.log + *@Description TODO + *@author dell + *@date 2018年6月13日 下午2:21:04 + *@version 版本号 + */ +package com.nis.domain.log; + +import java.util.Date; + +import com.nis.domain.BaseEntity; + +/** + * @ClassName: ReportLog.java + * @Description: TODO + * @author (dell) + * @date 2018年6月13日 下午2:21:04 + * @version V1.0 + */ +public class ReportLog extends BaseEntity{ + /** + * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = 7079305499220977782L; + private Long configId; + private Long sum; + private Integer service; + private Date statTime; + /** + * configId + * @return configId + */ + + public Long getConfigId() { + return configId; + } + /** + * @param configId the configId to set + */ + public void setConfigId(Long configId) { + this.configId = configId; + } + /** + * sum + * @return sum + */ + + public Long getSum() { + return sum; + } + /** + * @param sum the sum to set + */ + public void setSum(Long sum) { + this.sum = sum; + } + /** + * service + * @return service + */ + + public Integer getService() { + return service; + } + /** + * @param service the service to set + */ + public void setService(Integer service) { + this.service = service; + } + /** + * statTime + * @return statTime + */ + + public Date getStatTime() { + return statTime; + } + /** + * @param statTime the statTime to set + */ + public void setStatTime(Date statTime) { + this.statTime = statTime; + } + +} diff --git a/src/main/java/com/nis/domain/log/ReportResultLog.java b/src/main/java/com/nis/domain/log/ReportResultLog.java index 38cc46bea..19b50d3dc 100644 --- a/src/main/java/com/nis/domain/log/ReportResultLog.java +++ b/src/main/java/com/nis/domain/log/ReportResultLog.java @@ -24,7 +24,7 @@ import com.nis.domain.RestfulResult; */ public class ReportResultLog extends RestfulResult{ private Integer logSource; - private List> data; + private Page data; /** * logSource * @return logSource @@ -44,84 +44,14 @@ public class ReportResultLog extends RestfulResult{ * @return data */ - public List> getData() { + public Page getData() { return data; } /** * @param data the data to set */ - public void setData(List> data) { + public void setData(Page data) { this.data = data; } -} -class ReportLog extends BaseEntity{ - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = 7079305499220977782L; - private Long configId; - private Long sum; - private Integer service; - private Date statTime; - /** - * configId - * @return configId - */ - - public Long getConfigId() { - return configId; - } - /** - * @param configId the configId to set - */ - public void setConfigId(Long configId) { - this.configId = configId; - } - /** - * sum - * @return sum - */ - - public Long getSum() { - return sum; - } - /** - * @param sum the sum to set - */ - public void setSum(Long sum) { - this.sum = sum; - } - /** - * service - * @return service - */ - - public Integer getService() { - return service; - } - /** - * @param service the service to set - */ - public void setService(Integer service) { - this.service = service; - } - /** - * statTime - * @return statTime - */ - - public Date getStatTime() { - return statTime; - } - /** - * @param statTime the statTime to set - */ - public void setStatTime(Date statTime) { - this.statTime = statTime; - } - } \ No newline at end of file diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java new file mode 100644 index 000000000..26a9206c1 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java @@ -0,0 +1,59 @@ +/** + *@Title: NtcPzReportController.java + *@Package com.nis.web.controller.log.ntc + *@Description TODO + *@author dell + *@date 2018年6月12日 下午2:09:41 + *@version 版本号 + */ +package com.nis.web.controller.log.ntc; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.nis.domain.FunctionServiceDict; +import com.nis.domain.log.ReportLog; +import com.nis.domain.log.ReportResultLog; +import com.nis.util.ConfigServiceUtil; +import com.nis.util.Constants; +import com.nis.util.DictUtils; +import com.nis.web.controller.BaseController; + +/** + * @ClassName: NtcPzReportController.java + * @Description: TODO + * @author (dell) + * @date 2018年6月12日 下午2:09:41 + * @version V1.0 + */ +@Controller +@RequestMapping("${adminPath}/logs") +public class NtcPzReportController extends BaseController{ + @RequestMapping(value="ajaxGetLogTotal") + @ResponseBody + public String ajaxGetLogTotal(Model model,long endTime,int action,Integer functionId,String compileIds){ + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mi:ss"); + int interval=Constants.LOG_TIME_RANGE; + Date endDate=new Date(endTime); + Date startDate=new Date(endTime-interval); + int serviceId=0; + List serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue()); + for(FunctionServiceDict service:serviceList){ + if(service.getAction().intValue()==action){ + serviceId=service.getServiceId().intValue(); + break; + } + } + ReportResultLog result=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate)); + if(result.getData()!=null&&result.getData().getList()!=null){ + model.addAttribute("data", result.getData().getList()); + } + return "success"; + } +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnController.java b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnController.java index bb230ead5..68cbc12e6 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnController.java @@ -1,6 +1,5 @@ package com.nis.web.controller.log.ntc; -import java.io.File; import java.io.IOException; import java.util.Date; import java.util.HashMap; @@ -11,7 +10,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; -import org.aspectj.util.FileUtil; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -46,46 +44,16 @@ public class OpenVpnController extends BaseController{ public String list(Model model,@ModelAttribute("log")NtcOpenVpnLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { try { + //初始化action + initLogServiceType(model, entry); + Page page = new Page(request, response); Map params=new HashMap<>(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); + //查询值判断 + initLogSearchValue(entry,params); - if (StringUtils.isNotBlank(entry.getSearchFoundStartTime())&&StringUtils.isNotBlank(entry.getSearchFoundEndTime())) { - params.put("searchFoundStartTime", entry.getSearchFoundStartTime()); - params.put("searchFoundEndTime", entry.getSearchFoundEndTime()); - }else{ - //设置默认查询当前时间及前五分钟 - String startTime = DateUtils.getDateTime(); - Date dateEnd = new Date(new Date().getTime()-Constants.LOG_TIME_RANGE); - String endTime = DateUtils.formatDateTime(dateEnd); - params.put("searchFoundStartTime", startTime); - params.put("searchFoundEndTime",endTime ); - entry.setSearchFoundStartTime(startTime); - entry.setSearchFoundEndTime(endTime); - } - - if (StringUtils.isNotBlank(entry.getProtocol())) { - params.put("searchProtocol", entry.getProtocol()); - } - if (entry.getServiceType()!=null) { - params.put("searchServiceType", entry.getServiceType()); - } - if (StringUtils.isNotBlank(entry.getServerIp())) { - params.put("searchServerIp", entry.getServerIp()); - } - if (StringUtils.isNotBlank(entry.getClientIp())) { - params.put("searchClientIp", entry.getClientIp()); - } - if (StringUtils.isNotBlank(entry.getCljIp())) { - params.put("searchCljIp", entry.getCljIp()); - } - if (entry.getDirection()!=null) { - params.put("searchDirection", entry.getDirection()); - } - if (entry.getEntranceId()!=null) { - params.put("searchEntranceId", entry.getEntranceId()); - } String url = ""; url = Constants.LOG_BASE_URL+Constants.NTC_OPENVPN_LOG; String jsonString = HttpClientUtil.getMsg(url,params); diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp index 735d83504..b6fca1c44 100644 --- a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp @@ -311,7 +311,7 @@ - 0 +
${cfg.creatorName } ${cfg.editorName } @@ -328,13 +328,5 @@ - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index 319dc2b28..dbc1ad923 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -58,14 +58,26 @@ $(document).ready(function(){
-
-
-
- -
- -
-
+
+
+
+ + + + + + + +
+
+
+ + + + + + +
@@ -78,19 +90,14 @@ $(document).ready(function(){
- -
-
-
- - - - - - - -
-
+
+
+
+ +
+ +
+
@@ -117,7 +124,7 @@ $(document).ready(function(){
-
+
-
+
-
+
- +
-
+
- +
@@ -184,7 +191,7 @@ $(document).ready(function(){ ${log.cfgId} ${log.entranceId} - + @@ -215,7 +222,10 @@ $(document).ready(function(){ ${log.userRegion} ${log.version} ${log.encryptMode} - ${log.hmac} + + + + TCP UDP diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index acab99555..8e0b3089a 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -22538,12 +22538,13 @@ transition: background-color .1s ease-in-out; /* END SHOW MORE CSS**/ -/**�����б��Ӽ�չʾ��ʽ**/ +/**子配置选项卡样式**/ .tabInfo { width: 150px; border: 1px solid #c2cad8; padding: 5px; - border-bottom: 0px + border-bottom: 0px; + cursor:pointer; } .content { width: 80%; @@ -22569,4 +22570,12 @@ span[id^='open']{ } span[id^='close']{ cursor:pointer; +} +.loading-total{ + width:50px; + height:10px; + position:relative; + background:url(../img/loading.gif) no-repeat center center; + opacity:0.7; + filter:progid:DXImageTransform.Microsoft.Alpha(opacity=70); } \ No newline at end of file