diff --git a/src/main/java/com/nis/web/controller/restful/LogController.java b/src/main/java/com/nis/web/controller/restful/LogController.java index 75526c6..314b7e0 100644 --- a/src/main/java/com/nis/web/controller/restful/LogController.java +++ b/src/main/java/com/nis/web/controller/restful/LogController.java @@ -32,27 +32,18 @@ import com.nis.domain.restful.MmSampleVoipLog; import com.nis.domain.restful.MmVoipAccountLog; import com.nis.domain.restful.MmVoipIpLog; import com.nis.domain.restful.NtcAppLog; -import com.nis.domain.restful.NtcAttrTypeReport; import com.nis.domain.restful.NtcDdosLog; -import com.nis.domain.restful.NtcDestipCountryReport; import com.nis.domain.restful.NtcDnsLog; -import com.nis.domain.restful.NtcEntranceReport; import com.nis.domain.restful.NtcFtpLog; import com.nis.domain.restful.NtcHttpLog; import com.nis.domain.restful.NtcIpLog; import com.nis.domain.restful.NtcIpsecLog; import com.nis.domain.restful.NtcL2tpLog; -import com.nis.domain.restful.NtcLwhhReport; import com.nis.domain.restful.NtcMailLog; import com.nis.domain.restful.NtcOpenvpnLog; import com.nis.domain.restful.NtcPptpLog; -import com.nis.domain.restful.NtcPzReport; -import com.nis.domain.restful.NtcReportEntity; -import com.nis.domain.restful.NtcServiceReport; -import com.nis.domain.restful.NtcSrcipDomesticReport; import com.nis.domain.restful.NtcSshLog; import com.nis.domain.restful.NtcSslLog; -import com.nis.domain.restful.NtcTagReport; import com.nis.domain.restful.PxyHttpLog; import com.nis.restful.RestServiceException; import com.nis.util.Configurations; @@ -64,8 +55,7 @@ import com.nis.web.controller.BaseRestController; import com.nis.web.service.AuditLogThread; import com.nis.web.service.HiveSqlService; import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.LogTestService; -import com.nis.web.service.restful.NtcReportService; +import com.nis.web.service.restful.NtcLogService; import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; @@ -82,13 +72,11 @@ import com.wordnik.swagger.annotations.ApiOperation; @RequestMapping("${servicePath}/log/v1") @Api(value = "LogController", description = "配置命中日志基本服务接口") public class LogController extends BaseRestController { - @Autowired - public LogTestService testService; @Autowired protected ServicesRequestLogService servicesRequestLogService; @Autowired - protected NtcReportService ntcReportService; + protected NtcLogService ntcLogService; @RequestMapping(value = "/ntcIpLogs", method = RequestMethod.GET) @ApiOperation(value = "IP地址日志查询", httpMethod = "GET", notes = "对应配置为IP地址管理，存储动作为阻断与监测的命中日志。对日志功能IP地址提供数据基础查询服务") @@ -100,7 +88,7 @@ public class LogController extends BaseRestController { Page ntcIpLogPage = null; try { resetTime(ntcIpLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcIpLog, NtcIpLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcIpLog, NtcIpLog.class, page); ntcIpLogPage = new Page(); ntcIpLogPage.setPageNo(page.getPageNo()); ntcIpLogPage.setPageSize(page.getPageSize()); @@ -166,7 +154,7 @@ public class LogController extends BaseRestController { Page ntcHttpLogPage = null; try { resetTime(ntcHttpLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcHttpLog, NtcHttpLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcHttpLog, NtcHttpLog.class, page); ntcHttpLogPage = new Page(); ntcHttpLogPage.setPageNo(page.getPageNo()); ntcHttpLogPage.setPageSize(page.getPageSize()); @@ -226,7 +214,7 @@ public class LogController extends BaseRestController { Page ntcDnsLogPage = null; try { resetTime(ntcDnsLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcDnsLog, NtcDnsLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcDnsLog, NtcDnsLog.class, page); ntcDnsLogPage = new Page(); ntcDnsLogPage.setPageNo(page.getPageNo()); ntcDnsLogPage.setPageSize(page.getPageSize()); @@ -286,7 +274,7 @@ public class LogController extends BaseRestController { Page ntcMailLogPage = null; try { resetTime(ntcMailLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcMailLog, NtcMailLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcMailLog, NtcMailLog.class, page); ntcMailLogPage = new Page(); ntcMailLogPage.setPageNo(page.getPageNo()); ntcMailLogPage.setPageSize(page.getPageSize()); @@ -346,7 +334,7 @@ public class LogController extends BaseRestController { Page ntcSslLogPage = null; try { resetTime(ntcSslLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcSslLog, NtcSslLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcSslLog, NtcSslLog.class, page); ntcSslLogPage = new Page(); ntcSslLogPage.setPageNo(page.getPageNo()); ntcSslLogPage.setPageSize(page.getPageSize()); @@ -406,7 +394,7 @@ public class LogController extends BaseRestController { Page ntcPptpLogPage = null; try { resetTime(ntcPptpLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcPptpLog, NtcPptpLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcPptpLog, NtcPptpLog.class, page); ntcPptpLogPage = new Page(); ntcPptpLogPage.setPageNo(page.getPageNo()); ntcPptpLogPage.setPageSize(page.getPageSize()); @@ -465,7 +453,7 @@ public class LogController extends BaseRestController { Page ntcL2tpLogPage = null; try { resetTime(ntcL2tpLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcL2tpLog, NtcL2tpLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcL2tpLog, NtcL2tpLog.class, page); ntcL2tpLogPage = new Page(); ntcL2tpLogPage.setPageNo(page.getPageNo()); ntcL2tpLogPage.setPageSize(page.getPageSize()); @@ -525,7 +513,7 @@ public class LogController extends BaseRestController { Page ntcOpenvpnLogPage = null; try { resetTime(ntcOpenvpnLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcOpenvpnLog, NtcOpenvpnLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcOpenvpnLog, NtcOpenvpnLog.class, page); ntcOpenvpnLogPage = new Page(); ntcOpenvpnLogPage.setPageNo(page.getPageNo()); ntcOpenvpnLogPage.setPageSize(page.getPageSize()); @@ -585,7 +573,7 @@ public class LogController extends BaseRestController { Page ntcIpsecLogPage = null; try { resetTime(ntcIpsecLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcIpsecLog, NtcIpsecLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcIpsecLog, NtcIpsecLog.class, page); ntcIpsecLogPage = new Page(); ntcIpsecLogPage.setPageNo(page.getPageNo()); ntcIpsecLogPage.setPageSize(page.getPageSize()); @@ -645,7 +633,7 @@ public class LogController extends BaseRestController { Page ntcSshLogPage = null; try { resetTime(ntcSshLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcSshLog, NtcSshLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcSshLog, NtcSshLog.class, page); ntcSshLogPage = new Page(); ntcSshLogPage.setPageNo(page.getPageNo()); ntcSshLogPage.setPageSize(page.getPageSize()); @@ -705,7 +693,7 @@ public class LogController extends BaseRestController { Page ntcFtpLogPage = null; try { resetTime(ntcFtpLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcFtpLog, NtcFtpLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcFtpLog, NtcFtpLog.class, page); ntcFtpLogPage = new Page(); ntcFtpLogPage.setPageNo(page.getPageNo()); ntcFtpLogPage.setPageSize(page.getPageSize()); @@ -763,7 +751,7 @@ public class LogController extends BaseRestController { Page ntcAppLogPage = null; try { resetTime(ntcAppLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcAppLog, NtcAppLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcAppLog, NtcAppLog.class, page); ntcAppLogPage = new Page(); ntcAppLogPage.setPageNo(page.getPageNo()); ntcAppLogPage.setPageSize(page.getPageSize()); @@ -821,7 +809,7 @@ public class LogController extends BaseRestController { Page ntcDdosLogPage = null; try { resetTime(ntcDdosLog); - ntcReportService.queryConditionCheck(auditLogThread, start, ntcDdosLog, NtcDdosLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, ntcDdosLog, NtcDdosLog.class, page); ntcDdosLogPage = new Page(); ntcDdosLogPage.setPageNo(page.getPageNo()); ntcDdosLogPage.setPageSize(page.getPageSize()); @@ -879,7 +867,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(dkBehaviorLog); - ntcReportService.queryConditionCheck(auditLogThread, start, dkBehaviorLog, DkBehaviorLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, dkBehaviorLog, DkBehaviorLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -932,7 +920,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmAvIpLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmAvIpLog, MmAvIpLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmAvIpLog, MmAvIpLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -985,7 +973,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmAvUrlLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmAvUrlLog, MmAvUrlLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmAvUrlLog, MmAvUrlLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1038,7 +1026,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmPicIpLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmPicIpLog, MmPicIpLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmPicIpLog, MmPicIpLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1091,7 +1079,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmPicUrlLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmPicUrlLog, MmPicUrlLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmPicUrlLog, MmPicUrlLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1145,7 +1133,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmVoipIpLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmVoipIpLog, MmVoipIpLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmVoipIpLog, MmVoipIpLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1198,7 +1186,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmVoipLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmVoipLog, MmVoipAccountLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmVoipLog, MmVoipAccountLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1252,7 +1240,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmSampleAudioLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmSampleAudioLog, MmSampleAudioLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmSampleAudioLog, MmSampleAudioLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1305,7 +1293,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmSampleVideoLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmSampleVideoLog, MmSampleVideoLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmSampleVideoLog, MmSampleVideoLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1358,7 +1346,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmPornAudioLevelLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmPornAudioLevelLog, MmPornAudioLevelLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmPornAudioLevelLog, MmPornAudioLevelLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1411,7 +1399,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmPornVideoLevelLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmPornVideoLevelLog, MmPornVideoLevelLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmPornVideoLevelLog, MmPornVideoLevelLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1465,7 +1453,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmSamplePicLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmSamplePicLog, MmSamplePicLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmSamplePicLog, MmSamplePicLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1518,7 +1506,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(mmSampleVoipLog); - ntcReportService.queryConditionCheck(auditLogThread, start, mmSampleVoipLog, MmSampleVoipLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, mmSampleVoipLog, MmSampleVoipLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1572,7 +1560,7 @@ public class LogController extends BaseRestController { Page logPage = null; try { resetTime(pxyHttpLog); - ntcReportService.queryConditionCheck(auditLogThread, start, pxyHttpLog, PxyHttpLog.class, page); + ntcLogService.queryConditionCheck(auditLogThread, start, pxyHttpLog, PxyHttpLog.class, page); logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); @@ -1614,313 +1602,8 @@ public class LogController extends BaseRestController { return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "PXY HTTP日志检索成功", logPage, 0); } - @RequestMapping(value = "/ntcPzReport", method = RequestMethod.GET) - @ApiOperation(value = "配置日志总量统计", httpMethod = "GET", notes = "配置命中日志数量实时统计报表，对外提供多种数据表现形式，具体可应用于界面配置命中总量业务、配置报表业务等") - public Map ntcPzReport(Page page, NtcPzReport ntcPzReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, - request, null); - - Page ntcPzReportPage = null; - try { - resetReportTime(ntcPzReport); - //验证实时报表 - ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcPzReport, NtcPzReport.class, page); - //验证serachCfgId - ntcReportService.checkNumericCondition(saveLogThread,start,ntcPzReport.getSearchCfgId(),"searchCfgId"); - String orderBy = ""; - if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcPzReport.class.getSimpleName(), page.getOrderBy()); - } else { - orderBy = "report_time"; - } - page.setOrderBy(orderBy); - ntcPzReportPage = ntcReportService.findNtcPzReport(new Page(request, response, NtcPzReport.class), - ntcPzReport); - } catch (Exception e) { - saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "配置日志总量统计失败"); - } - throw ((RestServiceException) e); - } - - return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "配置日志总量统计成功", - ntcPzReportPage, 0); - } - - @RequestMapping(value = "/ntcServiceReport", method = RequestMethod.GET) - @ApiOperation(value = "业务类型统计查询服务", httpMethod = "GET", notes = "业务类型统计查询服务，基于业务类型（service）维度聚合") - public Map ntcServiceReport(Page page, NtcServiceReport ntcServiceReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, - request, null); - - Page reportPage = null; - try { - resetReportTime(ntcServiceReport); - ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcServiceReport, NtcServiceReport.class, page); - String orderBy = ""; - if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcServiceReport.class.getSimpleName(), page.getOrderBy()); - } else { - orderBy = "report_time"; - } - page.setOrderBy(orderBy); - reportPage = ntcReportService.findNtcServiceReport(new Page(request, response, NtcServiceReport.class), - ntcServiceReport); - } catch (Exception e) { - saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "业务类型统计查询失败"); - } - throw ((RestServiceException) e); - } - - return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "业务类型统计查询成功", - reportPage, 0); - } - - @RequestMapping(value = "/ntcTagReport", method = RequestMethod.GET) - @ApiOperation(value = "标签统计查询服务", httpMethod = "GET", notes = "标签统计查询服务，基于标签与业务类型（service）维度聚合") - public Map ntcTagReport(Page page, NtcTagReport ntcTagReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, - request, null); - Page reportPage = null; - try { - resetReportTime(ntcTagReport); - ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcTagReport, NtcTagReport.class, page); - //验证serachTag - ntcReportService.checkNumericCondition(saveLogThread,start,ntcTagReport.getSearchTag(),"searchTag"); - String orderBy = ""; - if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcTagReport.class.getSimpleName(), page.getOrderBy()); - } else { - orderBy = "report_time"; - } - page.setOrderBy(orderBy); - reportPage = ntcReportService.findNtcTagReport(new Page(request, response, NtcTagReport.class), - ntcTagReport); - } catch (Exception e) { - saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "标签统计查询失败"); - } - throw ((RestServiceException) e); - } - - return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "标签统计查询成功", - reportPage, 0); - } - @RequestMapping(value = "/ntcAttrTypeReport", method = RequestMethod.GET) - @ApiOperation(value = "性质统计查询服务", httpMethod = "GET", notes = "性质统计查询服务，基于性质与业务类型（service）维度聚合") - public Map ntcAttrTypeReport(Page page, NtcAttrTypeReport ntcAttrTypeReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, - request, null); - - Page reportPage = null; - try { - resetReportTime(ntcAttrTypeReport); - ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcAttrTypeReport, NtcAttrTypeReport.class, page); - //验证searchAttrType - ntcReportService.checkNumericCondition(saveLogThread,start,ntcAttrTypeReport.getSearchAttrType(),"searchAttrType"); - String orderBy = ""; - if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcAttrTypeReport.class.getSimpleName(), page.getOrderBy()); - } else { - orderBy = "report_time"; - } - page.setOrderBy(orderBy); - reportPage = ntcReportService.findNtcAttrTypeReport(new Page(request, response, NtcAttrTypeReport.class), - ntcAttrTypeReport); - } catch (Exception e) { - saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "性质统计查询失败"); - } - throw ((RestServiceException) e); - } - - return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "性质统计查询成功", - reportPage, 0); - } - - @RequestMapping(value = "/ntcLwhhReport", method = RequestMethod.GET) - @ApiOperation(value = "来文函号统计查询服务", httpMethod = "GET", notes = "来文函号统计查询服务，基于来文函号与业务类型（service）维度聚合") - public Map ntcLwhhReport(Page page, NtcLwhhReport ntcLwhhReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, - request, null); - - Page reportPage = null; - try { - resetReportTime(ntcLwhhReport); - //验证实时报表 - ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcLwhhReport, NtcLwhhReport.class, page); - //验证serachCfgId - ntcReportService.checkNumericCondition(saveLogThread,start,ntcLwhhReport.getSearchLwhh(),"searchLwhh"); - String orderBy = ""; - if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcLwhhReport.class.getSimpleName(), page.getOrderBy()); - } else { - orderBy = "report_time"; - } - page.setOrderBy(orderBy); - reportPage = ntcReportService.findNtcLwhhReport(new Page(request, response, NtcLwhhReport.class), - ntcLwhhReport); - } catch (Exception e) { - saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "来文函号统计查询失败"); - } - throw ((RestServiceException) e); - } - - return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "来文函号统计查询成功", - reportPage, 0); - } - - @RequestMapping(value = "/ntcSrcipDomesticReport", method = RequestMethod.GET) - @ApiOperation(value = "境内源IP统计查询服务", httpMethod = "GET", notes = "境内源IP统计查询服务，基于源IP所属省、市与业务类型（service）维度聚合") - public Map ntcSrcipDomesticReport(Page page, NtcSrcipDomesticReport ntcSrcipDomesticReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, - request, null); - - Page reportPage = null; - try { - resetReportTime(ntcSrcipDomesticReport); - //验证实时报表 - ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcSrcipDomesticReport, NtcSrcipDomesticReport.class, page); - String orderBy = ""; - if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcSrcipDomesticReport.class.getSimpleName(), page.getOrderBy()); - } else { - orderBy = "report_time"; - } - page.setOrderBy(orderBy); - reportPage = ntcReportService.findNtcSrcipDomesticReport(new Page(request, response, NtcSrcipDomesticReport.class), - ntcSrcipDomesticReport); - } catch (Exception e) { - saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "境内源IP统计查询失败"); - } - throw ((RestServiceException) e); - } - - return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "境内源IP统计查询成功", - reportPage, 0); - } - - @RequestMapping(value = "/ntcDestipCountryReport", method = RequestMethod.GET) - @ApiOperation(value = "各国家目的IP统计查询服务", httpMethod = "GET", notes = "各国家目的IP统计查询服务，基于目的IP所属国家与业务类型（service）维度聚合") - public Map ntcDestipCountryReport(Page page, NtcDestipCountryReport ntcDestipCountryReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, - request, null); - - Page reportPage = null; - try { - resetReportTime(ntcDestipCountryReport); - //验证实时报表 - ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcDestipCountryReport, NtcDestipCountryReport.class, page); - String orderBy = ""; - if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcDestipCountryReport.class.getSimpleName(), page.getOrderBy()); - } else { - orderBy = "report_time"; - } - page.setOrderBy(orderBy); - reportPage = ntcReportService.findNtcDestipCountryReport(new Page(request, response, NtcDestipCountryReport.class), - ntcDestipCountryReport); - } catch (Exception e) { - saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "各国家目的IP统计查询失败"); - } - throw ((RestServiceException) e); - } - - return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "各国家目的IP统计查询成功", - reportPage, 0); - } - - @RequestMapping(value = "/ntcEntranceReport", method = RequestMethod.GET) - @ApiOperation(value = "运营商局点统计查询服务", httpMethod = "GET", notes = "运营商局点统计查询服务，基于出入口与业务类型（service）维度聚合") - public Map ntcEntranceReport(Page page, NtcEntranceReport ntcEntranceReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, - request, null); - - Page reportPage = null; - try { - resetReportTime(ntcEntranceReport); - ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcEntranceReport, NtcEntranceReport.class, page); - //验证searchEntrance - ntcReportService.checkNumericCondition(saveLogThread,start,ntcEntranceReport.getSearchEntrance(),"searchEntrance"); - String orderBy = ""; - if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcEntranceReport.class.getSimpleName(), page.getOrderBy()); - } else { - orderBy = "report_time"; - } - page.setOrderBy(orderBy); - reportPage = ntcReportService.findNtcEntranceReport(new Page(request, response, NtcEntranceReport.class), - ntcEntranceReport); - } catch (Exception e) { - saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "运营商局点统计查询失败"); - } - throw ((RestServiceException) e); - } - - return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "运营商局点统计查询成功", - reportPage, 0); - } - /** - * @Description: - * @author (zdx) - * @date 2018年7月12日 上午11:01:30 - * @param entity - * @throws Exception - */ - public void resetReportTime(NtcReportEntity entity) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Map map = DateUtils.getLocalTime(entity.getSearchReportStartTime(), - entity.getSearchReportEndTime(), Constants.PZ_REPORT_TIME, "minute"); - entity.setSearchReportStartTime(map.get("startTime")); - entity.setSearchReportEndTime(map.get("endTime")); - } /** diff --git a/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java b/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java new file mode 100644 index 0000000..7216965 --- /dev/null +++ b/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java @@ -0,0 +1,371 @@ +package com.nis.web.controller.restful; + +import java.text.SimpleDateFormat; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import com.nis.domain.Page; +import com.nis.domain.restful.NtcAttrTypeReport; +import com.nis.domain.restful.NtcDestipCountryReport; +import com.nis.domain.restful.NtcEntranceReport; +import com.nis.domain.restful.NtcLwhhReport; +import com.nis.domain.restful.NtcPzReport; +import com.nis.domain.restful.NtcReportEntity; +import com.nis.domain.restful.NtcServiceReport; +import com.nis.domain.restful.NtcSrcipDomesticReport; +import com.nis.domain.restful.NtcTagReport; +import com.nis.restful.RestServiceException; +import com.nis.util.Constants; +import com.nis.util.DateUtils; +import com.nis.web.controller.BaseRestController; +import com.nis.web.service.AuditLogThread; +import com.nis.web.service.ServicesRequestLogService; +import com.nis.web.service.restful.NtcReportService; +import com.wordnik.swagger.annotations.Api; +import com.wordnik.swagger.annotations.ApiOperation; + +/** + * + *

Title: SingleDimensionReport

+ *

Description: 单维度统计查询报表controller

+ *

Company: IIE

+ * @author rkg + * @date 2018年7月24日 + * + */ +@RestController +@RequestMapping("${servicePath}/log/v1") +@Api(value = "SingleDimensionReport", description = "单维度统计查询报表controller") +public class SingleDimensionReport extends BaseRestController { + + @Autowired + protected ServicesRequestLogService servicesRequestLogService; + + @Autowired + protected NtcReportService ntcReportService; + + @RequestMapping(value = "/ntcPzReport", method = RequestMethod.GET) + @ApiOperation(value = "配置日志总量统计", httpMethod = "GET", notes = "配置命中日志数量实时统计报表，对外提供多种数据表现形式，具体可应用于界面配置命中总量业务、配置报表业务等") + public Map ntcPzReport(Page page, NtcPzReport ntcPzReport, Model model, HttpServletRequest request, + HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, + request, null); + + Page ntcPzReportPage = null; + try { + resetReportTime(ntcPzReport); + //验证实时报表 + ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcPzReport, NtcPzReport.class, page); + //验证serachCfgId + ntcReportService.checkNumericCondition(saveLogThread,start,ntcPzReport.getSearchCfgId(),"searchCfgId"); + String orderBy = ""; + if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { + orderBy = Page.getOrderBySql(NtcPzReport.class.getSimpleName(), page.getOrderBy()); + } else { + orderBy = "report_time"; + } + page.setOrderBy(orderBy); + ntcPzReportPage = ntcReportService.findNtcPzReport(new Page(request, response, NtcPzReport.class), + ntcPzReport); + } catch (Exception e) { + saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); + e.printStackTrace(); + logger.error(e.getMessage()); + if (!(e instanceof RestServiceException)) { + e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "配置日志总量统计失败"); + } + throw ((RestServiceException) e); + } + + return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "配置日志总量统计成功", + ntcPzReportPage, 0); + } + + @RequestMapping(value = "/ntcServiceReport", method = RequestMethod.GET) + @ApiOperation(value = "业务类型统计查询服务", httpMethod = "GET", notes = "业务类型统计查询服务，基于业务类型（service）维度聚合") + public Map ntcServiceReport(Page page, NtcServiceReport ntcServiceReport, Model model, HttpServletRequest request, + HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, + request, null); + + Page reportPage = null; + try { + resetReportTime(ntcServiceReport); + ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcServiceReport, NtcServiceReport.class, page); + String orderBy = ""; + if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { + orderBy = Page.getOrderBySql(NtcServiceReport.class.getSimpleName(), page.getOrderBy()); + } else { + orderBy = "report_time"; + } + page.setOrderBy(orderBy); + reportPage = ntcReportService.findNtcServiceReport(new Page(request, response, NtcServiceReport.class), + ntcServiceReport); + } catch (Exception e) { + saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); + e.printStackTrace(); + logger.error(e.getMessage()); + if (!(e instanceof RestServiceException)) { + e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "业务类型统计查询失败"); + } + throw ((RestServiceException) e); + } + + return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "业务类型统计查询成功", + reportPage, 0); + } + + + + @RequestMapping(value = "/ntcTagReport", method = RequestMethod.GET) + @ApiOperation(value = "标签统计查询服务", httpMethod = "GET", notes = "标签统计查询服务，基于标签与业务类型（service）维度聚合") + public Map ntcTagReport(Page page, NtcTagReport ntcTagReport, Model model, HttpServletRequest request, + HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, + request, null); + + Page reportPage = null; + try { + resetReportTime(ntcTagReport); + ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcTagReport, NtcTagReport.class, page); + //验证serachTag + ntcReportService.checkNumericCondition(saveLogThread,start,ntcTagReport.getSearchTag(),"searchTag"); + String orderBy = ""; + if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { + orderBy = Page.getOrderBySql(NtcTagReport.class.getSimpleName(), page.getOrderBy()); + } else { + orderBy = "report_time"; + } + page.setOrderBy(orderBy); + reportPage = ntcReportService.findNtcTagReport(new Page(request, response, NtcTagReport.class), + ntcTagReport); + } catch (Exception e) { + saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); + e.printStackTrace(); + logger.error(e.getMessage()); + if (!(e instanceof RestServiceException)) { + e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "标签统计查询失败"); + } + throw ((RestServiceException) e); + } + + return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "标签统计查询成功", + reportPage, 0); + } + @RequestMapping(value = "/ntcAttrTypeReport", method = RequestMethod.GET) + @ApiOperation(value = "性质统计查询服务", httpMethod = "GET", notes = "性质统计查询服务，基于性质与业务类型（service）维度聚合") + public Map ntcAttrTypeReport(Page page, NtcAttrTypeReport ntcAttrTypeReport, Model model, HttpServletRequest request, + HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, + request, null); + + Page reportPage = null; + try { + resetReportTime(ntcAttrTypeReport); + ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcAttrTypeReport, NtcAttrTypeReport.class, page); + //验证searchAttrType + ntcReportService.checkNumericCondition(saveLogThread,start,ntcAttrTypeReport.getSearchAttrType(),"searchAttrType"); + String orderBy = ""; + if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { + orderBy = Page.getOrderBySql(NtcAttrTypeReport.class.getSimpleName(), page.getOrderBy()); + } else { + orderBy = "report_time"; + } + page.setOrderBy(orderBy); + reportPage = ntcReportService.findNtcAttrTypeReport(new Page(request, response, NtcAttrTypeReport.class), + ntcAttrTypeReport); + } catch (Exception e) { + saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); + e.printStackTrace(); + logger.error(e.getMessage()); + if (!(e instanceof RestServiceException)) { + e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "性质统计查询失败"); + } + throw ((RestServiceException) e); + } + + return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "性质统计查询成功", + reportPage, 0); + } + + @RequestMapping(value = "/ntcLwhhReport", method = RequestMethod.GET) + @ApiOperation(value = "来文函号统计查询服务", httpMethod = "GET", notes = "来文函号统计查询服务，基于来文函号与业务类型（service）维度聚合") + public Map ntcLwhhReport(Page page, NtcLwhhReport ntcLwhhReport, Model model, HttpServletRequest request, + HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, + request, null); + + Page reportPage = null; + try { + resetReportTime(ntcLwhhReport); + //验证实时报表 + ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcLwhhReport, NtcLwhhReport.class, page); + //验证serachCfgId + ntcReportService.checkNumericCondition(saveLogThread,start,ntcLwhhReport.getSearchLwhh(),"searchLwhh"); + String orderBy = ""; + if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { + orderBy = Page.getOrderBySql(NtcLwhhReport.class.getSimpleName(), page.getOrderBy()); + } else { + orderBy = "report_time"; + } + page.setOrderBy(orderBy); + reportPage = ntcReportService.findNtcLwhhReport(new Page(request, response, NtcLwhhReport.class), + ntcLwhhReport); + } catch (Exception e) { + saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); + e.printStackTrace(); + logger.error(e.getMessage()); + if (!(e instanceof RestServiceException)) { + e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "来文函号统计查询失败"); + } + throw ((RestServiceException) e); + } + + return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "来文函号统计查询成功", + reportPage, 0); + } + + @RequestMapping(value = "/ntcSrcipDomesticReport", method = RequestMethod.GET) + @ApiOperation(value = "境内源IP统计查询服务", httpMethod = "GET", notes = "境内源IP统计查询服务，基于源IP所属省、市与业务类型（service）维度聚合") + public Map ntcSrcipDomesticReport(Page page, NtcSrcipDomesticReport ntcSrcipDomesticReport, Model model, HttpServletRequest request, + HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, + request, null); + + Page reportPage = null; + try { + resetReportTime(ntcSrcipDomesticReport); + //验证实时报表 + ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcSrcipDomesticReport, NtcSrcipDomesticReport.class, page); + String orderBy = ""; + if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { + orderBy = Page.getOrderBySql(NtcSrcipDomesticReport.class.getSimpleName(), page.getOrderBy()); + } else { + orderBy = "report_time"; + } + page.setOrderBy(orderBy); + reportPage = ntcReportService.findNtcSrcipDomesticReport(new Page(request, response, NtcSrcipDomesticReport.class), + ntcSrcipDomesticReport); + } catch (Exception e) { + saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); + e.printStackTrace(); + logger.error(e.getMessage()); + if (!(e instanceof RestServiceException)) { + e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "境内源IP统计查询失败"); + } + throw ((RestServiceException) e); + } + + return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "境内源IP统计查询成功", + reportPage, 0); + } + + + + + @RequestMapping(value = "/ntcDestipCountryReport", method = RequestMethod.GET) + @ApiOperation(value = "各国家目的IP统计查询服务", httpMethod = "GET", notes = "各国家目的IP统计查询服务，基于目的IP所属国家与业务类型（service）维度聚合") + public Map ntcDestipCountryReport(Page page, NtcDestipCountryReport ntcDestipCountryReport, Model model, + HttpServletRequest request, HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, + null); + + Page reportPage = null; + try { + resetReportTime(ntcDestipCountryReport); + // 验证实时报表 + ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcDestipCountryReport, + NtcDestipCountryReport.class, page); + String orderBy = ""; + if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { + orderBy = Page.getOrderBySql(NtcDestipCountryReport.class.getSimpleName(), page.getOrderBy()); + } else { + orderBy = "report_time"; + } + page.setOrderBy(orderBy); + reportPage = ntcReportService.findNtcDestipCountryReport( + new Page(request, response, NtcDestipCountryReport.class), + ntcDestipCountryReport); + } catch (Exception e) { + saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); + e.printStackTrace(); + logger.error(e.getMessage()); + if (!(e instanceof RestServiceException)) { + e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "各国家目的IP统计查询失败"); + } + throw ((RestServiceException) e); + } + + return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "各国家目的IP统计查询成功", + reportPage, 0); + } + + @RequestMapping(value = "/ntcEntranceReport", method = RequestMethod.GET) + @ApiOperation(value = "运营商局点统计查询服务", httpMethod = "GET", notes = "运营商局点统计查询服务，基于出入口与业务类型（service）维度聚合") + public Map ntcEntranceReport(Page page, NtcEntranceReport ntcEntranceReport, Model model, + HttpServletRequest request, HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, + null); + + Page reportPage = null; + try { + resetReportTime(ntcEntranceReport); + ntcReportService.queryReportConditionCheck(saveLogThread, start, ntcEntranceReport, NtcEntranceReport.class, + page); + // 验证searchEntrance + ntcReportService.checkNumericCondition(saveLogThread, start, ntcEntranceReport.getSearchEntrance(), + "searchEntrance"); + String orderBy = ""; + if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { + orderBy = Page.getOrderBySql(NtcEntranceReport.class.getSimpleName(), page.getOrderBy()); + } else { + orderBy = "report_time"; + } + page.setOrderBy(orderBy); + reportPage = ntcReportService.findNtcEntranceReport( + new Page(request, response, NtcEntranceReport.class), ntcEntranceReport); + } catch (Exception e) { + saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); + e.printStackTrace(); + logger.error(e.getMessage()); + if (!(e instanceof RestServiceException)) { + e = new RestServiceException(saveLogThread, System.currentTimeMillis() - start, "运营商局点统计查询失败"); + } + throw ((RestServiceException) e); + } + + return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "运营商局点统计查询成功", reportPage, + 0); + } + + /** + * @Description: + * @author (zdx) + * @date 2018年7月12日 上午11:01:30 + * @param entity + * @throws Exception + */ + public void resetReportTime(NtcReportEntity entity) throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Map map = DateUtils.getLocalTime(entity.getSearchReportStartTime(), + entity.getSearchReportEndTime(), Constants.PZ_REPORT_TIME, "minute"); + entity.setSearchReportStartTime(map.get("startTime")); + entity.setSearchReportEndTime(map.get("endTime")); + } +} diff --git a/src/main/java/com/nis/web/service/restful/LogTestService.java b/src/main/java/com/nis/web/service/restful/LogTestService.java deleted file mode 100644 index 004b19c..0000000 --- a/src/main/java/com/nis/web/service/restful/LogTestService.java +++ /dev/null @@ -1,681 +0,0 @@ -package com.nis.web.service.restful; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.log4j.Logger; -import org.springframework.stereotype.Service; - -import com.beust.jcommander.internal.Lists; -import com.nis.domain.LogEntity; -import com.nis.domain.Page; -import com.nis.domain.restful.NtcDnsLog; -import com.nis.domain.restful.NtcFtpLog; -import com.nis.domain.restful.NtcHttpLog; -import com.nis.domain.restful.NtcIpLog; -import com.nis.domain.restful.NtcIpsecLog; -import com.nis.domain.restful.NtcL2tpLog; -import com.nis.domain.restful.NtcMailLog; -import com.nis.domain.restful.NtcOpenvpnLog; -import com.nis.domain.restful.NtcPptpLog; -import com.nis.domain.restful.NtcPzReport; -import com.nis.domain.restful.NtcSshLog; -import com.nis.domain.restful.NtcSslLog; -import com.nis.web.service.BaseLogService; - -/** - * Created by darnell on 2018/6/10. - * 日志测试业务类，用于接口或临时验证测试使用 - */ -@Service -public class LogTestService extends BaseLogService { - - protected final Logger logger = Logger.getLogger(this.getClass()); - - - /** - * IP地址日志检索测试业务方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcIpLogPage(Page page, NtcIpLog entity) throws Exception{ - List ntcIpLogs = Lists.newArrayList(); - NtcIpLog ntcIpLog = new NtcIpLog(); - ntcIpLog.setId(35L); - ntcIpLog.setCfgId(531L); - ntcIpLog.setService(16); - ntcIpLog.setFoundTime(new Date()); - ntcIpLog.setRecvTime(new Date()); - ntcIpLog.setAddrType(4); - ntcIpLog.setTransProto("IPv4_TCP"); - ntcIpLog.setsIp("192.168.10.106"); - ntcIpLog.setsPort("80"); - ntcIpLog.setdIp("202.106.0.20"); - ntcIpLog.setdPort("8443"); - ntcIpLog.setCapIp("10.0.6.240"); - ntcIpLog.setDeviceId(1356981); - ntcIpLog.setDirection(0); - ntcIpLog.setStreamDir(0); - ntcIpLog.setEntranceId(21L); - ntcIpLog.setUserRegion("531"); - ntcIpLogs.add(ntcIpLog); - - ntcIpLog = new NtcIpLog(); - ntcIpLog.setId(36L); - ntcIpLog.setCfgId(532L); - ntcIpLog.setService(128); - ntcIpLog.setFoundTime(new Date()); - ntcIpLog.setRecvTime(new Date()); - ntcIpLog.setAddrType(4); - ntcIpLog.setTransProto("IPv4_TCP"); - ntcIpLog.setsIp("192.168.10.106"); - ntcIpLog.setsPort("80"); - ntcIpLog.setdIp("202.106.0.20"); - ntcIpLog.setdPort("8443"); - ntcIpLog.setCapIp("10.0.6.240"); - ntcIpLog.setDeviceId(1356981); - ntcIpLog.setDirection(0); - ntcIpLog.setStreamDir(0); - ntcIpLog.setEntranceId(21L); - ntcIpLog.setUserRegion("531"); - ntcIpLogs.add(ntcIpLog); - page.setCount(ntcIpLogs.size()); - - page.setList(ntcIpLogs); - - - return page; - } - - /** - * http 日志检索测试业务方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcHttpLogPage(Page page, NtcHttpLog entity) throws Exception { - - List ntcHttpLogs = Lists.newArrayList(); - - NtcHttpLog ntcHttpLog = new NtcHttpLog(); - ntcHttpLog = (NtcHttpLog) createTestData(ntcHttpLog); - ntcHttpLog.setId(35L); - ntcHttpLog.setCfgId(1532L); - ntcHttpLog.setService(17); - ntcHttpLog.setUserRegion("1532"); - ntcHttpLog.setUrl("http://jd.com/get/api/json"); - ntcHttpLog.setReqHdrFile("reqHdrFile1532.txt"); - ntcHttpLog.setReqBodyFile("reqBodyFile1532"); - ntcHttpLog.setResHdrFile("resHdrFile1532.txt"); - ntcHttpLog.setResBodyFile("resBodyFile1532"); - ntcHttpLogs.add(ntcHttpLog); - - - ntcHttpLog = new NtcHttpLog(); - ntcHttpLog = (NtcHttpLog) createTestData(ntcHttpLog); - ntcHttpLog.setId(36L); - ntcHttpLog.setCfgId(1533L); - ntcHttpLog.setService(129); - ntcHttpLog.setUserRegion("1533"); - ntcHttpLog.setUrl("http://jd.com/get/api/json/abc"); - ntcHttpLog.setReqHdrFile("reqHdrFile1533.txt"); - ntcHttpLog.setReqBodyFile("reqBodyFile1533"); - ntcHttpLog.setResHdrFile("resHdrFile1533.txt"); - ntcHttpLog.setResBodyFile("resBodyFile1533"); - ntcHttpLogs.add(ntcHttpLog); - - - page.setCount(ntcHttpLogs.size()); - page.setList(ntcHttpLogs); - - return page; - } - - /** - * dns 日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcDnsLogPage(Page page, NtcDnsLog entity) throws Exception { - - List ntcDnsLogs = Lists.newArrayList(); - - NtcDnsLog ntcDnsLog = new NtcDnsLog(); - ntcDnsLog = (NtcDnsLog) createTestData(ntcDnsLog); - ntcDnsLog.setId(37L); - ntcDnsLog.setCfgId(2532L); - ntcDnsLog.setService(18); - ntcDnsLog.setUserRegion("2532"); - ntcDnsLog.setQr(0); - ntcDnsLog.setRd(1); - ntcDnsLog.setRa(0); - ntcDnsLog.setRr("query"); - ntcDnsLog.setqType(0); - ntcDnsLog.setQclass(0); - ntcDnsLog.setOpcode(0); - ntcDnsLog.setQname("www.sina.com.cn"); - ntcDnsLog.setCname("sina"); - ntcDnsLog.setDnsSub(1); - - ntcDnsLogs.add(ntcDnsLog); - - - ntcDnsLog = new NtcDnsLog(); - ntcDnsLog = (NtcDnsLog) createTestData(ntcDnsLog); - ntcDnsLog.setId(38L); - ntcDnsLog.setCfgId(2533L); - ntcDnsLog.setService(130); - ntcDnsLog.setUserRegion("2533"); - ntcDnsLog.setQr(1); - ntcDnsLog.setRd(1); - ntcDnsLog.setRa(0); - ntcDnsLog.setRr("query"); - ntcDnsLog.setqType(1); - ntcDnsLog.setQclass(1); - ntcDnsLog.setOpcode(1); - ntcDnsLog.setQname("www.sina.com.cn"); - ntcDnsLog.setCname("sina"); - ntcDnsLog.setDnsSub(2); - - ntcDnsLogs.add(ntcDnsLog); - - - page.setCount(ntcDnsLogs.size()); - page.setList(ntcDnsLogs); - - return page; - } - - /** - * SSL 日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcSslLogPage(Page page, NtcSslLog entity) throws Exception { - - List ntcSslLogs = Lists.newArrayList(); - - NtcSslLog ntcSslLog = new NtcSslLog(); - ntcSslLog = (NtcSslLog) createTestData(ntcSslLog); - ntcSslLog.setId(39L); - ntcSslLog.setCfgId(4532L); - ntcSslLog.setService(19); - ntcSslLog.setUserRegion("4532"); - ntcSslLog.setVersion("版本 3"); - ntcSslLog.setSni("*.cnblogs.cn"); - ntcSslLog.setCa("DigCert Inc"); - ntcSslLog.setSan("*.cnblogs.cn"); - - - ntcSslLogs.add(ntcSslLog); - - - ntcSslLog = new NtcSslLog(); - ntcSslLog = (NtcSslLog) createTestData(ntcSslLog); - ntcSslLog.setId(40L); - ntcSslLog.setCfgId(4533L); - ntcSslLog.setService(131); - ntcSslLog.setUserRegion("4533"); - ntcSslLog.setVersion("版本 3"); - ntcSslLog.setSni("*.cnblogs.cn"); - ntcSslLog.setCa("DigCert Inc"); - ntcSslLog.setSan("*.cnblogs.cn"); - - - ntcSslLogs.add(ntcSslLog); - - - page.setCount(ntcSslLogs.size()); - page.setList(ntcSslLogs); - - return page; - } - - - /** - * Mail日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcMailLogPage(Page page, NtcMailLog entity) throws Exception { - - List ntcMailLogs = Lists.newArrayList(); - - NtcMailLog ntcMailLog = new NtcMailLog(); - ntcMailLog = (NtcMailLog) createTestData(ntcMailLog); - ntcMailLog.setId(38L); - ntcMailLog.setCfgId(3532L); - ntcMailLog.setService(20); - ntcMailLog.setUserRegion("3532"); - ntcMailLog.setMailProto("SMTP"); - ntcMailLog.setMailFrom("darnell@163.com"); - ntcMailLog.setMailTo("iamfree@163.com"); - ntcMailLog.setSubject("领导工资问题，涨涨"); - ntcMailLog.setEmlFile("http://127.0.0.1/abc.eml"); - ntcMailLogs.add(ntcMailLog); - - - ntcMailLog = new NtcMailLog(); - ntcMailLog = (NtcMailLog) createTestData(ntcMailLog); - ntcMailLog.setId(39L); - ntcMailLog.setCfgId(3533L); - ntcMailLog.setService(132); - ntcMailLog.setUserRegion("3533"); - ntcMailLog.setMailProto("smtp"); - ntcMailLog.setMailFrom("iamfree@163.com"); - ntcMailLog.setMailTo("darnell@163.com"); - ntcMailLog.setSubject("滚"); - ntcMailLog.setEmlFile("http://127.0.0.1/abc.eml"); - - ntcMailLogs.add(ntcMailLog); - - - page.setCount(ntcMailLogs.size()); - page.setList(ntcMailLogs); - - return page; - } - - - /** - * PPTP 日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcPptpLogPage(Page page, NtcPptpLog entity) throws Exception { - - List ntcPptpLogs = Lists.newArrayList(); - - NtcPptpLog ntcPptpLog = new NtcPptpLog(); - ntcPptpLog = (NtcPptpLog) createTestData(ntcPptpLog); - ntcPptpLog.setId(41L); - ntcPptpLog.setCfgId(5532L); - ntcPptpLog.setService(22); - ntcPptpLog.setUserRegion("5532"); - ntcPptpLog.setTunnelType(1); - ntcPptpLog.setEncryptMode(1); - - - - ntcPptpLogs.add(ntcPptpLog); - - - ntcPptpLog = new NtcPptpLog(); - ntcPptpLog = (NtcPptpLog) createTestData(ntcPptpLog); - ntcPptpLog.setId(42L); - ntcPptpLog.setCfgId(4533L); - ntcPptpLog.setService(134); - ntcPptpLog.setUserRegion("5533"); - ntcPptpLog.setTunnelType(2); - ntcPptpLog.setEncryptMode(6); - - - - ntcPptpLogs.add(ntcPptpLog); - - - page.setCount(ntcPptpLogs.size()); - page.setList(ntcPptpLogs); - - return page; - } - - - /** - * L2TP 日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcL2tpLogPage(Page page, NtcL2tpLog entity) throws Exception { - - List ntcL2tpLogs = Lists.newArrayList(); - - NtcL2tpLog ntcL2tpLog = new NtcL2tpLog(); - ntcL2tpLog = (NtcL2tpLog) createTestData(ntcL2tpLog); - ntcL2tpLog.setId(43L); - ntcL2tpLog.setCfgId(6532L); - ntcL2tpLog.setService(23); - ntcL2tpLog.setUserRegion("6532"); - ntcL2tpLog.setTunnelType(1); - ntcL2tpLog.setEncryptMode(1); - - - - ntcL2tpLogs.add(ntcL2tpLog); - ntcL2tpLog = new NtcL2tpLog(); - ntcL2tpLog = (NtcL2tpLog) createTestData(ntcL2tpLog); - ntcL2tpLog.setId(44L); - ntcL2tpLog.setCfgId(6533L); - ntcL2tpLog.setService(135); - ntcL2tpLog.setUserRegion("6533"); - ntcL2tpLog.setTunnelType(2); - ntcL2tpLog.setEncryptMode(2); - - - - ntcL2tpLogs.add(ntcL2tpLog); - - - page.setCount(ntcL2tpLogs.size()); - page.setList(ntcL2tpLogs); - - return page; - } - - /** - *OPENVPN 日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcOpenvpnLogPage(Page page, NtcOpenvpnLog entity) throws Exception { - - List ntcOpenvpnLogs = Lists.newArrayList(); - - NtcOpenvpnLog ntcOpenvpnLog = new NtcOpenvpnLog(); - ntcOpenvpnLog = (NtcOpenvpnLog) createTestData(ntcOpenvpnLog); - ntcOpenvpnLog.setId(45L); - ntcOpenvpnLog.setCfgId(6532L); - ntcOpenvpnLog.setService(24); - ntcOpenvpnLog.setUserRegion("6532"); - ntcOpenvpnLog.setVersion("版本1"); - ntcOpenvpnLog.setEncryptMode("AES"); - ntcOpenvpnLog.setHmac(1); - ntcOpenvpnLog.setTunnelType(1); - - - - ntcOpenvpnLogs.add(ntcOpenvpnLog); - - - ntcOpenvpnLog = new NtcOpenvpnLog(); - ntcOpenvpnLog = (NtcOpenvpnLog) createTestData(ntcOpenvpnLog); - ntcOpenvpnLog.setId(46L); - ntcOpenvpnLog.setCfgId(4533L); - ntcOpenvpnLog.setService(136); - ntcOpenvpnLog.setUserRegion("6533"); - ntcOpenvpnLog.setVersion("版本1"); - ntcOpenvpnLog.setEncryptMode("MD5"); - ntcOpenvpnLog.setHmac(1); - ntcOpenvpnLog.setTunnelType(2); - - - - ntcOpenvpnLogs.add(ntcOpenvpnLog); - - - page.setCount(ntcOpenvpnLogs.size()); - page.setList(ntcOpenvpnLogs); - - return page; - } - - - /** - * IPSEC 日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcIpsecLogPage(Page page, NtcIpsecLog entity) throws Exception { - - List ntcIpsecLogs = Lists.newArrayList(); - - NtcIpsecLog ntcIpsecLog = new NtcIpsecLog(); - ntcIpsecLog = (NtcIpsecLog) createTestData(ntcIpsecLog); - ntcIpsecLog.setId(47L); - ntcIpsecLog.setCfgId(7532L); - ntcIpsecLog.setService(137); - ntcIpsecLog.setUserRegion("7532"); - ntcIpsecLog.setExProtocol(1); - ntcIpsecLog.setIsakmpMode(1); - - ntcIpsecLogs.add(ntcIpsecLog); - - - ntcIpsecLog = new NtcIpsecLog(); - ntcIpsecLog = (NtcIpsecLog) createTestData(ntcIpsecLog); - - ntcIpsecLog.setId(48L); - ntcIpsecLog.setCfgId(7533L); - ntcIpsecLog.setService(137); - ntcIpsecLog.setUserRegion("7533"); - ntcIpsecLog.setExProtocol(2); - ntcIpsecLog.setIsakmpMode(2); - - - - - ntcIpsecLogs.add(ntcIpsecLog); - - - page.setCount(ntcIpsecLogs.size()); - page.setList(ntcIpsecLogs); - - return page; - } - - /** - * SSH 日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcSshLogPage(Page page, NtcSshLog entity) throws Exception { - - List ntcSshLogs = Lists.newArrayList(); - - NtcSshLog ntcSshLog = new NtcSshLog(); - ntcSshLog = (NtcSshLog) createTestData(ntcSshLog); - ntcSshLog.setId(49L); - ntcSshLog.setCfgId(8532L); - ntcSshLog.setService(26); - ntcSshLog.setUserRegion("8532"); - ntcSshLog.setVersion("版本2"); - ntcSshLog.setHostKey("*&SDAEAS"); - ntcSshLog.setHostCookie("87we8wewe888888"); - ntcSshLog.setEncryptMode("SHA-1"); - ntcSshLog.setMac("CRC"); - ntcSshLog.setTunnelType(1); - - - ntcSshLogs.add(ntcSshLog); - - - ntcSshLog = new NtcSshLog(); - ntcSshLog = (NtcSshLog) createTestData(ntcSshLog); - ntcSshLog.setId(50L); - ntcSshLog.setCfgId(8533L); - ntcSshLog.setService(138); - ntcSshLog.setUserRegion("8533"); - ntcSshLog.setVersion("版本2"); - ntcSshLog.setHostKey("*&SDAEAS111"); - ntcSshLog.setHostCookie("87we8wewe88228888"); - ntcSshLog.setEncryptMode("SHA-1"); - ntcSshLog.setMac("CRC"); - ntcSshLog.setTunnelType(2); - - - ntcSshLogs.add(ntcSshLog); - - page.setCount(ntcSshLogs.size()); - page.setList(ntcSshLogs); - - return page; - } - - /** - * FTP 日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcFtpLogPage(Page page, NtcFtpLog entity) throws Exception { - - List ntcFtpLogs = Lists.newArrayList(); - - NtcFtpLog ntcFtpLog = new NtcFtpLog(); - ntcFtpLog = (NtcFtpLog) createTestData(ntcFtpLog); - ntcFtpLog.setId(51L); - ntcFtpLog.setCfgId(9532L); - ntcFtpLog.setService(21); - ntcFtpLog.setUserRegion(" 9532"); - ntcFtpLog.setFtpUrl("ftp://127.0.0.1/a/b/c.txt"); - ntcFtpLog.setFtpContent("我能解附件内容"); - - - - ntcFtpLogs.add(ntcFtpLog); - - - ntcFtpLog = new NtcFtpLog(); - ntcFtpLog = (NtcFtpLog) createTestData(ntcFtpLog); - ntcFtpLog.setId(52L); - ntcFtpLog.setCfgId(9533L); - ntcFtpLog.setService(133); - ntcFtpLog.setUserRegion("9533"); - ntcFtpLog.setFtpUrl("ftp://127.0.0.1/a/b/d.txt"); - ntcFtpLog.setFtpContent("我能解附件内容"); - - ntcFtpLogs.add(ntcFtpLog); - - page.setCount(ntcFtpLogs.size()); - page.setList(ntcFtpLogs); - - return page; - } - - /** - * FTP 日志检索测试方法 - * @param page - * @param entity - * @return - * @throws Exception - */ - public Page findNtcPzReport(Page page, NtcPzReport entity) throws Exception { - - - - if ("1".equals(entity.getSearchBusinessType())) { - Page page1 = new Page(); - page1.setPageNo(page.getPageNo()); - page1.setPageSize(page.getPageSize()); - List restList = new ArrayList(); - Map restMap = new HashMap(); - restMap.put("cfgId", 20l); - restMap.put("sum", 1000l); - restList.add(restMap); - Map restMap2 = new HashMap(); - restMap2.put("cfgId", 30l); - restMap2.put("sum", 1001l); - restList.add(restMap2); - page1.setCount(restList.size()); - page1.setList(restList); - return page1; - }else if ("2".equals(entity.getSearchBusinessType())){ - - List ntcPzReports = Lists.newArrayList(); - Date date = new Date(); - NtcPzReport ntcPzReport = new NtcPzReport(); - ntcPzReport.setCfgId(20l); - ntcPzReport.setSum(400l); - ntcPzReport.setService(1); - ntcPzReport.setReportTime(date); - ntcPzReports.add(ntcPzReport); - - NtcPzReport ntcPzReport3 = new NtcPzReport(); - ntcPzReport3.setCfgId(30l); - ntcPzReport3.setSum(351l); - ntcPzReport3.setService(1); - ntcPzReport3.setReportTime(date); - ntcPzReports.add(ntcPzReport3); - Date date1 = new Date(); - date1.setMinutes(date1.getMinutes()+5); - NtcPzReport ntcPzReport1 = new NtcPzReport(); - ntcPzReport1.setCfgId(20l); - ntcPzReport1.setSum(400l); - ntcPzReport1.setService(1); - ntcPzReport1.setReportTime(date1); - ntcPzReports.add(ntcPzReport1); - - NtcPzReport ntcPzReport4 = new NtcPzReport(); - ntcPzReport4.setCfgId(30l); - ntcPzReport4.setSum(500l); - ntcPzReport4.setService(1); - ntcPzReport4.setReportTime(date1); - ntcPzReports.add(ntcPzReport4); - - Date date2 = new Date(); - date2.setMinutes(date2.getMinutes()+10); - NtcPzReport ntcPzReport2 = new NtcPzReport(); - ntcPzReport2.setCfgId(20l); - ntcPzReport2.setSum(200l); - ntcPzReport2.setService(1); - ntcPzReport2.setReportTime(date2); - ntcPzReports.add(ntcPzReport2); - - NtcPzReport ntcPzReport5 = new NtcPzReport(); - ntcPzReport5.setCfgId(30l); - ntcPzReport5.setSum(150l); - ntcPzReport5.setService(1); - ntcPzReport5.setReportTime(date2); - ntcPzReports.add(ntcPzReport5); - - page.setCount(ntcPzReports.size()); - page.setList(ntcPzReports); - return page; - } - - return null; - - } - - - - - private Object createTestData(LogEntity logEntity) { - logEntity.setTransProto("IPv4_TCP"); - logEntity.setFoundTime(new Date()); - logEntity.setRecvTime(new Date()); - logEntity.setAddrType(4); - logEntity.setsIp("192.168.10.106"); - logEntity.setsPort("80"); - logEntity.setdIp("202.106.0.20"); - logEntity.setdPort("8443"); - logEntity.setCapIp("10.0.6.240"); - logEntity.setDeviceId(1356981); - logEntity.setDirection(0); - logEntity.setStreamDir(0); - logEntity.setEntranceId(21L); - - return logEntity; - - } - - - - - - - -} diff --git a/src/main/java/com/nis/web/service/restful/NtcLogService.java b/src/main/java/com/nis/web/service/restful/NtcLogService.java new file mode 100644 index 0000000..898e9f1 --- /dev/null +++ b/src/main/java/com/nis/web/service/restful/NtcLogService.java @@ -0,0 +1,16 @@ +package com.nis.web.service.restful; + +import org.springframework.stereotype.Service; + +import com.nis.web.service.BaseLogService; + +/** + * @Description:TODO(这里用一句话描述这个类的作用) + * @author (zdx) + * @date 2018年7月10日 上午9:47:39 + * @version V1.0 + */ +@Service +public class NtcLogService extends BaseLogService { + +} diff --git a/src/main/java/com/nis/web/service/restful/NtcReportService.java b/src/main/java/com/nis/web/service/restful/NtcReportService.java index dd60189..07b2365 100644 --- a/src/main/java/com/nis/web/service/restful/NtcReportService.java +++ b/src/main/java/com/nis/web/service/restful/NtcReportService.java @@ -32,8 +32,7 @@ public class NtcReportService extends BaseLogService { @Autowired protected NtcReportDao dao; - public Page findNtcPzReport(Page page, NtcPzReport entity) - throws Exception { + public Page findNtcPzReport(Page page, NtcPzReport entity) throws Exception { entity.setPage(page); page.setList(dao.findNtcPzReport(entity)); if ("1".equals(entity.getSearchBusinessType())) { @@ -57,43 +56,47 @@ public class NtcReportService extends BaseLogService { return null; } - + public Page findNtcServiceReport(Page page, NtcServiceReport entity) throws Exception { entity.setPage(page); page.setList(dao.findNtcServiceReport(entity)); return page; } - public Page findNtcTagReport(Page page, NtcTagReport entity) - throws Exception { + + public Page findNtcTagReport(Page page, NtcTagReport entity) throws Exception { entity.setPage(page); page.setList(dao.findNtcTagReport(entity)); return page; } + public Page findNtcAttrTypeReport(Page page, NtcAttrTypeReport entity) throws Exception { entity.setPage(page); page.setList(dao.findNtcAttrTypeReport(entity)); return page; } - public Page findNtcLwhhReport(Page page, NtcLwhhReport entity) - throws Exception { + + public Page findNtcLwhhReport(Page page, NtcLwhhReport entity) throws Exception { entity.setPage(page); page.setList(dao.findNtcLwhhReport(entity)); return page; } - public Page findNtcSrcipDomesticReport(Page page, NtcSrcipDomesticReport entity) - throws Exception { + + public Page findNtcSrcipDomesticReport(Page page, + NtcSrcipDomesticReport entity) throws Exception { entity.setPage(page); page.setList(dao.findNtcSrcipDomesticReport(entity)); return page; } - public Page findNtcDestipCountryReport(Page page, NtcDestipCountryReport entity) - throws Exception { + + public Page findNtcDestipCountryReport(Page page, + NtcDestipCountryReport entity) throws Exception { entity.setPage(page); page.setList(dao.findNtcDestipCountryReport(entity)); return page; } + public Page findNtcEntranceReport(Page page, NtcEntranceReport entity) throws Exception { entity.setPage(page);