From ed111ec4b8ca47f0e749c3a0821d6b27f67a4c89 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Fri, 22 Dec 2017 15:22:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=92=8C=E6=97=A5=E5=BF=97=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/restful/DfAttrStatLogDaily.java | 47 - .../domain/restful/DfAttrStatLogMonth.java | 29 - .../nis/domain/restful/DfAttrTypeReport.java | 62 -- .../restful/DfDestIpCounrtyStatLogDaily.java | 39 - .../restful/DfDestIpCounrtyStatLogMonth.java | 26 - .../domain/restful/DfDestIpCountryReport.java | 62 -- .../nis/domain/restful/DfDestIpReport.java | 24 - .../nis/domain/restful/DfDjLogStatistics.java | 35 - .../com/nis/domain/restful/DfDjNestLog.java | 173 ---- .../domain/restful/DfDjPzLogStatistics.java | 21 - .../domain/restful/DfEntrStatLogDaily.java | 48 - .../domain/restful/DfEntrStatLogMonth.java | 29 - .../nis/domain/restful/DfEntranceReport.java | 62 -- .../domain/restful/DfJitAffairDestReport.java | 62 -- .../domain/restful/DfJitAffairSrcReport.java | 62 -- .../nis/domain/restful/DfJitFlDestReport.java | 63 -- .../nis/domain/restful/DfJitFlSrcReport.java | 62 -- .../restful/DfJitGuaranteeDestReport.java | 43 - .../restful/DfJitGuaranteeSrcReport.java | 43 - .../nis/domain/restful/DfJitIdDestReport.java | 45 - .../nis/domain/restful/DfJitIdSrcReport.java | 46 - .../restful/DfJitMissionDestReport.java | 43 - .../domain/restful/DfJitMissionSrcReport.java | 43 - .../domain/restful/DfJitTagDestReport.java | 43 - .../nis/domain/restful/DfJitTagSrcReport.java | 43 - .../nis/domain/restful/DfLwhhAttrDaily.java | 77 -- .../nis/domain/restful/DfLwhhAttrMonth.java | 77 -- .../nis/domain/restful/DfLwhhAttrReport.java | 76 -- .../com/nis/domain/restful/DfLwhhReport.java | 61 -- .../domain/restful/DfLwhhStatLogDaily.java | 48 - .../domain/restful/DfLwhhStatLogMonth.java | 29 - .../nis/domain/restful/DfLwhhTagDaily.java | 77 -- .../nis/domain/restful/DfLwhhTagMonth.java | 77 -- .../nis/domain/restful/DfLwhhTagReport.java | 76 -- .../com/nis/domain/restful/DfPzReport.java | 63 -- .../nis/domain/restful/DfPzReportStat.java | 98 -- .../nis/domain/restful/DfServiceReport.java | 47 - .../nis/domain/restful/DfSrcIpAttrDaily.java | 79 -- .../nis/domain/restful/DfSrcIpAttrMonth.java | 79 -- .../nis/domain/restful/DfSrcIpAttrReport.java | 78 -- .../domain/restful/DfSrcIpDomeSticReport.java | 81 -- .../restful/DfSrcIpDomesticStatLogDaily.java | 51 - .../restful/DfSrcIpDomesticStatLogMonth.java | 25 - .../com/nis/domain/restful/DfSrcIpReport.java | 33 - .../nis/domain/restful/DfSrcIpTagDaily.java | 79 -- .../nis/domain/restful/DfSrcIpTagMonth.java | 79 -- .../nis/domain/restful/DfSrcIpTagReport.java | 78 -- .../nis/domain/restful/DfStatLogDaily.java | 49 - .../nis/domain/restful/DfStatLogMonth.java | 25 - .../com/nis/domain/restful/DfTagReport.java | 62 -- .../nis/domain/restful/DfTagStatLogDaily.java | 47 - .../nis/domain/restful/DfTagStatLogMonth.java | 29 - .../domain/restful/DjAttrStatLogDaily.java | 47 - .../domain/restful/DjAttrStatLogMonth.java | 25 - .../nis/domain/restful/DjAttrTypeReport.java | 62 -- .../com/nis/domain/restful/DjCkStatLog.java | 195 ---- .../restful/DjDestIpCounrtyStatLogDaily.java | 39 - .../restful/DjDestIpCounrtyStatLogMonth.java | 26 - .../domain/restful/DjDestIpCountryReport.java | 62 -- .../domain/restful/DjEntrStatLogDaily.java | 48 - .../domain/restful/DjEntrStatLogMonth.java | 26 - .../nis/domain/restful/DjEntranceReport.java | 62 -- .../domain/restful/DjJitAffairDestReport.java | 62 -- .../domain/restful/DjJitAffairSrcReport.java | 62 -- .../nis/domain/restful/DjJitFlDestReport.java | 63 -- .../nis/domain/restful/DjJitFlSrcReport.java | 62 -- .../restful/DjJitGuaranteeDestReport.java | 43 - .../restful/DjJitGuaranteeSrcReport.java | 43 - .../nis/domain/restful/DjJitIdDestReport.java | 44 - .../nis/domain/restful/DjJitIdSrcReport.java | 45 - .../restful/DjJitMissionDestReport.java | 43 - .../domain/restful/DjJitMissionSrcReport.java | 43 - .../domain/restful/DjJitTagDestReport.java | 43 - .../nis/domain/restful/DjJitTagSrcReport.java | 43 - .../nis/domain/restful/DjLwhhAttrDaily.java | 77 -- .../nis/domain/restful/DjLwhhAttrMonth.java | 77 -- .../nis/domain/restful/DjLwhhAttrReport.java | 76 -- .../com/nis/domain/restful/DjLwhhReport.java | 61 -- .../domain/restful/DjLwhhStatLogDaily.java | 48 - .../domain/restful/DjLwhhStatLogMonth.java | 26 - .../nis/domain/restful/DjLwhhTagDaily.java | 77 -- .../nis/domain/restful/DjLwhhTagMonth.java | 77 -- .../nis/domain/restful/DjLwhhTagReport.java | 76 -- .../com/nis/domain/restful/DjPzReport.java | 73 -- .../nis/domain/restful/DjPzReportStat.java | 108 -- .../nis/domain/restful/DjSrcIpAttrDaily.java | 79 -- .../nis/domain/restful/DjSrcIpAttrMonth.java | 79 -- .../nis/domain/restful/DjSrcIpAttrReport.java | 78 -- .../domain/restful/DjSrcIpDomeSticReport.java | 81 -- .../restful/DjSrcIpDomesticStatLogDaily.java | 51 - .../restful/DjSrcIpDomesticStatLogMonth.java | 25 - .../nis/domain/restful/DjSrcIpTagDaily.java | 79 -- .../nis/domain/restful/DjSrcIpTagMonth.java | 79 -- .../nis/domain/restful/DjSrcIpTagReport.java | 78 -- .../nis/domain/restful/DjStatLogDaily.java | 49 - .../nis/domain/restful/DjStatLogMonth.java | 21 - .../com/nis/domain/restful/DjTagReport.java | 62 -- .../nis/domain/restful/DjTagStatLogDaily.java | 47 - .../nis/domain/restful/DjTagStatLogMonth.java | 25 - .../restful/DfDjLogStatController.java | 231 ----- .../restful/DfJitLogSearchController.java | 753 -------------- .../DfMultiDimensionalReportController.java | 215 ---- .../DfMultiDimensionalStatLogController.java | 333 ------- .../restful/DfReportController.java | 636 ------------ .../restful/DfStatLogController.java | 792 --------------- .../restful/DjJitLogSearchController.java | 921 ------------------ .../DjMultiDimensionalReportController.java | 215 ---- .../DjMultiDimensionalStatLogController.java | 333 ------- .../restful/DjReportController.java | 487 --------- .../restful/DjStatLogController.java | 791 --------------- .../restful/dfDjNestLogController.java | 109 --- .../java/com/nis/web/dao/DfDjLogStatDao.java | 25 - .../java/com/nis/web/dao/DfDjLogStatDao.xml | 150 --- .../java/com/nis/web/dao/DfDjNestLogDao.java | 13 - .../java/com/nis/web/dao/DfDjNestLogDao.xml | 43 - .../com/nis/web/dao/DfJitLogSearchDao.java | 45 - .../com/nis/web/dao/DfJitLogSearchDao.xml | 692 ------------- .../web/dao/DfMultiDimensionalReportDao.java | 43 - .../web/dao/DfMultiDimensionalReportDao.xml | 230 ----- .../web/dao/DfMultiDimensionalStatLogDao.java | 40 - .../web/dao/DfMultiDimensionalStatLogDao.xml | 475 --------- .../java/com/nis/web/dao/DfReportDao.java | 58 -- src/main/java/com/nis/web/dao/DfReportDao.xml | 824 ---------------- .../java/com/nis/web/dao/DfStatLogDao.java | 54 - .../java/com/nis/web/dao/DfStatLogDao.xml | 857 ---------------- .../com/nis/web/dao/DjJitLogSearchDao.java | 48 - .../com/nis/web/dao/DjJitLogSearchDao.xml | 776 --------------- .../web/dao/DjMultiDimensionalReportDao.java | 32 - .../web/dao/DjMultiDimensionalReportDao.xml | 230 ----- .../web/dao/DjMultiDimensionalStatLogDao.java | 40 - .../web/dao/DjMultiDimensionalStatLogDao.xml | 475 --------- .../java/com/nis/web/dao/DjReportDao.java | 49 - src/main/java/com/nis/web/dao/DjReportDao.xml | 617 ------------ .../java/com/nis/web/dao/DjStatLogDao.java | 54 - .../java/com/nis/web/dao/DjStatLogDao.xml | 858 ---------------- .../service/restful/ConfigSourcesService.java | 4 +- .../service/restful/DfDjNestLogService.java | 57 -- .../restful/DfJitLogSearchService.java | 144 --- .../DfMultiDimensionalReportService.java | 122 --- .../DfMultiDimensionalStatLogService.java | 83 -- .../web/service/restful/DfReportService.java | 277 ------ .../web/service/restful/DfStatLogService.java | 203 ---- .../service/restful/DfdjLogStatService.java | 122 --- .../restful/DjJitLogSearchService.java | 150 --- .../DjMultiDimensionalReportService.java | 112 --- .../DjMultiDimensionalStatLogService.java | 83 -- .../web/service/restful/DjReportService.java | 186 ---- .../web/service/restful/DjStatLogService.java | 203 ---- .../restful/UpdateCompileByJDBCThread.java | 41 + 149 files changed, 44 insertions(+), 20019 deletions(-) delete mode 100644 src/main/java/com/nis/domain/restful/DfAttrStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfAttrStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfAttrTypeReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfDestIpCounrtyStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfDestIpCounrtyStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfDestIpCountryReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfDestIpReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfDjLogStatistics.java delete mode 100644 src/main/java/com/nis/domain/restful/DfDjNestLog.java delete mode 100644 src/main/java/com/nis/domain/restful/DfDjPzLogStatistics.java delete mode 100644 src/main/java/com/nis/domain/restful/DfEntrStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfEntrStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfEntranceReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitAffairDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitAffairSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitFlDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitFlSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitGuaranteeDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitGuaranteeSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitIdDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitIdSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitMissionDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitMissionSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitTagDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfJitTagSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfLwhhAttrDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfLwhhAttrMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfLwhhAttrReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfLwhhReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfLwhhStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfLwhhStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfLwhhTagDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfLwhhTagMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfLwhhTagReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfPzReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfPzReportStat.java delete mode 100644 src/main/java/com/nis/domain/restful/DfServiceReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpAttrDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpAttrMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpAttrReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpDomeSticReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpDomesticStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpDomesticStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpTagDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpTagMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfSrcIpTagReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DfTagReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DfTagStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DfTagStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjAttrStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjAttrStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjAttrTypeReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjCkStatLog.java delete mode 100644 src/main/java/com/nis/domain/restful/DjDestIpCounrtyStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjDestIpCounrtyStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjDestIpCountryReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjEntrStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjEntrStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjEntranceReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitAffairDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitAffairSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitFlDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitFlSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitGuaranteeDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitGuaranteeSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitIdDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitIdSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitMissionDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitMissionSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitTagDestReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjJitTagSrcReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjLwhhAttrDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjLwhhAttrMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjLwhhAttrReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjLwhhReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjLwhhStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjLwhhStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjLwhhTagDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjLwhhTagMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjLwhhTagReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjPzReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjPzReportStat.java delete mode 100644 src/main/java/com/nis/domain/restful/DjSrcIpAttrDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjSrcIpAttrMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjSrcIpAttrReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjSrcIpDomeSticReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjSrcIpDomesticStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjSrcIpDomesticStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjSrcIpTagDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjSrcIpTagMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjSrcIpTagReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjStatLogMonth.java delete mode 100644 src/main/java/com/nis/domain/restful/DjTagReport.java delete mode 100644 src/main/java/com/nis/domain/restful/DjTagStatLogDaily.java delete mode 100644 src/main/java/com/nis/domain/restful/DjTagStatLogMonth.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DfDjLogStatController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DfJitLogSearchController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DfMultiDimensionalReportController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DfMultiDimensionalStatLogController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DfReportController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DfStatLogController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DjJitLogSearchController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DjMultiDimensionalReportController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DjMultiDimensionalStatLogController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DjReportController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/DjStatLogController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/dfDjNestLogController.java delete mode 100644 src/main/java/com/nis/web/dao/DfDjLogStatDao.java delete mode 100644 src/main/java/com/nis/web/dao/DfDjLogStatDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfDjNestLogDao.java delete mode 100644 src/main/java/com/nis/web/dao/DfDjNestLogDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfJitLogSearchDao.java delete mode 100644 src/main/java/com/nis/web/dao/DfJitLogSearchDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.java delete mode 100644 src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.java delete mode 100644 src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfReportDao.java delete mode 100644 src/main/java/com/nis/web/dao/DfReportDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfStatLogDao.java delete mode 100644 src/main/java/com/nis/web/dao/DfStatLogDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjJitLogSearchDao.java delete mode 100644 src/main/java/com/nis/web/dao/DjJitLogSearchDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.java delete mode 100644 src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.java delete mode 100644 src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjReportDao.java delete mode 100644 src/main/java/com/nis/web/dao/DjReportDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjStatLogDao.java delete mode 100644 src/main/java/com/nis/web/dao/DjStatLogDao.xml delete mode 100644 src/main/java/com/nis/web/service/restful/DfDjNestLogService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DfJitLogSearchService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DfMultiDimensionalReportService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DfMultiDimensionalStatLogService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DfReportService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DfStatLogService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DfdjLogStatService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DjJitLogSearchService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DjMultiDimensionalReportService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DjMultiDimensionalStatLogService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DjReportService.java delete mode 100644 src/main/java/com/nis/web/service/restful/DjStatLogService.java diff --git a/src/main/java/com/nis/domain/restful/DfAttrStatLogDaily.java b/src/main/java/com/nis/domain/restful/DfAttrStatLogDaily.java deleted file mode 100644 index 22f70a5..0000000 --- a/src/main/java/com/nis/domain/restful/DfAttrStatLogDaily.java +++ /dev/null @@ -1,47 +0,0 @@ -/** -* @Title: DfTagStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DfAttrStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="性质", required=true) - protected Integer attrType; - - protected String searchAttrType; - - public Integer getAttrType() { - return attrType; - } - public void setAttrType(Integer attrType) { - this.attrType = attrType; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } -} diff --git a/src/main/java/com/nis/domain/restful/DfAttrStatLogMonth.java b/src/main/java/com/nis/domain/restful/DfAttrStatLogMonth.java deleted file mode 100644 index cb92e32..0000000 --- a/src/main/java/com/nis/domain/restful/DfAttrStatLogMonth.java +++ /dev/null @@ -1,29 +0,0 @@ -/** -* @Title: DfTagStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DfAttrStatLogMonth extends DfAttrStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DfAttrTypeReport.java b/src/main/java/com/nis/domain/restful/DfAttrTypeReport.java deleted file mode 100644 index f51c003..0000000 --- a/src/main/java/com/nis/domain/restful/DfAttrTypeReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfAttrTypeReport - * @Description: 管控性质实时统计 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DfAttrTypeReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = -9186632214937498812L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "性质", required = true) - protected Integer attrType; - - protected String searchAttrType; - protected String searchService; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Integer getAttrType() { - return attrType; - } - - public void setAttrType(Integer attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfDestIpCounrtyStatLogDaily.java b/src/main/java/com/nis/domain/restful/DfDestIpCounrtyStatLogDaily.java deleted file mode 100644 index 985ceff..0000000 --- a/src/main/java/com/nis/domain/restful/DfDestIpCounrtyStatLogDaily.java +++ /dev/null @@ -1,39 +0,0 @@ -/** -* @Title: DfDestIpCounrtyStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfDestIpCounrtyStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DfDestIpCounrtyStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="国家", required=true) - protected String destCountry; - - public String getDestCountry() { - return destCountry; - } - public void setDestCountry(String destCountry) { - this.destCountry = destCountry; - } - - -} diff --git a/src/main/java/com/nis/domain/restful/DfDestIpCounrtyStatLogMonth.java b/src/main/java/com/nis/domain/restful/DfDestIpCounrtyStatLogMonth.java deleted file mode 100644 index 9ac566a..0000000 --- a/src/main/java/com/nis/domain/restful/DfDestIpCounrtyStatLogMonth.java +++ /dev/null @@ -1,26 +0,0 @@ -/** -* @Title: DfDestIpCounrtyStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - - -/** -* @ClassName: DfDestIpCounrtyStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DfDestIpCounrtyStatLogMonth extends DfDestIpCounrtyStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DfDestIpCountryReport.java b/src/main/java/com/nis/domain/restful/DfDestIpCountryReport.java deleted file mode 100644 index a9277e1..0000000 --- a/src/main/java/com/nis/domain/restful/DfDestIpCountryReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfDestIpCountryReport - * @Description: 管控境内目的IP(带私有标签)实时统计模型 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DfDestIpCountryReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = -6490028574641528475L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "目的IP所属国家", required = true) - protected String destCountry; - - protected String searchService; - protected String searchDestCountry; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public String getDestCountry() { - return destCountry; - } - - public void setDestCountry(String destCountry) { - this.destCountry = destCountry; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchDestCountry() { - return searchDestCountry; - } - - public void setSearchDestCountry(String searchDestCountry) { - this.searchDestCountry = searchDestCountry; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfDestIpReport.java b/src/main/java/com/nis/domain/restful/DfDestIpReport.java deleted file mode 100644 index 8cc247c..0000000 --- a/src/main/java/com/nis/domain/restful/DfDestIpReport.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.nis.domain.restful; - -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfDestIpReport extends DfReportEntity{ - - /** - * serialVersionUID - */ - private static final long serialVersionUID = -6785031994558744311L; - - - @ApiModelProperty(value = "目的IP所属国家", required = true) - protected String destCountry; - - public String getDestCountry() { - return destCountry; - } - public void setDestCountry(String destCountry) { - this.destCountry = destCountry; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfDjLogStatistics.java b/src/main/java/com/nis/domain/restful/DfDjLogStatistics.java deleted file mode 100644 index 1e679db..0000000 --- a/src/main/java/com/nis/domain/restful/DfDjLogStatistics.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.nis.domain.restful; - -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; - -/** - * @ClassName: DfDjLogStatistics - * @Description: 封堵日志总量统计 - * @author (zbc) - * @date 2016年11月14日 下午4:00:00 - * @version V1.0 - */ -public class DfDjLogStatistics extends StatLogEntity { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = -2664087481901057237L; - - - @Override - @JsonIgnore - public Integer getService() { - return super.getService(); - } - - @Override - @JsonIgnore - public Date getStatTime() { - return super.getStatTime(); - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfDjNestLog.java b/src/main/java/com/nis/domain/restful/DfDjNestLog.java deleted file mode 100644 index d011e65..0000000 --- a/src/main/java/com/nis/domain/restful/DfDjNestLog.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.nis.domain.restful; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.xml.bind.annotation.XmlTransient; - -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.nis.domain.Page; -import com.nis.util.JsonDateSerializer; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfDjNestLog - * @Description: 嵌套信息日志 - * @author (ZBC) - * @date 2016年11月09日 下午02:25:00 - * @version V1.0 - */ -public class DfDjNestLog implements Serializable { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 4112513339553998553L; - - - @ApiModelProperty(value = "本层嵌套ID", required = true) - protected String layerId; - @ApiModelProperty(value = "发现时间", required = true) - protected Date foundTime; - @ApiModelProperty(value = "接收时间", required = true) - protected Date recvTime; - @ApiModelProperty(value = "本层嵌套层数", required = true) - protected Integer layerCnt; - @ApiModelProperty(value = "嵌套协议类型", required = true) - protected String nestProtocol; - @ApiModelProperty(value = "嵌套服务端ip地址", required = true) - protected String nestServerIp; - @ApiModelProperty(value = "嵌套客户端ip地址", required = true) - protected String nestClientIp; - @ApiModelProperty(value = "嵌套服务端端口", required = true) - protected Integer nestServerPort; - @ApiModelProperty(value = "嵌套客户端端口", required = true) - protected Integer nestClientPort; - @ApiModelProperty(value = "外层嵌套关联ID", required = true) - protected String overId; - - - - protected String searchLayerId; - protected String searchActiveSys; - - - - @JsonSerialize(using = JsonDateSerializer.class) - public Date getFoundTime() { - return foundTime; - } - public void setFoundTime(Date foundTime) { - this.foundTime = foundTime; - } - - @JsonSerialize(using = JsonDateSerializer.class) - public Date getRecvTime() { - return recvTime; - } - public void setRecvTime(Date recvTime) { - this.recvTime = recvTime; - } - - public Integer getLayerCnt() { - return layerCnt; - } - public void setLayerCnt(Integer layerCnt) { - this.layerCnt = layerCnt; - } - - public String getNestProtocol() { - return nestProtocol; - } - public void setNestProtocol(String nestProtocol) { - this.nestProtocol = nestProtocol; - } - - public String getNestServerIp() { - return nestServerIp; - } - public void setNestServerIp(String nestServerIp) { - this.nestServerIp = nestServerIp; - } - - public String getNestClientIp() { - return nestClientIp; - } - public void setNestClientIp(String nestClientIp) { - this.nestClientIp = nestClientIp; - } - - public Integer getNestServerPort() { - return nestServerPort; - } - public void setNestServerPort(Integer nestServerPort) { - this.nestServerPort = nestServerPort; - } - - public Integer getNestClientPort() { - return nestClientPort; - } - public void setNestClientPort(Integer nestClientPort) { - this.nestClientPort = nestClientPort; - } - - public String getOverId() { - return overId; - } - public void setOverId(String overId) { - this.overId = overId; - } - - public String getLayerId() { - return layerId; - } - public void setLayerId(String layerId) { - this.layerId = layerId; - } - - @JsonIgnore - public String getSearchLayerId() { - return searchLayerId; - } - public void setSearchLayerId(String searchLayerId) { - this.searchLayerId = searchLayerId; - } - - @JsonIgnore - public String getSearchActiveSys() { - return searchActiveSys; - } - public void setSearchActiveSys(String searchActiveSys) { - this.searchActiveSys = searchActiveSys; - } - - - - /** - * 当前实体分页对象 - */ - protected Page page; - - @JsonIgnore - @XmlTransient - public Page getPage() { - if (page == null) { - page = new Page(); - } - return page; - } - - public Page setPage(Page page) { - this.page = page; - return page; - } - - @Override - public String toString() { - return ReflectionToStringBuilder.toString(this); - } -} diff --git a/src/main/java/com/nis/domain/restful/DfDjPzLogStatistics.java b/src/main/java/com/nis/domain/restful/DfDjPzLogStatistics.java deleted file mode 100644 index 452583f..0000000 --- a/src/main/java/com/nis/domain/restful/DfDjPzLogStatistics.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; - -/** - * @ClassName: DfDjLogStatistics - * @Description: 封堵配置日志总量统计 - * @author (zbc) - * @date 2016年11月14日 下午4:00:00 - * @version V1.0 - */ -public class DfDjPzLogStatistics extends StatLogEntity { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 8210969217513777081L; - - -} diff --git a/src/main/java/com/nis/domain/restful/DfEntrStatLogDaily.java b/src/main/java/com/nis/domain/restful/DfEntrStatLogDaily.java deleted file mode 100644 index fc47eed..0000000 --- a/src/main/java/com/nis/domain/restful/DfEntrStatLogDaily.java +++ /dev/null @@ -1,48 +0,0 @@ -/** -* @Title: DfTagStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DfEntrStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="局点", required=true) - protected Long entranceId; - - protected String searchEntranceId; - - public Long getEntranceId() { - return entranceId; - } - public void setEntranceId(Long entranceId) { - this.entranceId = entranceId; - } - @JsonIgnore - public String getSearchEntranceId() { - return searchEntranceId; - } - public void setSearchEntranceId(String searchEntranceId) { - this.searchEntranceId = searchEntranceId; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfEntrStatLogMonth.java b/src/main/java/com/nis/domain/restful/DfEntrStatLogMonth.java deleted file mode 100644 index 02ff382..0000000 --- a/src/main/java/com/nis/domain/restful/DfEntrStatLogMonth.java +++ /dev/null @@ -1,29 +0,0 @@ -/** -* @Title: DfTagStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DfEntrStatLogMonth extends DfEntrStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DfEntranceReport.java b/src/main/java/com/nis/domain/restful/DfEntranceReport.java deleted file mode 100644 index 5e8f358..0000000 --- a/src/main/java/com/nis/domain/restful/DfEntranceReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfEntranceReport - * @Description: 管控局点（带私有标签）实时统计模型 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DfEntranceReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = 6093854240033900622L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "局点信息", required = true) - protected Long entraceId; - - protected String searchService; - protected String searchEntraceId; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Long getEntraceId() { - return entraceId; - } - - public void setEntraceId(Long entraceId) { - this.entraceId = entraceId; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchEntraceId() { - return searchEntraceId; - } - - public void setSearchEntraceId(String searchEntraceId) { - this.searchEntraceId = searchEntraceId; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfJitAffairDestReport.java b/src/main/java/com/nis/domain/restful/DfJitAffairDestReport.java deleted file mode 100644 index 05071ca..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitAffairDestReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitAffairDestReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 6367339032317209141L; - @ApiModelProperty(value = "子话题", required = true) - private Integer affair; - @ApiModelProperty(value = "事件", required = true) - private Integer topic; - - /** - * 查询部分 - */ - private String searchAffair; - private String searchTopic; - - public DfJitAffairDestReport() { - super(); - } - - public Integer getAffair() { - return affair; - } - - public void setAffair(Integer affair) { - this.affair = affair; - } - - public Integer getTopic() { - return topic; - } - - public void setTopic(Integer topic) { - this.topic = topic; - } - - @JsonIgnore - public String getSearchAffair() { - return searchAffair; - } - - public void setSearchAffair(String searchAffair) { - this.searchAffair = searchAffair; - } - - @JsonIgnore - public String getSearchTopic() { - return searchTopic; - } - - public void setSearchTopic(String searchTopic) { - this.searchTopic = searchTopic; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitAffairSrcReport.java b/src/main/java/com/nis/domain/restful/DfJitAffairSrcReport.java deleted file mode 100644 index 9d7c530..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitAffairSrcReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitAffairSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = -9081795070814096710L; - @ApiModelProperty(value = "子话题", required = true) - private Integer affair; - @ApiModelProperty(value = "事件", required = true) - private Integer topic; - - /** - * 查询部分 - */ - private String searchAffair; - private String searchTopic; - - public DfJitAffairSrcReport() { - super(); - } - - public Integer getAffair() { - return affair; - } - - public void setAffair(Integer affair) { - this.affair = affair; - } - - public Integer getTopic() { - return topic; - } - - public void setTopic(Integer topic) { - this.topic = topic; - } - - @JsonIgnore - public String getSearchAffair() { - return searchAffair; - } - - public void setSearchAffair(String searchAffair) { - this.searchAffair = searchAffair; - } - - @JsonIgnore - public String getSearchTopic() { - return searchTopic; - } - - public void setSearchTopic(String searchTopic) { - this.searchTopic = searchTopic; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitFlDestReport.java b/src/main/java/com/nis/domain/restful/DfJitFlDestReport.java deleted file mode 100644 index 02ebf24..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitFlDestReport.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitFlDestReport extends DfJitLogEntity { - - - /** - * - */ - private static final long serialVersionUID = -8661475281697413205L; - @ApiModelProperty(value = "分类", required = true) - private Integer fl; - @ApiModelProperty(value = "性质", required = true) - private Integer xz; - - /** - * 查询部分 - */ - private String searchFl; - private String searchXz; - - public DfJitFlDestReport() { - super(); - } - - public Integer getFl() { - return fl; - } - - public void setFl(Integer fl) { - this.fl = fl; - } - - public Integer getXz() { - return xz; - } - - public void setXz(Integer xz) { - this.xz = xz; - } - - @JsonIgnore - public String getSearchFl() { - return searchFl; - } - - public void setSearchFl(String searchFl) { - this.searchFl = searchFl; - } - - @JsonIgnore - public String getSearchXz() { - return searchXz; - } - - public void setSearchXz(String searchXz) { - this.searchXz = searchXz; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitFlSrcReport.java b/src/main/java/com/nis/domain/restful/DfJitFlSrcReport.java deleted file mode 100644 index b3da017..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitFlSrcReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitFlSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 1866611122134109630L; - @ApiModelProperty(value = "分类", required = true) - private Integer fl; - @ApiModelProperty(value = "性质", required = true) - private Integer xz; - - /** - * 查询部分 - */ - private String searchFl; - private String searchXz; - - public DfJitFlSrcReport() { - super(); - } - - public Integer getFl() { - return fl; - } - - public void setFl(Integer fl) { - this.fl = fl; - } - - public Integer getXz() { - return xz; - } - - public void setXz(Integer xz) { - this.xz = xz; - } - - @JsonIgnore - public String getSearchFl() { - return searchFl; - } - - public void setSearchFl(String searchFl) { - this.searchFl = searchFl; - } - - @JsonIgnore - public String getSearchXz() { - return searchXz; - } - - public void setSearchXz(String searchXz) { - this.searchXz = searchXz; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitGuaranteeDestReport.java b/src/main/java/com/nis/domain/restful/DfJitGuaranteeDestReport.java deleted file mode 100644 index 370d66e..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitGuaranteeDestReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitGuaranteeDestReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 4886806743747030623L; - - @ApiModelProperty(value = "保障期", required = true) - private Integer guarantee; - - /** - * 查询部分 - */ - private String searchGuarantee; - - public DfJitGuaranteeDestReport() { - super(); - } - - public Integer getGuarantee() { - return guarantee; - } - - public void setGuarantee(Integer guarantee) { - this.guarantee = guarantee; - } - - @JsonIgnore - public String getSearchGuarantee() { - return searchGuarantee; - } - - public void setSearchGuarantee(String searchGuarantee) { - this.searchGuarantee = searchGuarantee; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitGuaranteeSrcReport.java b/src/main/java/com/nis/domain/restful/DfJitGuaranteeSrcReport.java deleted file mode 100644 index 3ddb95d..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitGuaranteeSrcReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitGuaranteeSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 558117618430759769L; - - @ApiModelProperty(value = "保障期", required = true) - private Integer guarantee; - - /** - * 查询部分 - */ - private String searchGuarantee; - - public DfJitGuaranteeSrcReport() { - super(); - } - - public Integer getGuarantee() { - return guarantee; - } - - public void setGuarantee(Integer guarantee) { - this.guarantee = guarantee; - } - - @JsonIgnore - public String getSearchGuarantee() { - return searchGuarantee; - } - - public void setSearchGuarantee(String searchGuarantee) { - this.searchGuarantee = searchGuarantee; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitIdDestReport.java b/src/main/java/com/nis/domain/restful/DfJitIdDestReport.java deleted file mode 100644 index 6e21a9b..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitIdDestReport.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitIdDestReport extends DfJitLogEntity { - - - /** - * - */ - private static final long serialVersionUID = -3056813909262889527L; - - @ApiModelProperty(value = "配置id", required = true) - private Long id; - - /** - * 查询部分 - */ - private String searchId; - - public DfJitIdDestReport() { - super(); - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @JsonIgnore - public String getSearchId() { - return searchId; - } - - public void setSearchId(String searchId) { - this.searchId = searchId; - } - - - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitIdSrcReport.java b/src/main/java/com/nis/domain/restful/DfJitIdSrcReport.java deleted file mode 100644 index 2366466..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitIdSrcReport.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitIdSrcReport extends DfJitLogEntity { - - - - /** - * - */ - private static final long serialVersionUID = 1789859856962153038L; - - @ApiModelProperty(value = "配置id", required = true) - private Long id; - - /** - * 查询部分 - */ - private String searchId; - - public DfJitIdSrcReport() { - super(); - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @JsonIgnore - public String getSearchId() { - return searchId; - } - - public void setSearchId(String searchId) { - this.searchId = searchId; - } - - - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitMissionDestReport.java b/src/main/java/com/nis/domain/restful/DfJitMissionDestReport.java deleted file mode 100644 index 227fe1f..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitMissionDestReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitMissionDestReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = -4200263721978195939L; - - @ApiModelProperty(value = "任务", required = true) - private Integer mission; - - /** - * 查询部分 - */ - private String searchMission; - - public DfJitMissionDestReport() { - super(); - } - - public Integer getMission() { - return mission; - } - - public void setMission(Integer mission) { - this.mission = mission; - } - - @JsonIgnore - public String getSearchMission() { - return searchMission; - } - - public void setSearchMission(String searchMission) { - this.searchMission = searchMission; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitMissionSrcReport.java b/src/main/java/com/nis/domain/restful/DfJitMissionSrcReport.java deleted file mode 100644 index f7cf417..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitMissionSrcReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitMissionSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 1244851836673765943L; - - @ApiModelProperty(value = "任务", required = true) - private Integer mission; - - /** - * 查询部分 - */ - private String searchMission; - - public DfJitMissionSrcReport() { - super(); - } - - public Integer getMission() { - return mission; - } - - public void setMission(Integer mission) { - this.mission = mission; - } - - @JsonIgnore - public String getSearchMission() { - return searchMission; - } - - public void setSearchMission(String searchMission) { - this.searchMission = searchMission; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitTagDestReport.java b/src/main/java/com/nis/domain/restful/DfJitTagDestReport.java deleted file mode 100644 index 8beebab..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitTagDestReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitTagDestReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = -8057168628547445607L; - - @ApiModelProperty(value = "标签", required = true) - private Integer tag; - - /** - * 查询部分 - */ - private String searchTag; - - public DfJitTagDestReport() { - super(); - } - - public Integer getTag() { - return tag; - } - - public void setTag(Integer tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfJitTagSrcReport.java b/src/main/java/com/nis/domain/restful/DfJitTagSrcReport.java deleted file mode 100644 index 1a09646..0000000 --- a/src/main/java/com/nis/domain/restful/DfJitTagSrcReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfJitTagSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = -1338482031809189715L; - - @ApiModelProperty(value = "标签", required = true) - private Integer tag; - - /** - * 查询部分 - */ - private String searchTag; - - public DfJitTagSrcReport() { - super(); - } - - public Integer getTag() { - return tag; - } - - public void setTag(Integer tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DfLwhhAttrDaily.java b/src/main/java/com/nis/domain/restful/DfLwhhAttrDaily.java deleted file mode 100644 index d7684e3..0000000 --- a/src/main/java/com/nis/domain/restful/DfLwhhAttrDaily.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhAttrDaily - * @Description: TODO(来文函号、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfLwhhAttrDaily extends StatLogEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchLwhh; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfLwhhAttrMonth.java b/src/main/java/com/nis/domain/restful/DfLwhhAttrMonth.java deleted file mode 100644 index c399ecc..0000000 --- a/src/main/java/com/nis/domain/restful/DfLwhhAttrMonth.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhAttrDaily - * @Description: TODO(来文函号、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfLwhhAttrMonth extends StatLogEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchLwhh; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfLwhhAttrReport.java b/src/main/java/com/nis/domain/restful/DfLwhhAttrReport.java deleted file mode 100644 index a4a7e6c..0000000 --- a/src/main/java/com/nis/domain/restful/DfLwhhAttrReport.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhAttrReport - * @Description: TODO(来文函号、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfLwhhAttrReport extends DfReportEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchLwhh; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfLwhhReport.java b/src/main/java/com/nis/domain/restful/DfLwhhReport.java deleted file mode 100644 index e499aab..0000000 --- a/src/main/java/com/nis/domain/restful/DfLwhhReport.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfLwhhReport - * @Description: 管控来文函号（带私有标签）实时统计模型 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DfLwhhReport extends DfReportEntity { - /** - * - */ - private static final long serialVersionUID = -7545794734532459964L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号ID", required = true) - protected Integer lwhh; - - protected String searchService; - protected String searchLwhh; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Integer getLwhh() { - return lwhh; - } - - public void setLwhh(Integer lwhh) { - this.lwhh = lwhh; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfLwhhStatLogDaily.java b/src/main/java/com/nis/domain/restful/DfLwhhStatLogDaily.java deleted file mode 100644 index e5c1009..0000000 --- a/src/main/java/com/nis/domain/restful/DfLwhhStatLogDaily.java +++ /dev/null @@ -1,48 +0,0 @@ -/** -* @Title: DfTagStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DfLwhhStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="来文函号", required=true) - protected Integer lwhh; - - protected String searchLwhh; - - public Integer getLwhh() { - return lwhh; - } - public void setLwhh(Integer lwhh) { - this.lwhh = lwhh; - } - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfLwhhStatLogMonth.java b/src/main/java/com/nis/domain/restful/DfLwhhStatLogMonth.java deleted file mode 100644 index a9f7ba9..0000000 --- a/src/main/java/com/nis/domain/restful/DfLwhhStatLogMonth.java +++ /dev/null @@ -1,29 +0,0 @@ -/** -* @Title: DfTagStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DfLwhhStatLogMonth extends DfLwhhStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DfLwhhTagDaily.java b/src/main/java/com/nis/domain/restful/DfLwhhTagDaily.java deleted file mode 100644 index 964aa1d..0000000 --- a/src/main/java/com/nis/domain/restful/DfLwhhTagDaily.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhTagReport - * @Description: TODO(来文函号、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfLwhhTagDaily extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchLwhh; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfLwhhTagMonth.java b/src/main/java/com/nis/domain/restful/DfLwhhTagMonth.java deleted file mode 100644 index 35670f4..0000000 --- a/src/main/java/com/nis/domain/restful/DfLwhhTagMonth.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhTagReport - * @Description: TODO(来文函号、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfLwhhTagMonth extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchLwhh; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfLwhhTagReport.java b/src/main/java/com/nis/domain/restful/DfLwhhTagReport.java deleted file mode 100644 index 75360e1..0000000 --- a/src/main/java/com/nis/domain/restful/DfLwhhTagReport.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhTagReport - * @Description: TODO(来文函号、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfLwhhTagReport extends DfReportEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchLwhh; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfPzReport.java b/src/main/java/com/nis/domain/restful/DfPzReport.java deleted file mode 100644 index 415ef29..0000000 --- a/src/main/java/com/nis/domain/restful/DfPzReport.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: dfPzReport - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2016年10月31日上午11:11:22 - * @version V1.0 - */ -public class DfPzReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = -6348665724846062686L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "编译配置ID", required = true) - protected Long cfgId; - - protected String searchCfgId; - protected String searchService; - - @JsonIgnore - public String getSearchCfgId() { - return searchCfgId; - } - - public void setSearchCfgId(String searchCfgId) { - this.searchCfgId = searchCfgId; - } - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Long getCfgId() { - return cfgId; - } - - public void setCfgId(Long cfgId) { - this.cfgId = cfgId; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfPzReportStat.java b/src/main/java/com/nis/domain/restful/DfPzReportStat.java deleted file mode 100644 index 2d3e531..0000000 --- a/src/main/java/com/nis/domain/restful/DfPzReportStat.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.nis.domain.restful; - -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfPzReportSum - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2016年10月31日上午11:11:22 - * @version V1.0 - */ -public class DfPzReportStat extends DfReportEntity { - /** - * - */ - private static final long serialVersionUID = -7960862769580690410L; - @ApiModelProperty(value = "私有标签", required = true) - protected Integer service; - @ApiModelProperty(value = "编译配置ID", required = true) - protected Long configId; - @ApiModelProperty(value = "日志总量", required = true) - protected Long sum; - - - protected String searchService; - protected String searchStatActiveSys; - - @JsonIgnore - public String getSearchStatActiveSys() { - return searchStatActiveSys; - } - public void setSearchStatActiveSys(String searchStatActiveSys) { - this.searchStatActiveSys = searchStatActiveSys; - } - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public Long getConfigId() { - return configId; - } - public void setConfigId(Long configId) { - this.configId = configId; - } - @Override - @JsonIgnore - public Long getAsum() { - return super.getAsum(); - } - @Override - @JsonIgnore - public Long getBsum() { - return super.getBsum(); - } - @Override - @JsonIgnore - public Long getCsum() { - return super.getCsum(); - } - - /* (non-Javadoc) - * @see com.nis.domain.DfReportEntity#getAbsum() - */ - @Override - @JsonIgnore - public Long getAbsum() { - // TODO Auto-generated method stub - return super.getAbsum(); - } - public Long getSum() { - return sum; - } - public void setSum(Long sum) { - this.sum = sum; - } - @Override - @JsonIgnore - public Date getReportTime() { - // TODO Auto-generated method stub - return super.getReportTime(); - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfServiceReport.java b/src/main/java/com/nis/domain/restful/DfServiceReport.java deleted file mode 100644 index 840aa4c..0000000 --- a/src/main/java/com/nis/domain/restful/DfServiceReport.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.nis.domain.restful; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.nis.domain.DfReportEntity; -import com.nis.util.JsonDateSerializer; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: dfServiceReport - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2016年10月31日上午11:22:07 - * @version V1.0 - */ -public class DfServiceReport extends DfReportEntity implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -6219213545074023084L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer serviceType; - - protected String searchService; - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - public Integer getServiceType() { - return serviceType; - } - public void setServiceType(Integer serviceType) { - this.serviceType = serviceType; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpAttrDaily.java b/src/main/java/com/nis/domain/restful/DfSrcIpAttrDaily.java deleted file mode 100644 index 09fe087..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpAttrDaily.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpAttrReport - * @Description: TODO(境内ip、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfSrcIpAttrDaily extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpAttrMonth.java b/src/main/java/com/nis/domain/restful/DfSrcIpAttrMonth.java deleted file mode 100644 index 58deabc..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpAttrMonth.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpAttrReport - * @Description: TODO(境内ip、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfSrcIpAttrMonth extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpAttrReport.java b/src/main/java/com/nis/domain/restful/DfSrcIpAttrReport.java deleted file mode 100644 index c582d88..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpAttrReport.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpAttrReport - * @Description: TODO(境内ip、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfSrcIpAttrReport extends DfReportEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpDomeSticReport.java b/src/main/java/com/nis/domain/restful/DfSrcIpDomeSticReport.java deleted file mode 100644 index 0a02831..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpDomeSticReport.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfSrcIpDomeSticReport - * @Description: 管控境内源IP(带私有标签)实时统计模型 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DfSrcIpDomeSticReport extends DfReportEntity { - /** - * - */ - private static final long serialVersionUID = -7360674711430956834L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "源IP所在省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "源IP所在市", required = true) - protected String srcCity; - - protected String searchService; - protected String searchSrcProvince; - protected String searchSrcCity; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public String getSrcProvince() { - return srcProvince; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - - public String getSrcCity() { - return srcCity; - } - - public void setSrcCity(String srcCity) { - this.srcCity = srcCity; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - - @JsonIgnore - public String getSearchSrcCity() { - return searchSrcCity; - } - - public void setSearchSrcCity(String searchSrcCity) { - this.searchSrcCity = searchSrcCity; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpDomesticStatLogDaily.java b/src/main/java/com/nis/domain/restful/DfSrcIpDomesticStatLogDaily.java deleted file mode 100644 index 0d72e22..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpDomesticStatLogDaily.java +++ /dev/null @@ -1,51 +0,0 @@ -/** -* @Title: DfSrcipDomesticStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfSrcipDomesticStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DfSrcIpDomesticStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="省", required=true) - protected String srcProvince; - - @ApiModelProperty(value="市", required=true) - protected String srcCity; - - public String getSrcProvince() { - return srcProvince; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - - public String getSrcCity() { - return srcCity; - } - - public void setSrcCity(String srcCity) { - this.srcCity = srcCity; - } - - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpDomesticStatLogMonth.java b/src/main/java/com/nis/domain/restful/DfSrcIpDomesticStatLogMonth.java deleted file mode 100644 index b88c9a9..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpDomesticStatLogMonth.java +++ /dev/null @@ -1,25 +0,0 @@ -/** -* @Title: DfSrcipDomesticStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -/** -* @ClassName: DfSrcipDomesticStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DfSrcIpDomesticStatLogMonth extends DfSrcIpDomesticStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpReport.java b/src/main/java/com/nis/domain/restful/DfSrcIpReport.java deleted file mode 100644 index 9cb1b7b..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpReport.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.nis.domain.restful; - -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfSrcIpReport extends DfReportEntity{ - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 4386680443050994654L; - - - @ApiModelProperty(value = "源IP所属省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "源IP所属市") - protected String srcCity; - - public String getSrcProvince() { - return srcProvince; - } - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - - public String getSrcCity() { - return srcCity; - } - public void setSrcCity(String srcCity) { - this.srcCity = srcCity; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpTagDaily.java b/src/main/java/com/nis/domain/restful/DfSrcIpTagDaily.java deleted file mode 100644 index f70f7e2..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpTagDaily.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpTagReport - * @Description: TODO(境内ip、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfSrcIpTagDaily extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpTagMonth.java b/src/main/java/com/nis/domain/restful/DfSrcIpTagMonth.java deleted file mode 100644 index 525282f..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpTagMonth.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpTagReport - * @Description: TODO(境内ip、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfSrcIpTagMonth extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfSrcIpTagReport.java b/src/main/java/com/nis/domain/restful/DfSrcIpTagReport.java deleted file mode 100644 index 4832230..0000000 --- a/src/main/java/com/nis/domain/restful/DfSrcIpTagReport.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpTagReport - * @Description: TODO(境内ip、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DfSrcIpTagReport extends DfReportEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DfStatLogDaily.java b/src/main/java/com/nis/domain/restful/DfStatLogDaily.java deleted file mode 100644 index 9e1f5a6..0000000 --- a/src/main/java/com/nis/domain/restful/DfStatLogDaily.java +++ /dev/null @@ -1,49 +0,0 @@ -/** -* @Title: DfStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DfStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="配置ID", required=true) - protected Long configId; - - protected String searchConfigId; - - public Long getConfigId() { - return configId; - } - public void setConfigId(Long configId) { - this.configId = configId; - } - @JsonIgnore - public String getSearchConfigId() { - return searchConfigId; - } - - - public void setSearchConfigId(String searchConfigId) { - this.searchConfigId = searchConfigId; - } -} diff --git a/src/main/java/com/nis/domain/restful/DfStatLogMonth.java b/src/main/java/com/nis/domain/restful/DfStatLogMonth.java deleted file mode 100644 index b02e2a4..0000000 --- a/src/main/java/com/nis/domain/restful/DfStatLogMonth.java +++ /dev/null @@ -1,25 +0,0 @@ -/** -* @Title: DfStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DfStatLogMonth extends DfStatLogDaily { - - -} diff --git a/src/main/java/com/nis/domain/restful/DfTagReport.java b/src/main/java/com/nis/domain/restful/DfTagReport.java deleted file mode 100644 index 5f4431d..0000000 --- a/src/main/java/com/nis/domain/restful/DfTagReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: dfTagReport - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2016年10月31日上午11:25:38 - * @version V1.0 - */ -public class DfTagReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = 6425675908119093476L; - @ApiModelProperty(value = "标签", required = true) - protected Integer tag; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - - protected String searchTag; - protected String searchService; - - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - public Integer getTag() { - return tag; - } - - public void setTag(Integer tag) { - this.tag = tag; - } -} diff --git a/src/main/java/com/nis/domain/restful/DfTagStatLogDaily.java b/src/main/java/com/nis/domain/restful/DfTagStatLogDaily.java deleted file mode 100644 index b5f5694..0000000 --- a/src/main/java/com/nis/domain/restful/DfTagStatLogDaily.java +++ /dev/null @@ -1,47 +0,0 @@ -/** -* @Title: DfTagStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DfTagStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="标签", required=true) - protected Integer tag; - - protected String searchTag; - - public Integer getTag() { - return tag; - } - public void setTag(Integer tag) { - this.tag = tag; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } -} diff --git a/src/main/java/com/nis/domain/restful/DfTagStatLogMonth.java b/src/main/java/com/nis/domain/restful/DfTagStatLogMonth.java deleted file mode 100644 index 5018fb2..0000000 --- a/src/main/java/com/nis/domain/restful/DfTagStatLogMonth.java +++ /dev/null @@ -1,29 +0,0 @@ -/** -* @Title: DfTagStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DfTagStatLogMonth extends DfTagStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DjAttrStatLogDaily.java b/src/main/java/com/nis/domain/restful/DjAttrStatLogDaily.java deleted file mode 100644 index 4adc44d..0000000 --- a/src/main/java/com/nis/domain/restful/DjAttrStatLogDaily.java +++ /dev/null @@ -1,47 +0,0 @@ -/** -* @Title: DfTagStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DjAttrStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="性质", required=true) - protected Integer attrType; - - protected String searchAttrType; - - public Integer getAttrType() { - return attrType; - } - public void setAttrType(Integer attrType) { - this.attrType = attrType; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } -} diff --git a/src/main/java/com/nis/domain/restful/DjAttrStatLogMonth.java b/src/main/java/com/nis/domain/restful/DjAttrStatLogMonth.java deleted file mode 100644 index b391cdd..0000000 --- a/src/main/java/com/nis/domain/restful/DjAttrStatLogMonth.java +++ /dev/null @@ -1,25 +0,0 @@ -/** -* @Title: DjTagStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -/** -* @ClassName: DjTagStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DjAttrStatLogMonth extends DjAttrStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DjAttrTypeReport.java b/src/main/java/com/nis/domain/restful/DjAttrTypeReport.java deleted file mode 100644 index 35f06c2..0000000 --- a/src/main/java/com/nis/domain/restful/DjAttrTypeReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfAttrTypeReport - * @Description: 管控性质实时统计 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DjAttrTypeReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = -9186632214937498812L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "性质", required = true) - protected Integer attrType; - - protected String searchAttrType; - protected String searchService; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Integer getAttrType() { - return attrType; - } - - public void setAttrType(Integer attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjCkStatLog.java b/src/main/java/com/nis/domain/restful/DjCkStatLog.java deleted file mode 100644 index 5f3048c..0000000 --- a/src/main/java/com/nis/domain/restful/DjCkStatLog.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.nis.domain.restful; - -import java.io.Serializable; -import java.util.Date; -import java.util.Map; - -import javax.xml.bind.annotation.XmlTransient; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.common.collect.Maps; -import com.nis.domain.Page; -import com.nis.util.JsonDateSerializer; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjCkStatLog implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -8465748814742964183L; - @ApiModelProperty(value = "ID", required = true) - private Long statId; - @ApiModelProperty(value = "配置ID", required = true) - private Long configId; - @ApiModelProperty(value = "业务类型", required = true) - private Integer service; - @ApiModelProperty(value = "生效系统", required = true) - private Integer activeSys; - @ApiModelProperty(value = "国际出入口", required = true) - private Long gjCkId; - @ApiModelProperty(value = "总计", required = true) - private Long sum; - @ApiModelProperty(value = "统计时间", required = true) - private Date capTime; - - private String searchCapStartTime; - private String searchCapEndTime; - private String searchGjCkId; - private String searchCfgId; - private String searchService; - private String searchActiveSys; - /** - * 当前实体分页对象 - */ - private Page page; - - /** - * 自定义SQL（SQL标识，SQL内容） - */ - private Map sqlMap; - - public DjCkStatLog() { - super(); - } - - @JsonIgnore - public Long getStatId() { - return statId; - } - - public void setStatId(Long statId) { - this.statId = statId; - } - - public Long getConfigId() { - return configId; - } - - public void setConfigId(Long configId) { - this.configId = configId; - } - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Long getGjCkId() { - return gjCkId; - } - - public void setGjCkId(Long gjCkId) { - this.gjCkId = gjCkId; - } - - public Long getSum() { - return sum; - } - - public void setSum(Long sum) { - this.sum = sum; - } - - @JsonSerialize(using = JsonDateSerializer.class) - public Date getCapTime() { - return capTime; - } - - public void setCapTime(Date capTime) { - this.capTime = capTime; - } - - @JsonIgnore - public String getSearchCapStartTime() { - return searchCapStartTime; - } - - public void setSearchCapStartTime(String searchCapStartTime) { - this.searchCapStartTime = searchCapStartTime; - } - - @JsonIgnore - public String getSearchCapEndTime() { - return searchCapEndTime; - } - - public void setSearchCapEndTime(String searchCapEndTime) { - this.searchCapEndTime = searchCapEndTime; - } - - @JsonIgnore - public String getSearchGjCkId() { - return searchGjCkId; - } - - public void setSearchGjCkId(String searchGjCkId) { - this.searchGjCkId = searchGjCkId; - } - - @JsonIgnore - public String getSearchCfgId() { - return searchCfgId; - } - - public void setSearchCfgId(String searchCfgId) { - this.searchCfgId = searchCfgId; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - @XmlTransient - public Page getPage() { - if (page == null) { - page = new Page(); - } - return page; - } - - public void setPage(Page page) { - this.page = page; - } - - @JsonIgnore - @XmlTransient - public Map getSqlMap() { - if (sqlMap == null) { - sqlMap = Maps.newHashMap(); - } - return sqlMap; - } - - public void setSqlMap(Map sqlMap) { - this.sqlMap = sqlMap; - } - - public Integer getActiveSys() { - return activeSys; - } - - public void setActiveSys(Integer activeSys) { - this.activeSys = activeSys; - } - - @JsonIgnore - public String getSearchActiveSys() { - return searchActiveSys; - } - - public void setSearchActiveSys(String searchActiveSys) { - this.searchActiveSys = searchActiveSys; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjDestIpCounrtyStatLogDaily.java b/src/main/java/com/nis/domain/restful/DjDestIpCounrtyStatLogDaily.java deleted file mode 100644 index f9cb0a4..0000000 --- a/src/main/java/com/nis/domain/restful/DjDestIpCounrtyStatLogDaily.java +++ /dev/null @@ -1,39 +0,0 @@ -/** -* @Title: DfDestIpCounrtyStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfDestIpCounrtyStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DjDestIpCounrtyStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="国家", required=true) - protected String destCountry; - - public String getDestCountry() { - return destCountry; - } - public void setDestCountry(String destCountry) { - this.destCountry = destCountry; - } - - -} diff --git a/src/main/java/com/nis/domain/restful/DjDestIpCounrtyStatLogMonth.java b/src/main/java/com/nis/domain/restful/DjDestIpCounrtyStatLogMonth.java deleted file mode 100644 index 559923f..0000000 --- a/src/main/java/com/nis/domain/restful/DjDestIpCounrtyStatLogMonth.java +++ /dev/null @@ -1,26 +0,0 @@ -/** -* @Title: DjDestIpCounrtyStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - - -/** -* @ClassName: DjDestIpCounrtyStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DjDestIpCounrtyStatLogMonth extends DjDestIpCounrtyStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DjDestIpCountryReport.java b/src/main/java/com/nis/domain/restful/DjDestIpCountryReport.java deleted file mode 100644 index 583c883..0000000 --- a/src/main/java/com/nis/domain/restful/DjDestIpCountryReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfDestIpCountryReport - * @Description: 管控境内目的IP(带私有标签)实时统计模型 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DjDestIpCountryReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = -6490028574641528475L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "目的IP所属国家", required = true) - protected String destCountry; - - protected String searchService; - protected String searchDestCountry; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public String getDestCountry() { - return destCountry; - } - - public void setDestCountry(String destCountry) { - this.destCountry = destCountry; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchDestCountry() { - return searchDestCountry; - } - - public void setSearchDestCountry(String searchDestCountry) { - this.searchDestCountry = searchDestCountry; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjEntrStatLogDaily.java b/src/main/java/com/nis/domain/restful/DjEntrStatLogDaily.java deleted file mode 100644 index 6e8c664..0000000 --- a/src/main/java/com/nis/domain/restful/DjEntrStatLogDaily.java +++ /dev/null @@ -1,48 +0,0 @@ -/** -* @Title: DfTagStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DjEntrStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="局点", required=true) - protected Long entranceId; - - protected String searchEntranceId; - - public Long getEntranceId() { - return entranceId; - } - public void setEntranceId(Long entranceId) { - this.entranceId = entranceId; - } - @JsonIgnore - public String getSearchEntranceId() { - return searchEntranceId; - } - public void setSearchEntranceId(String searchEntranceId) { - this.searchEntranceId = searchEntranceId; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjEntrStatLogMonth.java b/src/main/java/com/nis/domain/restful/DjEntrStatLogMonth.java deleted file mode 100644 index 600fcee..0000000 --- a/src/main/java/com/nis/domain/restful/DjEntrStatLogMonth.java +++ /dev/null @@ -1,26 +0,0 @@ -/** -* @Title: DjTagStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - - -/** -* @ClassName: DjTagStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DjEntrStatLogMonth extends DjEntrStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DjEntranceReport.java b/src/main/java/com/nis/domain/restful/DjEntranceReport.java deleted file mode 100644 index 9d9c6fa..0000000 --- a/src/main/java/com/nis/domain/restful/DjEntranceReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfEntranceReport - * @Description: 管控局点（带私有标签）实时统计模型 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DjEntranceReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = 6093854240033900622L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "局点信息", required = true) - protected Long entraceId; - - protected String searchService; - protected String searchEntraceId; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Long getEntraceId() { - return entraceId; - } - - public void setEntraceId(Long entraceId) { - this.entraceId = entraceId; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchEntraceId() { - return searchEntraceId; - } - - public void setSearchEntraceId(String searchEntraceId) { - this.searchEntraceId = searchEntraceId; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjJitAffairDestReport.java b/src/main/java/com/nis/domain/restful/DjJitAffairDestReport.java deleted file mode 100644 index 224033f..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitAffairDestReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitAffairDestReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 6367339032317209141L; - @ApiModelProperty(value = "子话题", required = true) - private Integer affair; - @ApiModelProperty(value = "事件", required = true) - private Integer topic; - - /** - * 查询部分 - */ - private String searchAffair; - private String searchTopic; - - public DjJitAffairDestReport() { - super(); - } - - public Integer getAffair() { - return affair; - } - - public void setAffair(Integer affair) { - this.affair = affair; - } - - public Integer getTopic() { - return topic; - } - - public void setTopic(Integer topic) { - this.topic = topic; - } - - @JsonIgnore - public String getSearchAffair() { - return searchAffair; - } - - public void setSearchAffair(String searchAffair) { - this.searchAffair = searchAffair; - } - - @JsonIgnore - public String getSearchTopic() { - return searchTopic; - } - - public void setSearchTopic(String searchTopic) { - this.searchTopic = searchTopic; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitAffairSrcReport.java b/src/main/java/com/nis/domain/restful/DjJitAffairSrcReport.java deleted file mode 100644 index 2a8a78d..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitAffairSrcReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitAffairSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = -9081795070814096710L; - @ApiModelProperty(value = "子话题", required = true) - private Integer affair; - @ApiModelProperty(value = "事件", required = true) - private Integer topic; - - /** - * 查询部分 - */ - private String searchAffair; - private String searchTopic; - - public DjJitAffairSrcReport() { - super(); - } - - public Integer getAffair() { - return affair; - } - - public void setAffair(Integer affair) { - this.affair = affair; - } - - public Integer getTopic() { - return topic; - } - - public void setTopic(Integer topic) { - this.topic = topic; - } - - @JsonIgnore - public String getSearchAffair() { - return searchAffair; - } - - public void setSearchAffair(String searchAffair) { - this.searchAffair = searchAffair; - } - - @JsonIgnore - public String getSearchTopic() { - return searchTopic; - } - - public void setSearchTopic(String searchTopic) { - this.searchTopic = searchTopic; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitFlDestReport.java b/src/main/java/com/nis/domain/restful/DjJitFlDestReport.java deleted file mode 100644 index ad239f4..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitFlDestReport.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitFlDestReport extends DfJitLogEntity { - - - /** - * - */ - private static final long serialVersionUID = -8661475281697413205L; - @ApiModelProperty(value = "分类", required = true) - private Integer fl; - @ApiModelProperty(value = "性质", required = true) - private Integer xz; - - /** - * 查询部分 - */ - private String searchFl; - private String searchXz; - - public DjJitFlDestReport() { - super(); - } - - public Integer getFl() { - return fl; - } - - public void setFl(Integer fl) { - this.fl = fl; - } - - public Integer getXz() { - return xz; - } - - public void setXz(Integer xz) { - this.xz = xz; - } - - @JsonIgnore - public String getSearchFl() { - return searchFl; - } - - public void setSearchFl(String searchFl) { - this.searchFl = searchFl; - } - - @JsonIgnore - public String getSearchXz() { - return searchXz; - } - - public void setSearchXz(String searchXz) { - this.searchXz = searchXz; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitFlSrcReport.java b/src/main/java/com/nis/domain/restful/DjJitFlSrcReport.java deleted file mode 100644 index b675a3d..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitFlSrcReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitFlSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 1866611122134109630L; - @ApiModelProperty(value = "分类", required = true) - private Integer fl; - @ApiModelProperty(value = "性质", required = true) - private Integer xz; - - /** - * 查询部分 - */ - private String searchFl; - private String searchXz; - - public DjJitFlSrcReport() { - super(); - } - - public Integer getFl() { - return fl; - } - - public void setFl(Integer fl) { - this.fl = fl; - } - - public Integer getXz() { - return xz; - } - - public void setXz(Integer xz) { - this.xz = xz; - } - - @JsonIgnore - public String getSearchFl() { - return searchFl; - } - - public void setSearchFl(String searchFl) { - this.searchFl = searchFl; - } - - @JsonIgnore - public String getSearchXz() { - return searchXz; - } - - public void setSearchXz(String searchXz) { - this.searchXz = searchXz; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitGuaranteeDestReport.java b/src/main/java/com/nis/domain/restful/DjJitGuaranteeDestReport.java deleted file mode 100644 index e4be86f..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitGuaranteeDestReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitGuaranteeDestReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 4886806743747030623L; - - @ApiModelProperty(value = "保障期", required = true) - private Integer guarantee; - - /** - * 查询部分 - */ - private String searchGuarantee; - - public DjJitGuaranteeDestReport() { - super(); - } - - public Integer getGuarantee() { - return guarantee; - } - - public void setGuarantee(Integer guarantee) { - this.guarantee = guarantee; - } - - @JsonIgnore - public String getSearchGuarantee() { - return searchGuarantee; - } - - public void setSearchGuarantee(String searchGuarantee) { - this.searchGuarantee = searchGuarantee; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitGuaranteeSrcReport.java b/src/main/java/com/nis/domain/restful/DjJitGuaranteeSrcReport.java deleted file mode 100644 index ecf45f2..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitGuaranteeSrcReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitGuaranteeSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 558117618430759769L; - - @ApiModelProperty(value = "保障期", required = true) - private Integer guarantee; - - /** - * 查询部分 - */ - private String searchGuarantee; - - public DjJitGuaranteeSrcReport() { - super(); - } - - public Integer getGuarantee() { - return guarantee; - } - - public void setGuarantee(Integer guarantee) { - this.guarantee = guarantee; - } - - @JsonIgnore - public String getSearchGuarantee() { - return searchGuarantee; - } - - public void setSearchGuarantee(String searchGuarantee) { - this.searchGuarantee = searchGuarantee; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitIdDestReport.java b/src/main/java/com/nis/domain/restful/DjJitIdDestReport.java deleted file mode 100644 index 4105847..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitIdDestReport.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitIdDestReport extends DfJitLogEntity { - - - /** - * - */ - private static final long serialVersionUID = -3056813909262889527L; - - @ApiModelProperty(value = "配置id", required = true) - private Long id; - - /** - * 查询部分 - */ - private String searchId; - - public DjJitIdDestReport() { - super(); - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - @JsonIgnore - public String getSearchId() { - return searchId; - } - - public void setSearchId(String searchId) { - this.searchId = searchId; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitIdSrcReport.java b/src/main/java/com/nis/domain/restful/DjJitIdSrcReport.java deleted file mode 100644 index 78f3521..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitIdSrcReport.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitIdSrcReport extends DfJitLogEntity { - - - - /** - * - */ - private static final long serialVersionUID = 6337204883984675891L; - - @ApiModelProperty(value = "配置id", required = true) - private Long id; - - /** - * 查询部分 - */ - private String searchId; - - public DjJitIdSrcReport() { - super(); - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - @JsonIgnore - public String getSearchId() { - return searchId; - } - - public void setSearchId(String searchId) { - this.searchId = searchId; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitMissionDestReport.java b/src/main/java/com/nis/domain/restful/DjJitMissionDestReport.java deleted file mode 100644 index 713ac7b..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitMissionDestReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitMissionDestReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = -4200263721978195939L; - - @ApiModelProperty(value = "任务", required = true) - private Integer mission; - - /** - * 查询部分 - */ - private String searchMission; - - public DjJitMissionDestReport() { - super(); - } - - public Integer getMission() { - return mission; - } - - public void setMission(Integer mission) { - this.mission = mission; - } - - @JsonIgnore - public String getSearchMission() { - return searchMission; - } - - public void setSearchMission(String searchMission) { - this.searchMission = searchMission; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitMissionSrcReport.java b/src/main/java/com/nis/domain/restful/DjJitMissionSrcReport.java deleted file mode 100644 index 7afc785..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitMissionSrcReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitMissionSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = 1244851836673765943L; - - @ApiModelProperty(value = "任务", required = true) - private Integer mission; - - /** - * 查询部分 - */ - private String searchMission; - - public DjJitMissionSrcReport() { - super(); - } - - public Integer getMission() { - return mission; - } - - public void setMission(Integer mission) { - this.mission = mission; - } - - @JsonIgnore - public String getSearchMission() { - return searchMission; - } - - public void setSearchMission(String searchMission) { - this.searchMission = searchMission; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitTagDestReport.java b/src/main/java/com/nis/domain/restful/DjJitTagDestReport.java deleted file mode 100644 index 9b6a718..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitTagDestReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitTagDestReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = -8057168628547445607L; - - @ApiModelProperty(value = "标签", required = true) - private Integer tag; - - /** - * 查询部分 - */ - private String searchTag; - - public DjJitTagDestReport() { - super(); - } - - public Integer getTag() { - return tag; - } - - public void setTag(Integer tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjJitTagSrcReport.java b/src/main/java/com/nis/domain/restful/DjJitTagSrcReport.java deleted file mode 100644 index de7778f..0000000 --- a/src/main/java/com/nis/domain/restful/DjJitTagSrcReport.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfJitLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DjJitTagSrcReport extends DfJitLogEntity { - - /** - * - */ - private static final long serialVersionUID = -1338482031809189715L; - - @ApiModelProperty(value = "标签", required = true) - private Integer tag; - - /** - * 查询部分 - */ - private String searchTag; - - public DjJitTagSrcReport() { - super(); - } - - public Integer getTag() { - return tag; - } - - public void setTag(Integer tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/DjLwhhAttrDaily.java b/src/main/java/com/nis/domain/restful/DjLwhhAttrDaily.java deleted file mode 100644 index e5704b1..0000000 --- a/src/main/java/com/nis/domain/restful/DjLwhhAttrDaily.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhAttrReport - * @Description: TODO(来文函号、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjLwhhAttrDaily extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchLwhh; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjLwhhAttrMonth.java b/src/main/java/com/nis/domain/restful/DjLwhhAttrMonth.java deleted file mode 100644 index d5e6171..0000000 --- a/src/main/java/com/nis/domain/restful/DjLwhhAttrMonth.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhAttrReport - * @Description: TODO(来文函号、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjLwhhAttrMonth extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchLwhh; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjLwhhAttrReport.java b/src/main/java/com/nis/domain/restful/DjLwhhAttrReport.java deleted file mode 100644 index 6f77c18..0000000 --- a/src/main/java/com/nis/domain/restful/DjLwhhAttrReport.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhAttrReport - * @Description: TODO(来文函号、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjLwhhAttrReport extends DfReportEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchLwhh; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjLwhhReport.java b/src/main/java/com/nis/domain/restful/DjLwhhReport.java deleted file mode 100644 index 9624c81..0000000 --- a/src/main/java/com/nis/domain/restful/DjLwhhReport.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfLwhhReport - * @Description: 管控来文函号（带私有标签）实时统计模型 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DjLwhhReport extends DfReportEntity { - /** - * - */ - private static final long serialVersionUID = -7545794734532459964L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号ID", required = true) - protected Integer lwhh; - - protected String searchService; - protected String searchLwhh; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Integer getLwhh() { - return lwhh; - } - - public void setLwhh(Integer lwhh) { - this.lwhh = lwhh; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjLwhhStatLogDaily.java b/src/main/java/com/nis/domain/restful/DjLwhhStatLogDaily.java deleted file mode 100644 index a426971..0000000 --- a/src/main/java/com/nis/domain/restful/DjLwhhStatLogDaily.java +++ /dev/null @@ -1,48 +0,0 @@ -/** -* @Title: DfTagStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DjLwhhStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="来文函号", required=true) - protected Integer lwhh; - - protected String searchLwhh; - - public Integer getLwhh() { - return lwhh; - } - public void setLwhh(Integer lwhh) { - this.lwhh = lwhh; - } - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjLwhhStatLogMonth.java b/src/main/java/com/nis/domain/restful/DjLwhhStatLogMonth.java deleted file mode 100644 index 1e83a07..0000000 --- a/src/main/java/com/nis/domain/restful/DjLwhhStatLogMonth.java +++ /dev/null @@ -1,26 +0,0 @@ -/** -* @Title: DjTagStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - - -/** -* @ClassName: DjTagStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DjLwhhStatLogMonth extends DjLwhhStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DjLwhhTagDaily.java b/src/main/java/com/nis/domain/restful/DjLwhhTagDaily.java deleted file mode 100644 index 6aa932f..0000000 --- a/src/main/java/com/nis/domain/restful/DjLwhhTagDaily.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhTagReport - * @Description: TODO(来文函号、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjLwhhTagDaily extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchLwhh; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjLwhhTagMonth.java b/src/main/java/com/nis/domain/restful/DjLwhhTagMonth.java deleted file mode 100644 index 45f80f8..0000000 --- a/src/main/java/com/nis/domain/restful/DjLwhhTagMonth.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhTagReport - * @Description: TODO(来文函号、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjLwhhTagMonth extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchLwhh; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjLwhhTagReport.java b/src/main/java/com/nis/domain/restful/DjLwhhTagReport.java deleted file mode 100644 index 48561f3..0000000 --- a/src/main/java/com/nis/domain/restful/DjLwhhTagReport.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfLwhhTagReport - * @Description: TODO(来文函号、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjLwhhTagReport extends DfReportEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "来文函号", required = true) - protected Long lwhh; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchLwhh; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - public Long getLwhh() { - return lwhh; - } - public void setLwhh(Long lwhh) { - this.lwhh = lwhh; - } - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchLwhh() { - return searchLwhh; - } - public void setSearchLwhh(String searchLwhh) { - this.searchLwhh = searchLwhh; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjPzReport.java b/src/main/java/com/nis/domain/restful/DjPzReport.java deleted file mode 100644 index 9f472ed..0000000 --- a/src/main/java/com/nis/domain/restful/DjPzReport.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DjPzReport - * @Description: TODO(一句话描述这个类) - * @author (ZBC) - * @date 2016年11月22日下午06:00:00 - * @version V1.0 - */ -public class DjPzReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = 5378450857152481993L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "编译配置ID", required = true) - protected Long cfgId; - - protected String searchCfgId; - protected String searchId; - protected String searchService; - - @JsonIgnore - public String getSearchId() { - return searchId; - } - - public void setSearchId(String searchId) { - this.searchId = searchId; - } - - @JsonIgnore - public String getSearchCfgId() { - return searchCfgId; - } - - public void setSearchCfgId(String searchCfgId) { - this.searchCfgId = searchCfgId; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Long getCfgId() { - return cfgId; - } - - public void setCfgId(Long cfgId) { - this.cfgId = cfgId; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjPzReportStat.java b/src/main/java/com/nis/domain/restful/DjPzReportStat.java deleted file mode 100644 index 613c92b..0000000 --- a/src/main/java/com/nis/domain/restful/DjPzReportStat.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.nis.domain.restful; - -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DjPzReportStat - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2016年10月31日上午11:11:22 - * @version V1.0 - */ -public class DjPzReportStat extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = -4204790492680773920L; - @ApiModelProperty(value = "私有标签", required = true) - protected Integer service; - @ApiModelProperty(value = "编译配置ID", required = true) - protected Long configId; - @ApiModelProperty(value = "日志总量", required = true) - protected Long sum; - - protected String searchService; - protected String searchStatActiveSys; - - @JsonIgnore - public String getSearchStatActiveSys() { - return searchStatActiveSys; - } - - public void setSearchStatActiveSys(String searchStatActiveSys) { - this.searchStatActiveSys = searchStatActiveSys; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public Long getConfigId() { - return configId; - } - - public void setConfigId(Long configId) { - this.configId = configId; - } - - @Override - @JsonIgnore - public Long getAsum() { - return super.getAsum(); - } - - @Override - @JsonIgnore - public Long getBsum() { - return super.getBsum(); - } - - public Long getSum() { - return sum; - } - - public void setSum(Long sum) { - this.sum = sum; - } - - @Override - @JsonIgnore - public Date getReportTime() { - // TODO Auto-generated method stub - return super.getReportTime(); - } - @Override - @JsonIgnore - public Long getCsum() { - return super.getCsum(); - } - /* (non-Javadoc) - * @see com.nis.domain.DfReportEntity#getAbsum() - */ - @Override - @JsonIgnore - public Long getAbsum() { - // TODO Auto-generated method stub - return super.getAbsum(); - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjSrcIpAttrDaily.java b/src/main/java/com/nis/domain/restful/DjSrcIpAttrDaily.java deleted file mode 100644 index f5f9973..0000000 --- a/src/main/java/com/nis/domain/restful/DjSrcIpAttrDaily.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpAttrReport - * @Description: TODO(境内ip、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjSrcIpAttrDaily extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjSrcIpAttrMonth.java b/src/main/java/com/nis/domain/restful/DjSrcIpAttrMonth.java deleted file mode 100644 index ac58733..0000000 --- a/src/main/java/com/nis/domain/restful/DjSrcIpAttrMonth.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpAttrReport - * @Description: TODO(境内ip、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjSrcIpAttrMonth extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjSrcIpAttrReport.java b/src/main/java/com/nis/domain/restful/DjSrcIpAttrReport.java deleted file mode 100644 index febb411..0000000 --- a/src/main/java/com/nis/domain/restful/DjSrcIpAttrReport.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpAttrReport - * @Description: TODO(境内ip、性质多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjSrcIpAttrReport extends DfReportEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "性质", required = true) - protected Long attrType; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchAttrType; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getAttrType() { - return attrType; - } - public void setAttrType(Long attrType) { - this.attrType = attrType; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchAttrType() { - return searchAttrType; - } - public void setSearchAttrType(String searchAttrType) { - this.searchAttrType = searchAttrType; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjSrcIpDomeSticReport.java b/src/main/java/com/nis/domain/restful/DjSrcIpDomeSticReport.java deleted file mode 100644 index edcd0ab..0000000 --- a/src/main/java/com/nis/domain/restful/DjSrcIpDomeSticReport.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: DfSrcIpDomeSticReport - * @Description: 管控境内源IP(带私有标签)实时统计模型 - * @author (rkg) - * @date 2017年01月05日 下午3:41:50 - * @version V1.0 - */ -public class DjSrcIpDomeSticReport extends DfReportEntity { - /** - * - */ - private static final long serialVersionUID = -7360674711430956834L; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "源IP所在省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "源IP所在市", required = true) - protected String srcCity; - - protected String searchService; - protected String searchSrcProvince; - protected String searchSrcCity; - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - public String getSrcProvince() { - return srcProvince; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - - public String getSrcCity() { - return srcCity; - } - - public void setSrcCity(String srcCity) { - this.srcCity = srcCity; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - - @JsonIgnore - public String getSearchSrcCity() { - return searchSrcCity; - } - - public void setSearchSrcCity(String searchSrcCity) { - this.searchSrcCity = searchSrcCity; - } - -} diff --git a/src/main/java/com/nis/domain/restful/DjSrcIpDomesticStatLogDaily.java b/src/main/java/com/nis/domain/restful/DjSrcIpDomesticStatLogDaily.java deleted file mode 100644 index 49600d0..0000000 --- a/src/main/java/com/nis/domain/restful/DjSrcIpDomesticStatLogDaily.java +++ /dev/null @@ -1,51 +0,0 @@ -/** -* @Title: DfSrcipDomesticStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfSrcipDomesticStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DjSrcIpDomesticStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="省", required=true) - protected String srcProvince; - - @ApiModelProperty(value="市", required=true) - protected String srcCity; - - public String getSrcProvince() { - return srcProvince; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - - public String getSrcCity() { - return srcCity; - } - - public void setSrcCity(String srcCity) { - this.srcCity = srcCity; - } - - -} diff --git a/src/main/java/com/nis/domain/restful/DjSrcIpDomesticStatLogMonth.java b/src/main/java/com/nis/domain/restful/DjSrcIpDomesticStatLogMonth.java deleted file mode 100644 index d9c1453..0000000 --- a/src/main/java/com/nis/domain/restful/DjSrcIpDomesticStatLogMonth.java +++ /dev/null @@ -1,25 +0,0 @@ -/** -* @Title: DjSrcipDomesticStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -/** -* @ClassName: DjSrcipDomesticStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DjSrcIpDomesticStatLogMonth extends DjSrcIpDomesticStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/domain/restful/DjSrcIpTagDaily.java b/src/main/java/com/nis/domain/restful/DjSrcIpTagDaily.java deleted file mode 100644 index 2f920f5..0000000 --- a/src/main/java/com/nis/domain/restful/DjSrcIpTagDaily.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpTagReport - * @Description: TODO(境内ip、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjSrcIpTagDaily extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjSrcIpTagMonth.java b/src/main/java/com/nis/domain/restful/DjSrcIpTagMonth.java deleted file mode 100644 index a46c6be..0000000 --- a/src/main/java/com/nis/domain/restful/DjSrcIpTagMonth.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpTagReport - * @Description: TODO(境内ip、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjSrcIpTagMonth extends StatLogEntity{ - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjSrcIpTagReport.java b/src/main/java/com/nis/domain/restful/DjSrcIpTagReport.java deleted file mode 100644 index ba0c98f..0000000 --- a/src/main/java/com/nis/domain/restful/DjSrcIpTagReport.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfSrcIpTagReport - * @Description: TODO(境内ip、标签多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:29:28 - * @version V1.0 - */ -public class DjSrcIpTagReport extends DfReportEntity { - - private static final long serialVersionUID = -1183216703585029756L; - - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - @ApiModelProperty(value = "省", required = true) - protected String srcProvince; - @ApiModelProperty(value = "标签", required = true) - protected Long tag; - - - protected String searchService; - protected String searchSrcProvince; - protected String searchTag; - - - public Integer getService() { - return service; - } - public void setService(Integer service) { - this.service = service; - } - - public void setSrcProvince(String srcProvince) { - this.srcProvince = srcProvince; - } - public String getSrcProvince() { - return srcProvince; - } - - public Long getTag() { - return tag; - } - public void setTag(Long tag) { - this.tag = tag; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchSrcProvince() { - return searchSrcProvince; - } - public void setSearchSrcProvince(String searchSrcProvince) { - this.searchSrcProvince = searchSrcProvince; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - - -} diff --git a/src/main/java/com/nis/domain/restful/DjStatLogDaily.java b/src/main/java/com/nis/domain/restful/DjStatLogDaily.java deleted file mode 100644 index 835d8df..0000000 --- a/src/main/java/com/nis/domain/restful/DjStatLogDaily.java +++ /dev/null @@ -1,49 +0,0 @@ -/** -* @Title: DjStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DjStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DjStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="配置ID", required=true) - protected Long configId; - - protected String searchConfigId; - - public Long getConfigId() { - return configId; - } - public void setConfigId(Long configId) { - this.configId = configId; - } - @JsonIgnore - public String getSearchConfigId() { - return searchConfigId; - } - - - public void setSearchConfigId(String searchConfigId) { - this.searchConfigId = searchConfigId; - } -} diff --git a/src/main/java/com/nis/domain/restful/DjStatLogMonth.java b/src/main/java/com/nis/domain/restful/DjStatLogMonth.java deleted file mode 100644 index fb302e4..0000000 --- a/src/main/java/com/nis/domain/restful/DjStatLogMonth.java +++ /dev/null @@ -1,21 +0,0 @@ -/** -* @Title: DjStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -/** -* @ClassName: DjStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DjStatLogMonth extends DjStatLogDaily { - - -} diff --git a/src/main/java/com/nis/domain/restful/DjTagReport.java b/src/main/java/com/nis/domain/restful/DjTagReport.java deleted file mode 100644 index 31ad601..0000000 --- a/src/main/java/com/nis/domain/restful/DjTagReport.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.DfReportEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: dfTagReport - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2016年10月31日上午11:25:38 - * @version V1.0 - */ -public class DjTagReport extends DfReportEntity { - - /** - * - */ - private static final long serialVersionUID = 6425675908119093476L; - @ApiModelProperty(value = "标签", required = true) - protected Integer tag; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - - protected String searchTag; - protected String searchService; - - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - public Integer getTag() { - return tag; - } - - public void setTag(Integer tag) { - this.tag = tag; - } -} diff --git a/src/main/java/com/nis/domain/restful/DjTagStatLogDaily.java b/src/main/java/com/nis/domain/restful/DjTagStatLogDaily.java deleted file mode 100644 index 3accf68..0000000 --- a/src/main/java/com/nis/domain/restful/DjTagStatLogDaily.java +++ /dev/null @@ -1,47 +0,0 @@ -/** -* @Title: DfTagStatLogDaily.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.StatLogEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: DfTagStatLogDaily -* @Description: 天日志报表 -* @author (ddm) -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -public class DjTagStatLogDaily extends StatLogEntity { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -591616210162791616L; - - @ApiModelProperty(value="标签", required=true) - protected Integer tag; - - protected String searchTag; - - public Integer getTag() { - return tag; - } - public void setTag(Integer tag) { - this.tag = tag; - } - @JsonIgnore - public String getSearchTag() { - return searchTag; - } - public void setSearchTag(String searchTag) { - this.searchTag = searchTag; - } -} diff --git a/src/main/java/com/nis/domain/restful/DjTagStatLogMonth.java b/src/main/java/com/nis/domain/restful/DjTagStatLogMonth.java deleted file mode 100644 index cd92c36..0000000 --- a/src/main/java/com/nis/domain/restful/DjTagStatLogMonth.java +++ /dev/null @@ -1,25 +0,0 @@ -/** -* @Title: DjTagStatLogMonth.java -* @Package com.nis.domain.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:08:11 -* @version V1.0 -*/ -package com.nis.domain.restful; - -/** -* @ClassName: DjTagStatLogMonth -* @Description: 日志月报表 -* @author (ddm) -* @date 2017年01月05日 下午07:08:11 -* @version V1.0 -*/ -public class DjTagStatLogMonth extends DjTagStatLogDaily { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -2704912464592675932L; - -} diff --git a/src/main/java/com/nis/web/controller/restful/DfDjLogStatController.java b/src/main/java/com/nis/web/controller/restful/DfDjLogStatController.java deleted file mode 100644 index 7c5404d..0000000 --- a/src/main/java/com/nis/web/controller/restful/DfDjLogStatController.java +++ /dev/null @@ -1,231 +0,0 @@ -package com.nis.web.controller.restful; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.nis.domain.Page; -import com.nis.domain.restful.DfDjLogStatistics; -import com.nis.domain.restful.DfDjPzLogStatistics; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.JsonMapper; -import com.nis.util.redis.RedisDao; -import com.nis.util.redis.SaveRedisThread; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DfdjLogStatService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** - * @ClassName: LogStatisticsController - * @Description: 封堵/监测日志统计查询服务 - * @author (zbc) - * @date 2016年11月14日 下午4:00:00 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes", "unchecked" }) -public class DfDjLogStatController extends BaseRestController { - - protected final Logger logger = Logger.getLogger(this.getClass()); - protected String logSource="0"; - - @Autowired - protected DfdjLogStatService logStatService; - @Autowired - protected RedisDao redisDao; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - - /*@RequestMapping(value="/dfLogStatistics", method = RequestMethod.GET) - @ApiOperation(value="封堵日志总量统计查询" , httpMethod = "GET", notes="get log list") - public Map dfLogStatistics( - @RequestParam(value = "searchStatActiveSys", required = false, defaultValue = "2") String searchStatActiveSys, - @RequestParam(value = "searchService", required = true) String searchService, - DfDjLogStatistics logStatistics, HttpServletRequest request, HttpServletResponse response) { - - if(!"4".equals(searchStatActiveSys) ) { - searchStatActiveSys="2"; - logStatistics.setSearchStatActiveSys(searchStatActiveSys); - } - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - - DfDjLogStatistics entity = null; - try{ - logStatService.queryConditionCheck(thread,start,logStatistics, DfDjLogStatistics.class, null); - - entity = logStatService.findDfLogStatistics(logStatistics); - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵日志总量统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchStatActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "封堵日志总量统计检索成功", - entity, searchStatActiveSys, logSource); - } - - @RequestMapping(value="/dfPzLogStatistics", method = RequestMethod.GET) - @ApiOperation(value="封堵配置日志总量统计查询" , httpMethod = "GET", notes="get log list") - public Map dfPzLogStatistics( - @RequestParam(value = "searchStatActiveSys", required = false, defaultValue = "2") String searchStatActiveSys, - @RequestParam(value = "searchService", required = true) String searchService, - Page page, DfDjPzLogStatistics logStatistics, - HttpServletRequest request, HttpServletResponse response) { - - if(!"4".equals(searchStatActiveSys) ) { - searchStatActiveSys="2"; - logStatistics.setSearchStatActiveSys(searchStatActiveSys); - } - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - - Page logPage = null; - boolean keyExists = false; - String key = ""; - - try { - logStatService.queryConditionCheck(thread,start,logStatistics, DfDjPzLogStatistics.class, page); - - if (Constants.IS_OPEN_REDIS) { - // 根据查询条件获取key - key = logStatService.getJedisKey(request, true); - // 判断key是否存在 - keyExists = redisDao.exists(key); - } - // 存在则直接从redis中查询 - if (keyExists) { - logPage = (Page) JsonMapper.fromJsonString(redisDao.getString(key), Page.class); - } else { - // 不存在则查询数据库并保存查询结果到redis中 - logPage = logStatService.findDfPzLogStatistics( - new Page(request, response, DfDjPzLogStatistics.class), logStatistics); - - if (Constants.IS_OPEN_REDIS) - new SaveRedisThread(key, logPage, Constants.ORACLE_EXPIRE).start(); - } - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵配置日志总量统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchStatActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "封堵配置日志总量统计检索成功", - logPage, searchStatActiveSys, logSource); - } - - @RequestMapping(value="/djLogStatistics", method = RequestMethod.GET) - @ApiOperation(value="监测日志总量统计查询" , httpMethod = "GET", notes="get log list") - public Map djLogStatistics( - @RequestParam(value = "searchStatActiveSys", required = false, defaultValue = "2") String searchStatActiveSys, - @RequestParam(value = "searchService", required = true) String searchService, - DfDjLogStatistics logStatistics, HttpServletRequest request, HttpServletResponse response) { - - if(!"4".equals(searchStatActiveSys) ) { - searchStatActiveSys="2"; - logStatistics.setSearchStatActiveSys(searchStatActiveSys); - } - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - - DfDjLogStatistics entity = null; - try{ - logStatService.queryConditionCheck(thread,start,logStatistics, DfDjLogStatistics.class, null); - - entity = logStatService.findDjLogStatistics(logStatistics); - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测日志总量统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchStatActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测日志总量统计检索成功", - entity, searchStatActiveSys, logSource); - } - - @RequestMapping(value="/djPzLogStatistics", method = RequestMethod.GET) - @ApiOperation(value="监测配置日志总量统计查询" , httpMethod = "GET", notes="get log list") - public Map djPzLogStatistics( - @RequestParam(value = "searchStatActiveSys", required = false, defaultValue = "2") String searchStatActiveSys, - @RequestParam(value = "searchService", required = true) String searchService, - Page page, DfDjPzLogStatistics logStatistics, - HttpServletRequest request, HttpServletResponse response) { - - if(!"4".equals(searchStatActiveSys) ) { - searchStatActiveSys="2"; - logStatistics.setSearchStatActiveSys(searchStatActiveSys); - } - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - - Page logPage = null; - boolean keyExists = false; - String key = ""; - - try { - logStatService.queryConditionCheck(thread,start,logStatistics, DfDjPzLogStatistics.class, page); - - if (Constants.IS_OPEN_REDIS) { - // 根据查询条件获取key - key = logStatService.getJedisKey(request, true); - // 判断key是否存在 - keyExists = redisDao.exists(key); - } - // 存在则直接从redis中查询 - if (keyExists) { - logPage = (Page) JsonMapper.fromJsonString(redisDao.getString(key), Page.class); - } else { - // 不存在则查询数据库并保存查询结果到redis中 - logPage = logStatService.findDjPzLogStatistics( - new Page(request, response, DfDjPzLogStatistics.class), logStatistics); - - if (Constants.IS_OPEN_REDIS) - new SaveRedisThread(key, logPage, Constants.ORACLE_EXPIRE).start(); - } - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测配置日志总量统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchStatActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测配置日志总量统计检索成功", - logPage, searchStatActiveSys, logSource); - }*/ -} diff --git a/src/main/java/com/nis/web/controller/restful/DfJitLogSearchController.java b/src/main/java/com/nis/web/controller/restful/DfJitLogSearchController.java deleted file mode 100644 index c3d5148..0000000 --- a/src/main/java/com/nis/web/controller/restful/DfJitLogSearchController.java +++ /dev/null @@ -1,753 +0,0 @@ -package com.nis.web.controller.restful; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.nis.domain.Page; -import com.nis.domain.restful.DfJitAffairDestReport; -import com.nis.domain.restful.DfJitAffairSrcReport; -import com.nis.domain.restful.DfJitFlDestReport; -import com.nis.domain.restful.DfJitFlSrcReport; -import com.nis.domain.restful.DfJitGuaranteeDestReport; -import com.nis.domain.restful.DfJitGuaranteeSrcReport; -import com.nis.domain.restful.DfJitIdDestReport; -import com.nis.domain.restful.DfJitIdSrcReport; -import com.nis.domain.restful.DfJitMissionDestReport; -import com.nis.domain.restful.DfJitMissionSrcReport; -import com.nis.domain.restful.DfJitTagDestReport; -import com.nis.domain.restful.DfJitTagSrcReport; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.StringUtil; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DfJitLogSearchService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** - * - * @ClassName: DfJitLogSearchController - * @Description: 管控日志实时统计查询服务 - * @author (rkg) - * @date 2016年9月13日上午10:32:21 - * @version V1.0 - */ - -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes" }) -public class DfJitLogSearchController extends BaseRestController { - private final Logger logger1 = Logger.getLogger(this.getClass()); - protected String logSource="0"; - @Autowired - private DfJitLogSearchService dfJitLogSearchService; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - @RequestMapping(value = "/dfJitFlSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控分类性质源IP实时统计", httpMethod = "GET", notes = "管控分类性质源IP实时统计列表") - public Map dfJitFlSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitFlSrcReport dfJitFlSrcReportSources, HttpServletRequest request, - HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page dfJitFlSrcReportSourcesPage = null; - try { - // 公共请求参数校验 - dfJitLogSearchService.queryDfJitFlCheck(thread, start, dfJitFlSrcReportSources.getSearchFl(), - dfJitFlSrcReportSources.getSearchXz()); - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitFlSrcReportSources, DfJitFlSrcReport.class, - page); - - dfJitFlSrcReportSourcesPage = dfJitLogSearchService.findDfJitFlSrcReport( - new Page(request, response, DfJitFlSrcReport.class), dfJitFlSrcReportSources); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控分类性质源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控分类性质源IP实时统计检索成功", - dfJitFlSrcReportSourcesPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitFlDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控分类性质目的IP实时统计服务", httpMethod = "GET", notes = "管控分类性质目的IP实时统计列表") - public Map dfJitFlDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitFlDestReport dfJitFlDestReport, HttpServletRequest request, HttpServletResponse response) { - - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page reporPage = null; - try { - // 公共请求参数校验 - dfJitLogSearchService.queryDfJitFlCheck(thread, start, dfJitFlDestReport.getSearchFl(), - dfJitFlDestReport.getSearchXz()); - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitFlDestReport, DfJitFlDestReport.class, page); - - reporPage = dfJitLogSearchService.findDfJitFlDestReport( - new Page(request, response, DfJitFlDestReport.class), dfJitFlDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控分类性质目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控分类性质目的IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitAffairSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控事件子话题源IP实时统计服务", httpMethod = "GET", notes = "管控事件子话题源IP实时统计列表") - public Map dfJitAffairSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitAffairSrcReport dfJitAffairSrcReport, HttpServletRequest request, - HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(dfJitAffairSrcReport.getSearchAffair())) { - Integer.parseInt(dfJitAffairSrcReport.getSearchAffair()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchAffair参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchAffair参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - try { - if (!StringUtil.isBlank(dfJitAffairSrcReport.getSearchTopic())) { - Integer.parseInt(dfJitAffairSrcReport.getSearchTopic()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchTopic参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchTopic参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - Page reporPage = null; - try { - - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitAffairSrcReport, DfJitAffairSrcReport.class, - page); - - reporPage = dfJitLogSearchService.findDfJitAffairSrcReport( - new Page(request, response, DfJitAffairSrcReport.class), - dfJitAffairSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控事件子话题源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控事件子话题源IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitAffairDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控事件子话题目的IP实时统计服务", httpMethod = "GET", notes = "管控事件子话题目的IP实时统计列表") - public Map dfJitAffairDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitAffairDestReport dfJitAffairDestReport, HttpServletRequest request, - HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(dfJitAffairDestReport.getSearchAffair())) { - Integer.parseInt(dfJitAffairDestReport.getSearchAffair()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchAffair参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchAffair参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - try { - if (!StringUtil.isBlank(dfJitAffairDestReport.getSearchTopic())) { - Integer.parseInt(dfJitAffairDestReport.getSearchTopic()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchTopic参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchTopic参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - Page reporPage = null; - try { - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitAffairDestReport, DfJitAffairDestReport.class, - page); - - reporPage = dfJitLogSearchService.findDfJitAffairDestReport( - new Page(request, response, DfJitAffairDestReport.class), - dfJitAffairDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控事件子话题目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控事件子话题目的IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitMissionSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控任务源IP实时统计服务", httpMethod = "GET", notes = "管控任务源IP实时统计列表") - public Map dfJitMissionSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitMissionSrcReport dfJitMissionSrcReport, HttpServletRequest request, - HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(dfJitMissionSrcReport.getSearchMission())) { - Integer.parseInt(dfJitMissionSrcReport.getSearchMission()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchMission参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchMission参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitMissionSrcReport, DfJitMissionSrcReport.class, - page); - - reporPage = dfJitLogSearchService.findDfJitMissionSrcReport( - new Page(request, response, DfJitMissionSrcReport.class), - dfJitMissionSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控任务源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控任务源IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitMissionDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控任务目的IP实时统计服务", httpMethod = "GET", notes = "管控任务目的IP实时统计列表") - public Map dfJitMissionDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitMissionDestReport dfJitMissionDestReport, HttpServletRequest request, - HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(dfJitMissionDestReport.getSearchMission())) { - Integer.parseInt(dfJitMissionDestReport.getSearchMission()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchMission参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchMission参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitMissionDestReport, - DfJitMissionDestReport.class, page); - reporPage = dfJitLogSearchService.findDfJitMissionDestReport( - new Page(request, response, DfJitMissionDestReport.class), - dfJitMissionDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控任务目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控任务目的IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitGuaranteeSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控保障期源IP实时统计服务", httpMethod = "GET", notes = "管控保障期源IP实时统计列表") - public Map dfJitGuaranteeSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitGuaranteeSrcReport dfJitGuaranteeSrcReport, HttpServletRequest request, - HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(dfJitGuaranteeSrcReport.getSearchGuarantee())) { - Integer.parseInt(dfJitGuaranteeSrcReport.getSearchGuarantee()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchGuarantee参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchGuarantee参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitGuaranteeSrcReport, - DfJitGuaranteeSrcReport.class, page); - reporPage = dfJitLogSearchService.findDfJitGuaranteeSrcReport( - new Page(request, response, DfJitGuaranteeSrcReport.class), - dfJitGuaranteeSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控保障期源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控保障期源IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitGuaranteeDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控保障期目的IP实时统计服务", httpMethod = "GET", notes = "管控保障期目的IP实时统计列表") - public Map dfJitGuaranteeDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitGuaranteeDestReport dfJitGuaranteeDestReport, HttpServletRequest request, - HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(dfJitGuaranteeDestReport.getSearchGuarantee())) { - Integer.parseInt(dfJitGuaranteeDestReport.getSearchGuarantee()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchGuarantee参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchGuarantee参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitGuaranteeDestReport, - DfJitGuaranteeDestReport.class, page); - reporPage = dfJitLogSearchService.findDfJitGuaranteeDestReport( - new Page(request, response, DfJitGuaranteeDestReport.class), - dfJitGuaranteeDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控保障期目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控保障期目的IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitTagSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控标签源IP实时统计服务", httpMethod = "GET", notes = "管控标签源IP实时统计列表") - public Map dfJitTagSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitTagSrcReport dfJitTagSrcReport, HttpServletRequest request, HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - if (null != dfJitTagSrcReport.getSearchTag() && !dfJitTagSrcReport.getSearchTag().equals("")) { - String[] tagArr = dfJitTagSrcReport.getSearchTag().split(","); - List tagList = new ArrayList(); - for (int i = 0; i < tagArr.length; i++) { - if (!tagArr[i].equals("")) { - try { - Integer.parseInt(tagArr[i]); - tagList.add(tagArr[i]); - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, - System.currentTimeMillis() - start, "searchTag参数格式错误", - RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchTag参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - } - } - StringBuffer sb = new StringBuffer(); - for (String str : tagList) { - sb.append(str + ","); - } - String tag = sb.substring(0, sb.length() - 1); - dfJitTagSrcReport.setSearchTag(tag); - } - - Page reporPage = null; - try { - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitTagSrcReport, DfJitTagSrcReport.class, page); - reporPage = dfJitLogSearchService.findDfJitTagSrcReport( - new Page(request, response, DfJitTagSrcReport.class), dfJitTagSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控标签源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控标签源IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitTagDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控标签目的IP实时统计服务", httpMethod = "GET", notes = "管控标签目的IP实时统计列表") - public Map dfJitTagDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitTagDestReport dfJitTagDestReport, HttpServletRequest request, - HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - if (null != dfJitTagDestReport.getSearchTag() && !dfJitTagDestReport.getSearchTag().equals("")) { - String[] tagArr = dfJitTagDestReport.getSearchTag().split(","); - List tagList = new ArrayList(); - for (int i = 0; i < tagArr.length; i++) { - if (!tagArr[i].equals("")) { - try { - Integer.parseInt(tagArr[i]); - tagList.add(tagArr[i]); - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, - System.currentTimeMillis() - start, "searchTag参数格式错误", - RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchTag参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - } - } - StringBuffer sb = new StringBuffer(); - for (String str : tagList) { - sb.append(str + ","); - } - String tag = sb.substring(0, sb.length() - 1); - dfJitTagDestReport.setSearchTag(tag); - } - - Page reporPage = null; - try { - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitTagDestReport, DfJitTagDestReport.class, - page); - reporPage = dfJitLogSearchService.findDfJitTagDestReport( - new Page(request, response, DfJitTagDestReport.class), dfJitTagDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控标签目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控标签目的IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitIdSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控规则源IP实时统计服务", httpMethod = "GET", notes = "管控规则源IP实时统计列表") - public Map dfJitIdSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitIdSrcReport dfJitIdSrcReport, HttpServletRequest request, HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(dfJitIdSrcReport.getSearchId())) { - Integer.parseInt(dfJitIdSrcReport.getSearchId()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchId参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitIdSrcReport, DfJitIdSrcReport.class, page); - reporPage = dfJitLogSearchService.findDfJitIdSrcReport( - new Page(request, response, DfJitIdSrcReport.class), dfJitIdSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控规则源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控规则源IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } - - @RequestMapping(value = "/dfJitIdDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控规则目的IP实时统计服务", httpMethod = "GET", notes = "管控规则目的IP实时统计列表") - public Map dfJitIdDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DfJitIdDestReport dfJitIdDestReport, HttpServletRequest request, HttpServletResponse response) { - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys)) searchActiveSys=Constants.ACTIVESYS_B; - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(dfJitIdDestReport.getSearchId())) { - Integer.parseInt(dfJitIdDestReport.getSearchId()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchId参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - dfJitLogSearchService.queryConditionCheck(thread, start, dfJitIdDestReport, DfJitIdDestReport.class, page); - reporPage = dfJitLogSearchService.findDfJitIdDestReport( - new Page(request, response, DfJitIdDestReport.class), dfJitIdDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控规则目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控规则目的IP实时统计检索成功", - reporPage, searchActiveSys,logSource); - } -} diff --git a/src/main/java/com/nis/web/controller/restful/DfMultiDimensionalReportController.java b/src/main/java/com/nis/web/controller/restful/DfMultiDimensionalReportController.java deleted file mode 100644 index 554dffe..0000000 --- a/src/main/java/com/nis/web/controller/restful/DfMultiDimensionalReportController.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.nis.web.controller.restful; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -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.DfReportEntity; -import com.nis.domain.LogEntity; -import com.nis.domain.Page; -import com.nis.domain.restful.DfLwhhAttrReport; -import com.nis.domain.restful.DfLwhhTagReport; -import com.nis.domain.restful.DfSrcIpAttrReport; -import com.nis.domain.restful.DfSrcIpTagReport; -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.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DfMultiDimensionalReportService; -import com.wordnik.swagger.annotations.ApiOperation; - - -/** - * - * @ClassName: DfMultiDimensionalReportController - * @Description: TODO(df多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:53:01 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes" }) -public class DfMultiDimensionalReportController extends BaseRestController { - protected final Logger logger = Logger.getLogger(this.getClass()); - - protected String activeSys = Constants.ACTIVESYS_ALL; - protected String logSource = "0"; - @Autowired - protected DfMultiDimensionalReportService dfMultiDimensionalReportService; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - - @RequestMapping(value = "dfLwhhAttrReportSources", method = RequestMethod.GET) - @ApiOperation(value = "来文函号、性质多维实时统计", httpMethod = "GET", notes = "get log list") - public Map dfServiceReportSources(Page page, DfLwhhAttrReport dfLwhhAttrReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page lwhhAttrReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfLwhhAttrReport); - // 校验 - dfMultiDimensionalReportService.queryConditionCheck(thread, start, dfLwhhAttrReport, DfLwhhAttrReport.class, - page); - // 查询数据库 - lwhhAttrReportPage = dfMultiDimensionalReportService.findDfLwhhAttrReportPage( - new Page(request, response, DfLwhhAttrReport.class), dfLwhhAttrReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "来文函号、性质多维实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "来文函号、性质多维实时统计成功", - lwhhAttrReportPage, activeSys, logSource); - } - - - - @RequestMapping(value = "dfLwhhTagReportSources", method = RequestMethod.GET) - @ApiOperation(value = "来文函号、标签多维实时统计", httpMethod = "GET", notes = "get log list") - public Map dfServiceReportSources(Page page, DfLwhhTagReport dfLwhhTagReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page lwhhTagReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfLwhhTagReport); - // 校验 - dfMultiDimensionalReportService.queryConditionCheck(thread, start, dfLwhhTagReport, DfLwhhTagReport.class, - page); - // 查询数据库 - lwhhTagReportPage = dfMultiDimensionalReportService.findDfLwhhTagReportPage( - new Page(request, response, DfLwhhTagReport.class), dfLwhhTagReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "来文函号、标签多维实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "来文函号、标签多维实时统计成功", - lwhhTagReportPage, activeSys, logSource); - } - - @RequestMapping(value = "dfSrcIpAttrReportSources", method = RequestMethod.GET) - @ApiOperation(value = "来文函号、性质多维实时统计", httpMethod = "GET", notes = "get log list") - public Map dfServiceReportSources(Page page, DfSrcIpAttrReport dfSrcIpAttrReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page srcIpAttrReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfSrcIpAttrReport); - // 校验 - dfMultiDimensionalReportService.queryConditionCheck(thread, start, dfSrcIpAttrReport, DfSrcIpAttrReport.class, - page); - // 查询数据库 - srcIpAttrReportPage = dfMultiDimensionalReportService.findDfSrcIpAttrReportPage( - new Page(request, response, DfSrcIpAttrReport.class), dfSrcIpAttrReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "境内源ip、性质多维实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "境内源ip、性质多维实时统计成功", - srcIpAttrReportPage, activeSys, logSource); - } - - - - @RequestMapping(value = "dfSrcIpTagReportSources", method = RequestMethod.GET) - @ApiOperation(value = "来文函号、标签多维实时统计", httpMethod = "GET", notes = "get log list") - public Map dfServiceReportSources(Page page, DfSrcIpTagReport dfSrcIpTagReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page srcIpTagReportPage = null; - try { - - //设置本地默认查询时间 - resetTime(dfSrcIpTagReport); - - // 校验 - dfMultiDimensionalReportService.queryConditionCheck(thread, start, dfSrcIpTagReport, DfSrcIpTagReport.class, - page); - // 查询数据库 - srcIpTagReportPage = dfMultiDimensionalReportService.findDfSrcIpTagReportPage( - new Page(request, response, DfSrcIpTagReport.class), dfSrcIpTagReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "境内源ip、标签多维实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "境内源ip、标签多维实时统计成功", - srcIpTagReportPage, activeSys, logSource); - } - - /** - * - * @Title: resetTime - * @Description: (实时统计默认查询本地一个小时的数据) - * @param @param entity - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public void resetTime(DfReportEntity entity) throws Exception { - Map map = DateUtils.getLocalTime(entity.getSearchReportStartTime(), - entity.getSearchReportEndTime(), Constants.REPORT_LOCAL_TIME,"report"); - entity.setSearchReportStartTime(map.get("startTime")); - entity.setSearchReportEndTime(map.get("endTime")); - } -} diff --git a/src/main/java/com/nis/web/controller/restful/DfMultiDimensionalStatLogController.java b/src/main/java/com/nis/web/controller/restful/DfMultiDimensionalStatLogController.java deleted file mode 100644 index fe69df8..0000000 --- a/src/main/java/com/nis/web/controller/restful/DfMultiDimensionalStatLogController.java +++ /dev/null @@ -1,333 +0,0 @@ -/** -* @Title: DfStatLogController.java -* @Package com.nis.web.controller -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 下午1:22:15 -* @version V1.0 -*/ -package com.nis.web.controller.restful; - - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -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.StatLogEntity; -import com.nis.domain.restful.DfLwhhAttrDaily; -import com.nis.domain.restful.DfLwhhAttrMonth; -import com.nis.domain.restful.DfLwhhTagDaily; -import com.nis.domain.restful.DfLwhhTagMonth; -import com.nis.domain.restful.DfSrcIpAttrDaily; -import com.nis.domain.restful.DfSrcIpAttrMonth; -import com.nis.domain.restful.DfSrcIpTagDaily; -import com.nis.domain.restful.DfSrcIpTagMonth; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.DateUtils; -import com.nis.util.redis.RedisDao; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DfMultiDimensionalStatLogService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** -* @ClassName: DfStatLogController -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (ddm) -* @date 2016年9月13日 下午1:22:15 -* @version V1.0 -*/ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes", "unchecked" }) -public class DfMultiDimensionalStatLogController extends BaseRestController{ - protected final Logger logger = Logger.getLogger(this.getClass()); - protected String logSource="0"; - protected String activeSys=Constants.ACTIVESYS_ALL; - - @Autowired - protected DfMultiDimensionalStatLogService dfMultiDimensionalStatLogService; - @Autowired - protected RedisDao redisDao; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - - - @RequestMapping(value="dfLwhhAttrDailySources", method = RequestMethod.GET) - @ApiOperation(value="封堵来文函号-性质多维日报表" , httpMethod = "GET", notes="get log list") - public Map dfLwhhAttrDailySources( - Page page,DfLwhhAttrDaily dfLwhhAttrDaily, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dfLwhhAttrDailyPage =null; - try { - resetTime(dfLwhhAttrDaily, "daily"); - - dfMultiDimensionalStatLogService.queryConditionCheck(thread,start,dfLwhhAttrDaily, DfLwhhAttrDaily.class, page); - - dfLwhhAttrDailyPage = dfMultiDimensionalStatLogService.dfLwhhAttrDaily(new Page(request, response,DfLwhhAttrDaily.class), dfLwhhAttrDaily); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵来文函号-性质多维日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵来文函号-标签多维日报表检索成功",dfLwhhAttrDailyPage,activeSys,logSource); - } - @RequestMapping(value="dfLwhhAttrMonthSources", method = RequestMethod.GET) - @ApiOperation(value="封堵来文函号-性质多维月报表" , httpMethod = "GET", notes="get log list") - public Map dfLwhhAttrMonthSources( - Page page,DfLwhhAttrMonth dfLwhhAttrMonth, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dfLwhhAttrMonthPage =null; - try { - resetTime(dfLwhhAttrMonth, "month"); - - - //查询条件校验 - dfMultiDimensionalStatLogService.queryConditionCheck(thread,start,dfLwhhAttrMonth, DfLwhhAttrMonth.class, page); - - dfLwhhAttrMonthPage = dfMultiDimensionalStatLogService.dfLwhhAttrMonth(new Page(request, response,DfLwhhAttrMonth.class), dfLwhhAttrMonth); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵来文函号-性质多维月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵来文函号-性质多维月报表检索成功",dfLwhhAttrMonthPage,activeSys,logSource); - } - - - - @RequestMapping(value="dfLwhhTagDailySources", method = RequestMethod.GET) - @ApiOperation(value="封堵来文函号-标签多维日报表" , httpMethod = "GET", notes="get log list") - public Map dfLwhhTagDailySources( - Page page,DfLwhhTagDaily dfLwhhTagDaily, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dfLwhhTagDailyPage =null; - try { - resetTime(dfLwhhTagDaily, "daily"); - - dfMultiDimensionalStatLogService.queryConditionCheck(thread,start,dfLwhhTagDaily, DfLwhhTagDaily.class, page); - - dfLwhhTagDailyPage = dfMultiDimensionalStatLogService.dfLwhhTagDaily(new Page(request, response,DfLwhhTagDaily.class), dfLwhhTagDaily); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵来文函号-标签多维日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵来文函号-标签多维日报表检索成功",dfLwhhTagDailyPage,activeSys,logSource); - } - @RequestMapping(value="dfLwhhTagMonthSources", method = RequestMethod.GET) - @ApiOperation(value="封堵来文函号-标签多维月报表" , httpMethod = "GET", notes="get log list") - public Map dfLwhhTagMonthSources( - Page page,DfLwhhTagMonth dfLwhhTagMonth, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dfLwhhTagMonthPage =null; - try { - resetTime(dfLwhhTagMonth, "month"); - - - //查询条件校验 - dfMultiDimensionalStatLogService.queryConditionCheck(thread,start,dfLwhhTagMonth, DfLwhhTagMonth.class, page); - - dfLwhhTagMonthPage = dfMultiDimensionalStatLogService.dfLwhhTagMonth(new Page(request, response,DfLwhhTagMonth.class), dfLwhhTagMonth); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵来文函号-标签多维月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵来文函号-标签多维月报表检索成功",dfLwhhTagMonthPage,activeSys,logSource); - } - - - - @RequestMapping(value="dfSrcIpAttrDailySources", method = RequestMethod.GET) - @ApiOperation(value="封堵省-性质多维日报表" , httpMethod = "GET", notes="get log list") - public Map dfSrcIpAttrDailySources( - Page page,DfSrcIpAttrDaily dfSrcIpAttrDaily, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dfSrcIpAttrDailyPage =null; - try { - resetTime(dfSrcIpAttrDaily, "daily"); - - dfMultiDimensionalStatLogService.queryConditionCheck(thread,start,dfSrcIpAttrDaily, DfSrcIpAttrDaily.class, page); - - dfSrcIpAttrDailyPage = dfMultiDimensionalStatLogService.dfSrcIpAttrDaily(new Page(request, response,DfSrcIpAttrDaily.class), dfSrcIpAttrDaily); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵省-性质多维日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵省-标签多维日报表检索成功",dfSrcIpAttrDailyPage,activeSys,logSource); - } - @RequestMapping(value="dfSrcIpAttrMonthSources", method = RequestMethod.GET) - @ApiOperation(value="封堵省-性质多维月报表" , httpMethod = "GET", notes="get log list") - public Map dfSrcIpAttrMonthSources( - Page page,DfSrcIpAttrMonth dfSrcIpAttrMonth, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dfSrcIpAttrMonthPage =null; - try { - resetTime(dfSrcIpAttrMonth, "month"); - - - //查询条件校验 - dfMultiDimensionalStatLogService.queryConditionCheck(thread,start,dfSrcIpAttrMonth, DfSrcIpAttrMonth.class, page); - - dfSrcIpAttrMonthPage = dfMultiDimensionalStatLogService.dfSrcIpAttrMonth(new Page(request, response,DfSrcIpAttrMonth.class), dfSrcIpAttrMonth); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵省-性质多维月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵省-性质多维月报表检索成功",dfSrcIpAttrMonthPage,activeSys,logSource); - } - - - - @RequestMapping(value="dfSrcIpTagDailySources", method = RequestMethod.GET) - @ApiOperation(value="封堵省-标签多维日报表" , httpMethod = "GET", notes="get log list") - public Map dfSrcIpTagDailySources( - Page page,DfSrcIpTagDaily dfSrcIpTagDaily, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dfSrcIpTagDailyPage =null; - try { - resetTime(dfSrcIpTagDaily, "daily"); - - dfMultiDimensionalStatLogService.queryConditionCheck(thread,start,dfSrcIpTagDaily, DfSrcIpTagDaily.class, page); - - dfSrcIpTagDailyPage = dfMultiDimensionalStatLogService.dfSrcIpTagDaily(new Page(request, response,DfSrcIpTagDaily.class), dfSrcIpTagDaily); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵省-标签多维日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵省-标签多维日报表检索成功",dfSrcIpTagDailyPage,activeSys,logSource); - } - @RequestMapping(value="dfSrcIpTagMonthSources", method = RequestMethod.GET) - @ApiOperation(value="封堵省-标签多维月报表" , httpMethod = "GET", notes="get log list") - public Map dfSrcIpTagMonthSources( - Page page,DfSrcIpTagMonth dfSrcIpTagMonth, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dfSrcIpTagMonthPage =null; - try { - resetTime(dfSrcIpTagMonth, "month"); - - - //查询条件校验 - dfMultiDimensionalStatLogService.queryConditionCheck(thread,start,dfSrcIpTagMonth, DfSrcIpTagMonth.class, page); - - dfSrcIpTagMonthPage = dfMultiDimensionalStatLogService.dfSrcIpTagMonth(new Page(request, response,DfSrcIpTagMonth.class), dfSrcIpTagMonth); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵省-标签多维月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵省-标签多维月报表检索成功",dfSrcIpTagMonthPage,activeSys,logSource); - } - - /** - * - * @Title: resetTime - * @Description: (日报表默认查询本地前一天的数据) - * @param @param entity - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public void resetTime(StatLogEntity entity,String type) throws Exception{ - Map map = DateUtils.getLocalTime(entity.getSearchStatStartTime(), - entity.getSearchStatEndTime(), Constants.REPORT_LOCAL_TIME,type); - entity.setSearchStatStartTime(map.get("startTime")); - entity.setSearchStatEndTime(map.get("endTime")); - } - -} diff --git a/src/main/java/com/nis/web/controller/restful/DfReportController.java b/src/main/java/com/nis/web/controller/restful/DfReportController.java deleted file mode 100644 index f23fbe4..0000000 --- a/src/main/java/com/nis/web/controller/restful/DfReportController.java +++ /dev/null @@ -1,636 +0,0 @@ -package com.nis.web.controller.restful; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -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.DfReportEntity; -import com.nis.domain.LogEntity; -import com.nis.domain.Page; -import com.nis.domain.restful.DfAttrTypeReport; -import com.nis.domain.restful.DfDestIpCountryReport; -import com.nis.domain.restful.DfDestIpReport; -import com.nis.domain.restful.DfEntranceReport; -import com.nis.domain.restful.DfLwhhReport; -import com.nis.domain.restful.DfPzReport; -import com.nis.domain.restful.DfPzReportStat; -import com.nis.domain.restful.DfServiceReport; -import com.nis.domain.restful.DfSrcIpDomeSticReport; -import com.nis.domain.restful.DfSrcIpReport; -import com.nis.domain.restful.DfTagReport; -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.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DfReportService; -import com.wordnik.swagger.annotations.ApiOperation; - -import net.sf.json.JSONObject; - -/** - * @ClassName: DfReportController - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2016年10月31日上午11:56:50 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes" }) -public class DfReportController extends BaseRestController { - protected final Logger logger = Logger.getLogger(this.getClass()); - - protected String activeSys = Constants.ACTIVESYS_ALL; - protected String logSource = "0"; - @Autowired - protected DfReportService dfReportService; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - @RequestMapping(value = "dfPzReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控配置实时统计服务", httpMethod = "GET", notes = "get log list") - public Map dfPzReportSources(Page page, DfPzReport dfPzReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page pzReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfPzReport); - - dfReportService.queryConditionCheck(thread, start, dfPzReport, DfPzReport.class, page); - - // 查询数据库 - pzReportPage = dfReportService.findDfPzReportPage(new Page(request, response, DfPzReport.class), - dfPzReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控配置实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控配置实时统计成功", - pzReportPage, activeSys, logSource); - } - - /** - * 配置统计[小时] - * - * @param page - * @param dfPzReport - * @param model - * @param request - * @param response - * @return - */ - @RequestMapping(value = "dfPzStatSources", method = RequestMethod.GET) - @ApiOperation(value = "管控各配置量统计服务[小时]", httpMethod = "GET", notes = "get log list") - public Map dfPzStatSources(Page page, DfPzReportStat dfPzReportStat, Model model, HttpServletRequest request, - HttpServletResponse response) { - if (!Constants.ACTIVESYS_A.equals(dfPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_C.equals(dfPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_AB.equals(dfPzReportStat.getSearchStatActiveSys()) - ) { - dfPzReportStat.setSearchStatActiveSys(Constants.ACTIVESYS_B); - } - activeSys = dfPzReportStat.getSearchStatActiveSys(); - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page pzReportPage = null; - try { - - //设置本地默认查询时间 - resetTime(dfPzReportStat); - - dfReportService.queryConditionCheck(thread, start, dfPzReportStat, DfPzReportStat.class, page); - - // 查询数据库 - pzReportPage = dfReportService.findDfPzReportStatPage( - new Page(request, response, DfPzReportStat.class), dfPzReportStat); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控各配置量统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控各配置量统计成功", - pzReportPage, activeSys, logSource); - } - /** - * 配置统计[分钟] - * - * @param page - * @param dfPzReport - * @param model - * @param request - * @param response - * @return - */ - @RequestMapping(value = "dfPzStatMinutesSources", method = RequestMethod.GET) - @ApiOperation(value = "管控各配置量统计服务[分钟]", httpMethod = "GET", notes = "get log list") - public Map dfPzStatMinutesSources(Page page, DfPzReportStat dfPzReportStat, Model model, HttpServletRequest request, - HttpServletResponse response) { - if (!Constants.ACTIVESYS_A.equals(dfPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_C.equals(dfPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_AB.equals(dfPzReportStat.getSearchStatActiveSys()) - ) { - dfPzReportStat.setSearchStatActiveSys(Constants.ACTIVESYS_B); - } - activeSys = dfPzReportStat.getSearchStatActiveSys(); - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page pzReportPage = null; - try { - - //设置本地默认查询时间 - resetTime(dfPzReportStat); - - dfReportService.queryConditionCheck(thread, start, dfPzReportStat, DfPzReportStat.class, page); - - // 查询数据库 - pzReportPage = dfReportService.findDfPzReportStatMinutesPage( - new Page(request, response, DfPzReportStat.class), dfPzReportStat); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控各配置量统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控各配置量统计成功", - pzReportPage, activeSys, logSource); - } - - /** - * 配置统计 - * - * @param page - * @param dfPzReport - * @param model - * @param request - * @param response - * @return - */ - @RequestMapping(value = "dfPzSumStatSources", method = RequestMethod.GET) - @ApiOperation(value = "管控配置总量统计服务", httpMethod = "GET", notes = "get log list") - public Map dfPzSumStatSources(Page page, DfPzReportStat dfPzReportStat, Model model, HttpServletRequest request, - HttpServletResponse response) { - if (!Constants.ACTIVESYS_A.equals(dfPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_C.equals(dfPzReportStat.getSearchStatActiveSys()) - ) { - dfPzReportStat.setSearchStatActiveSys(Constants.ACTIVESYS_B); - } - activeSys = dfPzReportStat.getSearchStatActiveSys(); - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - JSONObject json = new JSONObject(); - try { - - //设置本地默认查询时间 - resetTime(dfPzReportStat); - - dfReportService.queryConditionCheck(thread, start, dfPzReportStat, DfPzReportStat.class,page); - - // 查询数据库 - Long sum = dfReportService.findDfPzReportSumStat( - new Page(request, response, DfPzReportStat.class), dfPzReportStat); - if (sum == null) - sum = 0l; - json.put("sum", sum); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控配置总量统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控配置总量统计成功", json, - activeSys, logSource); - } - - @RequestMapping(value = "dfServiceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控业务类型实时统计", httpMethod = "GET", notes = "get log list") - public Map dfServiceReportSources(Page page, DfServiceReport dfServiceReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page serviceReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfServiceReport); - - // 校验 - dfReportService.queryConditionCheck(thread, start, dfServiceReport, DfServiceReport.class, - page); - // 查询数据库 - serviceReportPage = dfReportService.findDfServiceReportPage( - new Page(request, response, DfServiceReport.class), dfServiceReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控业务类型实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控业务类型实时统计成功", - serviceReportPage, activeSys, logSource); - } - - @RequestMapping(value = "dfTagReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控标签实时统计", httpMethod = "GET", notes = "get log list") - public Map dfTagReportSources(Page page, DfTagReport dfTagReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page tagReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfTagReport); - - // 校验 - dfReportService.queryConditionCheck(thread, start, dfTagReport, DfTagReport.class, page); - // 查询数据库 - tagReportPage = dfReportService - .findDfTagReportPage(new Page(request, response, DfTagReport.class), dfTagReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控标签实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控标签实时统计成功", - tagReportPage, activeSys, logSource); - } - - @RequestMapping(value = "/dfSrcIpDomesticReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控境内源IP实时统计服务", httpMethod = "GET", notes = "管控境内源IP实时统计列表") - public Map dfSrcIpDomesticReportSources(Page page, DfSrcIpReport dfSrcIpDomesticReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page reporPage = null; - try { - //设置本地默认查询时间 - resetTime(dfSrcIpDomesticReport); - - dfReportService.queryConditionCheck(thread, start, dfSrcIpDomesticReport, DfSrcIpReport.class, page); - - reporPage = dfReportService.findDfSrcIpReport( - new Page(request, response, DfSrcIpReport.class), dfSrcIpDomesticReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控境内源IP实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控境内源IP实时统计检索成功", - reporPage, activeSys, logSource); - } - - @RequestMapping(value = "/dfDestIpCountryReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控各国家目的IP实时统计服务", httpMethod = "GET", notes = "管控各国家目的IP实时统计列表") - public Map dfDestIpCountryReportSources(Page page, DfDestIpReport dfDestIpReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page reporPage = null; - try { - //设置本地默认查询时间 - resetTime(dfDestIpReport); - - dfReportService.queryConditionCheck(thread, start, dfDestIpReport, DfDestIpReport.class, page); - - reporPage = dfReportService.findDfDestIpReport( - new Page(request, response, DfDestIpReport.class), dfDestIpReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控各国家目的IP实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控各国家目的IP实时统计检索成功", - reporPage, activeSys, logSource); - } - - @RequestMapping(value = "dfPzPrivServiceSumSources", method = RequestMethod.GET) - @ApiOperation(value = "管控配置总量实时统计", httpMethod = "GET", notes = "get log list") - public Map dfPzPrivServiceSumSources(Page page, DfPzReport dfPzReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page pzReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfPzReport); - - dfReportService.queryConditionCheck(thread, start, dfPzReport, DfPzReport.class, page); - - // 查询数据库 - pzReportPage = dfReportService.findDfPriTagReport(new Page(request, response, DfPzReport.class), - dfPzReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控配置总量实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控配置总量实时统计成功", - pzReportPage, activeSys, logSource); - } - - @RequestMapping(value = "dfAttrTypeReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控性质（带私有标签）实时统计", httpMethod = "GET", notes = "get log list") - public Map dfAttrTypeReportSources(Page page, DfAttrTypeReport dfAttrTypeReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page attrTypeReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfAttrTypeReport); - - dfReportService.queryConditionCheck(thread, start, dfAttrTypeReport, DfPzReport.class, page); - // 查询数据库 - attrTypeReportPage = dfReportService.findAttrTypeReport( - new Page(request, response, DfAttrTypeReport.class), dfAttrTypeReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控性质（带私有标签）实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控性质（带私有标签）实时统计成功", - attrTypeReportPage, activeSys, logSource); - } - - @RequestMapping(value = "dfSrcIpDomesticPrivServiceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控境内源IP(带私有标签)实时统计", httpMethod = "GET", notes = "get log list") - public Map dfSrcIpDomesticPrivServiceReportSources(Page page, DfSrcIpDomeSticReport dfSrcIpDomeSticReport, - Model model, HttpServletRequest request, HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page srcIpDomeSticReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfSrcIpDomeSticReport); - - dfReportService.queryConditionCheck(thread, start, dfSrcIpDomeSticReport, DfSrcIpDomeSticReport.class, - page); - // 查询数据库 - srcIpDomeSticReportPage = dfReportService.findSrcIpDomeSticReport( - new Page(request, response, DfSrcIpDomeSticReport.class), - dfSrcIpDomeSticReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控境内源IP(带私有标签)实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控境内源IP(带私有标签)实时统计成功", - srcIpDomeSticReportPage, activeSys, logSource); - } - - @RequestMapping(value = "dfDestIpCountryPrivServiceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控境内目的IP(带私有标签)实时统计", httpMethod = "GET", notes = "get log list") - public Map dfDestIpCountryPrivServiceReportSources(Page page, DfDestIpCountryReport dfDestIpCountryReport, - Model model, HttpServletRequest request, HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page dfDestIpCountryReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfDestIpCountryReport); - - dfReportService.queryConditionCheck(thread, start, dfDestIpCountryReport, DfDestIpCountryReport.class, - page); - // 查询数据库 - dfDestIpCountryReportPage = dfReportService.findDestIpCountryReport( - new Page(request, response, DfDestIpCountryReport.class), - dfDestIpCountryReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控境内目的IP(带私有标签)实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控境内目的IP(带私有标签)实时统计成功", - dfDestIpCountryReportPage, activeSys, logSource); - } - - @RequestMapping(value = "dfEntranceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控局点（带私有标签）实时统计", httpMethod = "GET", notes = "get log list") - public Map dfEntranceReportSources(Page page, DfEntranceReport dfEntranceReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page dfEntranceReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfEntranceReport); - - dfReportService.queryConditionCheck(thread, start, dfEntranceReport, DfEntranceReport.class, - page); - // 查询数据库 - dfEntranceReportPage = dfReportService.findDfEntranceReport( - new Page(request, response, DfEntranceReport.class), dfEntranceReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控局点（带私有标签）实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控局点（带私有标签）实时统计成功", - dfEntranceReportPage, activeSys, logSource); - } - - @RequestMapping(value = "dfLwhhReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控来文函号（带私有标签）实时统计", httpMethod = "GET", notes = "get log list") - public Map dfLwhhReportSources(Page page, DfLwhhReport dfLwhhReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page dfLwhhReportPage = null; - try { - //设置本地默认查询时间 - resetTime(dfLwhhReport); - - dfReportService.queryConditionCheck(thread, start, dfLwhhReport, DfLwhhReport.class, page); - // 查询数据库 - dfLwhhReportPage = dfReportService - .findDfLwhhReport(new Page(request, response, DfLwhhReport.class), dfLwhhReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控来文函号（带私有标签）实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控来文函号（带私有标签）实时统计成功", - dfLwhhReportPage, activeSys, logSource); - } - - - - @RequestMapping(value = "dfTagPrivServiceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "管控标签（带私有标签）实时统计", httpMethod = "GET", notes = "get log list") - public Map dfTagPrivServiceReportSources(Page page, DfTagReport dfTagReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page dfTagReportPage = null; - try { - - //设置本地默认查询时间 - resetTime(dfTagReport); - - dfReportService.queryConditionCheck(thread, start, dfTagReport, DfTagReport.class, page); - // 查询数据库 - dfTagReportPage = dfReportService - .findDfTagReportPage(new Page(request, response, DfTagReport.class), dfTagReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "管控标签（带私有标签）实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "管控标签（带私有标签）实时统计成功", - dfTagReportPage, activeSys, logSource); - } - - /** - * - * @Title: resetTime - * @Description: (实时统计默认查询本地一个小时的数据) - * @param @param entity - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public void resetTime(DfReportEntity entity) throws Exception { - Map map = DateUtils.getLocalTime(entity.getSearchReportStartTime(), - entity.getSearchReportEndTime(), Constants.REPORT_LOCAL_TIME,"report"); - entity.setSearchReportStartTime(map.get("startTime")); - entity.setSearchReportEndTime(map.get("endTime")); - } -} diff --git a/src/main/java/com/nis/web/controller/restful/DfStatLogController.java b/src/main/java/com/nis/web/controller/restful/DfStatLogController.java deleted file mode 100644 index 7f20361..0000000 --- a/src/main/java/com/nis/web/controller/restful/DfStatLogController.java +++ /dev/null @@ -1,792 +0,0 @@ -/** -* @Title: DfStatLogController.java -* @Package com.nis.web.controller -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 下午1:22:15 -* @version V1.0 -*/ -package com.nis.web.controller.restful; - - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -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.DfReportEntity; -import com.nis.domain.Page; -import com.nis.domain.StatLogEntity; -import com.nis.domain.restful.DfAttrStatLogDaily; -import com.nis.domain.restful.DfAttrStatLogMonth; -import com.nis.domain.restful.DfDestIpCounrtyStatLogDaily; -import com.nis.domain.restful.DfDestIpCounrtyStatLogMonth; -import com.nis.domain.restful.DfEntrStatLogDaily; -import com.nis.domain.restful.DfEntrStatLogMonth; -import com.nis.domain.restful.DfLwhhStatLogDaily; -import com.nis.domain.restful.DfLwhhStatLogMonth; -import com.nis.domain.restful.DfSrcIpDomesticStatLogDaily; -import com.nis.domain.restful.DfSrcIpDomesticStatLogMonth; -import com.nis.domain.restful.DfStatLogDaily; -import com.nis.domain.restful.DfStatLogMonth; -import com.nis.domain.restful.DfTagStatLogDaily; -import com.nis.domain.restful.DfTagStatLogMonth; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.DateUtils; -import com.nis.util.JsonMapper; -import com.nis.util.StringUtil; -import com.nis.util.redis.RedisDao; -import com.nis.util.redis.SaveRedisThread; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DfStatLogService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** -* @ClassName: DfStatLogController -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (ddm) -* @date 2016年9月13日 下午1:22:15 -* @version V1.0 -*/ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes", "unchecked" }) -public class DfStatLogController extends BaseRestController{ - protected final Logger logger = Logger.getLogger(this.getClass()); - protected String logSource="0"; - protected String activeSys=Constants.ACTIVESYS_ALL; - - @Autowired - protected DfStatLogService dfStatLogService; - @Autowired - protected RedisDao redisDao; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - @RequestMapping(value="dfStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="封堵日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map dfStatLogDailySources( - Page page,DfStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchConfigId())) { - Long.parseLong(dailyLog.getSearchConfigId()); - } - - dfStatLogService.queryConditionCheck(thread,start,dailyLog, DfStatLogDaily.class, page); - - dailyLogPage = dfStatLogService.dfStatLogDaily(new Page(request, response,DfStatLogDaily.class), dailyLog); - - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchConfigId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - @RequestMapping(value="dfStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="封堵日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map dfStatLogMonthSources( - Page page,DfStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchConfigId())) { - Long.parseLong(monthLog.getSearchConfigId()); - } - - //查询条件校验 - dfStatLogService.queryConditionCheck(thread,start,monthLog, DfStatLogMonth.class, page); - - monthLogPage = dfStatLogService.dfStatLogMonth(new Page(request, response,DfStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchConfigId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"封堵日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "封堵日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - - /** - * 标签日报表 - * - * @Title: dfTagStatLogDailySources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfTagStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="标签封堵日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map dfTagStatLogDailySources( - Page page,DfTagStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - //查询条件校验 - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchTag())) { - Integer.parseInt(dailyLog.getSearchTag()); - } - - dfStatLogService.queryConditionCheck(thread,start,dailyLog, DfTagStatLogDaily.class, page); - - dailyLogPage = dfStatLogService.dfTagStatLogDaily(new Page(request, response,DfTagStatLogDaily.class), dailyLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchTag参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"标签封堵日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "标签封堵日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * 标签月报表 - * - * @Title: dfTagStatLogDailySources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfTagStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="标签封堵日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map dfTagStatLogMonthSources( - Page page,DfTagStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchTag())) { - Integer.parseInt(monthLog.getSearchTag()); - } - - //查询条件校验 - dfStatLogService.queryConditionCheck(thread,start,monthLog, DfTagStatLogMonth.class, page); - - monthLogPage = dfStatLogService.dfTagStatLogMonth(new Page(request, response,DfTagStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchTag参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"标签封堵日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "标签封堵日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - - /** - * @Title: dfTagStatLogDailySources - * @Description: (性质日报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfAttrStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="性质封堵日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map dfAttrStatLogDailySources( - Page page,DfAttrStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchAttrType())) { - Integer.parseInt(dailyLog.getSearchAttrType()); - } - - dfStatLogService.queryConditionCheck(thread,start,dailyLog, DfAttrStatLogDaily.class, page); - - dailyLogPage = dfStatLogService.dfAttrStatLogDaily(new Page(request, response,DfAttrStatLogDaily.class), dailyLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchAttrType参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"性质封堵日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "性质封堵日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * @Title: dfAttrStatLogDailySources - * @Description: (性质月报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfAttrStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="性质封堵日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map dfAttrStatLogMonthSources( - Page page,DfAttrStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchAttrType())) { - Integer.parseInt(monthLog.getSearchAttrType()); - } - - //查询条件校验 - dfStatLogService.queryConditionCheck(thread,start,monthLog, DfAttrStatLogMonth.class, page); - - monthLogPage = dfStatLogService.dfAttrStatLogMonth(new Page(request, response,DfAttrStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchAttrType参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"性质封堵日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "性质封堵日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - - /** - * @Title: dfEntrStatLogDailySources - * @Description: (局点日报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfEntrStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="局点封堵日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map dfEntrStatLogDailySources( - Page page,DfEntrStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchEntranceId())) { - Integer.parseInt(dailyLog.getSearchEntranceId()); - } - - dfStatLogService.queryConditionCheck(thread,start,dailyLog, DfEntrStatLogDaily.class, page); - - dailyLogPage = dfStatLogService.dfEntrStatLogDaily(new Page(request, response,DfEntrStatLogDaily.class), dailyLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchEntranceId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"局点封堵日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "局点封堵日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * @Title: dfEntrStatLogDailySources - * @Description: (局点月报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfEntrStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="局点封堵日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map dfEntrStatLogMonthSources( - Page page,DfEntrStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchEntranceId())) { - Integer.parseInt(monthLog.getSearchEntranceId()); - } - //查询条件校验 - dfStatLogService.queryConditionCheck(thread,start,monthLog, DfEntrStatLogMonth.class, page); - - monthLogPage = dfStatLogService.dfEntrStatLogMonth(new Page(request, response,DfEntrStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchEntranceId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"局点封堵日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "局点封堵日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - /** - * @Title: dfLwhhStatLogDailySources - * @Description: (局点日报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfLwhhStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="来文函号封堵日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map dfLwhhStatLogDailySources( - Page page,DfLwhhStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - //查询条件校验 - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchLwhh())) { - Integer.parseInt(dailyLog.getSearchLwhh()); - } - - dfStatLogService.queryConditionCheck(thread,start,dailyLog, DfLwhhStatLogDaily.class, page); - - dailyLogPage = dfStatLogService.dfLwhhStatLogDaily(new Page(request, response,DfLwhhStatLogDaily.class), dailyLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchLwhh参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"来文函号封堵日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "来文函号封堵日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * @Title: dfLwhhStatLogDailySources - * @Description: (局点月报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfLwhhStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="来文函号封堵日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map dfLwhhStatLogMonthSources( - Page page,DfLwhhStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchLwhh())) { - Integer.parseInt(monthLog.getSearchLwhh()); - } - //查询条件校验 - dfStatLogService.queryConditionCheck(thread,start,monthLog, DfLwhhStatLogMonth.class, page); - - monthLogPage = dfStatLogService.dfLwhhStatLogMonth(new Page(request, response,DfLwhhStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchLwhh参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"来文函号封堵日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "来文函号封堵日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - - /** - * 境内源IP日报表 - * - * @Title: dfSrcIpDomesticStatLogDailySources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfSrcIpDomesticStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="境内源IP封堵日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map dfSrcIpDomesticStatLogDailySources( - Page page,DfSrcIpDomesticStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - dfStatLogService.queryConditionCheck(thread,start,dailyLog, DfSrcIpDomesticStatLogDaily.class, page); - - dailyLogPage = dfStatLogService.dfSrcIpDomesticStatLogDaily(new Page(request, response,DfSrcIpDomesticStatLogDaily.class), dailyLog); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"境内源IP封堵日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "境内源IP封堵日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * 境内源IP月报表 - * - * @Title: dfSrcIpDomesticStatLogMonthSources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfSrcIpDomesticStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="境内源IP封堵日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map dfSrcIpDomesticStatLogMonthSources( - Page page,DfSrcIpDomesticStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - //查询条件校验 - dfStatLogService.queryConditionCheck(thread,start,monthLog, DfSrcIpDomesticStatLogMonth.class, page); - - monthLogPage = dfStatLogService.dfSrcIpDomesticStatLogMonth(new Page(request, response,DfSrcIpDomesticStatLogMonth.class), monthLog); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"境内源IP封堵日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "境内源IP封堵日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - /** - * 国家目的IP日报表 - * - * @Title: dfDestIpCounrtyStatLogDailySources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfDestIpCountryStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="国家目的IP封堵日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map dfDestIpCounrtyStatLogDailySources( - Page page,DfDestIpCounrtyStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - dfStatLogService.queryConditionCheck(thread,start,dailyLog, DfDestIpCounrtyStatLogDaily.class, page); - - dailyLogPage = dfStatLogService.dfDestIpCounrtyStatLogDaily(new Page(request, response,DfDestIpCounrtyStatLogDaily.class), dailyLog); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"国家目的IP封堵日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "国家目的IP封堵日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * 国家目的IP月报表 - * - * @Title: dfDestIpCounrtyStatLogMonthSources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="dfDestIpCountryStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="国家目的IP封堵日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map dfDestIpCounrtyStatLogMonthSources( - Page page,DfDestIpCounrtyStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - //查询条件校验 - dfStatLogService.queryConditionCheck(thread,start,monthLog, DfDestIpCounrtyStatLogMonth.class, page); - - monthLogPage = dfStatLogService.dfDestIpCounrtyStatLogMonth(new Page(request, response,DfDestIpCounrtyStatLogMonth.class), monthLog); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"国家目的IP封堵日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "国家目的IP封堵日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - /** - * - * @Title: resetTime - * @Description: (日报表默认查询本地前一天的数据) - * @param @param entity - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public void resetTime(StatLogEntity entity,String type) throws Exception{ - Map map = DateUtils.getLocalTime(entity.getSearchStatStartTime(), - entity.getSearchStatEndTime(), Constants.REPORT_LOCAL_TIME,type); - entity.setSearchStatStartTime(map.get("startTime")); - entity.setSearchStatEndTime(map.get("endTime")); - } - -} diff --git a/src/main/java/com/nis/web/controller/restful/DjJitLogSearchController.java b/src/main/java/com/nis/web/controller/restful/DjJitLogSearchController.java deleted file mode 100644 index 941227e..0000000 --- a/src/main/java/com/nis/web/controller/restful/DjJitLogSearchController.java +++ /dev/null @@ -1,921 +0,0 @@ -package com.nis.web.controller.restful; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.nis.domain.Page; -import com.nis.domain.restful.DjCkStatLog; -import com.nis.domain.restful.DjJitAffairDestReport; -import com.nis.domain.restful.DjJitAffairSrcReport; -import com.nis.domain.restful.DjJitFlDestReport; -import com.nis.domain.restful.DjJitFlSrcReport; -import com.nis.domain.restful.DjJitGuaranteeDestReport; -import com.nis.domain.restful.DjJitGuaranteeSrcReport; -import com.nis.domain.restful.DjJitIdDestReport; -import com.nis.domain.restful.DjJitIdSrcReport; -import com.nis.domain.restful.DjJitMissionDestReport; -import com.nis.domain.restful.DjJitMissionSrcReport; -import com.nis.domain.restful.DjJitTagDestReport; -import com.nis.domain.restful.DjJitTagSrcReport; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.StringUtil; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DjJitLogSearchService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** - * - * @ClassName: DjJitLogSearchController - * @Description: 监测日志实时统计查询服务 - * @author (rkg) - * @date 2016年9月13日上午10:32:21 - * @version V1.0 - */ - -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes" }) -public class DjJitLogSearchController extends BaseRestController { - private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - private final Logger logger1 = Logger.getLogger(this.getClass()); - protected String logSource = "0"; - @Autowired - private DjJitLogSearchService djJitLogSearchService; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - @RequestMapping(value = "/djJitFlSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测分类性质源IP实时统计", httpMethod = "GET", notes = "监测分类性质源IP实时统计列表") - public Map djJitFlSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitFlSrcReport djJitFlSrcReportSources, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page djJitFlSrcReportSourcesPage = null; - try { - // 公共请求参数校验 - djJitLogSearchService.queryDjJitFlCheck(thread, start, djJitFlSrcReportSources.getSearchFl(), - djJitFlSrcReportSources.getSearchXz()); - djJitLogSearchService.queryConditionCheck(thread, start, djJitFlSrcReportSources, DjJitFlSrcReport.class, - page); - djJitFlSrcReportSourcesPage = djJitLogSearchService.findDjJitFlSrcReport( - new Page(request, response, DjJitFlSrcReport.class), djJitFlSrcReportSources); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测分类性质源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测分类性质源IP实时统计检索成功", - djJitFlSrcReportSourcesPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitFlDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测分类性质目的IP实时统计服务", httpMethod = "GET", notes = "监测分类性质目的IP实时统计列表") - public Map djJitFlDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitFlDestReport djJitFlDestReport, HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page reporPage = null; - try { - // 公共请求参数校验 - djJitLogSearchService.queryDjJitFlCheck(thread, start, djJitFlDestReport.getSearchFl(), - djJitFlDestReport.getSearchXz()); - djJitLogSearchService.queryConditionCheck(thread, start, djJitFlDestReport, DjJitFlDestReport.class, page); - reporPage = djJitLogSearchService.findDjJitFlDestReport( - new Page(request, response, DjJitFlDestReport.class), djJitFlDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测分类性质目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测分类性质目的IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitAffairSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测事件子话题源IP实时统计服务", httpMethod = "GET", notes = "监测事件子话题源IP实时统计列表") - public Map djJitAffairSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitAffairSrcReport djJitAffairSrcReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(djJitAffairSrcReport.getSearchAffair())) { - Integer.parseInt(djJitAffairSrcReport.getSearchAffair()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchAffair参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchAffair参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - try { - if (!StringUtil.isBlank(djJitAffairSrcReport.getSearchTopic())) { - Integer.parseInt(djJitAffairSrcReport.getSearchTopic()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchTopic参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchTopic参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitAffairSrcReport, DjJitAffairSrcReport.class, - page); - reporPage = djJitLogSearchService.findDjJitAffairSrcReport( - new Page(request, response, DjJitAffairSrcReport.class), - djJitAffairSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测事件子话题源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测事件子话题源IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitAffairDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测事件子话题目的IP实时统计服务", httpMethod = "GET", notes = "监测事件子话题目的IP实时统计列表") - public Map djJitAffairDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitAffairDestReport djJitAffairDestReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(djJitAffairDestReport.getSearchAffair())) { - Integer.parseInt(djJitAffairDestReport.getSearchAffair()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchAffair参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchAffair参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - try { - if (!StringUtil.isBlank(djJitAffairDestReport.getSearchTopic())) { - Integer.parseInt(djJitAffairDestReport.getSearchTopic()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchTopic参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchTopic参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitAffairDestReport, DjJitAffairDestReport.class, - page); - reporPage = djJitLogSearchService.findDjJitAffairDestReport( - new Page(request, response, DjJitAffairDestReport.class), - djJitAffairDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测事件子话题目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测事件子话题目的IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitMissionSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测任务源IP实时统计服务", httpMethod = "GET", notes = "监测任务源IP实时统计列表") - public Map djJitMissionSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitMissionSrcReport djJitMissionSrcReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(djJitMissionSrcReport.getSearchMission())) { - Integer.parseInt(djJitMissionSrcReport.getSearchMission()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchMission参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchMission参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitMissionSrcReport, DjJitMissionSrcReport.class, - page); - reporPage = djJitLogSearchService.findDjJitMissionSrcReport( - new Page(request, response, DjJitMissionSrcReport.class), - djJitMissionSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测任务源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测任务源IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitMissionDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测任务目的IP实时统计服务", httpMethod = "GET", notes = "监测任务目的IP实时统计列表") - public Map djJitMissionDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitMissionDestReport djJitMissionDestReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(djJitMissionDestReport.getSearchMission())) { - Integer.parseInt(djJitMissionDestReport.getSearchMission()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchMission参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchMission参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitMissionDestReport, - DjJitMissionDestReport.class, page); - reporPage = djJitLogSearchService.findDjJitMissionDestReport( - new Page(request, response, DjJitMissionDestReport.class), - djJitMissionDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测任务目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测任务目的IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitGuaranteeSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测保障期源IP实时统计服务", httpMethod = "GET", notes = "监测保障期源IP实时统计列表") - public Map djJitGuaranteeSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitGuaranteeSrcReport djJitGuaranteeSrcReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(djJitGuaranteeSrcReport.getSearchGuarantee())) { - Integer.parseInt(djJitGuaranteeSrcReport.getSearchGuarantee()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchGuarantee参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchGuarantee参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitGuaranteeSrcReport, - DjJitGuaranteeSrcReport.class, page); - reporPage = djJitLogSearchService.findDjJitGuaranteeSrcReport( - new Page(request, response, DjJitGuaranteeSrcReport.class), - djJitGuaranteeSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测保障期源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测保障期源IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitGuaranteeDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测保障期目的IP实时统计服务", httpMethod = "GET", notes = "监测保障期目的IP实时统计列表") - public Map djJitGuaranteeDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitGuaranteeDestReport djJitGuaranteeDestReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(djJitGuaranteeDestReport.getSearchGuarantee())) { - Integer.parseInt(djJitGuaranteeDestReport.getSearchGuarantee()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchGuarantee参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchGuarantee参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitGuaranteeDestReport, - DjJitGuaranteeDestReport.class, page); - reporPage = djJitLogSearchService.findDjJitGuaranteeDestReport( - new Page(request, response, DjJitGuaranteeDestReport.class), - djJitGuaranteeDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测保障期目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测保障期目的IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitTagSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测标签源IP实时统计服务", httpMethod = "GET", notes = "监测标签源IP实时统计列表") - public Map djJitTagSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitTagSrcReport djJitTagSrcReport, HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - if (null != djJitTagSrcReport.getSearchTag() && !djJitTagSrcReport.getSearchTag().equals("")) { - String[] tagArr = djJitTagSrcReport.getSearchTag().split(","); - List tagList = new ArrayList(); - for (int i = 0; i < tagArr.length; i++) { - if (!tagArr[i].equals("")) { - try { - Integer.parseInt(tagArr[i]); - tagList.add(tagArr[i]); - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, - System.currentTimeMillis() - start, "searchTag参数格式错误", - RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchTag参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - } - } - StringBuffer sb = new StringBuffer(); - for (String str : tagList) { - sb.append(str + ","); - } - String tag = sb.substring(0, sb.length() - 1); - djJitTagSrcReport.setSearchTag(tag); - } - - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitTagSrcReport, DjJitTagSrcReport.class, page); - reporPage = djJitLogSearchService.findDjJitTagSrcReport( - new Page(request, response, DjJitTagSrcReport.class), djJitTagSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测标签源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测标签源IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitTagDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测标签目的IP实时统计服务", httpMethod = "GET", notes = "监测标签目的IP实时统计列表") - public Map djJitTagDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitTagDestReport djJitTagDestReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - if (null != djJitTagDestReport.getSearchTag() && !djJitTagDestReport.getSearchTag().equals("")) { - String[] tagArr = djJitTagDestReport.getSearchTag().split(","); - List tagList = new ArrayList(); - for (int i = 0; i < tagArr.length; i++) { - if (!tagArr[i].equals("")) { - try { - Integer.parseInt(tagArr[i]); - tagList.add(tagArr[i]); - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, - System.currentTimeMillis() - start, "searchTag参数格式错误", - RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchTag参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - } - } - StringBuffer sb = new StringBuffer(); - for (String str : tagList) { - sb.append(str + ","); - } - String tag = sb.substring(0, sb.length() - 1); - djJitTagDestReport.setSearchTag(tag); - } - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitTagDestReport, DjJitTagDestReport.class, - page); - reporPage = djJitLogSearchService.findDjJitTagDestReport( - new Page(request, response, DjJitTagDestReport.class), djJitTagDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测标签目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测标签目的IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitIdSrcReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测规则源IP实时统计服务", httpMethod = "GET", notes = "监测规则源IP实时统计列表") - public Map djJitIdSrcReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitIdSrcReport djJitIdSrcReport, HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(djJitIdSrcReport.getSearchId())) { - Integer.parseInt(djJitIdSrcReport.getSearchId()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchId参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitIdSrcReport, DjJitIdSrcReport.class, page); - reporPage = djJitLogSearchService.findDjJitIdSrcReport( - new Page(request, response, DjJitIdSrcReport.class), djJitIdSrcReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测规则源IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测规则源IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djJitIdDestReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测规则目的IP实时统计服务", httpMethod = "GET", notes = "监测规则目的IP实时统计列表") - public Map djJitIdDestReportSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjJitIdDestReport djJitIdDestReport, HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(djJitIdDestReport.getSearchId())) { - Integer.parseInt(djJitIdDestReport.getSearchId()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchId参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - djJitLogSearchService.queryConditionCheck(thread, start, djJitIdDestReport, DjJitIdDestReport.class, page); - reporPage = djJitLogSearchService.findDjJitIdDestReport( - new Page(request, response, DjJitIdDestReport.class), djJitIdDestReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测规则目的IP实时统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测规则目的IP实时统计检索成功", - reporPage, searchActiveSys, logSource); - } - - @RequestMapping(value = "/djCkStatLogSources", method = RequestMethod.GET) - @ApiOperation(value = "监测日志国际出入口统计服务", httpMethod = "GET", notes = "监测日志国际出入口统计列表") - public Map djCkStatLogSources( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - Page page, DjCkStatLog djCkStatLog, HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - // 公共请求参数校验 - try { - if (!StringUtil.isBlank(djCkStatLog.getSearchCfgId())) { - Long.parseLong(djCkStatLog.getSearchCfgId()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchCfgId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchId参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - try { - if (!StringUtil.isBlank(djCkStatLog.getSearchGjCkId())) { - Long.parseLong(djCkStatLog.getSearchGjCkId()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchGjCkId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchGjCkId参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - try { - if (!StringUtil.isBlank(djCkStatLog.getSearchActiveSys())) { - Integer.parseInt(djCkStatLog.getSearchActiveSys()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchActiveSys参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchGjCkId参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - try { - if (!StringUtil.isBlank(djCkStatLog.getSearchCapStartTime())) { - sdf.parse(djCkStatLog.getSearchCapStartTime()); - } - } catch (ParseException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchCapStartTime参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchCapStartTime参数格式格式"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - try { - if (!StringUtil.isBlank(djCkStatLog.getSearchCapEndTime())) { - sdf.parse(djCkStatLog.getSearchCapEndTime()); - } - } catch (ParseException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchCapEndTime参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchCapEndTime参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - throw ((RestServiceException) e); - } - - try { - if (!StringUtil.isBlank(djCkStatLog.getSearchService())) { - Integer.parseInt(djCkStatLog.getSearchService()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - RestServiceException restError = new RestServiceException(thread, System.currentTimeMillis() - start, - "searchService参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restError.setActiveSys(searchActiveSys); - restError.setLogSource(logSource); - throw restError; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "searchService参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - try { - djJitLogSearchService.checkCloumnIsExist(thread, start, DjCkStatLog.class, page); - } catch (RestServiceException e) { - logger1.error(e); - e.setActiveSys(searchActiveSys); - e.setLogSource(logSource); - throw e; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "请求参数错误"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - Page reporPage = null; - try { - reporPage = djJitLogSearchService - .findDjCkStatLog(new Page(request, response, DjCkStatLog.class), djCkStatLog); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - logger1.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测日志国际出入口统计检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测日志国际出入口统计检索成功", - reporPage, searchActiveSys, logSource); - } - -} diff --git a/src/main/java/com/nis/web/controller/restful/DjMultiDimensionalReportController.java b/src/main/java/com/nis/web/controller/restful/DjMultiDimensionalReportController.java deleted file mode 100644 index 8220f10..0000000 --- a/src/main/java/com/nis/web/controller/restful/DjMultiDimensionalReportController.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.nis.web.controller.restful; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -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.DfReportEntity; -import com.nis.domain.LogEntity; -import com.nis.domain.Page; -import com.nis.domain.restful.DjLwhhAttrReport; -import com.nis.domain.restful.DjLwhhTagReport; -import com.nis.domain.restful.DjSrcIpAttrReport; -import com.nis.domain.restful.DjSrcIpTagReport; -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.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DjMultiDimensionalReportService; -import com.wordnik.swagger.annotations.ApiOperation; - - -/** - * - * @ClassName: DjMultiDimensionalReportController - * @Description: TODO(dj多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午2:53:01 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes" }) -public class DjMultiDimensionalReportController extends BaseRestController { - protected final Logger logger = Logger.getLogger(this.getClass()); - - protected String activeSys = Constants.ACTIVESYS_ALL; - protected String logSource = "0"; - @Autowired - protected DjMultiDimensionalReportService djMultiDimensionalReportService; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - - @RequestMapping(value = "djLwhhAttrReportSources", method = RequestMethod.GET) - @ApiOperation(value = "来文函号、性质多维实时统计", httpMethod = "GET", notes = "get log list") - public Map djServiceReportSources(Page page, DjLwhhAttrReport djLwhhAttrReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page lwhhAttrReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djLwhhAttrReport); - // 校验 - djMultiDimensionalReportService.queryConditionCheck(thread, start, djLwhhAttrReport, DjLwhhAttrReport.class, - page); - // 查询数据库 - lwhhAttrReportPage = djMultiDimensionalReportService.findDjLwhhAttrReportPage( - new Page(request, response, DjLwhhAttrReport.class), djLwhhAttrReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "来文函号、性质多维实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "来文函号、性质多维实时统计成功", - lwhhAttrReportPage, activeSys, logSource); - } - - - - @RequestMapping(value = "djLwhhTagReportSources", method = RequestMethod.GET) - @ApiOperation(value = "来文函号、标签多维实时统计", httpMethod = "GET", notes = "get log list") - public Map djServiceReportSources(Page page, DjLwhhTagReport djLwhhTagReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page lwhhTagReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djLwhhTagReport); - // 校验 - djMultiDimensionalReportService.queryConditionCheck(thread, start, djLwhhTagReport, DjLwhhTagReport.class, - page); - // 查询数据库 - lwhhTagReportPage = djMultiDimensionalReportService.findDjLwhhTagReportPage( - new Page(request, response, DjLwhhTagReport.class), djLwhhTagReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "来文函号、标签多维实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "来文函号、标签多维实时统计成功", - lwhhTagReportPage, activeSys, logSource); - } - - @RequestMapping(value = "djSrcIpAttrReportSources", method = RequestMethod.GET) - @ApiOperation(value = "来文函号、性质多维实时统计", httpMethod = "GET", notes = "get log list") - public Map djServiceReportSources(Page page, DjSrcIpAttrReport djSrcIpAttrReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page srcIpAttrReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djSrcIpAttrReport); - - // 校验 - djMultiDimensionalReportService.queryConditionCheck(thread, start, djSrcIpAttrReport, DjSrcIpAttrReport.class, - page); - // 查询数据库 - srcIpAttrReportPage = djMultiDimensionalReportService.findDjSrcIpAttrReportPage( - new Page(request, response, DjSrcIpAttrReport.class), djSrcIpAttrReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "境内源ip、性质多维实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "境内源ip、性质多维实时统计成功", - srcIpAttrReportPage, activeSys, logSource); - } - - - - @RequestMapping(value = "djSrcIpTagReportSources", method = RequestMethod.GET) - @ApiOperation(value = "来文函号、标签多维实时统计", httpMethod = "GET", notes = "get log list") - public Map djServiceReportSources(Page page, DjSrcIpTagReport djSrcIpTagReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page srcIpTagReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djSrcIpTagReport); - // 校验 - djMultiDimensionalReportService.queryConditionCheck(thread, start, djSrcIpTagReport, DjSrcIpTagReport.class, - page); - // 查询数据库 - srcIpTagReportPage = djMultiDimensionalReportService.findDjSrcIpTagReportPage( - new Page(request, response, DjSrcIpTagReport.class), djSrcIpTagReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "境内源ip、标签多维实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "境内源ip、标签多维实时统计成功", - srcIpTagReportPage, activeSys, logSource); - } - - /** - * - * @Title: resetTime - * @Description: (实时统计默认查询本地一个小时的数据) - * @param @param entity - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public void resetTime(DfReportEntity entity) throws Exception { - Map map = DateUtils.getLocalTime(entity.getSearchReportStartTime(), - entity.getSearchReportEndTime(), Constants.REPORT_LOCAL_TIME,"report"); - entity.setSearchReportStartTime(map.get("startTime")); - entity.setSearchReportEndTime(map.get("endTime")); - } - -} diff --git a/src/main/java/com/nis/web/controller/restful/DjMultiDimensionalStatLogController.java b/src/main/java/com/nis/web/controller/restful/DjMultiDimensionalStatLogController.java deleted file mode 100644 index 0de4b20..0000000 --- a/src/main/java/com/nis/web/controller/restful/DjMultiDimensionalStatLogController.java +++ /dev/null @@ -1,333 +0,0 @@ -/** -* @Title: DjStatLogController.java -* @Package com.nis.web.controller -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 下午1:22:15 -* @version V1.0 -*/ -package com.nis.web.controller.restful; - - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -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.StatLogEntity; -import com.nis.domain.restful.DjLwhhAttrDaily; -import com.nis.domain.restful.DjLwhhAttrMonth; -import com.nis.domain.restful.DjLwhhTagDaily; -import com.nis.domain.restful.DjLwhhTagMonth; -import com.nis.domain.restful.DjSrcIpAttrDaily; -import com.nis.domain.restful.DjSrcIpAttrMonth; -import com.nis.domain.restful.DjSrcIpTagDaily; -import com.nis.domain.restful.DjSrcIpTagMonth; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.DateUtils; -import com.nis.util.redis.RedisDao; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DjMultiDimensionalStatLogService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** -* @ClassName: DjStatLogController -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (ddm) -* @date 2016年9月13日 下午1:22:15 -* @version V1.0 -*/ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes", "unchecked" }) -public class DjMultiDimensionalStatLogController extends BaseRestController{ - protected final Logger logger = Logger.getLogger(this.getClass()); - protected String logSource="0"; - protected String activeSys=Constants.ACTIVESYS_ALL; - - @Autowired - protected DjMultiDimensionalStatLogService djMultiDimensionalStatLogService; - @Autowired - protected RedisDao redisDao; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - - - @RequestMapping(value="djLwhhAttrDailySources", method = RequestMethod.GET) - @ApiOperation(value="监测来文函号-性质多维日报表" , httpMethod = "GET", notes="get log list") - public Map djLwhhAttrDailySources( - Page page,DjLwhhAttrDaily djLwhhAttrDaily, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page djLwhhAttrDailyPage =null; - try { - resetTime(djLwhhAttrDaily, "daily"); - - djMultiDimensionalStatLogService.queryConditionCheck(thread,start,djLwhhAttrDaily, DjLwhhAttrDaily.class, page); - - djLwhhAttrDailyPage = djMultiDimensionalStatLogService.djLwhhAttrDaily(new Page(request, response,DjLwhhAttrDaily.class), djLwhhAttrDaily); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测来文函号-性质多维日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测来文函号-标签多维日报表检索成功",djLwhhAttrDailyPage,activeSys,logSource); - } - @RequestMapping(value="djLwhhAttrMonthSources", method = RequestMethod.GET) - @ApiOperation(value="监测来文函号-性质多维月报表" , httpMethod = "GET", notes="get log list") - public Map djLwhhAttrMonthSources( - Page page,DjLwhhAttrMonth djLwhhAttrMonth, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page djLwhhAttrMonthPage =null; - try { - resetTime(djLwhhAttrMonth, "month"); - - - //查询条件校验 - djMultiDimensionalStatLogService.queryConditionCheck(thread,start,djLwhhAttrMonth, DjLwhhAttrMonth.class, page); - - djLwhhAttrMonthPage = djMultiDimensionalStatLogService.djLwhhAttrMonth(new Page(request, response,DjLwhhAttrMonth.class), djLwhhAttrMonth); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测来文函号-性质多维月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测来文函号-性质多维月报表检索成功",djLwhhAttrMonthPage,activeSys,logSource); - } - - - - @RequestMapping(value="djLwhhTagDailySources", method = RequestMethod.GET) - @ApiOperation(value="监测来文函号-标签多维日报表" , httpMethod = "GET", notes="get log list") - public Map djLwhhTagDailySources( - Page page,DjLwhhTagDaily djLwhhTagDaily, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page djLwhhTagDailyPage =null; - try { - resetTime(djLwhhTagDaily, "daily"); - - djMultiDimensionalStatLogService.queryConditionCheck(thread,start,djLwhhTagDaily, DjLwhhTagDaily.class, page); - - djLwhhTagDailyPage = djMultiDimensionalStatLogService.djLwhhTagDaily(new Page(request, response,DjLwhhTagDaily.class), djLwhhTagDaily); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测来文函号-标签多维日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测来文函号-标签多维日报表检索成功",djLwhhTagDailyPage,activeSys,logSource); - } - @RequestMapping(value="djLwhhTagMonthSources", method = RequestMethod.GET) - @ApiOperation(value="监测来文函号-标签多维月报表" , httpMethod = "GET", notes="get log list") - public Map djLwhhTagMonthSources( - Page page,DjLwhhTagMonth djLwhhTagMonth, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page djLwhhTagMonthPage =null; - try { - resetTime(djLwhhTagMonth, "month"); - - - //查询条件校验 - djMultiDimensionalStatLogService.queryConditionCheck(thread,start,djLwhhTagMonth, DjLwhhTagMonth.class, page); - - djLwhhTagMonthPage = djMultiDimensionalStatLogService.djLwhhTagMonth(new Page(request, response,DjLwhhTagMonth.class), djLwhhTagMonth); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测来文函号-标签多维月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测来文函号-标签多维月报表检索成功",djLwhhTagMonthPage,activeSys,logSource); - } - - - - @RequestMapping(value="djSrcIpAttrDailySources", method = RequestMethod.GET) - @ApiOperation(value="监测省-性质多维日报表" , httpMethod = "GET", notes="get log list") - public Map djSrcIpAttrDailySources( - Page page,DjSrcIpAttrDaily djSrcIpAttrDaily, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page djSrcIpAttrDailyPage =null; - try { - resetTime(djSrcIpAttrDaily, "daily"); - - djMultiDimensionalStatLogService.queryConditionCheck(thread,start,djSrcIpAttrDaily, DjSrcIpAttrDaily.class, page); - - djSrcIpAttrDailyPage = djMultiDimensionalStatLogService.djSrcIpAttrDaily(new Page(request, response,DjSrcIpAttrDaily.class), djSrcIpAttrDaily); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测省-性质多维日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测省-标签多维日报表检索成功",djSrcIpAttrDailyPage,activeSys,logSource); - } - @RequestMapping(value="djSrcIpAttrMonthSources", method = RequestMethod.GET) - @ApiOperation(value="监测省-性质多维月报表" , httpMethod = "GET", notes="get log list") - public Map djSrcIpAttrMonthSources( - Page page,DjSrcIpAttrMonth djSrcIpAttrMonth, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page djSrcIpAttrMonthPage =null; - try { - resetTime(djSrcIpAttrMonth, "month"); - - - //查询条件校验 - djMultiDimensionalStatLogService.queryConditionCheck(thread,start,djSrcIpAttrMonth, DjSrcIpAttrMonth.class, page); - - djSrcIpAttrMonthPage = djMultiDimensionalStatLogService.djSrcIpAttrMonth(new Page(request, response,DjSrcIpAttrMonth.class), djSrcIpAttrMonth); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测省-性质多维月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测省-性质多维月报表检索成功",djSrcIpAttrMonthPage,activeSys,logSource); - } - - - - @RequestMapping(value="djSrcIpTagDailySources", method = RequestMethod.GET) - @ApiOperation(value="监测省-标签多维日报表" , httpMethod = "GET", notes="get log list") - public Map djSrcIpTagDailySources( - Page page,DjSrcIpTagDaily djSrcIpTagDaily, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page djSrcIpTagDailyPage =null; - try { - resetTime(djSrcIpTagDaily, "daily"); - - djMultiDimensionalStatLogService.queryConditionCheck(thread,start,djSrcIpTagDaily, DjSrcIpTagDaily.class, page); - - djSrcIpTagDailyPage = djMultiDimensionalStatLogService.djSrcIpTagDaily(new Page(request, response,DjSrcIpTagDaily.class), djSrcIpTagDaily); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测省-标签多维日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测省-标签多维日报表检索成功",djSrcIpTagDailyPage,activeSys,logSource); - } - @RequestMapping(value="djSrcIpTagMonthSources", method = RequestMethod.GET) - @ApiOperation(value="监测省-标签多维月报表" , httpMethod = "GET", notes="get log list") - public Map djSrcIpTagMonthSources( - Page page,DjSrcIpTagMonth djSrcIpTagMonth, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page djSrcIpTagMonthPage =null; - try { - resetTime(djSrcIpTagMonth, "month"); - - - //查询条件校验 - djMultiDimensionalStatLogService.queryConditionCheck(thread,start,djSrcIpTagMonth, DjSrcIpTagMonth.class, page); - - djSrcIpTagMonthPage = djMultiDimensionalStatLogService.djSrcIpTagMonth(new Page(request, response,DjSrcIpTagMonth.class), djSrcIpTagMonth); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测省-标签多维月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测省-标签多维月报表检索成功",djSrcIpTagMonthPage,activeSys,logSource); - } - - /** - * - * @Title: resetTime - * @Description: (日报表默认查询本地前一天的数据) - * @param @param entity - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public void resetTime(StatLogEntity entity,String type) throws Exception{ - Map map = DateUtils.getLocalTime(entity.getSearchStatStartTime(), - entity.getSearchStatEndTime(), Constants.REPORT_LOCAL_TIME,type); - entity.setSearchStatStartTime(map.get("startTime")); - entity.setSearchStatEndTime(map.get("endTime")); - } - -} diff --git a/src/main/java/com/nis/web/controller/restful/DjReportController.java b/src/main/java/com/nis/web/controller/restful/DjReportController.java deleted file mode 100644 index 0f58af8..0000000 --- a/src/main/java/com/nis/web/controller/restful/DjReportController.java +++ /dev/null @@ -1,487 +0,0 @@ -package com.nis.web.controller.restful; - -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; -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.DfReportEntity; -import com.nis.domain.Page; -import com.nis.domain.restful.DjAttrTypeReport; -import com.nis.domain.restful.DjDestIpCountryReport; -import com.nis.domain.restful.DjEntranceReport; -import com.nis.domain.restful.DjLwhhReport; -import com.nis.domain.restful.DjPzReport; -import com.nis.domain.restful.DjSrcIpDomeSticReport; -import com.nis.domain.restful.DjTagReport; -import com.nis.domain.restful.DjPzReportStat; -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.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DjReportService; -import com.wordnik.swagger.annotations.ApiOperation; - -import net.sf.json.JSONObject; - -/** - * @ClassName: DjReportController - * @Description: 监测日志实时统计查询服务 - * @author (ZBC) - * @date 2016年11月22日下午06:00:00 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes" }) -public class DjReportController extends BaseRestController { - protected final Logger logger = Logger.getLogger(this.getClass()); - - protected String activeSys = Constants.ACTIVESYS_ALL; - protected String logSource = "0"; - - @Autowired - protected DjReportService djReportService; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - @RequestMapping(value = "djPzReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测配置实时统计服务", httpMethod = "GET", notes = "get log list") - public Map djPzReportSources(Page page, DjPzReport djPzReport, HttpServletRequest request, - HttpServletResponse response) { - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page pzReportPage = null; - - try { - //设置本地默认查询时间 - resetTime(djPzReport); - - djReportService.queryConditionCheck(thread, start, djPzReport, DjPzReport.class, page); - // 查询数据库 - pzReportPage = djReportService.findDjPzReportPage(new Page(request, response, DjPzReport.class), - djPzReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测配置实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测配置实时统计成功", - pzReportPage, activeSys, logSource); - } - - /** - * 配置统计【小时】 - * - * @param page - * @param djPzReport - * @param model - * @param request - * @param response - * @return - */ - @RequestMapping(value = "djPzStatSources", method = RequestMethod.GET) - @ApiOperation(value = "监测各配置量统计服务[小时]", httpMethod = "GET", notes = "get log list") - public Map djPzStatSources(Page page, DjPzReportStat djPzReportStat, Model model, HttpServletRequest request, - HttpServletResponse response) { - if (!Constants.ACTIVESYS_A.equals(djPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_C.equals(djPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_AB.equals(djPzReportStat.getSearchStatActiveSys())) { - djPzReportStat.setSearchStatActiveSys(Constants.ACTIVESYS_B); - } - activeSys = djPzReportStat.getSearchStatActiveSys(); - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page pzReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djPzReportStat); - - djReportService.queryConditionCheck(thread, start, djPzReportStat, DjPzReportStat.class, page); - - // 查询数据库 - pzReportPage = djReportService.findDjPzReportStatPage( - new Page(request, response, DjPzReportStat.class), djPzReportStat); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测各配置量统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测各配置量统计成功", - pzReportPage, activeSys, logSource); - } - /** - * 配置统计【分钟】 - * - * @param page - * @param djPzReport - * @param model - * @param request - * @param response - * @return - */ - @RequestMapping(value = "djPzStatMinutesSources", method = RequestMethod.GET) - @ApiOperation(value = "监测各配置量统计服务[分钟]", httpMethod = "GET", notes = "get log list") - public Map djPzStatMinutesSources(Page page, DjPzReportStat djPzReportStat, Model model, HttpServletRequest request, - HttpServletResponse response) { - if (!Constants.ACTIVESYS_A.equals(djPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_C.equals(djPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_AB.equals(djPzReportStat.getSearchStatActiveSys())) { - djPzReportStat.setSearchStatActiveSys(Constants.ACTIVESYS_B); - } - activeSys = djPzReportStat.getSearchStatActiveSys(); - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - - Page pzReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djPzReportStat); - - djReportService.queryConditionCheck(thread, start, djPzReportStat, DjPzReportStat.class, page); - - // 查询数据库 - pzReportPage = djReportService.findDjPzReportStatMinutesPage( - new Page(request, response, DjPzReportStat.class), djPzReportStat); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测各配置量统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测各配置量统计成功", - pzReportPage, activeSys, logSource); - } - - /** - * 配置统计 - * - * @param page - * @param djPzReport - * @param model - * @param request - * @param response - * @return - */ - @RequestMapping(value = "djPzSumStatSources", method = RequestMethod.GET) - @ApiOperation(value = "监测配置总量统计服务", httpMethod = "GET", notes = "get log list") - public Map djPzSumStatSources(Page page, DjPzReportStat djPzReportStat, Model model, HttpServletRequest request, - HttpServletResponse response) { - - if (!Constants.ACTIVESYS_A.equals(djPzReportStat.getSearchStatActiveSys()) - && !Constants.ACTIVESYS_C.equals(djPzReportStat.getSearchStatActiveSys()) - ) { - djPzReportStat.setSearchStatActiveSys(Constants.ACTIVESYS_B); - } - activeSys = djPzReportStat.getSearchStatActiveSys(); - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - JSONObject json = new JSONObject(); - try { - //设置本地默认查询时间 - resetTime(djPzReportStat); - - djReportService.queryConditionCheck(thread, start, djPzReportStat, DjPzReportStat.class, - page); - - // 查询数据库 - Long sum = djReportService.findDjPzReportSumStat( - new Page(request, response, DjPzReportStat.class), djPzReportStat); - if (sum == null) - sum = 0l; - json.put("sum", sum); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测配置总量统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测配置总量统计成功", json, - activeSys, logSource); - } - - @RequestMapping(value = "djPzPrivServiceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测配置（带私有标签）统计服务", httpMethod = "GET", notes = "get log list") - public Map djPzPrivServiceReportSources(Page page, DjPzReport djPzReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page djPzReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djPzReport); - - djReportService.queryConditionCheck(thread, start, djPzReport, DjPzReport.class, page); - // 查询数据库 - djPzReportPage = djReportService - .findDjPzPrivPage(new Page(request, response, DjPzReport.class), djPzReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测配置（带私有标签）统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测配置（带私有标签）统计成功", - djPzReportPage, activeSys, logSource); - } - - - - @RequestMapping(value = "djAttrTypeReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测性质（带私有标签）实时统计", httpMethod = "GET", notes = "get log list") - public Map djAttrTypeReportSources(Page page, DjAttrTypeReport djAttrTypeReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page attrTypeReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djAttrTypeReport); - - djReportService.queryConditionCheck(thread, start, djAttrTypeReport, DjPzReport.class, page); - // 查询数据库 - attrTypeReportPage = djReportService.findAttrTypeReport( - new Page(request, response, DjAttrTypeReport.class), djAttrTypeReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测性质（带私有标签）实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测性质（带私有标签）实时统计成功", - attrTypeReportPage, activeSys, logSource); - } - - @RequestMapping(value = "djSrcIpDomesticPrivServiceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测境内源IP(带私有标签)实时统计", httpMethod = "GET", notes = "get log list") - public Map djSrcIpDomesticPrivServiceReportSources(Page page, DjSrcIpDomeSticReport djSrcIpDomeSticReport, - Model model, HttpServletRequest request, HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page srcIpDomeSticReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djSrcIpDomeSticReport); - - djReportService.queryConditionCheck(thread, start, djSrcIpDomeSticReport, DjSrcIpDomeSticReport.class, - page); - // 查询数据库 - srcIpDomeSticReportPage = djReportService.findSrcIpDomeSticReport( - new Page(request, response, DjSrcIpDomeSticReport.class), - djSrcIpDomeSticReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测境内源IP(带私有标签)实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测境内源IP(带私有标签)实时统计成功", - srcIpDomeSticReportPage, activeSys, logSource); - } - - @RequestMapping(value = "djDestIpCountryPrivServiceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测境内目的IP(带私有标签)实时统计", httpMethod = "GET", notes = "get log list") - public Map djDestIpCountryPrivServiceReportSources(Page page, DjDestIpCountryReport djDestIpCountryReport, - Model model, HttpServletRequest request, HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page djDestIpCountryReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djDestIpCountryReport); - - djReportService.queryConditionCheck(thread, start, djDestIpCountryReport, DjDestIpCountryReport.class, - page); - // 查询数据库 - djDestIpCountryReportPage = djReportService.findDestIpCountryReport( - new Page(request, response, DjDestIpCountryReport.class), - djDestIpCountryReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测境内目的IP(带私有标签)实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测境内目的IP(带私有标签)实时统计成功", - djDestIpCountryReportPage, activeSys, logSource); - } - - @RequestMapping(value = "djEntranceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测局点（带私有标签）实时统计", httpMethod = "GET", notes = "get log list") - public Map djEntranceReportSources(Page page, DjEntranceReport djEntranceReport, Model model, - HttpServletRequest request, HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page djEntranceReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djEntranceReport); - - djReportService.queryConditionCheck(thread, start, djEntranceReport, DjEntranceReport.class, - page); - // 查询数据库 - djEntranceReportPage = djReportService.findDjEntranceReport( - new Page(request, response, DjEntranceReport.class), djEntranceReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测局点（带私有标签）实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测局点（带私有标签）实时统计成功", - djEntranceReportPage, activeSys, logSource); - } - @RequestMapping(value = "djLwhhReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测来文函号（带私有标签）实时统计", httpMethod = "GET", notes = "get log list") - public Map djLwhhReportSources(Page page, DjLwhhReport djLwhhReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page djLwhhReportPage = null; - try { - //设置本地默认查询时间 - resetTime(djLwhhReport); - - djReportService.queryConditionCheck(thread, start, djLwhhReport, DjLwhhReport.class, page); - // 查询数据库 - djLwhhReportPage = djReportService - .findDjLwhhReport(new Page(request, response, DjLwhhReport.class), djLwhhReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测来文函号（带私有标签）实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测来文函号（带私有标签）实时统计成功", - djLwhhReportPage, activeSys, logSource); - } - @RequestMapping(value = "djTagPrivServiceReportSources", method = RequestMethod.GET) - @ApiOperation(value = "监测标签（带私有标签）实时统计", httpMethod = "GET", notes = "get log list") - public Map djTagPrivServiceReportSources(Page page, DjTagReport djTagReport, Model model, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, - null); - Page djTagReportPage = null; - try { - - //设置本地默认查询时间 - resetTime(djTagReport); - - djReportService.queryConditionCheck(thread, start, djTagReport, DjTagReport.class, page); - // 查询数据库 - djTagReportPage = djReportService - .findDjTagReportPage(new Page(request, response, DjTagReport.class), djTagReport); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.debug(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "监测标签（带私有标签）实时统计失败"); - } - ((RestServiceException) e).setLogSource(logSource); - ((RestServiceException) e).setActiveSys(activeSys); - throw ((RestServiceException) e); - - } - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "监测标签（带私有标签）实时统计成功", - djTagReportPage, activeSys, logSource); - } - /** - * - * @Title: resetTime - * @Description: (实时统计默认查询本地一个小时的数据) - * @param @param entity - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public void resetTime(DfReportEntity entity) throws Exception { - Map map = DateUtils.getLocalTime(entity.getSearchReportStartTime(), - entity.getSearchReportEndTime(), Constants.REPORT_LOCAL_TIME,"report"); - entity.setSearchReportStartTime(map.get("startTime")); - entity.setSearchReportEndTime(map.get("endTime")); - } -} diff --git a/src/main/java/com/nis/web/controller/restful/DjStatLogController.java b/src/main/java/com/nis/web/controller/restful/DjStatLogController.java deleted file mode 100644 index 504291f..0000000 --- a/src/main/java/com/nis/web/controller/restful/DjStatLogController.java +++ /dev/null @@ -1,791 +0,0 @@ -/** -* @Title: DjStatLogController.java -* @Package com.nis.web.controller -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 下午1:22:15 -* @version V1.0 -*/ -package com.nis.web.controller.restful; - - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -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.StatLogEntity; -import com.nis.domain.restful.DjAttrStatLogDaily; -import com.nis.domain.restful.DjAttrStatLogMonth; -import com.nis.domain.restful.DjDestIpCounrtyStatLogDaily; -import com.nis.domain.restful.DjDestIpCounrtyStatLogMonth; -import com.nis.domain.restful.DjEntrStatLogDaily; -import com.nis.domain.restful.DjEntrStatLogMonth; -import com.nis.domain.restful.DjLwhhStatLogDaily; -import com.nis.domain.restful.DjLwhhStatLogMonth; -import com.nis.domain.restful.DjSrcIpDomesticStatLogDaily; -import com.nis.domain.restful.DjSrcIpDomesticStatLogMonth; -import com.nis.domain.restful.DjStatLogDaily; -import com.nis.domain.restful.DjStatLogMonth; -import com.nis.domain.restful.DjTagStatLogDaily; -import com.nis.domain.restful.DjTagStatLogMonth; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.DateUtils; -import com.nis.util.JsonMapper; -import com.nis.util.StringUtil; -import com.nis.util.redis.RedisDao; -import com.nis.util.redis.SaveRedisThread; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DjStatLogService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** -* @ClassName: DjStatLogController -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (ddm) -* @date 2016年9月13日 下午1:22:15 -* @version V1.0 -*/ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes", "unchecked" }) -public class DjStatLogController extends BaseRestController{ - protected final Logger logger = Logger.getLogger(this.getClass()); - protected String logSource="0"; - protected String activeSys=Constants.ACTIVESYS_ALL; - - @Autowired - protected DjStatLogService djStatLogService; - @Autowired - protected RedisDao redisDao; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - @RequestMapping(value="djStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="监测日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map djStatLogDailySources( - Page page,DjStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchConfigId())) { - Long.parseLong(dailyLog.getSearchConfigId()); - } - - djStatLogService.queryConditionCheck(thread,start,dailyLog, DjStatLogDaily.class, page); - - dailyLogPage = djStatLogService.djStatLogDaily(new Page(request, response,DjStatLogDaily.class), dailyLog); - - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchConfigId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - @RequestMapping(value="djStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="监测日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map djStatLogMonthSources( - Page page,DjStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchConfigId())) { - Long.parseLong(monthLog.getSearchConfigId()); - } - - //查询条件校验 - djStatLogService.queryConditionCheck(thread,start,monthLog, DjStatLogMonth.class, page); - - monthLogPage = djStatLogService.djStatLogMonth(new Page(request, response,DjStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchConfigId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"监测日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "监测日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - - /** - * 标签日报表 - * - * @Title: djTagStatLogDailySources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djTagStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="标签监测日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map djTagStatLogDailySources( - Page page,DjTagStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - //查询条件校验 - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchTag())) { - Integer.parseInt(dailyLog.getSearchTag()); - } - - djStatLogService.queryConditionCheck(thread,start,dailyLog, DjTagStatLogDaily.class, page); - - dailyLogPage = djStatLogService.djTagStatLogDaily(new Page(request, response,DjTagStatLogDaily.class), dailyLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchTag参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"标签监测日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "标签监测日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * 标签月报表 - * - * @Title: djTagStatLogDailySources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djTagStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="标签监测日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map djTagStatLogMonthSources( - Page page,DjTagStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchTag())) { - Integer.parseInt(monthLog.getSearchTag()); - } - - //查询条件校验 - djStatLogService.queryConditionCheck(thread,start,monthLog, DjTagStatLogMonth.class, page); - - monthLogPage = djStatLogService.djTagStatLogMonth(new Page(request, response,DjTagStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchTag参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"标签监测日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "标签监测日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - - /** - * @Title: djTagStatLogDailySources - * @Description: (性质日报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djAttrStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="性质监测日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map djAttrStatLogDailySources( - Page page,DjAttrStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchAttrType())) { - Integer.parseInt(dailyLog.getSearchAttrType()); - } - - djStatLogService.queryConditionCheck(thread,start,dailyLog, DjAttrStatLogDaily.class, page); - - dailyLogPage = djStatLogService.djAttrStatLogDaily(new Page(request, response,DjAttrStatLogDaily.class), dailyLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchAttrType参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"性质监测日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "性质监测日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * @Title: djAttrStatLogDailySources - * @Description: (性质月报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djAttrStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="性质监测日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map djAttrStatLogMonthSources( - Page page,DjAttrStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchAttrType())) { - Integer.parseInt(monthLog.getSearchAttrType()); - } - - //查询条件校验 - djStatLogService.queryConditionCheck(thread,start,monthLog, DjAttrStatLogMonth.class, page); - - monthLogPage = djStatLogService.djAttrStatLogMonth(new Page(request, response,DjAttrStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchAttrType参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"性质监测日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "性质监测日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - - /** - * @Title: djEntrStatLogDailySources - * @Description: (局点日报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djEntrStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="局点监测日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map djEntrStatLogDailySources( - Page page,DjEntrStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchEntranceId())) { - Integer.parseInt(dailyLog.getSearchEntranceId()); - } - - djStatLogService.queryConditionCheck(thread,start,dailyLog, DjEntrStatLogDaily.class, page); - - dailyLogPage = djStatLogService.djEntrStatLogDaily(new Page(request, response,DjEntrStatLogDaily.class), dailyLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchEntranceId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"局点监测日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "局点监测日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * @Title: djEntrStatLogDailySources - * @Description: (局点月报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djEntrStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="局点监测日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map djEntrStatLogMonthSources( - Page page,DjEntrStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchEntranceId())) { - Integer.parseInt(monthLog.getSearchEntranceId()); - } - //查询条件校验 - djStatLogService.queryConditionCheck(thread,start,monthLog, DjEntrStatLogMonth.class, page); - - monthLogPage = djStatLogService.djEntrStatLogMonth(new Page(request, response,DjEntrStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchEntranceId参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"局点监测日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "局点监测日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - /** - * @Title: djLwhhStatLogDailySources - * @Description: (局点日报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djLwhhStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="来文函号监测日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map djLwhhStatLogDailySources( - Page page,DjLwhhStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - //查询条件校验 - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - if (!StringUtil.isBlank(dailyLog.getSearchLwhh())) { - Integer.parseInt(dailyLog.getSearchLwhh()); - } - - djStatLogService.queryConditionCheck(thread,start,dailyLog, DjLwhhStatLogDaily.class, page); - - dailyLogPage = djStatLogService.djLwhhStatLogDaily(new Page(request, response,DjLwhhStatLogDaily.class), dailyLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchLwhh参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"来文函号监测日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "来文函号监测日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * @Title: djLwhhStatLogDailySources - * @Description: (局点月报表) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djLwhhStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="来文函号监测日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map djLwhhStatLogMonthSources( - Page page,DjLwhhStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - - if (!StringUtil.isBlank(monthLog.getSearchLwhh())) { - Integer.parseInt(monthLog.getSearchLwhh()); - } - //查询条件校验 - djStatLogService.queryConditionCheck(thread,start,monthLog, DjLwhhStatLogMonth.class, page); - - monthLogPage = djStatLogService.djLwhhStatLogMonth(new Page(request, response,DjLwhhStatLogMonth.class), monthLog); - - }catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage() + " " + e.getCause()); - e.printStackTrace(); - logger.error(e); - RestServiceException restE = new RestServiceException(thread, System.currentTimeMillis() - start, - "SearchLwhh参数格式错误", RestBusinessCode.param_formate_error.getValue()); - restE.setActiveSys(activeSys); - restE.setLogSource(logSource); - throw restE; - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"来文函号监测日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "来文函号监测日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - - /** - * 境内源IP日报表 - * - * @Title: djSrcIpDomesticStatLogDailySources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djSrcIpDomesticStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="境内源IP监测日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map djSrcIpDomesticStatLogDailySources( - Page page,DjSrcIpDomesticStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - djStatLogService.queryConditionCheck(thread,start,dailyLog, DjSrcIpDomesticStatLogDaily.class, page); - - dailyLogPage = djStatLogService.djSrcIpDomesticStatLogDaily(new Page(request, response,DjSrcIpDomesticStatLogDaily.class), dailyLog); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"境内源IP监测日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "境内源IP监测日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * 境内源IP月报表 - * - * @Title: djSrcIpDomesticStatLogMonthSources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djSrcIpDomesticStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="境内源IP监测日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map djSrcIpDomesticStatLogMonthSources( - Page page,DjSrcIpDomesticStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - //查询条件校验 - djStatLogService.queryConditionCheck(thread,start,monthLog, DjSrcIpDomesticStatLogMonth.class, page); - - monthLogPage = djStatLogService.djSrcIpDomesticStatLogMonth(new Page(request, response,DjSrcIpDomesticStatLogMonth.class), monthLog); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"境内源IP监测日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "境内源IP监测日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - /** - * 国家目的IP日报表 - * - * @Title: djDestIpCounrtyStatLogDailySources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djDestIpCountryStatLogDailySources", method = RequestMethod.GET) - @ApiOperation(value="国家目的IP监测日志配置日报表" , httpMethod = "GET", notes="get log list") - public Map djDestIpCounrtyStatLogDailySources( - Page page,DjDestIpCounrtyStatLogDaily dailyLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page dailyLogPage =null; - try { - resetTime(dailyLog, "daily"); - - djStatLogService.queryConditionCheck(thread,start,dailyLog, DjDestIpCounrtyStatLogDaily.class, page); - - dailyLogPage = djStatLogService.djDestIpCounrtyStatLogDaily(new Page(request, response,DjDestIpCounrtyStatLogDaily.class), dailyLog); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"国家目的IP监测日志配置日报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "国家目的IP监测日志配置日报表检索成功",dailyLogPage,activeSys,logSource); - } - /** - * 国家目的IP月报表 - * - * @Title: djDestIpCounrtyStatLogMonthSources - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param page - * @param @param dailyLog - * @param @param request - * @param @param response - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @RequestMapping(value="djDestIpCountryStatLogMonthSources", method = RequestMethod.GET) - @ApiOperation(value="国家目的IP监测日志配置月报表" , httpMethod = "GET", notes="get log list") - public Map djDestIpCounrtyStatLogMonthSources( - Page page,DjDestIpCounrtyStatLogMonth monthLog, HttpServletRequest request, HttpServletResponse response) { - - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_GET,request, null); - Page monthLogPage =null; - try { - resetTime(monthLog, "month"); - //查询条件校验 - djStatLogService.queryConditionCheck(thread,start,monthLog, DjDestIpCounrtyStatLogMonth.class, page); - - monthLogPage = djStatLogService.djDestIpCounrtyStatLogMonth(new Page(request, response,DjDestIpCounrtyStatLogMonth.class), monthLog); - - }catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(!(e instanceof RestServiceException)){ - e=new RestServiceException(thread,System.currentTimeMillis()-start,"国家目的IP监测日志配置月报表检索失败"); - } - ((RestServiceException) e).setActiveSys(activeSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - - } - return serviceResponse(thread,System.currentTimeMillis()-start,request, response, "国家目的IP监测日志配置月报表检索成功",monthLogPage,activeSys,logSource); - } - /** - * - * @Title: resetTime - * @Description: (日报表默认查询本地前一天的数据) - * @param @param entity - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public void resetTime(StatLogEntity entity,String type) throws Exception{ - Map map = DateUtils.getLocalTime(entity.getSearchStatStartTime(), - entity.getSearchStatEndTime(), Constants.REPORT_LOCAL_TIME,type); - entity.setSearchStatStartTime(map.get("startTime")); - entity.setSearchStatEndTime(map.get("endTime")); - } - -} diff --git a/src/main/java/com/nis/web/controller/restful/dfDjNestLogController.java b/src/main/java/com/nis/web/controller/restful/dfDjNestLogController.java deleted file mode 100644 index 3e4a519..0000000 --- a/src/main/java/com/nis/web/controller/restful/dfDjNestLogController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.nis.web.controller.restful; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.datanucleus.util.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.nis.domain.Page; -import com.nis.domain.restful.DfDjNestLog; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.JsonMapper; -import com.nis.util.redis.RedisDao; -import com.nis.util.redis.SaveRedisThread; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.DfDjNestLogService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** - * - * @ClassName: dfDjNestLogController - * @Description: 嵌套日志查询服务 - * @author (zbc) - * @date 2016年11月11日 下午4:40:00 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/log/v1") -@SuppressWarnings({ "rawtypes", "unchecked" }) -public class dfDjNestLogController extends BaseRestController { - protected final Logger logger = Logger.getLogger(this.getClass()); - - @Autowired - protected DfDjNestLogService dfDjNestLogService; - @Autowired - protected RedisDao redisDao; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - - protected String logSource = "0"; - - - @RequestMapping(value = "/dfDjNestLogs", method = RequestMethod.GET) - @ApiOperation(value = "嵌套日志分页获取", httpMethod = "GET", notes = "get log list") - public Map dfDjNestLogList( - @RequestParam(value = "searchActiveSys", required = false, defaultValue = Constants.ACTIVESYS_B) String searchActiveSys, - @RequestParam(value = "searchLayerId", required = true) String searchLayerId, - Page page, DfDjNestLog dfDjNestLog, HttpServletRequest request, HttpServletResponse response) { - - if(!Constants.ACTIVESYS_A.equals(searchActiveSys) && !Constants.ACTIVESYS_C.equals(searchActiveSys))searchActiveSys=Constants.ACTIVESYS_B; - if(StringUtils.notEmpty(searchLayerId)) { - dfDjNestLog.setSearchLayerId(searchLayerId); - } - - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, null); - boolean keyExists = false; - String key = ""; - Page dfDjNestLogPage = null; - - try { - // 请求参数校验 - dfDjNestLogService.queryConditionCheck(thread, start, dfDjNestLog, DfDjNestLog.class, page); - - if (Constants.IS_OPEN_REDIS) { - // 根据查询条件获取key - key = dfDjNestLogService.getJedisKey(request, true); - // 判断key是否存在 - keyExists = redisDao.exists(key); - } - // 存在则直接从redis中查询 - if (keyExists) { - dfDjNestLogPage = (Page) JsonMapper.fromJsonString(redisDao.getString(key), Page.class); - } else { - // 不存在则查询数据库并保存查询结果到redis中 - dfDjNestLogPage = dfDjNestLogService - .findDfDjNestLogPage(new Page(request, response, DfDjNestLog.class), dfDjNestLog); - - if (Constants.IS_OPEN_REDIS) - new SaveRedisThread(key, dfDjNestLogPage, Constants.ORACLE_EXPIRE).start(); - } - - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if (!(e instanceof RestServiceException)) { - e = new RestServiceException(thread, System.currentTimeMillis() - start, "嵌套日志检索失败"); - } - ((RestServiceException) e).setActiveSys(searchActiveSys); - ((RestServiceException) e).setLogSource(logSource); - throw ((RestServiceException) e); - } - - return serviceResponse(thread, System.currentTimeMillis() - start, request, response, "嵌套日志检索成功", - dfDjNestLogPage, searchActiveSys, logSource); - } -} diff --git a/src/main/java/com/nis/web/dao/DfDjLogStatDao.java b/src/main/java/com/nis/web/dao/DfDjLogStatDao.java deleted file mode 100644 index 12574d5..0000000 --- a/src/main/java/com/nis/web/dao/DfDjLogStatDao.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.restful.DfDjLogStatistics; -import com.nis.domain.restful.DfDjPzLogStatistics; - -/** - * @ClassName: DfDjLogStatDao - * @Description: TODO(这里用一句话描述这个类的作用) - * @author (zbc) - * @date 2016年11月14日 下午4:00:00 - * @version V1.0 - */ -@MyBatisDao -public interface DfDjLogStatDao { - - List findDfLogStatistics(DfDjLogStatistics entity); - - List findDfPzLogStatistics(DfDjPzLogStatistics entity); - - List findDjLogStatistics(DfDjLogStatistics entity); - - List findDjPzLogStatistics(DfDjPzLogStatistics entity); -} diff --git a/src/main/java/com/nis/web/dao/DfDjLogStatDao.xml b/src/main/java/com/nis/web/dao/DfDjLogStatDao.xml deleted file mode 100644 index c10f533..0000000 --- a/src/main/java/com/nis/web/dao/DfDjLogStatDao.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - SUM - - - - - - - - - - - - CONFIG_ID, SERVICE, STAT_TIME, SUM - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfDjNestLogDao.java b/src/main/java/com/nis/web/dao/DfDjNestLogDao.java deleted file mode 100644 index 4afb18b..0000000 --- a/src/main/java/com/nis/web/dao/DfDjNestLogDao.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.nis.web.dao; - -import java.io.Serializable; -import java.util.List; - -import com.nis.domain.restful.DfDjNestLog; - -@MyBatisDao -public interface DfDjNestLogDao extends CrudDao { - - List findDfDjNestLogPage(DfDjNestLog entity); - -} diff --git a/src/main/java/com/nis/web/dao/DfDjNestLogDao.xml b/src/main/java/com/nis/web/dao/DfDjNestLogDao.xml deleted file mode 100644 index 4414e7b..0000000 --- a/src/main/java/com/nis/web/dao/DfDjNestLogDao.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - LAYER_ID,FOUND_TIME,RECV_TIME,LAYER_CNT,NEST_PROTOCOL,NEST_SERVER_IP, - NEST_CLIENT_IP,NEST_SERVER_PORT,NEST_CLIENT_PORT,OVER_ID - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfJitLogSearchDao.java b/src/main/java/com/nis/web/dao/DfJitLogSearchDao.java deleted file mode 100644 index fef2afb..0000000 --- a/src/main/java/com/nis/web/dao/DfJitLogSearchDao.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.restful.DfJitAffairDestReport; -import com.nis.domain.restful.DfJitAffairSrcReport; -import com.nis.domain.restful.DfJitFlDestReport; -import com.nis.domain.restful.DfJitFlSrcReport; -import com.nis.domain.restful.DfJitGuaranteeDestReport; -import com.nis.domain.restful.DfJitGuaranteeSrcReport; -import com.nis.domain.restful.DfJitIdDestReport; -import com.nis.domain.restful.DfJitIdSrcReport; -import com.nis.domain.restful.DfJitMissionDestReport; -import com.nis.domain.restful.DfJitMissionSrcReport; -import com.nis.domain.restful.DfJitTagDestReport; -import com.nis.domain.restful.DfJitTagSrcReport; - -@MyBatisDao -public interface DfJitLogSearchDao { - - List findDfJitFlSrcReport(DfJitFlSrcReport dfJitFlSrcReportSources); - - List findDfJitFlDestReport(DfJitFlDestReport dfJitFlDestReport); - - List findDfJitAffairSrcReport(DfJitAffairSrcReport dfJitAffairSrcReport); - - List findDfJitAffairDestReport(DfJitAffairDestReport dfJitAffairDestReport); - - List findDfJitMissionSrcReport(DfJitMissionSrcReport dfJitMissionSrcReport); - - List findDfJitMissionDestReport(DfJitMissionDestReport dfJitMissionDestReport); - - List findDfJitGuaranteeSrcReport(DfJitGuaranteeSrcReport dfJitGuaranteeSrcReport); - - List findDfJitGuaranteeDestReport(DfJitGuaranteeDestReport dfJitGuaranteeDestReport); - - List findDfJitTagSrcReport(DfJitTagSrcReport dfJitTagSrcReport); - - List findDfJitTagDestReport(DfJitTagDestReport dfJitTagDestReport); - - List findDfJitIdSrcReport(DfJitIdSrcReport dfJitIdSrcReport); - - List findDfJitIdDestReport(DfJitIdDestReport dfJitIdDestReport); - -} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfJitLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfJitLogSearchDao.xml deleted file mode 100644 index 1bfd9f9..0000000 --- a/src/main/java/com/nis/web/dao/DfJitLogSearchDao.xml +++ /dev/null @@ -1,692 +0,0 @@ - - - - - - - - - - - - - - - - STAT_ID, FL, XZ, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, FL, XZ, REPORT_TIME, DEST_COUNTRY, DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - STAT_ID, Affair,topic, REPORT_TIME, SRC_COUNTRY, - SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, Affair,topic, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - STAT_ID, mission, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, mission, REPORT_TIME, DEST_COUNTRY, DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, guarantee, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, guarantee, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, tag, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, tag, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, id, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, id, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.java b/src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.java deleted file mode 100644 index 98872c2..0000000 --- a/src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.DfReportEntity; -import com.nis.domain.restful.DfAttrTypeReport; -import com.nis.domain.restful.DfDestIpCountryReport; -import com.nis.domain.restful.DfDestIpReport; -import com.nis.domain.restful.DfEntranceReport; -import com.nis.domain.restful.DfLwhhAttrReport; -import com.nis.domain.restful.DfLwhhReport; -import com.nis.domain.restful.DfLwhhTagReport; -import com.nis.domain.restful.DfPzReport; -import com.nis.domain.restful.DfPzReportStat; -import com.nis.domain.restful.DfServiceReport; -import com.nis.domain.restful.DfSrcIpAttrReport; -import com.nis.domain.restful.DfSrcIpDomeSticReport; -import com.nis.domain.restful.DfSrcIpReport; -import com.nis.domain.restful.DfSrcIpTagReport; -import com.nis.domain.restful.DfTagReport; - -/** - * - * @ClassName: DfMultiDimensionnalReportDao - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2017年8月4日下午4:46:31 - * @version V1.0 - */ -@MyBatisDao -public interface DfMultiDimensionalReportDao extends CrudDao { - - List findDfLwhhAttrReport(DfLwhhAttrReport pz); - - List findDfLwhhTagReportPage(DfLwhhTagReport pz); - - List findDfSrcIpAttrReportPage(DfSrcIpAttrReport pz); - - List findDfSrcIpTagReportPage(DfSrcIpTagReport pz); - - - -} diff --git a/src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.xml b/src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.xml deleted file mode 100644 index 44cab96..0000000 --- a/src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - ASUM,BSUM,REPORT_TIME,SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.java b/src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.java deleted file mode 100644 index fd685c3..0000000 --- a/src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.LogEntity; -import com.nis.domain.restful.DfLwhhAttrDaily; -import com.nis.domain.restful.DfLwhhAttrMonth; -import com.nis.domain.restful.DfLwhhTagDaily; -import com.nis.domain.restful.DfLwhhTagMonth; -import com.nis.domain.restful.DfSrcIpAttrDaily; -import com.nis.domain.restful.DfSrcIpAttrMonth; -import com.nis.domain.restful.DfSrcIpTagDaily; -import com.nis.domain.restful.DfSrcIpTagMonth; - -/** - * - * @ClassName: DfMultiDimensionnalReportDao - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2017年8月4日下午4:46:31 - * @version V1.0 - */ -@MyBatisDao -public interface DfMultiDimensionalStatLogDao extends CrudDao { - - List dfLwhhAttrDaily(DfLwhhAttrDaily pz); - List dfLwhhAttrMonth(DfLwhhAttrMonth pz); - - List dfLwhhTagDaily(DfLwhhTagDaily pz); - List dfLwhhTagMonth(DfLwhhTagMonth pz); - - List dfSrcIpAttrDaily(DfSrcIpAttrDaily pz); - List dfSrcIpAttrMonth(DfSrcIpAttrMonth pz); - - List dfSrcIpTagDaily(DfSrcIpTagDaily pz); - List dfSrcIpTagMonth(DfSrcIpTagMonth pz); - - - -} diff --git a/src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.xml b/src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.xml deleted file mode 100644 index 48e4f76..0000000 --- a/src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.xml +++ /dev/null @@ -1,475 +0,0 @@ - - - - - - ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfReportDao.java b/src/main/java/com/nis/web/dao/DfReportDao.java deleted file mode 100644 index 4255c71..0000000 --- a/src/main/java/com/nis/web/dao/DfReportDao.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.DfReportEntity; -import com.nis.domain.restful.DfAttrTypeReport; -import com.nis.domain.restful.DfDestIpCountryReport; -import com.nis.domain.restful.DfDestIpReport; -import com.nis.domain.restful.DfEntranceReport; -import com.nis.domain.restful.DfLwhhReport; -import com.nis.domain.restful.DfPzReport; -import com.nis.domain.restful.DfPzReportStat; -import com.nis.domain.restful.DfServiceReport; -import com.nis.domain.restful.DfSrcIpDomeSticReport; -import com.nis.domain.restful.DfSrcIpReport; -import com.nis.domain.restful.DfTagReport; - -/** - * - * @ClassName: DfReportDao - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2016年10月31日上午11:51:26 - * @version V1.0 - */ -@MyBatisDao -public interface DfReportDao extends CrudDao { - List findDfPzReport(DfPzReport pz); - - List findAttrTypeReport(DfAttrTypeReport pz); - - List findSrcIpDomeSticReport(DfSrcIpDomeSticReport pz); - - List findDestIpCountryReport(DfDestIpCountryReport pz); - - List findDfEntranceReport(DfEntranceReport pz); - - List findDfLwhhReport(DfLwhhReport pz); - - List findDfTagReportPage(DfTagReport pz); - - List findDfPriTagReport(DfPzReport pz); - - List findDfPzReportStat(DfPzReportStat pz); - - List findDfPzReportStatMinutes(DfPzReportStat pz); - - Long findDfPzReportSum(DfPzReportStat pz); - - List findDfSrcIpReport(DfSrcIpReport entity); - - List findDfDestIpReport(DfDestIpReport entity); - - List findDfServiceReport(DfServiceReport pz); - - List findDfTagReport(DfTagReport pz); - -} diff --git a/src/main/java/com/nis/web/dao/DfReportDao.xml b/src/main/java/com/nis/web/dao/DfReportDao.xml deleted file mode 100644 index ded34fa..0000000 --- a/src/main/java/com/nis/web/dao/DfReportDao.xml +++ /dev/null @@ -1,824 +0,0 @@ - - - - - - ASUM,BSUM,REPORT_TIME - - - ASUM,BSUM,ABSUM,REPORT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,CFG_ID,SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,service - - - - - - - - - - - - - ,tag - - - - - - - - - - - - - - - - - - - - - - - - - ,SRC_PROVINCE,SRC_CITY - - - - - - - - - - - - - - ,DEST_COUNTRY - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfStatLogDao.java b/src/main/java/com/nis/web/dao/DfStatLogDao.java deleted file mode 100644 index 22ab09a..0000000 --- a/src/main/java/com/nis/web/dao/DfStatLogDao.java +++ /dev/null @@ -1,54 +0,0 @@ -/** -* @Title: DfStatLogDao.java -* @Package com.nis.web.dao -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:21:31 -* @version V1.0 -*/ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.LogEntity; -import com.nis.domain.restful.DfAttrStatLogDaily; -import com.nis.domain.restful.DfAttrStatLogMonth; -import com.nis.domain.restful.DfDestIpCounrtyStatLogDaily; -import com.nis.domain.restful.DfDestIpCounrtyStatLogMonth; -import com.nis.domain.restful.DfEntrStatLogDaily; -import com.nis.domain.restful.DfEntrStatLogMonth; -import com.nis.domain.restful.DfLwhhStatLogDaily; -import com.nis.domain.restful.DfLwhhStatLogMonth; -import com.nis.domain.restful.DfSrcIpDomesticStatLogDaily; -import com.nis.domain.restful.DfSrcIpDomesticStatLogMonth; -import com.nis.domain.restful.DfStatLogDaily; -import com.nis.domain.restful.DfStatLogMonth; -import com.nis.domain.restful.DfTagStatLogDaily; -import com.nis.domain.restful.DfTagStatLogMonth; - -/** -* @ClassName: DfStatLogDao -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (ddm) -* @date 2016年9月13日 上午11:21:31 -* @version V1.0 -*/ -@MyBatisDao -public interface DfStatLogDao extends CrudDao { - - List dfStatLogDaily(DfStatLogDaily daily); - List dfStatLogMonth(DfStatLogMonth mongth); - List dfTagStatLogDaily(DfTagStatLogDaily daily); - List dfTagStatLogMonth(DfTagStatLogMonth mongth); - List dfAttrStatLogDaily(DfAttrStatLogDaily daily); - List dfAttrStatLogMonth(DfAttrStatLogMonth mongth); - List dfEntrStatLogDaily(DfEntrStatLogDaily daily); - List dfEntrStatLogMonth(DfEntrStatLogMonth mongth); - List dfLwhhStatLogDaily(DfLwhhStatLogDaily daily); - List dfLwhhStatLogMonth(DfLwhhStatLogMonth mongth); - List dfSrcIpDomesticStatLogDaily(DfSrcIpDomesticStatLogDaily daily); - List dfSrcIpDomesticStatLogMonth(DfSrcIpDomesticStatLogMonth mongth); - List dfDestIpCounrtyStatLogDaily(DfDestIpCounrtyStatLogDaily daily); - List dfDestIpCounrtyStatLogMonth(DfDestIpCounrtyStatLogMonth mongth); - -} diff --git a/src/main/java/com/nis/web/dao/DfStatLogDao.xml b/src/main/java/com/nis/web/dao/DfStatLogDao.xml deleted file mode 100644 index 852a1e6..0000000 --- a/src/main/java/com/nis/web/dao/DfStatLogDao.xml +++ /dev/null @@ -1,857 +0,0 @@ - - - - - - CONFIG_ID,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - TAG,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - attr_type,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - ENTRANCE_ID,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - lwhh,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - SRC_PROVINCE,SRC_CITY,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEST_COUNTRY,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjJitLogSearchDao.java b/src/main/java/com/nis/web/dao/DjJitLogSearchDao.java deleted file mode 100644 index 705a277..0000000 --- a/src/main/java/com/nis/web/dao/DjJitLogSearchDao.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.restful.DjCkStatLog; -import com.nis.domain.restful.DjJitAffairDestReport; -import com.nis.domain.restful.DjJitAffairSrcReport; -import com.nis.domain.restful.DjJitFlDestReport; -import com.nis.domain.restful.DjJitFlSrcReport; -import com.nis.domain.restful.DjJitGuaranteeDestReport; -import com.nis.domain.restful.DjJitGuaranteeSrcReport; -import com.nis.domain.restful.DjJitIdDestReport; -import com.nis.domain.restful.DjJitIdSrcReport; -import com.nis.domain.restful.DjJitMissionDestReport; -import com.nis.domain.restful.DjJitMissionSrcReport; -import com.nis.domain.restful.DjJitTagDestReport; -import com.nis.domain.restful.DjJitTagSrcReport; - -@MyBatisDao -public interface DjJitLogSearchDao { - - List findDjJitFlSrcReport(DjJitFlSrcReport djJitFlSrcReportSources); - - List findDjJitFlDestReport(DjJitFlDestReport djJitFlDestReport); - - List findDjJitAffairSrcReport(DjJitAffairSrcReport djJitAffairSrcReport); - - List findDjJitAffairDestReport(DjJitAffairDestReport djJitAffairDestReport); - - List findDjJitMissionSrcReport(DjJitMissionSrcReport djJitMissionSrcReport); - - List findDjJitMissionDestReport(DjJitMissionDestReport djJitMissionDestReport); - - List findDjJitGuaranteeSrcReport(DjJitGuaranteeSrcReport djJitGuaranteeSrcReport); - - List findDjJitGuaranteeDestReport(DjJitGuaranteeDestReport djJitGuaranteeDestReport); - - List findDjJitTagSrcReport(DjJitTagSrcReport djJitTagSrcReport); - - List findDjJitTagDestReport(DjJitTagDestReport djJitTagDestReport); - - List findDjJitIdSrcReport(DjJitIdSrcReport djJitIdSrcReport); - - List findDjJitIdDestReport(DjJitIdDestReport djJitIdDestReport); - - List findDjCkStatLog(DjCkStatLog djCkStatLog); - -} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjJitLogSearchDao.xml b/src/main/java/com/nis/web/dao/DjJitLogSearchDao.xml deleted file mode 100644 index a17b950..0000000 --- a/src/main/java/com/nis/web/dao/DjJitLogSearchDao.xml +++ /dev/null @@ -1,776 +0,0 @@ - - - - - - - - - - - - - - - - STAT_ID, FL, XZ, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, FL, XZ, REPORT_TIME, DEST_COUNTRY, DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - STAT_ID, Affair,topic, REPORT_TIME, SRC_COUNTRY, - SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, Affair,topic, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - STAT_ID, mission, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, mission, REPORT_TIME, DEST_COUNTRY, DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, guarantee, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, guarantee, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, tag, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, tag, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, id, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, id, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, CONFIG_ID, SERVICE, GJ_CK_ID,SUM,CAP_TIME,active_sys - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.java b/src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.java deleted file mode 100644 index ba4b425..0000000 --- a/src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.DfReportEntity; -import com.nis.domain.restful.DjLwhhAttrReport; -import com.nis.domain.restful.DjLwhhTagReport; -import com.nis.domain.restful.DjSrcIpAttrReport; -import com.nis.domain.restful.DjSrcIpTagReport; - -/** - * - * @ClassName: DjMultiDimensionnalReportDao - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2017年8月4日下午4:46:31 - * @version V1.0 - */ -@MyBatisDao -public interface DjMultiDimensionalReportDao extends CrudDao { - - List findDjLwhhAttrReport(DjLwhhAttrReport pz); - - List findDjLwhhTagReportPage(DjLwhhTagReport pz); - - List findDjSrcIpAttrReportPage(DjSrcIpAttrReport pz); - - List findDjSrcIpTagReportPage(DjSrcIpTagReport pz); - - - -} diff --git a/src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.xml b/src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.xml deleted file mode 100644 index 6924c3c..0000000 --- a/src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - ASUM,BSUM,REPORT_TIME,SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.java b/src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.java deleted file mode 100644 index 361e1f8..0000000 --- a/src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.LogEntity; -import com.nis.domain.restful.DjLwhhAttrDaily; -import com.nis.domain.restful.DjLwhhAttrMonth; -import com.nis.domain.restful.DjLwhhTagDaily; -import com.nis.domain.restful.DjLwhhTagMonth; -import com.nis.domain.restful.DjSrcIpAttrDaily; -import com.nis.domain.restful.DjSrcIpAttrMonth; -import com.nis.domain.restful.DjSrcIpTagDaily; -import com.nis.domain.restful.DjSrcIpTagMonth; - -/** - * - * @ClassName: DjMultiDimensionnalReportDao - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2017年8月4日下午4:46:31 - * @version V1.0 - */ -@MyBatisDao -public interface DjMultiDimensionalStatLogDao extends CrudDao { - - List djLwhhAttrDaily(DjLwhhAttrDaily pz); - List djLwhhAttrMonth(DjLwhhAttrMonth pz); - - List djLwhhTagDaily(DjLwhhTagDaily pz); - List djLwhhTagMonth(DjLwhhTagMonth pz); - - List djSrcIpAttrDaily(DjSrcIpAttrDaily pz); - List djSrcIpAttrMonth(DjSrcIpAttrMonth pz); - - List djSrcIpTagDaily(DjSrcIpTagDaily pz); - List djSrcIpTagMonth(DjSrcIpTagMonth pz); - - - -} diff --git a/src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.xml b/src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.xml deleted file mode 100644 index d99b30d..0000000 --- a/src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.xml +++ /dev/null @@ -1,475 +0,0 @@ - - - - - - ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjReportDao.java b/src/main/java/com/nis/web/dao/DjReportDao.java deleted file mode 100644 index 4d4f2ee..0000000 --- a/src/main/java/com/nis/web/dao/DjReportDao.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.DfReportEntity; -import com.nis.domain.restful.DjPzReportStat; -import com.nis.domain.restful.DjAttrTypeReport; -import com.nis.domain.restful.DjDestIpCountryReport; -import com.nis.domain.restful.DjEntranceReport; -import com.nis.domain.restful.DjLwhhReport; -import com.nis.domain.restful.DjSrcIpDomeSticReport; -import com.nis.domain.restful.DjTagReport; -import com.nis.domain.restful.DjPzReport; - -/** - * @ClassName: DjReportDao - * @Description: TODO(一句话描述这个类) - * @author (ZBC) - * @date 2016年11月22日下午06:00:00 - * @version V1.0 - */ -@SuppressWarnings("rawtypes") -@MyBatisDao -public interface DjReportDao extends CrudDao { - - List findDjPzReport(DjPzReport entity); - - List findDjPzPrivPage(DjPzReport entity); - - List findDjPzReportStat(DjPzReportStat pz); - List findDjPzReportStatMinutes(DjPzReportStat pz); - - // List findDjPzPrivPage(DjPzReport pz); - - Long findDjPzReportSum(DjPzReportStat pz); - - - List findAttrTypeReport(DjAttrTypeReport pz); - - List findSrcIpDomeSticReport(DjSrcIpDomeSticReport pz); - - List findDestIpCountryReport(DjDestIpCountryReport pz); - - List findDjEntranceReport(DjEntranceReport pz); - - List findDjLwhhReport(DjLwhhReport pz); - - List findDjTagReportPage(DjTagReport pz); -} diff --git a/src/main/java/com/nis/web/dao/DjReportDao.xml b/src/main/java/com/nis/web/dao/DjReportDao.xml deleted file mode 100644 index 760188c..0000000 --- a/src/main/java/com/nis/web/dao/DjReportDao.xml +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - ASUM,BSUM,CSUM,REPORT_TIME - - - - - - - - - - - - - - - - - - - - ,CFG_ID,SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,tag - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjStatLogDao.java b/src/main/java/com/nis/web/dao/DjStatLogDao.java deleted file mode 100644 index 9694f67..0000000 --- a/src/main/java/com/nis/web/dao/DjStatLogDao.java +++ /dev/null @@ -1,54 +0,0 @@ -/** -* @Title: DjStatLogDao.java -* @Package com.nis.web.dao -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:21:31 -* @version V1.0 -*/ -package com.nis.web.dao; - -import java.util.List; - -import com.nis.domain.LogEntity; -import com.nis.domain.restful.DjAttrStatLogDaily; -import com.nis.domain.restful.DjAttrStatLogMonth; -import com.nis.domain.restful.DjDestIpCounrtyStatLogDaily; -import com.nis.domain.restful.DjDestIpCounrtyStatLogMonth; -import com.nis.domain.restful.DjEntrStatLogDaily; -import com.nis.domain.restful.DjEntrStatLogMonth; -import com.nis.domain.restful.DjLwhhStatLogDaily; -import com.nis.domain.restful.DjLwhhStatLogMonth; -import com.nis.domain.restful.DjSrcIpDomesticStatLogDaily; -import com.nis.domain.restful.DjSrcIpDomesticStatLogMonth; -import com.nis.domain.restful.DjStatLogDaily; -import com.nis.domain.restful.DjStatLogMonth; -import com.nis.domain.restful.DjTagStatLogDaily; -import com.nis.domain.restful.DjTagStatLogMonth; - -/** -* @ClassName: DjStatLogDao -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (ddm) -* @date 2016年9月13日 上午11:21:31 -* @version V1.0 -*/ -@MyBatisDao -public interface DjStatLogDao extends CrudDao { - - List djStatLogDaily(DjStatLogDaily daily); - List djStatLogMonth(DjStatLogMonth mongth); - List djTagStatLogDaily(DjTagStatLogDaily daily); - List djTagStatLogMonth(DjTagStatLogMonth mongth); - List djAttrStatLogDaily(DjAttrStatLogDaily daily); - List djAttrStatLogMonth(DjAttrStatLogMonth mongth); - List djEntrStatLogDaily(DjEntrStatLogDaily daily); - List djEntrStatLogMonth(DjEntrStatLogMonth mongth); - List djLwhhStatLogDaily(DjLwhhStatLogDaily daily); - List djLwhhStatLogMonth(DjLwhhStatLogMonth mongth); - List djSrcIpDomesticStatLogDaily(DjSrcIpDomesticStatLogDaily daily); - List djSrcIpDomesticStatLogMonth(DjSrcIpDomesticStatLogMonth mongth); - List djDestIpCounrtyStatLogDaily(DjDestIpCounrtyStatLogDaily daily); - List djDestIpCounrtyStatLogMonth(DjDestIpCounrtyStatLogMonth mongth); - -} diff --git a/src/main/java/com/nis/web/dao/DjStatLogDao.xml b/src/main/java/com/nis/web/dao/DjStatLogDao.xml deleted file mode 100644 index 6ec93aa..0000000 --- a/src/main/java/com/nis/web/dao/DjStatLogDao.xml +++ /dev/null @@ -1,858 +0,0 @@ - - - - - - CONFIG_ID,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - TAG,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - attr_type,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - ENTRANCE_ID,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - lwhh,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - SRC_PROVINCE,SRC_CITY,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEST_COUNTRY,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java index 78f06ab..e5de816 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -1742,7 +1742,9 @@ public class ConfigSourcesService extends BaseService { if (null != compileList && compileList.size() > 0) { for (ConfigCompile config : compileList) { String msg = checkCompileOptForUpdate(config); - + if (config.getOpTime()==null) { + config.setOpTime(opTime); + } if (!msg.equals("ok")) { thread.setExceptionInfo(msg + sb.toString()); throw new RestServiceException(thread, System.currentTimeMillis() - start, msg + sb.toString(), diff --git a/src/main/java/com/nis/web/service/restful/DfDjNestLogService.java b/src/main/java/com/nis/web/service/restful/DfDjNestLogService.java deleted file mode 100644 index e70cef5..0000000 --- a/src/main/java/com/nis/web/service/restful/DfDjNestLogService.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.nis.web.service.restful; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DfDjNestLog; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.StringUtil; -import com.nis.web.dao.DfDjNestLogDao; -import com.nis.web.service.BaseLogService; -import com.nis.web.service.SaveRequestLogThread; - -/** - * @ClassName: DfDjNestLogService - * @Description: TODO(这里用一句话描述这个类的作用) - * @author (zbc) - * @date 2016年11月11日 下午4:40:00 - * @version V1.0 - */ -@Service -public class DfDjNestLogService extends BaseLogService { - protected final Logger logger = Logger.getLogger(this.getClass()); - - @Autowired - protected DfDjNestLogDao dao; - - - public Page findDfDjNestLogPage(Page page, DfDjNestLog entity) { - entity.setPage(page); - page.setList(dao.findDfDjNestLogPage(entity)); - return page; - } - - public void queryConditionCheck(SaveRequestLogThread thread, long start, DfDjNestLog entity, Class clazz, Page page) { - - if(StringUtil.isBlank(entity.getSearchLayerId())) { - throw new RestServiceException(thread, System.currentTimeMillis() - start, "searchLayerId查询参数不能为空", - RestBusinessCode.missing_args.getValue()); - } - - try { - checkCloumnIsExist(thread,start,clazz, page); - } catch (RestServiceException e) { - logger.error(e); - throw e; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger.error(e); - throw new RestServiceException(thread, System.currentTimeMillis() - start, "请求参数错误"); - } - - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DfJitLogSearchService.java b/src/main/java/com/nis/web/service/restful/DfJitLogSearchService.java deleted file mode 100644 index dc8059f..0000000 --- a/src/main/java/com/nis/web/service/restful/DfJitLogSearchService.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.nis.web.service.restful; - -import java.sql.SQLException; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DfJitAffairDestReport; -import com.nis.domain.restful.DfJitAffairSrcReport; -import com.nis.domain.restful.DfJitFlDestReport; -import com.nis.domain.restful.DfJitFlSrcReport; -import com.nis.domain.restful.DfJitGuaranteeDestReport; -import com.nis.domain.restful.DfJitGuaranteeSrcReport; -import com.nis.domain.restful.DfJitIdDestReport; -import com.nis.domain.restful.DfJitIdSrcReport; -import com.nis.domain.restful.DfJitMissionDestReport; -import com.nis.domain.restful.DfJitMissionSrcReport; -import com.nis.domain.restful.DfJitTagDestReport; -import com.nis.domain.restful.DfJitTagSrcReport; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.StringUtil; -import com.nis.web.dao.DfJitLogSearchDao; -import com.nis.web.service.BaseLogService; -import com.nis.web.service.SaveRequestLogThread; - -@Service -public class DfJitLogSearchService extends BaseLogService { - - @Autowired - private DfJitLogSearchDao dfJitLogSearchDao; - - public Page findDfJitFlSrcReport(Page page, DfJitFlSrcReport entity) - throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitFlSrcReport(entity)); - return page; - } - - public Page findDfJitFlDestReport(Page page, DfJitFlDestReport entity) - throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitFlDestReport(entity)); - return page; - } - - public Page findDfJitAffairSrcReport(Page page, - DfJitAffairSrcReport entity) throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitAffairSrcReport(entity)); - return page; - } - - public Page findDfJitAffairDestReport(Page page, - DfJitAffairDestReport entity) throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitAffairDestReport(entity)); - return page; - } - - - public Page findDfJitMissionSrcReport(Page page, - DfJitMissionSrcReport entity) throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitMissionSrcReport(entity)); - return page; - } - - public Page findDfJitMissionDestReport(Page page, - DfJitMissionDestReport entity) throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitMissionDestReport(entity)); - return page; - } - - public Page findDfJitGuaranteeSrcReport(Page page, - DfJitGuaranteeSrcReport entity) throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitGuaranteeSrcReport(entity)); - return page; - } - - public Page findDfJitGuaranteeDestReport(Page page, - DfJitGuaranteeDestReport entity) throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitGuaranteeDestReport(entity)); - return page; - } - - public Page findDfJitTagSrcReport(Page page, DfJitTagSrcReport entity) - throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitTagSrcReport(entity)); - return page; - } - - public Page findDfJitTagDestReport(Page page, DfJitTagDestReport entity) - throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitTagDestReport(entity)); - return page; - } - - public Page findDfJitIdSrcReport(Page page, DfJitIdSrcReport entity) - throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitIdSrcReport(entity)); - return page; - } - - public Page findDfJitIdDestReport(Page page, DfJitIdDestReport entity) - throws SQLException { - entity.setPage(page); - page.setList(dfJitLogSearchDao.findDfJitIdDestReport(entity)); - return page; - } - - public void queryDfJitFlCheck(SaveRequestLogThread thread,long start,String searchFl, String searchXz) { - try { - if (!StringUtil.isBlank(searchFl)) { - Integer.parseInt(searchFl); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - throw new RestServiceException(thread,System.currentTimeMillis()-start,"searchFl参数格式错误", RestBusinessCode.param_formate_error.getValue()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - throw new RestServiceException(thread,System.currentTimeMillis()-start,"searchFl参数错误"); - } - try { - if (!StringUtil.isBlank(searchXz)) { - Integer.parseInt(searchXz); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - throw new RestServiceException(thread,System.currentTimeMillis()-start,"searchXz参数格式错误", RestBusinessCode.param_formate_error.getValue()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - throw new RestServiceException(thread,System.currentTimeMillis()-start,"searchXz参数错误"); - } - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DfMultiDimensionalReportService.java b/src/main/java/com/nis/web/service/restful/DfMultiDimensionalReportService.java deleted file mode 100644 index 6bf5e0a..0000000 --- a/src/main/java/com/nis/web/service/restful/DfMultiDimensionalReportService.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.nis.web.service.restful; - -import java.sql.SQLException; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DfAttrTypeReport; -import com.nis.domain.restful.DfDestIpCountryReport; -import com.nis.domain.restful.DfDestIpReport; -import com.nis.domain.restful.DfEntranceReport; -import com.nis.domain.restful.DfLwhhAttrReport; -import com.nis.domain.restful.DfLwhhReport; -import com.nis.domain.restful.DfLwhhTagReport; -import com.nis.domain.restful.DfPzReport; -import com.nis.domain.restful.DfPzReportStat; -import com.nis.domain.restful.DfServiceReport; -import com.nis.domain.restful.DfSrcIpAttrReport; -import com.nis.domain.restful.DfSrcIpDomeSticReport; -import com.nis.domain.restful.DfSrcIpReport; -import com.nis.domain.restful.DfSrcIpTagReport; -import com.nis.domain.restful.DfTagReport; -import com.nis.web.dao.DfMultiDimensionalReportDao; -import com.nis.web.dao.DfReportDao; -import com.nis.web.service.BaseLogService; - -/** - * - * @ClassName: DfMultiDimensionsReportService - * @Description: TODO(df多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午3:14:07 - * @version V1.0 - */ -@Service -public class DfMultiDimensionalReportService extends BaseLogService { - /** - * 持久层对象 - */ - @Autowired - protected DfMultiDimensionalReportDao dao; - - - public Page findDfLwhhAttrReportPage(Page page, DfLwhhAttrReport entity) throws SQLException { - entity.setPage(page); - List dfLwhhAttrReports = dao.findDfLwhhAttrReport(entity); - if (null != dfLwhhAttrReports && dfLwhhAttrReports.size() > 0) { - for (DfLwhhAttrReport dfLwhhAttrReport : dfLwhhAttrReports) { - if (null != dfLwhhAttrReport.getAsum() && dfLwhhAttrReport.getAsum() != 0) { - dfLwhhAttrReport.setAbsum(dfLwhhAttrReport.getAsum()); - } else if ((null == dfLwhhAttrReport.getAsum() || dfLwhhAttrReport.getAsum() == 0) - && (null != dfLwhhAttrReport.getBsum() && dfLwhhAttrReport.getBsum() != 0)) { - dfLwhhAttrReport.setAbsum(dfLwhhAttrReport.getBsum()); - } else { - dfLwhhAttrReport.setAbsum(0l); - } - } - } - page.setList(dfLwhhAttrReports); - return page; - } - - public Page findDfLwhhTagReportPage(Page page, DfLwhhTagReport entity) throws SQLException { - entity.setPage(page); - List dfLwhhTagReports = dao.findDfLwhhTagReportPage(entity); - if (null != dfLwhhTagReports && dfLwhhTagReports.size() > 0) { - for (DfLwhhTagReport dfLwhhTagReport : dfLwhhTagReports) { - if (null != dfLwhhTagReport.getAsum() && dfLwhhTagReport.getAsum() != 0) { - dfLwhhTagReport.setAbsum(dfLwhhTagReport.getAsum()); - } else if ((null == dfLwhhTagReport.getAsum() || dfLwhhTagReport.getAsum() == 0) - && (null != dfLwhhTagReport.getBsum() && dfLwhhTagReport.getBsum() != 0)) { - dfLwhhTagReport.setAbsum(dfLwhhTagReport.getBsum()); - } else { - dfLwhhTagReport.setAbsum(0l); - } - } - } - page.setList(dfLwhhTagReports); - return page; - } - - public Page findDfSrcIpAttrReportPage(Page page, DfSrcIpAttrReport entity) throws SQLException { - entity.setPage(page); - List dfSrcIpAttrReports = dao.findDfSrcIpAttrReportPage(entity); - if (null != dfSrcIpAttrReports && dfSrcIpAttrReports.size() > 0) { - for (DfSrcIpAttrReport dfSrcIpAttrReport : dfSrcIpAttrReports) { - if (null != dfSrcIpAttrReport.getAsum() && dfSrcIpAttrReport.getAsum() != 0) { - dfSrcIpAttrReport.setAbsum(dfSrcIpAttrReport.getAsum()); - } else if ((null == dfSrcIpAttrReport.getAsum() || dfSrcIpAttrReport.getAsum() == 0) - && (null != dfSrcIpAttrReport.getBsum() && dfSrcIpAttrReport.getBsum() != 0)) { - dfSrcIpAttrReport.setAbsum(dfSrcIpAttrReport.getBsum()); - } else { - dfSrcIpAttrReport.setAbsum(0l); - } - } - } - page.setList(dfSrcIpAttrReports); - return page; - } - - public Page findDfSrcIpTagReportPage(Page page, DfSrcIpTagReport entity) throws SQLException { - entity.setPage(page); - List dfSrcIpTagReports = dao.findDfSrcIpTagReportPage(entity); - if (null != dfSrcIpTagReports && dfSrcIpTagReports.size() > 0) { - for (DfSrcIpTagReport dfSrcIpTagReport : dfSrcIpTagReports) { - if (null != dfSrcIpTagReport.getAsum() && dfSrcIpTagReport.getAsum() != 0) { - dfSrcIpTagReport.setAbsum(dfSrcIpTagReport.getAsum()); - } else if ((null == dfSrcIpTagReport.getAsum() || dfSrcIpTagReport.getAsum() == 0) - && (null != dfSrcIpTagReport.getBsum() && dfSrcIpTagReport.getBsum() != 0)) { - dfSrcIpTagReport.setAbsum(dfSrcIpTagReport.getBsum()); - } else { - dfSrcIpTagReport.setAbsum(0l); - } - } - } - page.setList(dfSrcIpTagReports); - return page; - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DfMultiDimensionalStatLogService.java b/src/main/java/com/nis/web/service/restful/DfMultiDimensionalStatLogService.java deleted file mode 100644 index cd3310c..0000000 --- a/src/main/java/com/nis/web/service/restful/DfMultiDimensionalStatLogService.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.nis.web.service.restful; - -import java.sql.SQLException; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DfLwhhAttrDaily; -import com.nis.domain.restful.DfLwhhAttrMonth; -import com.nis.domain.restful.DfLwhhTagDaily; -import com.nis.domain.restful.DfLwhhTagMonth; -import com.nis.domain.restful.DfSrcIpAttrDaily; -import com.nis.domain.restful.DfSrcIpAttrMonth; -import com.nis.domain.restful.DfSrcIpTagDaily; -import com.nis.domain.restful.DfSrcIpTagMonth; -import com.nis.web.dao.DfMultiDimensionalStatLogDao; -import com.nis.web.service.BaseLogService; - -/** - * - * @ClassName: DfMultiDimensionsReportService - * @Description: TODO(df多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午3:14:07 - * @version V1.0 - */ -@Service -public class DfMultiDimensionalStatLogService extends BaseLogService { - /** - * 持久层对象 - */ - @Autowired - protected DfMultiDimensionalStatLogDao dao; - - public Page dfLwhhAttrDaily(Page page, DfLwhhAttrDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfLwhhAttrDaily(entity)); - return page; - } - public Page dfLwhhAttrMonth(Page page, DfLwhhAttrMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfLwhhAttrMonth(entity)); - return page; - } - - - public Page dfLwhhTagDaily(Page page, DfLwhhTagDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfLwhhTagDaily(entity)); - return page; - } - public Page dfLwhhTagMonth(Page page, DfLwhhTagMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfLwhhTagMonth(entity)); - return page; - } - - - public Page dfSrcIpAttrDaily(Page page, DfSrcIpAttrDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfSrcIpAttrDaily(entity)); - return page; - } - public Page dfSrcIpAttrMonth(Page page, DfSrcIpAttrMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfSrcIpAttrMonth(entity)); - return page; - } - - - public Page dfSrcIpTagDaily(Page page, DfSrcIpTagDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfSrcIpTagDaily(entity)); - return page; - } - public Page dfSrcIpTagMonth(Page page, DfSrcIpTagMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfSrcIpTagMonth(entity)); - return page; - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DfReportService.java b/src/main/java/com/nis/web/service/restful/DfReportService.java deleted file mode 100644 index f58f1c9..0000000 --- a/src/main/java/com/nis/web/service/restful/DfReportService.java +++ /dev/null @@ -1,277 +0,0 @@ -package com.nis.web.service.restful; - -import java.sql.SQLException; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DfAttrTypeReport; -import com.nis.domain.restful.DfDestIpCountryReport; -import com.nis.domain.restful.DfDestIpReport; -import com.nis.domain.restful.DfEntranceReport; -import com.nis.domain.restful.DfLwhhReport; -import com.nis.domain.restful.DfPzReport; -import com.nis.domain.restful.DfPzReportStat; -import com.nis.domain.restful.DfServiceReport; -import com.nis.domain.restful.DfSrcIpDomeSticReport; -import com.nis.domain.restful.DfSrcIpReport; -import com.nis.domain.restful.DfTagReport; -import com.nis.web.dao.DfReportDao; -import com.nis.web.service.BaseLogService; - -/** - * - * @ClassName: DfReportService - * @Description: TODO(一句话描述这个类) - * @author (DDM) - * @date 2016年10月31日上午11:54:46 - * @version V1.0 - */ -@Service -public class DfReportService extends BaseLogService { - /** - * 持久层对象 - */ - @Autowired - protected DfReportDao dao; - - /** - * - * - * @Title: findDfPzReportPage - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param - * page - * @param @param - * entity - * @param @return - * @param @throws - * SQLException - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public Page findDfPzReportPage(Page page, DfPzReport entity) throws SQLException { - entity.setPage(page); - page.setList(dao.findDfPzReport(entity)); - return page; - } - - public Page findAttrTypeReport(Page page, DfAttrTypeReport entity) - throws SQLException { - entity.setPage(page); - List findAttrTypeReport = dao.findAttrTypeReport(entity); - page.setList(findAttrTypeReport); - return page; - } - - public Page findSrcIpDomeSticReport(Page page, - DfSrcIpDomeSticReport entity) throws SQLException { - entity.setPage(page); - List findSrcIpDomeSticReport = dao.findSrcIpDomeSticReport(entity); - if (null != findSrcIpDomeSticReport && findSrcIpDomeSticReport.size() > 0) { - for (DfSrcIpDomeSticReport dfSrcIpDomeSticReport : findSrcIpDomeSticReport) { - if (null != dfSrcIpDomeSticReport.getAsum() && dfSrcIpDomeSticReport.getAsum() != 0) { - dfSrcIpDomeSticReport.setAbsum(dfSrcIpDomeSticReport.getAsum()); - } else if ((null == dfSrcIpDomeSticReport.getAsum() || dfSrcIpDomeSticReport.getAsum() == 0) - && (null != dfSrcIpDomeSticReport.getBsum() && dfSrcIpDomeSticReport.getBsum() != 0)) { - dfSrcIpDomeSticReport.setAbsum(dfSrcIpDomeSticReport.getBsum()); - } else { - dfSrcIpDomeSticReport.setAbsum(0l); - } - } - } - page.setList(findSrcIpDomeSticReport); - return page; - } - - public Page findDestIpCountryReport(Page page, - DfDestIpCountryReport entity) throws SQLException { - entity.setPage(page); - List destIpCountryReport = dao.findDestIpCountryReport(entity); - if (null != destIpCountryReport && destIpCountryReport.size() > 0) { - for (DfDestIpCountryReport dfDestIpCountryReport : destIpCountryReport) { - if (null != dfDestIpCountryReport.getAsum() && dfDestIpCountryReport.getAsum() != 0) { - dfDestIpCountryReport.setAbsum(dfDestIpCountryReport.getAsum()); - } else if ((null == dfDestIpCountryReport.getAsum() || dfDestIpCountryReport.getAsum() == 0) - && (null != dfDestIpCountryReport.getBsum() && dfDestIpCountryReport.getBsum() != 0)) { - dfDestIpCountryReport.setAbsum(dfDestIpCountryReport.getBsum()); - } else { - dfDestIpCountryReport.setAbsum(0l); - } - } - } - page.setList(destIpCountryReport); - return page; - } - - public Page findDfEntranceReport(Page page, DfEntranceReport entity) - throws SQLException { - entity.setPage(page); - List findDfEntranceReport = dao.findDfEntranceReport(entity); - if (null != findDfEntranceReport && findDfEntranceReport.size() > 0) { - for (DfEntranceReport dfEntranceReport : findDfEntranceReport) { - if (null != dfEntranceReport.getAsum() && dfEntranceReport.getAsum() != 0) { - dfEntranceReport.setAbsum(dfEntranceReport.getAsum()); - } else if ((null == dfEntranceReport.getAsum() || dfEntranceReport.getAsum() == 0) - && (null != dfEntranceReport.getBsum() && dfEntranceReport.getBsum() != 0)) { - dfEntranceReport.setAbsum(dfEntranceReport.getBsum()); - } else { - dfEntranceReport.setAbsum(0l); - } - } - } - page.setList(findDfEntranceReport); - return page; - } - - public Page findDfLwhhReport(Page page, DfLwhhReport entity) throws SQLException { - entity.setPage(page); - List findDfLwhhReport = dao.findDfLwhhReport(entity); - if (null != findDfLwhhReport && findDfLwhhReport.size() > 0) { - for (DfLwhhReport dfLwhhReport : findDfLwhhReport) { - if (null != dfLwhhReport.getAsum() && dfLwhhReport.getAsum() != 0) { - dfLwhhReport.setAbsum(dfLwhhReport.getAsum()); - } else if ((null == dfLwhhReport.getAsum() || dfLwhhReport.getAsum() == 0) - && (null != dfLwhhReport.getBsum() && dfLwhhReport.getBsum() != 0)) { - dfLwhhReport.setAbsum(dfLwhhReport.getBsum()); - } else { - dfLwhhReport.setAbsum(0l); - } - } - } - page.setList(findDfLwhhReport); - return page; - } - - public Page findDfTagReport(Page page, DfTagReport entity) throws SQLException { - entity.setPage(page); - List findDfTagReport = dao.findDfTagReport(entity); - page.setList(findDfTagReport); - return page; - } - - public Page findDfPriTagReport(Page page, DfPzReport entity) throws SQLException { - entity.setPage(page); - List findDfPzReport = dao.findDfPzReport(entity); - if (null != findDfPzReport && findDfPzReport.size() > 0) { - for (DfPzReport dfPzReport : findDfPzReport) { - if (null != dfPzReport.getAsum() && dfPzReport.getAsum() != 0) { - dfPzReport.setAbsum(dfPzReport.getAsum()); - } else if ((null == dfPzReport.getAsum() || dfPzReport.getAsum() == 0) - && (null != dfPzReport.getBsum() && dfPzReport.getBsum() != 0)) { - dfPzReport.setAbsum(dfPzReport.getBsum()); - } else { - dfPzReport.setAbsum(0l); - } - } - } - page.setList(findDfPzReport); - return page; - } - - public Page findDfPzReportStatPage(Page page, DfPzReportStat entity) - throws SQLException { - entity.setPage(page); - page.setList(dao.findDfPzReportStat(entity)); - return page; - } - public Page findDfPzReportStatMinutesPage(Page page, DfPzReportStat entity) - throws SQLException { - entity.setPage(page); - page.setList(dao.findDfPzReportStatMinutes(entity)); - return page; - } - - public Long findDfPzReportSumStat(Page page, DfPzReportStat entity) throws SQLException { - return dao.findDfPzReportSum(entity); - } - - /** - * @Title: findDfSrcIpReport - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param - * page - * @param @param - * entity - * @param @return - * @param @throws - * SQLException - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public Page findDfSrcIpReport(Page page, DfSrcIpReport entity) { - entity.setPage(page); - page.setList(dao.findDfSrcIpReport(entity)); - return page; - } - - /** - * @Title: findDfDestIpReport - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param - * page - * @param @param - * entity - * @param @return - * @param @throws - * SQLException - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public Page findDfDestIpReport(Page page, DfDestIpReport entity) { - entity.setPage(page); - page.setList(dao.findDfDestIpReport(entity)); - return page; - } - - /** - * - * - * @Title: findDfServiceReportPage - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param - * page - * @param @param - * entity - * @param @return - * @param @throws - * SQLException - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public Page findDfServiceReportPage(Page page, DfServiceReport entity) - throws SQLException { - entity.setPage(page); - page.setList(dao.findDfServiceReport(entity)); - return page; - } - - /** - * @Title: findDfTagReportPage - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param - * page - * @param @param - * entity - * @param @return - * @param @throws - * SQLException - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public Page findDfTagReportPage(Page page, DfTagReport entity) throws SQLException { - entity.setPage(page); - - List findDfTagReportPage = dao.findDfTagReportPage(entity); - page.setList(findDfTagReportPage); - return page; - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DfStatLogService.java b/src/main/java/com/nis/web/service/restful/DfStatLogService.java deleted file mode 100644 index 78c9af5..0000000 --- a/src/main/java/com/nis/web/service/restful/DfStatLogService.java +++ /dev/null @@ -1,203 +0,0 @@ -/** -* @Title: DfStatLogService.java -* @Package com.nis.web.service.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:50:12 -* @version V1.0 -*/ -package com.nis.web.service.restful; - -import java.sql.SQLException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DfAttrStatLogDaily; -import com.nis.domain.restful.DfAttrStatLogMonth; -import com.nis.domain.restful.DfDestIpCounrtyStatLogDaily; -import com.nis.domain.restful.DfDestIpCounrtyStatLogMonth; -import com.nis.domain.restful.DfEntrStatLogDaily; -import com.nis.domain.restful.DfEntrStatLogMonth; -import com.nis.domain.restful.DfLwhhStatLogDaily; -import com.nis.domain.restful.DfLwhhStatLogMonth; -import com.nis.domain.restful.DfSrcIpDomesticStatLogDaily; -import com.nis.domain.restful.DfSrcIpDomesticStatLogMonth; -import com.nis.domain.restful.DfStatLogDaily; -import com.nis.domain.restful.DfStatLogMonth; -import com.nis.domain.restful.DfTagStatLogDaily; -import com.nis.domain.restful.DfTagStatLogMonth; -import com.nis.web.dao.DfStatLogDao; -import com.nis.web.service.BaseLogService; - -/** -* @ClassName: DfStatLogService -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (ddm) -* @date 2016年9月13日 上午11:50:12 -* @version V1.0 -*/ -@Service -public class DfStatLogService extends BaseLogService{ - /** - * 持久层对象 - */ - @Autowired - protected DfStatLogDao dao; - - /** - * 查询端口封堵分页数据 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfStatLogDaily(Page page, DfStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfStatLogDaily(entity)); - return page; - } - /** - * 查询端口封堵分页数据 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfStatLogMonth(Page page, DfStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfStatLogMonth(entity)); - return page; - } - /** - * 查询标签日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfTagStatLogDaily(Page page, DfTagStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfTagStatLogDaily(entity)); - return page; - } - /** - * 查询标签月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfTagStatLogMonth(Page page, DfTagStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfTagStatLogMonth(entity)); - return page; - } - /** - * 查询性质日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfAttrStatLogDaily(Page page, DfAttrStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfAttrStatLogDaily(entity)); - return page; - } - /** - * 查询性质月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfAttrStatLogMonth(Page page, DfAttrStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfAttrStatLogMonth(entity)); - return page; - } - /** - * 查询局点日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfEntrStatLogDaily(Page page, DfEntrStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfEntrStatLogDaily(entity)); - return page; - } - /** - * 查询局点月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfEntrStatLogMonth(Page page, DfEntrStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfEntrStatLogMonth(entity)); - return page; - } - /** - * 查询来文函号日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfLwhhStatLogDaily(Page page, DfLwhhStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfLwhhStatLogDaily(entity)); - return page; - } - /** - * 查询来文函号月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfLwhhStatLogMonth(Page page, DfLwhhStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfLwhhStatLogMonth(entity)); - return page; - } - /** - * 查询境内源ip日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfSrcIpDomesticStatLogDaily(Page page, DfSrcIpDomesticStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfSrcIpDomesticStatLogDaily(entity)); - return page; - } - /** - * 查询境内源ip月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfSrcIpDomesticStatLogMonth(Page page, DfSrcIpDomesticStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfSrcIpDomesticStatLogMonth(entity)); - return page; - } - /** - * 查询国家目的ip日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfDestIpCounrtyStatLogDaily(Page page, DfDestIpCounrtyStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfDestIpCounrtyStatLogDaily(entity)); - return page; - } - /** - * 查询国家目的ip月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page dfDestIpCounrtyStatLogMonth(Page page, DfDestIpCounrtyStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.dfDestIpCounrtyStatLogMonth(entity)); - return page; - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DfdjLogStatService.java b/src/main/java/com/nis/web/service/restful/DfdjLogStatService.java deleted file mode 100644 index 40e5c06..0000000 --- a/src/main/java/com/nis/web/service/restful/DfdjLogStatService.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.nis.web.service.restful; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.StatLogEntity; -import com.nis.domain.restful.DfDjLogStatistics; -import com.nis.domain.restful.DfDjPzLogStatistics; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.StringUtil; -import com.nis.web.dao.DfDjLogStatDao; -import com.nis.web.service.BaseLogService; -import com.nis.web.service.SaveRequestLogThread; - -/** - * @ClassName: DfdjLogStatService - * @Description: 封堵/监测日志统计查询 - * @author (zbc) - * @date 2016年11月14日 下午4:00:00 - * @version V1.0 - */ -@Service -@SuppressWarnings({ "rawtypes" }) -public class DfdjLogStatService extends BaseLogService { - private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - @Autowired - protected DfDjLogStatDao dao; - - - public DfDjLogStatistics findDfLogStatistics(DfDjLogStatistics entity) { - List list = dao.findDfLogStatistics(entity); - return entity; - } - - public Page findDfPzLogStatistics(Page page, DfDjPzLogStatistics entity) { - entity.setPage(page); - page.setList(dao.findDfPzLogStatistics(entity)); - return page; - } - - - public DfDjLogStatistics findDjLogStatistics(DfDjLogStatistics entity) { - List list = dao.findDjLogStatistics(entity); - return entity; - } - - public Page findDjPzLogStatistics(Page page, DfDjPzLogStatistics entity) { - entity.setPage(page); - page.setList(dao.findDjPzLogStatistics(entity)); - return page; - } - - - @Override - public void queryConditionCheck(SaveRequestLogThread thread, long start, StatLogEntity entity, Class clazz, Page page) { - /* - * searchConfigId为多条件格式 - */ - try { - if (!StringUtil.isBlank(entity.getSearchStatStartTime())) { - sdf.parse(entity.getSearchStatStartTime()); - } - } catch (ParseException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger.error(e); - throw new RestServiceException(thread, System.currentTimeMillis() - start, "searchStatStartTime参数格式错误", - RestBusinessCode.param_formate_error.getValue()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger.error(e); - throw new RestServiceException(thread, System.currentTimeMillis() - start, "searchStatStartTime参数格式错误"); - } - - try { - if (!StringUtil.isBlank(entity.getSearchStatEndTime())) { - sdf.parse(entity.getSearchStatEndTime()); - } - } catch (ParseException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger.error(e); - throw new RestServiceException(thread, System.currentTimeMillis() - start, "searchStatEndTime参数格式错误", - RestBusinessCode.param_formate_error.getValue()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger.error(e); - throw new RestServiceException(thread, System.currentTimeMillis() - start, "searchStatEndTime参数错误"); - } - - try { - if (!StringUtil.isBlank(entity.getSearchService())) { - Integer.parseInt(entity.getSearchService()); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger.error(e); - throw new RestServiceException(thread, System.currentTimeMillis() - start, "searchService参数格式错误", - RestBusinessCode.param_formate_error.getValue()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger.error(e); - throw new RestServiceException(thread, System.currentTimeMillis() - start, "searchService参数错误"); - } - - try { - checkCloumnIsExist(thread,start,clazz, page); - } catch (RestServiceException e) { - logger.error(e); - throw e; - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - logger.error(e); - throw new RestServiceException(thread, System.currentTimeMillis() - start, "请求参数错误"); - } - } -} diff --git a/src/main/java/com/nis/web/service/restful/DjJitLogSearchService.java b/src/main/java/com/nis/web/service/restful/DjJitLogSearchService.java deleted file mode 100644 index ea5ee1e..0000000 --- a/src/main/java/com/nis/web/service/restful/DjJitLogSearchService.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.nis.web.service.restful; - -import java.sql.SQLException; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DjCkStatLog; -import com.nis.domain.restful.DjJitAffairDestReport; -import com.nis.domain.restful.DjJitAffairSrcReport; -import com.nis.domain.restful.DjJitFlDestReport; -import com.nis.domain.restful.DjJitFlSrcReport; -import com.nis.domain.restful.DjJitGuaranteeDestReport; -import com.nis.domain.restful.DjJitGuaranteeSrcReport; -import com.nis.domain.restful.DjJitIdDestReport; -import com.nis.domain.restful.DjJitIdSrcReport; -import com.nis.domain.restful.DjJitMissionDestReport; -import com.nis.domain.restful.DjJitMissionSrcReport; -import com.nis.domain.restful.DjJitTagDestReport; -import com.nis.domain.restful.DjJitTagSrcReport; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.StringUtil; -import com.nis.web.dao.DjJitLogSearchDao; -import com.nis.web.service.BaseLogService; -import com.nis.web.service.SaveRequestLogThread; - -@Service -public class DjJitLogSearchService extends BaseLogService { - - @Autowired - private DjJitLogSearchDao djJitLogSearchDao; - - public Page findDjJitFlSrcReport(Page page, DjJitFlSrcReport entity) - throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitFlSrcReport(entity)); - return page; - } - - public Page findDjJitFlDestReport(Page page, DjJitFlDestReport entity) - throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitFlDestReport(entity)); - return page; - } - - public Page findDjJitAffairSrcReport(Page page, - DjJitAffairSrcReport entity) throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitAffairSrcReport(entity)); - return page; - } - - public Page findDjJitAffairDestReport(Page page, - DjJitAffairDestReport entity) throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitAffairDestReport(entity)); - return page; - } - - public Page findDjJitMissionSrcReport(Page page, - DjJitMissionSrcReport entity) throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitMissionSrcReport(entity)); - return page; - } - - public Page findDjJitMissionDestReport(Page page, - DjJitMissionDestReport entity) throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitMissionDestReport(entity)); - return page; - } - - public Page findDjJitGuaranteeSrcReport(Page page, - DjJitGuaranteeSrcReport entity) throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitGuaranteeSrcReport(entity)); - return page; - } - - public Page findDjJitGuaranteeDestReport(Page page, - DjJitGuaranteeDestReport entity) throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitGuaranteeDestReport(entity)); - return page; - } - - public Page findDjJitTagSrcReport(Page page, DjJitTagSrcReport entity) - throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitTagSrcReport(entity)); - return page; - } - - public Page findDjJitTagDestReport(Page page, DjJitTagDestReport entity) - throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitTagDestReport(entity)); - return page; - } - - public Page findDjJitIdSrcReport(Page page, DjJitIdSrcReport entity) - throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitIdSrcReport(entity)); - return page; - } - - public Page findDjJitIdDestReport(Page page, DjJitIdDestReport entity) - throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjJitIdDestReport(entity)); - return page; - } - - public Page findDjCkStatLog(Page page, DjCkStatLog entity) throws SQLException { - entity.setPage(page); - page.setList(djJitLogSearchDao.findDjCkStatLog(entity)); - return page; - } - - public void queryDjJitFlCheck(SaveRequestLogThread thread,long start,String searchFl, String searchXz) { - try { - if (!StringUtil.isBlank(searchFl)) { - Integer.parseInt(searchFl); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - throw new RestServiceException(thread,System.currentTimeMillis()-start,"searchFl参数格式错误", RestBusinessCode.param_formate_error.getValue()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - throw new RestServiceException(thread,System.currentTimeMillis()-start,"searchFl参数错误"); - } - try { - if (!StringUtil.isBlank(searchXz)) { - Integer.parseInt(searchXz); - } - } catch (NumberFormatException e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - throw new RestServiceException(thread,System.currentTimeMillis()-start,"searchXz参数格式错误", RestBusinessCode.param_formate_error.getValue()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - throw new RestServiceException(thread,System.currentTimeMillis()-start,"searchXz参数错误"); - } - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DjMultiDimensionalReportService.java b/src/main/java/com/nis/web/service/restful/DjMultiDimensionalReportService.java deleted file mode 100644 index 380add5..0000000 --- a/src/main/java/com/nis/web/service/restful/DjMultiDimensionalReportService.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.nis.web.service.restful; - -import java.sql.SQLException; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DjLwhhAttrReport; -import com.nis.domain.restful.DjLwhhReport; -import com.nis.domain.restful.DjLwhhTagReport; -import com.nis.domain.restful.DjSrcIpAttrReport; -import com.nis.domain.restful.DjSrcIpTagReport; -import com.nis.web.dao.DjMultiDimensionalReportDao; -import com.nis.web.dao.DjReportDao; -import com.nis.web.service.BaseLogService; - -/** - * - * @ClassName: DjMultiDimensionsReportService - * @Description: TODO(dj多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午3:14:07 - * @version V1.0 - */ -@Service -public class DjMultiDimensionalReportService extends BaseLogService { - /** - * 持久层对象 - */ - @Autowired - protected DjMultiDimensionalReportDao dao; - - - public Page findDjLwhhAttrReportPage(Page page, DjLwhhAttrReport entity) throws SQLException { - entity.setPage(page); - List djLwhhAttrReports = dao.findDjLwhhAttrReport(entity); - if (null != djLwhhAttrReports && djLwhhAttrReports.size() > 0) { - for (DjLwhhAttrReport djLwhhAttrReport : djLwhhAttrReports) { - if (null != djLwhhAttrReport.getAsum() && djLwhhAttrReport.getAsum() != 0) { - djLwhhAttrReport.setAbsum(djLwhhAttrReport.getAsum()); - } else if ((null == djLwhhAttrReport.getAsum() || djLwhhAttrReport.getAsum() == 0) - && (null != djLwhhAttrReport.getBsum() && djLwhhAttrReport.getBsum() != 0)) { - djLwhhAttrReport.setAbsum(djLwhhAttrReport.getBsum()); - } else { - djLwhhAttrReport.setAbsum(0l); - } - } - } - page.setList(djLwhhAttrReports); - return page; - } - - public Page findDjLwhhTagReportPage(Page page, DjLwhhTagReport entity) throws SQLException { - entity.setPage(page); - List djLwhhTagReports = dao.findDjLwhhTagReportPage(entity); - if (null != djLwhhTagReports && djLwhhTagReports.size() > 0) { - for (DjLwhhTagReport djLwhhTagReport : djLwhhTagReports) { - if (null != djLwhhTagReport.getAsum() && djLwhhTagReport.getAsum() != 0) { - djLwhhTagReport.setAbsum(djLwhhTagReport.getAsum()); - } else if ((null == djLwhhTagReport.getAsum() || djLwhhTagReport.getAsum() == 0) - && (null != djLwhhTagReport.getBsum() && djLwhhTagReport.getBsum() != 0)) { - djLwhhTagReport.setAbsum(djLwhhTagReport.getBsum()); - } else { - djLwhhTagReport.setAbsum(0l); - } - } - } - page.setList(djLwhhTagReports); - return page; - } - - public Page findDjSrcIpAttrReportPage(Page page, DjSrcIpAttrReport entity) throws SQLException { - entity.setPage(page); - List djSrcIpAttrReports = dao.findDjSrcIpAttrReportPage(entity); - if (null != djSrcIpAttrReports && djSrcIpAttrReports.size() > 0) { - for (DjSrcIpAttrReport djSrcIpAttrReport : djSrcIpAttrReports) { - if (null != djSrcIpAttrReport.getAsum() && djSrcIpAttrReport.getAsum() != 0) { - djSrcIpAttrReport.setAbsum(djSrcIpAttrReport.getAsum()); - } else if ((null == djSrcIpAttrReport.getAsum() || djSrcIpAttrReport.getAsum() == 0) - && (null != djSrcIpAttrReport.getBsum() && djSrcIpAttrReport.getBsum() != 0)) { - djSrcIpAttrReport.setAbsum(djSrcIpAttrReport.getBsum()); - } else { - djSrcIpAttrReport.setAbsum(0l); - } - } - } - page.setList(djSrcIpAttrReports); - return page; - } - - public Page findDjSrcIpTagReportPage(Page page, DjSrcIpTagReport entity) throws SQLException { - entity.setPage(page); - List djSrcIpTagReports = dao.findDjSrcIpTagReportPage(entity); - if (null != djSrcIpTagReports && djSrcIpTagReports.size() > 0) { - for (DjSrcIpTagReport djSrcIpTagReport : djSrcIpTagReports) { - if (null != djSrcIpTagReport.getAsum() && djSrcIpTagReport.getAsum() != 0) { - djSrcIpTagReport.setAbsum(djSrcIpTagReport.getAsum()); - } else if ((null == djSrcIpTagReport.getAsum() || djSrcIpTagReport.getAsum() == 0) - && (null != djSrcIpTagReport.getBsum() && djSrcIpTagReport.getBsum() != 0)) { - djSrcIpTagReport.setAbsum(djSrcIpTagReport.getBsum()); - } else { - djSrcIpTagReport.setAbsum(0l); - } - } - } - page.setList(djSrcIpTagReports); - return page; - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DjMultiDimensionalStatLogService.java b/src/main/java/com/nis/web/service/restful/DjMultiDimensionalStatLogService.java deleted file mode 100644 index 83b7225..0000000 --- a/src/main/java/com/nis/web/service/restful/DjMultiDimensionalStatLogService.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.nis.web.service.restful; - -import java.sql.SQLException; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DjLwhhAttrDaily; -import com.nis.domain.restful.DjLwhhAttrMonth; -import com.nis.domain.restful.DjLwhhTagDaily; -import com.nis.domain.restful.DjLwhhTagMonth; -import com.nis.domain.restful.DjSrcIpAttrDaily; -import com.nis.domain.restful.DjSrcIpAttrMonth; -import com.nis.domain.restful.DjSrcIpTagDaily; -import com.nis.domain.restful.DjSrcIpTagMonth; -import com.nis.web.dao.DjMultiDimensionalStatLogDao; -import com.nis.web.service.BaseLogService; - -/** - * - * @ClassName: DjMultiDimensionsReportService - * @Description: TODO(dj多维实时统计) - * @author (DDM) - * @date 2017年8月4日下午3:14:07 - * @version V1.0 - */ -@Service -public class DjMultiDimensionalStatLogService extends BaseLogService { - /** - * 持久层对象 - */ - @Autowired - protected DjMultiDimensionalStatLogDao dao; - - public Page djLwhhAttrDaily(Page page, DjLwhhAttrDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djLwhhAttrDaily(entity)); - return page; - } - public Page djLwhhAttrMonth(Page page, DjLwhhAttrMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djLwhhAttrMonth(entity)); - return page; - } - - - public Page djLwhhTagDaily(Page page, DjLwhhTagDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djLwhhTagDaily(entity)); - return page; - } - public Page djLwhhTagMonth(Page page, DjLwhhTagMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djLwhhTagMonth(entity)); - return page; - } - - - public Page djSrcIpAttrDaily(Page page, DjSrcIpAttrDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djSrcIpAttrDaily(entity)); - return page; - } - public Page djSrcIpAttrMonth(Page page, DjSrcIpAttrMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djSrcIpAttrMonth(entity)); - return page; - } - - - public Page djSrcIpTagDaily(Page page, DjSrcIpTagDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djSrcIpTagDaily(entity)); - return page; - } - public Page djSrcIpTagMonth(Page page, DjSrcIpTagMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djSrcIpTagMonth(entity)); - return page; - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DjReportService.java b/src/main/java/com/nis/web/service/restful/DjReportService.java deleted file mode 100644 index ded5cad..0000000 --- a/src/main/java/com/nis/web/service/restful/DjReportService.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.nis.web.service.restful; - -import java.sql.SQLException; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DjPzReportStat; -import com.nis.domain.restful.DjAttrTypeReport; -import com.nis.domain.restful.DjDestIpCountryReport; -import com.nis.domain.restful.DjEntranceReport; -import com.nis.domain.restful.DjLwhhReport; -import com.nis.domain.restful.DjSrcIpDomeSticReport; -import com.nis.domain.restful.DjTagReport; -import com.nis.domain.restful.DjPzReport; -import com.nis.web.dao.DjReportDao; -import com.nis.web.service.BaseLogService; - -/** - * - * @ClassName: DjReportService - * @Description: TODO(一句话描述这个类) - * @author (ZBC) - * @date 2016年11月22日下午06:00:00 - * @version V1.0 - */ -@Service -public class DjReportService extends BaseLogService { - /** - * 持久层对象 - */ - @Autowired - protected DjReportDao dao; - - /** - * @Title: findDjPzReportPage - * @param page - * @param djPzReport - * @return - */ - public Page findDjPzReportPage(Page page, DjPzReport entity) { - entity.setPage(page); - page.setList(dao.findDjPzReport(entity)); - return page; - } - - public Page findDjPzReportStatPage(Page page, DjPzReportStat entity) - throws SQLException { - entity.setPage(page); - page.setList(dao.findDjPzReportStat(entity)); - return page; - } - public Page findDjPzReportStatMinutesPage(Page page, DjPzReportStat entity) - throws SQLException { - entity.setPage(page); - page.setList(dao.findDjPzReportStatMinutes(entity)); - return page; - } - - public Page findDjPzPrivPage(Page page, DjPzReport entity) throws SQLException { - entity.setPage(page); - List findDjPzPrivPage = dao.findDjPzPrivPage(entity); - if (null != findDjPzPrivPage && findDjPzPrivPage.size() > 0) { - for (DjPzReport djPzReport : findDjPzPrivPage) { - if (null != djPzReport.getAsum() && djPzReport.getAsum() != 0) { - djPzReport.setAbsum(djPzReport.getAsum()); - } else if ((null == djPzReport.getAsum() || djPzReport.getAsum() == 0) - && (null != djPzReport.getBsum() && djPzReport.getBsum() != 0)) { - djPzReport.setAbsum(djPzReport.getBsum()); - } else { - djPzReport.setAbsum(0l); - } - } - } - page.setList(findDjPzPrivPage); - return page; - } - - public Long findDjPzReportSumStat(Page page, DjPzReportStat entity) throws SQLException { - return dao.findDjPzReportSum(entity); - } - - - - - - public Page findAttrTypeReport(Page page, DjAttrTypeReport entity) - throws SQLException { - entity.setPage(page); - List findAttrTypeReport = dao.findAttrTypeReport(entity); - page.setList(findAttrTypeReport); - return page; - } - - - public Page findSrcIpDomeSticReport(Page page, - DjSrcIpDomeSticReport entity) throws SQLException { - entity.setPage(page); - List findSrcIpDomeSticReport = dao.findSrcIpDomeSticReport(entity); - if (null != findSrcIpDomeSticReport && findSrcIpDomeSticReport.size() > 0) { - for (DjSrcIpDomeSticReport djSrcIpDomeSticReport : findSrcIpDomeSticReport) { - if (null != djSrcIpDomeSticReport.getAsum() && djSrcIpDomeSticReport.getAsum() != 0) { - djSrcIpDomeSticReport.setAbsum(djSrcIpDomeSticReport.getAsum()); - } else if ((null == djSrcIpDomeSticReport.getAsum() || djSrcIpDomeSticReport.getAsum() == 0) - && (null != djSrcIpDomeSticReport.getBsum() && djSrcIpDomeSticReport.getBsum() != 0)) { - djSrcIpDomeSticReport.setAbsum(djSrcIpDomeSticReport.getBsum()); - } else { - djSrcIpDomeSticReport.setAbsum(0l); - } - } - } - page.setList(findSrcIpDomeSticReport); - return page; - } - - - public Page findDestIpCountryReport(Page page, - DjDestIpCountryReport entity) throws SQLException { - entity.setPage(page); - List destIpCountryReport = dao.findDestIpCountryReport(entity); - if (null != destIpCountryReport && destIpCountryReport.size() > 0) { - for (DjDestIpCountryReport djDestIpCountryReport : destIpCountryReport) { - if (null != djDestIpCountryReport.getAsum() && djDestIpCountryReport.getAsum() != 0) { - djDestIpCountryReport.setAbsum(djDestIpCountryReport.getAsum()); - } else if ((null == djDestIpCountryReport.getAsum() || djDestIpCountryReport.getAsum() == 0) - && (null != djDestIpCountryReport.getBsum() && djDestIpCountryReport.getBsum() != 0)) { - djDestIpCountryReport.setAbsum(djDestIpCountryReport.getBsum()); - } else { - djDestIpCountryReport.setAbsum(0l); - } - } - } - page.setList(destIpCountryReport); - return page; - } - - public Page findDjEntranceReport(Page page, DjEntranceReport entity) - throws SQLException { - entity.setPage(page); - List findDjEntranceReport = dao.findDjEntranceReport(entity); - if (null != findDjEntranceReport && findDjEntranceReport.size() > 0) { - for (DjEntranceReport djEntranceReport : findDjEntranceReport) { - if (null != djEntranceReport.getAsum() && djEntranceReport.getAsum() != 0) { - djEntranceReport.setAbsum(djEntranceReport.getAsum()); - } else if ((null == djEntranceReport.getAsum() || djEntranceReport.getAsum() == 0) - && (null != djEntranceReport.getBsum() && djEntranceReport.getBsum() != 0)) { - djEntranceReport.setAbsum(djEntranceReport.getBsum()); - } else { - djEntranceReport.setAbsum(0l); - } - } - } - page.setList(findDjEntranceReport); - return page; - } - - public Page findDjLwhhReport(Page page, DjLwhhReport entity) throws SQLException { - entity.setPage(page); - List findDjLwhhReport = dao.findDjLwhhReport(entity); - if (null != findDjLwhhReport && findDjLwhhReport.size() > 0) { - for (DjLwhhReport djLwhhReport : findDjLwhhReport) { - if (null != djLwhhReport.getAsum() && djLwhhReport.getAsum() != 0) { - djLwhhReport.setAbsum(djLwhhReport.getAsum()); - } else if ((null == djLwhhReport.getAsum() || djLwhhReport.getAsum() == 0) - && (null != djLwhhReport.getBsum() && djLwhhReport.getBsum() != 0)) { - djLwhhReport.setAbsum(djLwhhReport.getBsum()); - } else { - djLwhhReport.setAbsum(0l); - } - } - } - page.setList(findDjLwhhReport); - return page; - } - - public Page findDjTagReportPage(Page page, DjTagReport entity) throws SQLException { - entity.setPage(page); - - List findDjTagReportPage = dao.findDjTagReportPage(entity); - page.setList(findDjTagReportPage); - return page; - } - -} diff --git a/src/main/java/com/nis/web/service/restful/DjStatLogService.java b/src/main/java/com/nis/web/service/restful/DjStatLogService.java deleted file mode 100644 index 0c2eab7..0000000 --- a/src/main/java/com/nis/web/service/restful/DjStatLogService.java +++ /dev/null @@ -1,203 +0,0 @@ -/** -* @Title: DjStatLogService.java -* @Package com.nis.web.service.restful -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午11:50:12 -* @version V1.0 -*/ -package com.nis.web.service.restful; - -import java.sql.SQLException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.DjAttrStatLogDaily; -import com.nis.domain.restful.DjAttrStatLogMonth; -import com.nis.domain.restful.DjDestIpCounrtyStatLogDaily; -import com.nis.domain.restful.DjDestIpCounrtyStatLogMonth; -import com.nis.domain.restful.DjEntrStatLogDaily; -import com.nis.domain.restful.DjEntrStatLogMonth; -import com.nis.domain.restful.DjLwhhStatLogDaily; -import com.nis.domain.restful.DjLwhhStatLogMonth; -import com.nis.domain.restful.DjSrcIpDomesticStatLogDaily; -import com.nis.domain.restful.DjSrcIpDomesticStatLogMonth; -import com.nis.domain.restful.DjStatLogDaily; -import com.nis.domain.restful.DjStatLogMonth; -import com.nis.domain.restful.DjTagStatLogDaily; -import com.nis.domain.restful.DjTagStatLogMonth; -import com.nis.web.dao.DjStatLogDao; -import com.nis.web.service.BaseLogService; - -/** -* @ClassName: DjStatLogService -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (ddm) -* @date 2016年9月13日 上午11:50:12 -* @version V1.0 -*/ -@Service -public class DjStatLogService extends BaseLogService{ - /** - * 持久层对象 - */ - @Autowired - protected DjStatLogDao dao; - - /** - * 查询端口封堵分页数据 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djStatLogDaily(Page page, DjStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djStatLogDaily(entity)); - return page; - } - /** - * 查询端口封堵分页数据 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djStatLogMonth(Page page, DjStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djStatLogMonth(entity)); - return page; - } - /** - * 查询标签日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djTagStatLogDaily(Page page, DjTagStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djTagStatLogDaily(entity)); - return page; - } - /** - * 查询标签月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djTagStatLogMonth(Page page, DjTagStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djTagStatLogMonth(entity)); - return page; - } - /** - * 查询性质日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djAttrStatLogDaily(Page page, DjAttrStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djAttrStatLogDaily(entity)); - return page; - } - /** - * 查询性质月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djAttrStatLogMonth(Page page, DjAttrStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djAttrStatLogMonth(entity)); - return page; - } - /** - * 查询局点日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djEntrStatLogDaily(Page page, DjEntrStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djEntrStatLogDaily(entity)); - return page; - } - /** - * 查询局点月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djEntrStatLogMonth(Page page, DjEntrStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djEntrStatLogMonth(entity)); - return page; - } - /** - * 查询来文函号日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djLwhhStatLogDaily(Page page, DjLwhhStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djLwhhStatLogDaily(entity)); - return page; - } - /** - * 查询来文函号月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djLwhhStatLogMonth(Page page, DjLwhhStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djLwhhStatLogMonth(entity)); - return page; - } - /** - * 查询境内源ip日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djSrcIpDomesticStatLogDaily(Page page, DjSrcIpDomesticStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djSrcIpDomesticStatLogDaily(entity)); - return page; - } - /** - * 查询境内源ip月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djSrcIpDomesticStatLogMonth(Page page, DjSrcIpDomesticStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djSrcIpDomesticStatLogMonth(entity)); - return page; - } - /** - * 查询国家目的ip日报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djDestIpCounrtyStatLogDaily(Page page, DjDestIpCounrtyStatLogDaily entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djDestIpCounrtyStatLogDaily(entity)); - return page; - } - /** - * 查询国家目的ip月报表 - * @param page 分页对象 - * @param entity - * @return - */ - public Page djDestIpCounrtyStatLogMonth(Page page, DjDestIpCounrtyStatLogMonth entity) throws SQLException{ - entity.setPage(page); - page.setList(dao.djDestIpCounrtyStatLogMonth(entity)); - return page; - } - -} diff --git a/src/main/java/com/nis/web/service/restful/UpdateCompileByJDBCThread.java b/src/main/java/com/nis/web/service/restful/UpdateCompileByJDBCThread.java index 39af8c7..bb6149c 100644 --- a/src/main/java/com/nis/web/service/restful/UpdateCompileByJDBCThread.java +++ b/src/main/java/com/nis/web/service/restful/UpdateCompileByJDBCThread.java @@ -192,6 +192,43 @@ public class UpdateCompileByJDBCThread implements Runnable { } } + /** + * + * @Description: 根据compileId更新与之对应的group关系表的生效状态 + * @author (zdx) + * @date 2017年8月16日 上午9:46:44 + * @param compileList + * @param conn + * @param opTime + * @param msgList + */ + public static void updateGroupByCompileId(List compileList, Connection conn, Date opTime, + List msgList) { + if (null != compileList && compileList.size() > 0) { + try { + StringBuffer sb = new StringBuffer(); + sb.append("update CONFIG_GROUP set IS_VALID=?,op_time=?,LAST_UPDATE=sysdate where COMPILE_ID=? "); + conn.setAutoCommit(false); + PreparedStatement ps = conn.prepareStatement(sb.toString()); + for (ConfigCompile compile : compileList) { + Object[] obj = new Object[] { compile.getIsValid(), opTime,compile.getCompileId() }; + for (int x = 0; x < obj.length; x++) { + if (x == 1) { + ps.setTimestamp(x + 1, utileDate2TimeStamp(opTime)); + } else { + ps.setObject(x + 1, obj[x]); + } + } + ps.addBatch(); + } + ps.executeBatch(); + } catch (Exception e) { + logger.error(e); + msgList.add(e); + } + } + } + public static void updateGroup(List groupList, Connection conn, Date opTime, List msgList) { if (null != groupList && groupList.size() > 0) { @@ -451,6 +488,10 @@ public class UpdateCompileByJDBCThread implements Runnable { } else if (null != numRegionList && numRegionList.size() > 0) { updateNumRegion(tableName, numRegionList, conn, opTime, msgList); } + + if((null !=compileList && compileList.size() > 0)&&(null != groupList && groupList.size()==0)){ + updateGroupByCompileId(compileList, conn, opTime, msgList); + } latch.countDown(); // System.out.println("latchCount=======================" + // latch.getCount()); From caa9503c861573f6e6a5d99fdef9e6635f88ca2c Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Fri, 22 Dec 2017 15:35:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=9D=99=E6=8E=A7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/restful/jk/JkDmbCk.java | 149 ----------- .../nis/domain/restful/jk/JkDmbCkSource.java | 125 --------- .../com/nis/domain/restful/jk/JkFdZb.java | 208 --------------- .../nis/domain/restful/jk/JkFdZbSource.java | 122 --------- .../com/nis/domain/restful/jk/JkFfjInfo.java | 99 -------- .../domain/restful/jk/JkFfjInfoSource.java | 51 ---- .../com/nis/domain/restful/jk/JkFwqInfo.java | 78 ------ .../domain/restful/jk/JkFwqInfoSource.java | 52 ---- .../java/com/nis/domain/restful/jk/JkLyq.java | 136 ---------- .../nis/domain/restful/jk/JkLyqSource.java | 122 --------- .../restful/jk/JkDmbCkController.java | 204 --------------- .../restful/jk/JkFdZbController.java | 177 ------------- .../restful/jk/JkFfjInfoController.java | 134 ---------- .../restful/jk/JkFwqInfoController.java | 134 ---------- .../restful/jk/JkLyqController.java | 199 --------------- .../java/com/nis/web/dao/ConfigPzIdDao.xml | 3 - .../java/com/nis/web/dao/jk/JkDmbCkDao.java | 20 -- .../java/com/nis/web/dao/jk/JkDmbCkDao.xml | 237 ------------------ .../java/com/nis/web/dao/jk/JkFdZbDao.java | 19 -- .../java/com/nis/web/dao/jk/JkFdZbDao.xml | 191 -------------- .../java/com/nis/web/dao/jk/JkFfjInfoDao.java | 20 -- .../java/com/nis/web/dao/jk/JkFfjInfoDao.xml | 47 ---- .../java/com/nis/web/dao/jk/JkFwqInfoDao.java | 21 -- .../java/com/nis/web/dao/jk/JkFwqInfoDao.xml | 33 --- .../java/com/nis/web/dao/jk/JkLyqDao.java | 21 -- src/main/java/com/nis/web/dao/jk/JkLyqDao.xml | 180 ------------- .../service/restful/jk/JkDmbCkService.java | 50 ---- .../web/service/restful/jk/JkFdZbService.java | 51 ---- .../service/restful/jk/JkFfjInfoService.java | 44 ---- .../service/restful/jk/JkFwqInfoService.java | 42 ---- .../web/service/restful/jk/JkLyqService.java | 50 ---- 31 files changed, 3019 deletions(-) delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkDmbCk.java delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkDmbCkSource.java delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkFdZb.java delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkFdZbSource.java delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkFfjInfo.java delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkFfjInfoSource.java delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkFwqInfo.java delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkFwqInfoSource.java delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkLyq.java delete mode 100644 src/main/java/com/nis/domain/restful/jk/JkLyqSource.java delete mode 100644 src/main/java/com/nis/web/controller/restful/jk/JkDmbCkController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/jk/JkFdZbController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/jk/JkFfjInfoController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/jk/JkFwqInfoController.java delete mode 100644 src/main/java/com/nis/web/controller/restful/jk/JkLyqController.java delete mode 100644 src/main/java/com/nis/web/dao/jk/JkDmbCkDao.java delete mode 100644 src/main/java/com/nis/web/dao/jk/JkDmbCkDao.xml delete mode 100644 src/main/java/com/nis/web/dao/jk/JkFdZbDao.java delete mode 100644 src/main/java/com/nis/web/dao/jk/JkFdZbDao.xml delete mode 100644 src/main/java/com/nis/web/dao/jk/JkFfjInfoDao.java delete mode 100644 src/main/java/com/nis/web/dao/jk/JkFfjInfoDao.xml delete mode 100644 src/main/java/com/nis/web/dao/jk/JkFwqInfoDao.java delete mode 100644 src/main/java/com/nis/web/dao/jk/JkFwqInfoDao.xml delete mode 100644 src/main/java/com/nis/web/dao/jk/JkLyqDao.java delete mode 100644 src/main/java/com/nis/web/dao/jk/JkLyqDao.xml delete mode 100644 src/main/java/com/nis/web/service/restful/jk/JkDmbCkService.java delete mode 100644 src/main/java/com/nis/web/service/restful/jk/JkFdZbService.java delete mode 100644 src/main/java/com/nis/web/service/restful/jk/JkFfjInfoService.java delete mode 100644 src/main/java/com/nis/web/service/restful/jk/JkFwqInfoService.java delete mode 100644 src/main/java/com/nis/web/service/restful/jk/JkLyqService.java diff --git a/src/main/java/com/nis/domain/restful/jk/JkDmbCk.java b/src/main/java/com/nis/domain/restful/jk/JkDmbCk.java deleted file mode 100644 index 8d6e958..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkDmbCk.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.nis.domain.restful.jk; - -import org.apache.ibatis.type.Alias; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.BaseEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * DmbCk entity. @author MyEclipse Persistence Tools - */ -@Alias("jkDmbck") -public class JkDmbCk extends BaseEntity{ - - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -5491965286339219052L; - // Fields - private Long gId; - @ApiModelProperty(value="国际出口ID", required=true) - private Long gjCkId; - @ApiModelProperty(value="是否生效", required=true) - private Long sfSx; -// @ApiModelProperty(value="生效范围", required=true) - private String sxFw; - @ApiModelProperty(value="出口名称", required=true) - private String ckMc; - @ApiModelProperty(value="出口位置", required=true) - private String ckWz; -// @ApiModelProperty(value="通讯方法", required=false) -// private String ckTxff; -// @ApiModelProperty(value="备注", required=false) -// private String ckBz; -// @ApiModelProperty(value="预留", required=false) -// private String yl; -// @ApiModelProperty(value="预留1", required=false) -// private Long yl1; -// @ApiModelProperty(value="预留2", required=false) -// private Long yl2; -// @ApiModelProperty(value="预留3", required=false) -// private String yl3; -// @ApiModelProperty(value="预留4", required=false) -// private String yl4; -// @ApiModelProperty(value="预留5", required=false) -// private String yl5; -// @ApiModelProperty(value="国际出口编号", required=true) -// private Long ckNo; - @ApiModelProperty(value="国际出口编号扩容", required=false) - private String ckNoRaw; - @ApiModelProperty(value="运营商类型", required=true) - private Long isp; - @ApiModelProperty(value="出口地点", required=true) - private Long dd; - - // Constructors - - /** default constructor */ - public JkDmbCk() { - } - - - - /* (non-Javadoc) - * @see com.nis.domain.BaseEntity#getId() - */ - @Override - @JsonIgnore - public Long getId() { - // TODO Auto-generated method stub - return super.getId(); - } - - public Long getGjCkId() { - return this.gjCkId; - } - - public void setGjCkId(Long gjCkId) { - this.gjCkId = gjCkId; - } - @JsonIgnore - public Long getGId() { - return this.gId; - } - - public void setGId(Long gId) { - this.gId = gId; - } - - public Long getSfSx() { - return this.sfSx; - } - - public void setSfSx(Long sfSx) { - this.sfSx = sfSx; - } - @JsonIgnore - public String getSxFw() { - return this.sxFw; - } - - public void setSxFw(String sxFw) { - this.sxFw = sxFw; - } - - public String getCkMc() { - return this.ckMc; - } - - public void setCkMc(String ckMc) { - this.ckMc = ckMc; - } - - public String getCkWz() { - return this.ckWz; - } - - public void setCkWz(String ckWz) { - this.ckWz = ckWz; - } - - public String getCkNoRaw() { - return this.ckNoRaw; - } - - public void setCkNoRaw(String ckNoRaw) { - this.ckNoRaw = ckNoRaw; - } - - public Long getIsp() { - return this.isp; - } - - public void setIsp(Long isp) { - this.isp = isp; - } - - public Long getDd() { - return this.dd; - } - - public void setDd(Long dd) { - this.dd = dd; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/jk/JkDmbCkSource.java b/src/main/java/com/nis/domain/restful/jk/JkDmbCkSource.java deleted file mode 100644 index ff3ec56..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkDmbCkSource.java +++ /dev/null @@ -1,125 +0,0 @@ -/** - *@Title: DmbCkSource.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - *@date 2016年9月9日 上午9:53:04 - *@version 版本号 - */ -package com.nis.domain.restful.jk; - -import java.util.Date; -import java.util.List; - -import org.apache.ibatis.type.Alias; - -import com.nis.domain.restful.ConfigCommonSource; - -/** - * @ClassName: DmbCkSource.java - * @Description: TODO - * @author (wx) - * @date 2016年9月9日 上午9:53:04 - * @version V1.0 - */ -@Alias("jkDmbCkSource") -public class JkDmbCkSource extends ConfigCommonSource{ - - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = 262835095511967504L; - private static final String DEFAULT_VERSION = "1.0"; - private List dmbCkList; - - - /** - * 创建一个新的实例 DmbCkSource. - * - */ - public JkDmbCkSource() { - super(); - // TODO Auto-generated constructor stub - this.version=DEFAULT_VERSION; - } - public JkDmbCkSource(String version) { - this.version=version; - } - - /** - * @return version - */ - public String getVersion() { - return version; - } - - /** - * @param version 要设置的 version - */ - public void setVersion(String version) { - this.version = version; - } - - /** - * @return operator - */ - public String getOperator() { - return operator; - } - - /** - * @param operator 要设置的 operator - */ - public void setOperator(String operator) { - this.operator = operator; - } - - - /** - * @return opTime - */ - public Date getOpTime() { - return opTime; - } - - /** - * @param opTime 要设置的 opTime - */ - public void setOpTime(Date opTime) { - this.opTime = opTime; - } - - - - /** - * @return opAction - */ - public Integer getOpAction() { - return opAction; - } - - /** - * @param opAction 要设置的 opAction - */ - public void setOpAction(Integer opAction) { - this.opAction = opAction; - } - - /** - * dmbCkList - * @return dmbCkList - */ - - public List getDmbCkList() { - return dmbCkList; - } - /** - * @param dmbCkList the dmbCkList to set - */ - public void setDmbCkList(List dmbCkList) { - this.dmbCkList = dmbCkList; - } -} diff --git a/src/main/java/com/nis/domain/restful/jk/JkFdZb.java b/src/main/java/com/nis/domain/restful/jk/JkFdZb.java deleted file mode 100644 index 4785160..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkFdZb.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.nis.domain.restful.jk; - -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.nis.domain.BaseEntity; -import com.nis.util.JsonDateSerializer; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * JkFdZb entity. - */ - -public class JkFdZb extends BaseEntity{ - - /** - * - */ - private static final Long serialVersionUID = 6166248976615344964L; - // Fields - @ApiModelProperty(value="全局编号", required=true) - private Long gId; - @ApiModelProperty(value="总表编号", required=true) - private Long zbId; - @ApiModelProperty(value="封堵方式", required=true) - private Long fdFs; - @ApiModelProperty(value="是否封堵", required=true) - private Long sfFd; - @ApiModelProperty(value="IP地址", required=true) - private String jkIp; - @ApiModelProperty(value="掩码", required=true) - private Long jkYm; - @ApiModelProperty(value="生效运营商", required=true) - private String ispRaw; - @ApiModelProperty(value="生效范围", required=true) - private String sxFw; - @ApiModelProperty(value="最后修改时间", required=true) - private Date lastUpdate; - /*@ApiModelProperty(value="IP地址类型", required=true) - private Integer addrType;*/ -// @ApiModelProperty(value="网站名称", required=true) -// private String jkWzMc; -// @ApiModelProperty(value="域名", required=true) -// private String jkDns; -// @ApiModelProperty(value="有害分类", required=true) -// private Long jkFl; -// @ApiModelProperty(value="有害性质", required=true) -// private Long jkXz; -// @ApiModelProperty(value="网站语言", required=true) -// private Long jkYy; -// @ApiModelProperty(value="通知单位", required=true) -// private String jkTzdw; -// @ApiModelProperty(value="来文函号", required=true) -// private String lwhh; -// @ApiModelProperty(value="预审员", required=true) -// private Long czyId; -// @ApiModelProperty(value="预审时间", required=true) -// private Date jkSj1; -// @ApiModelProperty(value="审核员", required=true) -// private Long jkShy; -// @ApiModelProperty(value="审核时间", required=true) -// private Date jkSj2; -// @ApiModelProperty(value="审批单号", required=true) -// private String spd; -// @ApiModelProperty(value="控管操作员", required=true) -// private Long kgczyid; -// @ApiModelProperty(value="控管操作时间", required=true) -// private Date kgczysj; -// @ApiModelProperty(value="用户组ID", required=true) -// private Long groupid; -// @ApiModelProperty(value="任务", required=true) -// private String rw; -// @ApiModelProperty(value="备注信息", required=true) -// private String jkBz; -// @ApiModelProperty(value="首次封堵时间", required=true) -// private String yl; -// @ApiModelProperty(value="有害网址配置ID", required=true) -// private Long yhwzId; -// @ApiModelProperty(value="截止日期", required=true) -// private Date yxrq; -// @ApiModelProperty(value="登记人", required=true) -// private Long djyid; -// @ApiModelProperty(value="登记时间 ", required=true) -// private Date djsj; -// @ApiModelProperty(value="复核人", required=true) -// private Long fhyid; -// @ApiModelProperty(value="复核时间", required=true) -// private Date fhsj; -// @ApiModelProperty(value="有害网址预审员", required=true) -// private Long yhwzysy; -// @ApiModelProperty(value="有害网址预审时间 ", required=true) -// private Date yhwzyssj; -// @ApiModelProperty(value="有害网址审核员", required=true) -// private Long yhwzshy; -// @ApiModelProperty(value="有害网址审核时间 ", required=true) -// private Date yhwzshsj; -// @ApiModelProperty(value="国际出口ID", required=true) -// private Long ipzyYsy; -// @ApiModelProperty(value="预审时间", required=true) -// private Date ipzyYssj; -// @ApiModelProperty(value="审核员", required=true) -// private Long ipzyShy; -// @ApiModelProperty(value="审核时间", required=true) -// private Date ipzyShsj; -// @ApiModelProperty(value="整型IP地址", required=true) -// private Long ipNum; -// @ApiModelProperty(value="生效运营商范围", required=true) -// private Long isp; -// @ApiModelProperty(value="预留1", required=true) -// private Long yl1; -// @ApiModelProperty(value="预留2", required=true) -// private Long yl2; -// @ApiModelProperty(value="预留3", required=true) -// private String yl3; -// @ApiModelProperty(value="预留4", required=true) -// private String yl4; -// @ApiModelProperty(value="预留5", required=true) -// private String yl5; - - public Long getGId() { - return gId; - } - @JsonIgnore - public void setGId(Long gId) { - this.gId = gId; - } - // Property accessors - - public Long getZbId() { - return this.zbId; - } - - public void setZbId(Long zbId) { - this.zbId = zbId; - } - - public Long getFdFs() { - return this.fdFs; - } - - public void setFdFs(Long fdFs) { - this.fdFs = fdFs; - } - - public Long getSfFd() { - return this.sfFd; - } - - public void setSfFd(Long sfFd) { - this.sfFd = sfFd; - } - - /*public Integer getAddrType() { - return addrType; - } - - public void setAddrType(Integer addrType) { - this.addrType = addrType; - } - */ - public String getJkIp() { - return this.jkIp; - } - - public void setJkIp(String jkIp) { - this.jkIp = jkIp; - } - - public Long getJkYm() { - return this.jkYm; - } - - public void setJkYm(Long jkYm) { - this.jkYm = jkYm; - } - - public String getSxFw() { - return this.sxFw; - } - - public void setSxFw(String sxFw) { - this.sxFw = sxFw; - } - - public String getIspRaw() { - return ispRaw; - } - public void setIspRaw(String ispRaw) { - this.ispRaw = ispRaw; - } - @JsonIgnore - /*@JsonSerialize(using=JsonDateSerializer.class)*/ - public Date getLastUpdate() { - return lastUpdate; - } - public void setLastUpdate(Date lastUpdate) { - this.lastUpdate = lastUpdate; - } - - @JsonIgnore - @Override - public Long getId() { - // TODO Auto-generated method stub - return super.getId(); - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/jk/JkFdZbSource.java b/src/main/java/com/nis/domain/restful/jk/JkFdZbSource.java deleted file mode 100644 index 803d4ee..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkFdZbSource.java +++ /dev/null @@ -1,122 +0,0 @@ -/** - *@Title: JkFdZbSource.java - *@Package com.nis.domain.restful.gk - *@Description TODO - *@author ddm - *@date 2016年10月20日 上午9:13:04 - *@version V1.0 - */ -package com.nis.domain.restful.jk; - -import java.util.Date; -import java.util.List; - -import com.nis.domain.restful.ConfigCommonSource; - -/** - * @ClassName: JkFdZbSource.java - * @Description: TODO - * @author (wx) -*@date 2016年10月20日 上午9:13:04 - * @version V1.0 - */ -public class JkFdZbSource extends ConfigCommonSource{ - - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - private static final long serialVersionUID = 78331728636991746L; - - - private static final String DEFAULT_VERSION = "1.0"; - private List jkFdZbList; - - - /** - * 创建一个新的实例 JkFdZbSource. - * - */ - public JkFdZbSource() { - super(); - this.version=DEFAULT_VERSION; - } - public JkFdZbSource(String version) { - this.version=version; - } - - /** - * @return version - */ - public String getVersion() { - return version; - } - - /** - * @param version 要设置的 version - */ - public void setVersion(String version) { - this.version = version; - } - - /** - * @return operator - */ - public String getOperator() { - return operator; - } - - /** - * @param operator 要设置的 operator - */ - public void setOperator(String operator) { - this.operator = operator; - } - - - /** - * @return opTime - */ - public Date getOpTime() { - return opTime; - } - - /** - * @param opTime 要设置的 opTime - */ - public void setOpTime(Date opTime) { - this.opTime = opTime; - } - - - - /** - * @return opAction - */ - public Integer getOpAction() { - return opAction; - } - - /** - * @param opAction 要设置的 opAction - */ - public void setOpAction(Integer opAction) { - this.opAction = opAction; - } - - /** - * jkFdZbList - * @return jkFdZbList - */ - - public List getJkFdZbList() { - return jkFdZbList; - } - /** - * @param jkFdZbList the jkFdZbList to set - */ - public void setJkFdZbList(List jkFdZbList) { - this.jkFdZbList = jkFdZbList; - } -} diff --git a/src/main/java/com/nis/domain/restful/jk/JkFfjInfo.java b/src/main/java/com/nis/domain/restful/jk/JkFfjInfo.java deleted file mode 100644 index d7c9562..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkFfjInfo.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.nis.domain.restful.jk; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.BaseEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: JkFfj.java - * @Description: TODO - * @author (zbc) - * @date 2016年10月19日 下午20:04:16 - * @version V1.0 - */ -public class JkFfjInfo extends BaseEntity { - - /** - * @Fields serialVersionUID - */ - private static final long serialVersionUID = -3343607423394648914L; - - @ApiModelProperty(value="全局编号", required=true) - protected Long gId; - @ApiModelProperty(value="分发机编号", required=true) - protected Long ffjId; - @ApiModelProperty(value="分发机名称", required=true) - protected String ffjMc; - @ApiModelProperty(value="分发机IP", required=true) - protected String ffjIp; - @ApiModelProperty(value="分发机角色", required=true) - protected Long ffjJs; - @ApiModelProperty(value="控管范围", required=true) - protected Long kgFw; - @ApiModelProperty(value="是否生效", required=true) - protected Long sfSx; - @ApiModelProperty(value="生效范围", required=true) - protected String sxFw; - - - public Long getgId() { - return gId; - } - @JsonIgnore - public void setgId(Long gId) { - this.gId = gId; - } - public Long getFfjId() { - return ffjId; - } - public void setFfjId(Long ffjId) { - this.ffjId = ffjId; - } - public String getFfjMc() { - return ffjMc; - } - public void setFfjMc(String ffjMc) { - this.ffjMc = ffjMc; - } - public String getFfjIp() { - return ffjIp; - } - public void setFfjIp(String ffjIp) { - this.ffjIp = ffjIp; - } - public Long getFfjJs() { - return ffjJs; - } - public void setFfjJs(Long ffjJs) { - this.ffjJs = ffjJs; - } - public Long getKgFw() { - return kgFw; - } - public void setKgFw(Long kgFw) { - this.kgFw = kgFw; - } - public Long getSfSx() { - return sfSx; - } - public void setSfSx(Long sfSx) { - this.sfSx = sfSx; - } - @JsonIgnore - public String getSxFw() { - return sxFw; - } - public void setSxFw(String sxFw) { - sxFw="0"; - this.sxFw = sxFw; - } - - - @JsonIgnore - @Override - public Long getId() { - return super.getId(); - } - -} diff --git a/src/main/java/com/nis/domain/restful/jk/JkFfjInfoSource.java b/src/main/java/com/nis/domain/restful/jk/JkFfjInfoSource.java deleted file mode 100644 index 8c7fb80..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkFfjInfoSource.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - *@Title: JkFfjInfoSource.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - * @date 2016年10月19日 下午20:04:16 - *@version 版本号 - */ -package com.nis.domain.restful.jk; - -import java.util.List; - -import com.nis.domain.restful.ConfigCommonSource; - -/** - * @ClassName: JkFfjInfoSource.java - * @Description: TODO - * @author (zbc) - * @date 2016年10月19日 下午20:04:16 - * @version V1.0 - */ -public class JkFfjInfoSource extends ConfigCommonSource { - - /** - * @Fields serialVersionUID - */ - private static final long serialVersionUID = 8841765964336072965L; - - - private static final String DEFAULT_VERSION = "1.0"; - private List jkffjList; - - public JkFfjInfoSource() { - super(); - super.version=DEFAULT_VERSION; - } - - public JkFfjInfoSource(String version) { - super(); - super.version = version; - } - - - public List getJkffjList() { - return jkffjList; - } - - public void setJkffjList(List jkffjList) { - this.jkffjList = jkffjList; - } -} diff --git a/src/main/java/com/nis/domain/restful/jk/JkFwqInfo.java b/src/main/java/com/nis/domain/restful/jk/JkFwqInfo.java deleted file mode 100644 index 041150d..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkFwqInfo.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.nis.domain.restful.jk; - -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.nis.domain.BaseEntity; -import com.nis.util.JsonDateSerializer; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class JkFwqInfo extends BaseEntity { - - /** - * @Fields serialVersionUID - */ - private static final long serialVersionUID = 2875730011488077179L; - - @ApiModelProperty(value="全局编号", required=true) - protected Long gId; - @ApiModelProperty(value="服务器编号", required=true) - protected Long fwqId; - @ApiModelProperty(value="服务器名称", required=true) - protected String fwqMc; - @ApiModelProperty(value="服务器IP地址", required=true) - protected String fwqIp; - @ApiModelProperty(value="是否生效", required=true) - protected Long sfSx; - @ApiModelProperty(value="生效范围", required=true) - protected String sxFw; - - - public Long getgId() { - return gId; - } - @JsonIgnore - public void setgId(Long gId) { - this.gId = gId; - } - public Long getFwqId() { - return fwqId; - } - public void setFwqId(Long fwqId) { - this.fwqId = fwqId; - } - public String getFwqMc() { - return fwqMc; - } - public void setFwqMc(String fwqMc) { - this.fwqMc = fwqMc; - } - public String getFwqIp() { - return fwqIp; - } - public void setFwqIp(String fwqIp) { - this.fwqIp = fwqIp; - } - public Long getSfSx() { - return sfSx; - } - public void setSfSx(Long sfSx) { - this.sfSx = sfSx; - } - @JsonIgnore - public String getSxFw() { - return sxFw; - } - public void setSxFw(String sxFw) { - this.sxFw = sxFw; - } - - - @JsonIgnore - @Override - public Long getId() { - return super.getId(); - } - -} diff --git a/src/main/java/com/nis/domain/restful/jk/JkFwqInfoSource.java b/src/main/java/com/nis/domain/restful/jk/JkFwqInfoSource.java deleted file mode 100644 index 45aafb4..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkFwqInfoSource.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - *@Title: JkFwqInfoSource.java - *@Package com.nis.domain.restful - *@Description TODO - *@author dell - * @date 2016年10月19日 下午20:04:16 - *@version 版本号 - */ -package com.nis.domain.restful.jk; - -import java.util.List; - -import com.nis.domain.restful.ConfigCommonSource; - -/** - * @ClassName: JkFwqInfoSource.java - * @Description: TODO - * @author (zbc) - * @date 2016年10月19日 下午20:04:16 - * @version V1.0 - */ -public class JkFwqInfoSource extends ConfigCommonSource { - - /** - * @Fields serialVersionUID - */ - private static final long serialVersionUID = -2670423354555878411L; - - private static final String DEFAULT_VERSION = "1.0"; - private List jkFwqList; - - - public JkFwqInfoSource() { - super(); - super.version = DEFAULT_VERSION; - } - - public JkFwqInfoSource(String version) { - super(); - super.version = version; - } - - - - public List getJkFwqInfoList() { - return jkFwqList; - } - - public void setJkFwqList(List jkFwqList) { - this.jkFwqList = jkFwqList; - } -} diff --git a/src/main/java/com/nis/domain/restful/jk/JkLyq.java b/src/main/java/com/nis/domain/restful/jk/JkLyq.java deleted file mode 100644 index faa4b52..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkLyq.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.nis.domain.restful.jk; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.nis.domain.BaseEntity; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * JkLyq entity. @author MyEclipse Persistence Tools - */ - -public class JkLyq extends BaseEntity { - - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -4644455398744485045L; - // Fields -// @ApiModelProperty(value="全局编号", required=true) - private Long gId; - @ApiModelProperty(value="路由器编号", required=true) - private Long lyqId; - @ApiModelProperty(value="路由器名称", required=true) - private String lyqMc; - @ApiModelProperty(value="控管服务器编号", required=true) - private Long fwqId; - @ApiModelProperty(value="虚拟主机编号", required=true) - private Long kgfs; - @ApiModelProperty(value="国际出口编号", required=true) - private Long gjCkId; - @ApiModelProperty(value="是否生效", required=true) - private Long sfSx; - @ApiModelProperty(value="生效范围", required=true) - private String sxFw; -// @ApiModelProperty(value="操作员", required=true) -// private Long czyId; -// @ApiModelProperty(value="操作时间", required=true) -// private Date czSj; -// @ApiModelProperty(value="备注", required=false) -// private String bz; -// @ApiModelProperty(value="预留", required=false) -// private String yl; - @ApiModelProperty(value="监听的端口", required=false) - private Long fwqDk; - - // Constructors - - /** default constructor */ - public JkLyq() { - } - - // Property accessors - /* (non-Javadoc) - * @see com.nis.domain.BaseEntity#getId() - */ - @Override - @JsonIgnore - public Long getId() { - // TODO Auto-generated method stub - return super.getId(); - } - public Long getLyqId() { - return this.lyqId; - } - - public void setLyqId(Long lyqId) { - this.lyqId = lyqId; - } - @JsonIgnore - public Long getGId() { - return this.gId; - } - - public void setGId(Long gId) { - this.gId = gId; - } - - public String getLyqMc() { - return this.lyqMc; - } - - public void setLyqMc(String lyqMc) { - this.lyqMc = lyqMc; - } - - public Long getFwqId() { - return this.fwqId; - } - - public void setFwqId(Long fwqId) { - this.fwqId = fwqId; - } - - public Long getKgfs() { - return this.kgfs; - } - - public void setKgfs(Long kgfs) { - this.kgfs = kgfs; - } - - public Long getGjCkId() { - return this.gjCkId; - } - - public void setGjCkId(Long gjCkId) { - this.gjCkId = gjCkId; - } - - public Long getSfSx() { - return this.sfSx; - } - - public void setSfSx(Long sfSx) { - this.sfSx = sfSx; - } - @JsonIgnore - public String getSxFw() { - return this.sxFw; - } - - public void setSxFw(String sxFw) { - this.sxFw = sxFw; - } - - public Long getFwqDk() { - return this.fwqDk; - } - - public void setFwqDk(Long fwqDk) { - this.fwqDk = fwqDk; - } - -} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/restful/jk/JkLyqSource.java b/src/main/java/com/nis/domain/restful/jk/JkLyqSource.java deleted file mode 100644 index 6a5e180..0000000 --- a/src/main/java/com/nis/domain/restful/jk/JkLyqSource.java +++ /dev/null @@ -1,122 +0,0 @@ -/** - *@Title: JkLyqSource.java - *@Package com.nis.domain.restful.jk - *@Description TODO - *@author dell - *@date 2016年9月9日 上午9:53:04 - *@version 版本号 - */ -package com.nis.domain.restful.jk; - -import java.util.Date; -import java.util.List; - -import com.nis.domain.restful.ConfigCommonSource; - -/** - * @ClassName: JkLyqSource.java - * @Description: TODO - * @author (wx) - * @date 2016年9月9日 上午9:53:04 - * @version V1.0 - */ -public class JkLyqSource extends ConfigCommonSource{ - - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = 262835095511967504L; - private static final String DEFAULT_VERSION = "1.0"; - private List jkLyqList; - - - /** - * 创建一个新的实例 DmbCkSource. - * - */ - public JkLyqSource() { - super(); - // TODO Auto-generated constructor stub - this.version=DEFAULT_VERSION; - } - public JkLyqSource(String version) { - this.version=version; - } - - /** - * @return version - */ - public String getVersion() { - return version; - } - - /** - * @param version 要设置的 version - */ - public void setVersion(String version) { - this.version = version; - } - - /** - * @return operator - */ - public String getOperator() { - return operator; - } - - /** - * @param operator 要设置的 operator - */ - public void setOperator(String operator) { - this.operator = operator; - } - - - /** - * @return opTime - */ - public Date getOpTime() { - return opTime; - } - - /** - * @param opTime 要设置的 opTime - */ - public void setOpTime(Date opTime) { - this.opTime = opTime; - } - - - - /** - * @return opAction - */ - public Integer getOpAction() { - return opAction; - } - - /** - * @param opAction 要设置的 opAction - */ - public void setOpAction(Integer opAction) { - this.opAction = opAction; - } - - /** - * jkLyqList - * @return jkLyqList - */ - - public List getJkLyqList() { - return jkLyqList; - } - /** - * @param jkLyqList the jkLyqList to set - */ - public void setJkLyqList(List jkLyqList) { - this.jkLyqList = jkLyqList; - } -} diff --git a/src/main/java/com/nis/web/controller/restful/jk/JkDmbCkController.java b/src/main/java/com/nis/web/controller/restful/jk/JkDmbCkController.java deleted file mode 100644 index 117bc99..0000000 --- a/src/main/java/com/nis/web/controller/restful/jk/JkDmbCkController.java +++ /dev/null @@ -1,204 +0,0 @@ -/** - *@Title: JkDmbCkController.java - *@Package com.nis.web.controller.restful - *@Description TODO - *@author wx - *@date 2016年9月7日 下午3:58:16 - *@version 版本号 - */ -package com.nis.web.controller.restful.jk; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -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.restful.jk.JkDmbCk; -import com.nis.domain.restful.jk.JkDmbCkSource; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.OracleErrorCodeUtil; -import com.nis.util.StringUtil; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.jk.JkDmbCkService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** - * @ClassName: JkDmbCkController.java - * @Description: TODO - * @author (wx) - * @date 2016年9月7日 下午3:58:16 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/jk/v1") -public class JkDmbCkController extends BaseRestController { - protected final Logger logger = Logger.getLogger(this.getClass()); - @Autowired - protected JkDmbCkService jkDmbCkService; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - /** - * saveDmbCkBatch(多条新增) - * (这里描述这个方法适用条件 – 可选) - * @param JkDmbCkSource - * @param request - * @param response - * @return - *Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") - @RequestMapping(value = "/dmbCkSources", method = RequestMethod.POST) - @ApiOperation(value = "保存因特网国际出入口", httpMethod = "POST", notes = "保存因特网国际出入口") - public Map saveDmbCkBatch(@RequestBody JkDmbCkSource dmbCkSource, HttpServletRequest request, HttpServletResponse response) { - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_POST,request, dmbCkSource); - super.checkOpAction(thread,System.currentTimeMillis()-start, dmbCkSource.getOpAction(), Constants.OPACTION_POST); - try{ - checkData(thread,start,dmbCkSource,Constants.OPACTION_POST); - jkDmbCkService.saveDmbCkBatch(dmbCkSource.getDmbCkList()); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(e instanceof RestServiceException) throw e; - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"保存因特网国际出入口失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"保存因特网国际出入口成功",dmbCkSource.getDmbCkList()); - } - /** - * - * updateDmbCkBatch(多条更新) - * (这里描述这个方法适用条件 – 可选) - * @param JkDmbCkSource - * @param request - * @param response - * @return - *Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") - @RequestMapping(value = "/dmbCkSources", method = RequestMethod.PUT) - @ApiOperation(value = "更新因特网国际出入口", httpMethod = "PUT", notes = "更新因特网国际出入口") - public Map updateDmbCkBatch(@RequestBody JkDmbCkSource dmbCkSource, HttpServletRequest request, HttpServletResponse response){ - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_PUT,request, dmbCkSource); - super.checkOpAction(thread,System.currentTimeMillis()-start,dmbCkSource.getOpAction(), Constants.OPACTION_PUT); - try{ - checkData(thread,start,dmbCkSource,Constants.OPACTION_PUT); - jkDmbCkService.updateDmbCkBatch(dmbCkSource.getDmbCkList()); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - if(e instanceof RestServiceException) throw e; - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"更新因特网国际出入口失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"更新因特网国际出入口成功",dmbCkSource.getDmbCkList()); - } - /** - * - * deleteDmbCk(单条删除) - * (这里描述这个方法适用条件 – 可选) - * @param id - * @param request - * @param response - * @return - *Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") -// @RequestMapping(value = "/dmbCkSources/{id}", method = RequestMethod.DELETE) -// @ApiOperation(value = "删除因特网国际出入口", httpMethod = "DELETE", notes = "删除因特网国际出入口") - public Map deleteDmbCk(@PathVariable("id") long id, HttpServletRequest request, HttpServletResponse response){ - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_DELETE,request, id); - try{ - jkDmbCkService.removeDmbCk(id); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"删除因特网国际出入口失败", RestBusinessCode.unknow_error.getValue()); - - } - - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"删除成功",id); - } - /** - * - * deleteDmbCk(多条删除) - * (这里描述这个方法适用条件 – 可选) - * @param JkDmbCkSource - * @param request - * @param response - * @return - *Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") -// @RequestMapping(value = "/dmbCkSources", method = RequestMethod.DELETE) -// @ApiOperation(value = "删除因特网国际出入口", httpMethod = "DELETE", notes = "删除因特网国际出入口") - public Map deleteDmbCk(@RequestBody JkDmbCkSource dmbCkSource, HttpServletRequest request, HttpServletResponse response){ - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_DELETE,request, dmbCkSource); - super.checkOpAction(thread,System.currentTimeMillis()-start,dmbCkSource.getOpAction(), Constants.OPACTION_DELETE); - try{ - jkDmbCkService.removeDmbCkBatch(dmbCkSource.getDmbCkList()); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e); - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"删除因特网国际出入口失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"批量删除成功",dmbCkSource.getDmbCkList()); - } - private void checkData(SaveRequestLogThread thread,long start,JkDmbCkSource dmbCkSource,int opAction){ - if(dmbCkSource.getDmbCkList().size()==0){ - throw new RestServiceException(thread,System.currentTimeMillis()-start,"因特网国际出入口不能为空", RestBusinessCode.unknow_error.getValue()); - } - for(JkDmbCk e:dmbCkSource.getDmbCkList()){ - if(opAction==Constants.OPACTION_POST&&e!=null&&e.getSfSx()!=Long.valueOf(Constants.YES)){ - throw new RestServiceException(thread,System.currentTimeMillis()-start,"只能新增有效数据", RestBusinessCode.wrong_range.getValue()); - }else if(opAction==Constants.OPACTION_PUT&&e!=null&&e.getSfSx()!=Long.valueOf(Constants.NO)){ - throw new RestServiceException(thread,System.currentTimeMillis()-start,"只允许将有效数据更改为无效数据", RestBusinessCode.wrong_range.getValue()); - } - if(opAction==Constants.OPACTION_POST){ - e.setSxFw("0"); - } - - } - } -} diff --git a/src/main/java/com/nis/web/controller/restful/jk/JkFdZbController.java b/src/main/java/com/nis/web/controller/restful/jk/JkFdZbController.java deleted file mode 100644 index 1d6f7d3..0000000 --- a/src/main/java/com/nis/web/controller/restful/jk/JkFdZbController.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.nis.web.controller.restful.jk; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -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.restful.jk.JkFdZb; -import com.nis.domain.restful.jk.JkFdZbSource; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.OracleErrorCodeUtil; -import com.nis.util.StringUtil; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.jk.JkFdZbService; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; - - -/** - * @ClassName: JkFdZbController - * @Description: 静态控管封堵/解封 - * @author (DDM) - * @date 2016年10月20日 上午10:20:33 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/jk/v1") -@Api(value = "JkFdZbController", description = "静态控管封堵/解封") -public class JkFdZbController extends BaseRestController { - Logger logger = LoggerFactory.getLogger(JkFdZbController.class); - SimpleDateFormat ymdhms=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - @Autowired - ServicesRequestLogService servicesRequestLogService; - @Autowired - protected JkFdZbService jkFdZbService; - - /** - * saveJkFdZbBatch(多条新增) - * (这里描述这个方法适用条件 – 可选) - * @param JkFdZbSource - * @param request - * @param response - * @return Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") - @RequestMapping(value = "/jkFdZbSources", method = RequestMethod.POST) - @ApiOperation(value = "静态控管封堵", httpMethod = "POST", notes = "save provider info") - public Map saveJkFdZbBatch(@RequestBody JkFdZbSource jkFdZbSource, HttpServletRequest request, HttpServletResponse response) { - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_POST,request, jkFdZbSource); - super.checkOpAction(thread,System.currentTimeMillis()-start, jkFdZbSource.getOpAction(), Constants.OPACTION_POST); - validJkFdZb(thread,System.currentTimeMillis()-start,jkFdZbSource.getJkFdZbList(),Constants.OPACTION_POST); - try{ - Date date=new Date(); - if(jkFdZbSource.getJkFdZbList() != null && jkFdZbSource.getJkFdZbList().size() >0){ - for (JkFdZb jkFdZb : jkFdZbSource.getJkFdZbList()) { - jkFdZb.setLastUpdate(date); - } - } - jkFdZbService.saveJkFdZbBatch(jkFdZbSource.getJkFdZbList()); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()+"\r\n"+e.getCause()); - if(e instanceof RestServiceException) throw e; - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"静态控管封堵失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"静态控管封堵成功",jkFdZbSource.getJkFdZbList()); - } - /** - * - * updateJkFdZbBatch(多条更新) - * (这里描述这个方法适用条件 – 可选) - * @param JkFdZbSource - * @param request - * @param response - * @return - *Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") - @RequestMapping(value = "/jkFdZbSources", method = RequestMethod.PUT) - @ApiOperation(value = "静态控管解封", httpMethod = "PUT", notes = "update provider info") - public Map updateJkFdZbBatch(@RequestBody JkFdZbSource jkFdZbSource, HttpServletRequest request, HttpServletResponse response){ - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_PUT,request, jkFdZbSource); - super.checkOpAction(thread,System.currentTimeMillis()-start,jkFdZbSource.getOpAction(), Constants.OPACTION_PUT); - - validJkFdZb(thread,System.currentTimeMillis()-start,jkFdZbSource.getJkFdZbList(),Constants.OPACTION_PUT); - - try{ - Date date=new Date(); - if(jkFdZbSource.getJkFdZbList() != null && jkFdZbSource.getJkFdZbList().size() >0){ - for (JkFdZb jkFdZb : jkFdZbSource.getJkFdZbList()) { - jkFdZb.setLastUpdate(date); - } - } - jkFdZbService.updateJkFdZbBatch(jkFdZbSource.getJkFdZbList()); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()+"\r\n"+e.getCause()); - if(e instanceof RestServiceException) throw e; - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"静态控管解封失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"静态控管解封成功",jkFdZbSource.getJkFdZbList()); - } - /** - * 校验是否存在无效数据 - * - * @Title: validJkFdZb - * @Description: TODO(这里用一句话描述这个方法的作用) - * @param @param thread - * @param @param start - * @param @param jkFdZbList - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public void validJkFdZb(SaveRequestLogThread thread,long start, List jkFdZbList,int opAction){ - String errorInfo = ""; - - if (jkFdZbList.size() <= 0) { - errorInfo = "静控封堵记录不能为空"; - thread.setExceptionInfo(errorInfo); - throw new RestServiceException(thread,System.currentTimeMillis()-start,errorInfo, RestBusinessCode.missing_args.getValue()); - }else{ - for (JkFdZb jkFdZb : jkFdZbList) { - if(opAction==Constants.OPACTION_POST&&jkFdZb != null && jkFdZb.getSfFd() !=Long.valueOf(Constants.YES)){ - errorInfo = "只能新增有效数据"; - thread.setExceptionInfo(errorInfo); - throw new RestServiceException(thread,System.currentTimeMillis()-start,errorInfo, RestBusinessCode.wrong_range.getValue()); - - }else if(opAction==Constants.OPACTION_PUT && jkFdZb != null && jkFdZb.getSfFd() !=Long.valueOf(Constants.NO)){ - errorInfo = "只允许将有效数据更改为无效数据"; - thread.setExceptionInfo(errorInfo); - throw new RestServiceException(thread,System.currentTimeMillis()-start,errorInfo, RestBusinessCode.wrong_range.getValue()); - - } - if(!"".equals(errorInfo)){ - break; - } - if(opAction==Constants.OPACTION_POST){ - jkFdZb.setSxFw("0"); - } - } - } - } - - -} diff --git a/src/main/java/com/nis/web/controller/restful/jk/JkFfjInfoController.java b/src/main/java/com/nis/web/controller/restful/jk/JkFfjInfoController.java deleted file mode 100644 index d35edfd..0000000 --- a/src/main/java/com/nis/web/controller/restful/jk/JkFfjInfoController.java +++ /dev/null @@ -1,134 +0,0 @@ -/** - *@Title: JkFfjInfoController.java - *@Package com.nis.web.controller.restful - *@Description TODO - *@author (zbc) - *@date 2016年10月19日 下午20:04:16 - *@version V1.0 - */ -package com.nis.web.controller.restful.jk; - -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -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.restful.jk.JkFfjInfo; -import com.nis.domain.restful.jk.JkFfjInfoSource; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.OracleErrorCodeUtil; -import com.nis.util.StringUtil; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.jk.JkFfjInfoService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** - * @ClassName: JkFfjInfoController.java - * @Description: TODO - * @author (zbc) - * @date 2016年10月19日 下午20:04:16 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/jk/v1") -@SuppressWarnings("rawtypes") -public class JkFfjInfoController extends BaseRestController { - protected final Logger logger = Logger.getLogger(this.getClass()); - - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - @Autowired - protected JkFfjInfoService jkFfjService; - - - @RequestMapping(value = "/jkFfjSources", method = RequestMethod.POST) - @ApiOperation(value = "保存静态控管分发机信息", httpMethod = "POST", notes = "save server info") - public Map saveJkFfjInfoBatch(@RequestBody JkFfjInfoSource jkFfjSource, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_POST, request, jkFfjSource); - super.checkOpAction(thread, System.currentTimeMillis() - start, jkFfjSource.getOpAction(), Constants.OPACTION_POST); - validJkFdZb(thread,System.currentTimeMillis()-start,jkFfjSource.getJkffjList(),Constants.OPACTION_POST); - try { - jkFfjService.saveJkFfjBatch(jkFfjSource.getJkffjList()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()+"\r\n"+e.getCause()); - if(e instanceof RestServiceException) throw e; - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"保存静态控管分发机信息失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"保存静态控管分发机信息成功",jkFfjSource.getJkffjList()); - } - - @RequestMapping(value = "/jkFfjSources", method = RequestMethod.PUT) - @ApiOperation(value = "更新静态控管分发机信息", httpMethod = "PUT", notes = "update server info") - public Map updateJkFfjInfoBatch(@RequestBody JkFfjInfoSource jkFfjSource, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_PUT, request, jkFfjSource); - super.checkOpAction(thread, System.currentTimeMillis() - start, jkFfjSource.getOpAction(), Constants.OPACTION_PUT); - validJkFdZb(thread,System.currentTimeMillis()-start,jkFfjSource.getJkffjList(),Constants.OPACTION_PUT); - try { - jkFfjService.updateJkFfjBatch(jkFfjSource.getJkffjList()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()+"\r\n"+e.getCause()); - if(e instanceof RestServiceException) throw e; - String info = OracleErrorCodeUtil.getOraCode(e); - if (!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread, System.currentTimeMillis() - start, info); - else - throw new RestServiceException(thread, System.currentTimeMillis() - start, "更新静态控管分发机信息失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"更新静态控管分发机信息成功",jkFfjSource.getJkffjList()); - } - - private void validJkFdZb(SaveRequestLogThread thread, long start, List jkffjList, int opAction) { - String errorInfo = ""; - - if (jkffjList.size() <= 0) { - errorInfo = "静控分发机记录不能为空"; - thread.setExceptionInfo(errorInfo); - throw new RestServiceException(thread,System.currentTimeMillis()-start,errorInfo, RestBusinessCode.missing_args.getValue()); - }else{ - for (JkFfjInfo JkFfj : jkffjList) { - if(opAction==Constants.OPACTION_POST&&JkFfj != null && JkFfj.getSfSx() !=Long.valueOf(Constants.YES)){ - errorInfo = "只能新增有效数据"; - thread.setExceptionInfo(errorInfo); - throw new RestServiceException(thread,System.currentTimeMillis()-start,errorInfo, RestBusinessCode.wrong_range.getValue()); - - }else if(opAction==Constants.OPACTION_PUT&&JkFfj != null && JkFfj.getSfSx() !=Long.valueOf(Constants.NO)){ - errorInfo = "只允许将有效数据更改为无效数据"; - thread.setExceptionInfo(errorInfo); - throw new RestServiceException(thread,System.currentTimeMillis()-start,errorInfo, RestBusinessCode.wrong_range.getValue()); - - } - if(!"".equals(errorInfo)){ - break; - } - if(opAction==Constants.OPACTION_POST){ - JkFfj.setSxFw("0"); - } - } - } - } - -} diff --git a/src/main/java/com/nis/web/controller/restful/jk/JkFwqInfoController.java b/src/main/java/com/nis/web/controller/restful/jk/JkFwqInfoController.java deleted file mode 100644 index 8ddbd78..0000000 --- a/src/main/java/com/nis/web/controller/restful/jk/JkFwqInfoController.java +++ /dev/null @@ -1,134 +0,0 @@ -/** - *@Title: JkFwqInfoController.java - *@Package com.nis.web.controller.restful - *@Description TODO - *@author (zbc) - *@date 2016年10月19日 下午20:04:16 - *@version V1.0 - */ -package com.nis.web.controller.restful.jk; - -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -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.restful.jk.JkFfjInfo; -import com.nis.domain.restful.jk.JkFfjInfoSource; -import com.nis.domain.restful.jk.JkFwqInfo; -import com.nis.domain.restful.jk.JkFwqInfoSource; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.OracleErrorCodeUtil; -import com.nis.util.StringUtil; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.jk.JkFwqInfoService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** - * @ClassName: JkFwqInfoController.java - * @Description: TODO - * @author (zbc) - * @date 2016年10月19日 下午20:04:16 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/jk/v1") -public class JkFwqInfoController extends BaseRestController { - protected final Logger logger = Logger.getLogger(this.getClass()); - - @Autowired - protected JkFwqInfoService jkFwqInfoService; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - - - @RequestMapping(value = "/jkFwqSources", method = RequestMethod.POST) - @ApiOperation(value = "保存静态控管服务器信息", httpMethod = "POST", notes = "save server info") - public Map saveJkFfjInfoBatch(@RequestBody JkFwqInfoSource jkFwqSource, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_POST, request, jkFwqSource); - super.checkOpAction(thread, System.currentTimeMillis() - start, jkFwqSource.getOpAction(), Constants.OPACTION_POST); - validJkFdZb(thread,System.currentTimeMillis()-start,jkFwqSource.getJkFwqInfoList(),Constants.OPACTION_POST); - try { - jkFwqInfoService.savejkFwqInfoBatch(jkFwqSource.getJkFwqInfoList()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()+"\r\n"+e.getCause()); - if(e instanceof RestServiceException) throw e; - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"保存静态控管服务器信息失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"保存静态控管服务器信息成功",jkFwqSource.getJkFwqInfoList()); - } - - @RequestMapping(value = "/jkFwqSources", method = RequestMethod.PUT) - @ApiOperation(value = "更新静态控管服务器信息", httpMethod = "PUT", notes = "update server info") - public Map updateJkFfjInfoBatch(@RequestBody JkFwqInfoSource jkFwqSource, HttpServletRequest request, - HttpServletResponse response) { - long start = System.currentTimeMillis(); - SaveRequestLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_PUT, request, jkFwqSource); - super.checkOpAction(thread, System.currentTimeMillis() - start, jkFwqSource.getOpAction(), Constants.OPACTION_PUT); - validJkFdZb(thread,System.currentTimeMillis()-start,jkFwqSource.getJkFwqInfoList(),Constants.OPACTION_PUT); - try { - jkFwqInfoService.updatejkFwqInfoBatch(jkFwqSource.getJkFwqInfoList()); - } catch (Exception e) { - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()+"\r\n"+e.getCause()); - if(e instanceof RestServiceException) throw e; - String info = OracleErrorCodeUtil.getOraCode(e); - if (!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread, System.currentTimeMillis() - start, info); - else - throw new RestServiceException(thread, System.currentTimeMillis() - start, "更新静态控管服务器信息失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"更新静态控管服务器信息成功",jkFwqSource.getJkFwqInfoList()); - } - - private void validJkFdZb(SaveRequestLogThread thread, long start, List jkFwqList, int opAction) { - String errorInfo = ""; - - if (jkFwqList.size() <= 0) { - errorInfo = "静态控管服务器信息不能为空"; - thread.setExceptionInfo(errorInfo); - throw new RestServiceException(thread,System.currentTimeMillis()-start,errorInfo, RestBusinessCode.missing_args.getValue()); - }else{ - for (JkFwqInfo jkFwq : jkFwqList) { - if(opAction==Constants.OPACTION_POST&&jkFwq != null && jkFwq.getSfSx()!=Long.valueOf(Constants.YES)){ - errorInfo = "只能新增有效数据"; - thread.setExceptionInfo(errorInfo); - throw new RestServiceException(thread,System.currentTimeMillis()-start,errorInfo, RestBusinessCode.wrong_range.getValue()); - - }else if(opAction==Constants.OPACTION_PUT&&jkFwq != null && jkFwq.getSfSx() !=Long.valueOf(Constants.NO)){ - errorInfo = "只允许将有效数据更改为无效数据"; - thread.setExceptionInfo(errorInfo); - throw new RestServiceException(thread,System.currentTimeMillis()-start,errorInfo, RestBusinessCode.wrong_range.getValue()); - - } - if(!"".equals(errorInfo)){ - break; - } - if(opAction==Constants.OPACTION_POST){ - jkFwq.setSxFw("0"); - } - } - } - } -} diff --git a/src/main/java/com/nis/web/controller/restful/jk/JkLyqController.java b/src/main/java/com/nis/web/controller/restful/jk/JkLyqController.java deleted file mode 100644 index f732a21..0000000 --- a/src/main/java/com/nis/web/controller/restful/jk/JkLyqController.java +++ /dev/null @@ -1,199 +0,0 @@ -/** - *@Title: JkLyqController.java - *@Package com.nis.web.controller.restful - *@Description TODO - *@author wx - *@date 2016年9月7日 下午3:58:16 - *@version 版本号 - */ -package com.nis.web.controller.restful.jk; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -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.restful.jk.JkLyq; -import com.nis.domain.restful.jk.JkLyqSource; -import com.nis.restful.RestBusinessCode; -import com.nis.restful.RestServiceException; -import com.nis.util.Constants; -import com.nis.util.OracleErrorCodeUtil; -import com.nis.util.StringUtil; -import com.nis.web.controller.BaseRestController; -import com.nis.web.service.SaveRequestLogThread; -import com.nis.web.service.ServicesRequestLogService; -import com.nis.web.service.restful.jk.JkLyqService; -import com.wordnik.swagger.annotations.ApiOperation; - -/** - * @ClassName: JkLyqController.java - * @Description: TODO - * @author (wx) - * @date 2016年9月7日 下午3:58:16 - * @version V1.0 - */ -@RestController -@RequestMapping("${servicePath}/jk/v1") -public class JkLyqController extends BaseRestController { - protected final Logger logger = Logger.getLogger(this.getClass()); - @Autowired - protected JkLyqService jkLyqService; - @Autowired - protected ServicesRequestLogService servicesRequestLogService; - /** - * saveJkLyqBatch(多条新增) - * (这里描述这个方法适用条件 – 可选) - * @param JkLyqSource - * @param request - * @param response - * @return - *Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") - @RequestMapping(value = "/jkLyqSources", method = RequestMethod.POST) - @ApiOperation(value = "保存静态控管路由器", httpMethod = "POST", notes = "保存静态控管路由器") - public Map saveJkLyqBatch(@RequestBody JkLyqSource jkLyqSource, HttpServletRequest request, HttpServletResponse response) { - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_POST,request, jkLyqSource); - super.checkOpAction(thread,System.currentTimeMillis()-start, jkLyqSource.getOpAction(), Constants.OPACTION_POST); - try{ - checKData(thread,start,jkLyqSource,Constants.OPACTION_POST); - jkLyqService.saveJkLyqBatch(jkLyqSource.getJkLyqList()); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()+"\r\n"+e.getCause()); - if(e instanceof RestServiceException) throw e; - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"保存静态控管路由器失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"保存静态控管路由器成功",jkLyqSource.getJkLyqList()); - } - /** - * - * updateJkLyqBatch(多条更新) - * (这里描述这个方法适用条件 – 可选) - * @param JkLyqSource - * @param request - * @param response - * @return - *Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") - @RequestMapping(value = "/jkLyqSources", method = RequestMethod.PUT) - @ApiOperation(value = "更新静态控管路由器", httpMethod = "PUT", notes = "更新静态控管路由器") - public Map updateJkLyqBatch(@RequestBody JkLyqSource jkLyqSource, HttpServletRequest request, HttpServletResponse response){ - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_PUT,request, jkLyqSource); - super.checkOpAction(thread,System.currentTimeMillis()-start,jkLyqSource.getOpAction(), Constants.OPACTION_PUT); - try{ - checKData(thread,start,jkLyqSource,Constants.OPACTION_PUT); - jkLyqService.updateJkLyqBatch(jkLyqSource.getJkLyqList()); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - e.printStackTrace(); - logger.error(e.getMessage()+"\r\n"+e.getCause()); - if(e instanceof RestServiceException) throw e; - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"更新静态控管路由器失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"更新静态控管路由器成功",jkLyqSource.getJkLyqList()); - } - /** - * - * deleteJkLyq(单条删除) - * (这里描述这个方法适用条件 – 可选) - * @param id - * @param request - * @param response - * @return - *Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") -// @RequestMapping(value = "/jkLyqSources/{id}", method = RequestMethod.DELETE) -// @ApiOperation(value = "删除静态控管路由器", httpMethod = "DELETE", notes = "删除静态控管路由器") - public Map deleteJkLyq(@PathVariable("id") long id, HttpServletRequest request, HttpServletResponse response){ - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_DELETE,request, id); - try{ - jkLyqService.removeJkLyq(id); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"删除静态控管路由器失败", RestBusinessCode.unknow_error.getValue()); - - } - - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"删除成功",id); - } - /** - * - * deleteJkLyq(多条删除) - * (这里描述这个方法适用条件 – 可选) - * @param JkLyqSource - * @param request - * @param response - * @return - *Map - * @exception - * @since 1.0.0 - */ - @SuppressWarnings("rawtypes") -// @RequestMapping(value = "/jkLyqSources", method = RequestMethod.DELETE) -// @ApiOperation(value = "删除静态控管路由器", httpMethod = "DELETE", notes = "删除静态控管路由器") - public Map deleteJkLyq(@RequestBody JkLyqSource jkLyqSource, HttpServletRequest request, HttpServletResponse response){ - long start=System.currentTimeMillis(); - SaveRequestLogThread thread=super.saveRequestLog(servicesRequestLogService,Constants.OPACTION_DELETE,request, jkLyqSource); - super.checkOpAction(thread,System.currentTimeMillis()-start,jkLyqSource.getOpAction(), Constants.OPACTION_DELETE); - try{ - jkLyqService.removeJkLyqBatch(jkLyqSource.getJkLyqList()); - }catch(Exception e){ - thread.setExceptionInfo(e.getMessage()+" "+e.getCause()); - String info=OracleErrorCodeUtil.getOraCode(e); - if(!StringUtil.isEmpty(info)) - OracleErrorCodeUtil.throwExceptionInfo(thread,System.currentTimeMillis()-start,info); - else - throw new RestServiceException(thread,System.currentTimeMillis()-start,"删除静态控管路由器失败", RestBusinessCode.unknow_error.getValue()); - } - return serviceResponse(thread,System.currentTimeMillis()-start,request,response,"批量删除成功",jkLyqSource.getJkLyqList()); - } - private void checKData(SaveRequestLogThread thread,long start,JkLyqSource jkLyqSource,int opAction){ - if(jkLyqSource.getJkLyqList().size()==0){ - throw new RestServiceException(thread,System.currentTimeMillis()-start,"静态控管路由器不能为空", RestBusinessCode.unknow_error.getValue()); - } - for(JkLyq entity:jkLyqSource.getJkLyqList()){ - if(opAction==Constants.OPACTION_POST&&entity!=null&&entity.getSfSx()!=Long.valueOf(Constants.YES)){ - throw new RestServiceException(thread,System.currentTimeMillis()-start,"只能新增有效数据", RestBusinessCode.wrong_range.getValue()); - }else if(opAction==Constants.OPACTION_PUT&&entity!=null&&entity.getSfSx()!=Long.valueOf(Constants.NO)){ - throw new RestServiceException(thread,System.currentTimeMillis()-start,"只允许将有效数据更改为无效数据", RestBusinessCode.wrong_range.getValue()); - } - if(opAction==Constants.OPACTION_POST){ - entity.setSxFw("0"); - } - } - } -} diff --git a/src/main/java/com/nis/web/dao/ConfigPzIdDao.xml b/src/main/java/com/nis/web/dao/ConfigPzIdDao.xml index 7ee034f..c52f90a 100644 --- a/src/main/java/com/nis/web/dao/ConfigPzIdDao.xml +++ b/src/main/java/com/nis/web/dao/ConfigPzIdDao.xml @@ -7,9 +7,6 @@ SEQ_COMPILEID.nextval - - SEQ_CONFIG_GROUP.nextval - SEQ_GROUPID.nextval diff --git a/src/main/java/com/nis/web/dao/jk/JkDmbCkDao.java b/src/main/java/com/nis/web/dao/jk/JkDmbCkDao.java deleted file mode 100644 index e51c15b..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkDmbCkDao.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nis.web.dao.jk; - -import com.nis.domain.restful.jk.JkDmbCk; -import com.nis.web.dao.CrudDao; -import com.nis.web.dao.MyBatisDao; -/** - * - * @ClassName: DmbCkDao.java - * @Description: TODO - * @author (dell) - * @date 2016年9月9日 上午10:03:33 - * @version V1.0 - */ -@MyBatisDao -public interface JkDmbCkDao extends CrudDao{ - int delete(long id); - int insert(JkDmbCk record); - int update(JkDmbCk record); - int updateValid(JkDmbCk record); -} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/jk/JkDmbCkDao.xml b/src/main/java/com/nis/web/dao/jk/JkDmbCkDao.xml deleted file mode 100644 index a4eaefd..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkDmbCkDao.xml +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - G_ID, GJ_CK_ID,SF_SX,SX_FW,CK_MC,CK_WZ,CK_NO_RAW,ISP,DD - - - - delete from DMB_CK - where GJ_CK_ID = #{gjCkId,jdbcType=BIGINT} - - - - insert into DMB_CK - - - GJ_CK_ID , - - - SF_SX , - - - SX_FW , - - - CK_MC , - - - CK_WZ , - - - - CK_NO_RAW , - - - ISP, - - - DD, - - - - - #{gjCkId,jdbcType=BIGINT}, - - - #{sfSx,jdbcType=BIGINT}, - - - - #{sxFw,jdbcType=VARCHAR}, - - - #{ckMc,jdbcType=VARCHAR}, - - - #{ckWz,jdbcType=BIGINT}, - - - - #{ckNoRaw,jdbcType=VARCHAR}, - - - #{isp,jdbcType=BIGINT}, - - - #{dd,jdbcType=BIGINT}, - - - - - update DMB_CK set SF_SX = #{sfSx,jdbcType=BIGINT} where GJ_CK_ID = #{gjCkId,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/jk/JkFdZbDao.java b/src/main/java/com/nis/web/dao/jk/JkFdZbDao.java deleted file mode 100644 index 24c9f45..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkFdZbDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nis.web.dao.jk; - -import com.nis.domain.restful.jk.JkFdZb; -import com.nis.web.dao.CrudDao; -import com.nis.web.dao.MyBatisDao; -/** - * - * @ClassName: JkFdZbDao.java - * @Description: TODO - * @author (ddm) - * @date 2016年10月19日 下午19:03:33 - * @version V1.0 - */ -@MyBatisDao -public interface JkFdZbDao extends CrudDao{ - int delete(long id); - int insert(JkFdZb record); - int update(JkFdZb record); -} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/jk/JkFdZbDao.xml b/src/main/java/com/nis/web/dao/jk/JkFdZbDao.xml deleted file mode 100644 index bd3b7ef..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkFdZbDao.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - G_ID,ZB_ID,FD_FS,SF_FD,JK_IP,JK_YM,ISP_RAW,LAST_UPDATE,SX_FW - - - - delete from JK_FD_ZB_FULL - where ZB_ID = #{zbId,jdbcType=BIGINT} - - - insert into JK_FD_ZB_FULL ( - zb_Id - ,fd_Fs - ,sf_Fd - ,jk_Ip - ,jk_Ym - ,isp_Raw - ,LAST_UPDATE - ,sx_Fw - - - ) - values ( - #{zbId,jdbcType=BIGINT}, - #{fdFs,jdbcType=BIGINT}, - #{sfFd,jdbcType=BIGINT}, - #{jkIp,jdbcType=VARCHAR}, - #{jkYm,jdbcType=BIGINT}, - #{ispRaw,jdbcType=VARCHAR}, - #{lastUpdate,jdbcType=VARCHAR}, - #{sxFw,jdbcType=VARCHAR} - ) - - - - update JK_FD_ZB_FULL - - - sf_Fd=#{sfFd,jdbcType=BIGINT}, - - - LAST_UPDATE=#{lastUpdate,jdbcType=BIGINT}, - - - - where ZB_ID = #{zbId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/jk/JkFfjInfoDao.java b/src/main/java/com/nis/web/dao/jk/JkFfjInfoDao.java deleted file mode 100644 index 24e25ee..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkFfjInfoDao.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nis.web.dao.jk; - -import com.nis.domain.restful.jk.JkFfjInfo; -import com.nis.web.dao.CrudDao; -import com.nis.web.dao.MyBatisDao; -/** - * - * @ClassName: JkFfjDao.java - * @Description: TODO - * @author (dell) - * @date 2016年9月9日 上午10:01:09 - * @version V1.0 - */ -@MyBatisDao -public interface JkFfjInfoDao extends CrudDao{ - int delete(long id); - int insert(JkFfjInfo record); - int update(JkFfjInfo record); - -} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/jk/JkFfjInfoDao.xml b/src/main/java/com/nis/web/dao/jk/JkFfjInfoDao.xml deleted file mode 100644 index b14f144..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkFfjInfoDao.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - G_ID, FFJ_ID, FFJ_MC, FFJ_IP, FFJ_JS, KG_FW, SF_SX, SX_FW - - - - - - delete from JK_FFJ - where FFJ_ID = #{ffjId,jdbcType=BIGINT} - - - - insert into JK_FFJ (FFJ_ID, FFJ_MC, FFJ_IP, FFJ_JS, KG_FW, SF_SX, SX_FW) - values (#{ffjId,jdbcType=BIGINT}, - #{ffjMc,jdbcType=VARCHAR}, #{ffjIp,jdbcType=VARCHAR}, - #{ffjJs,jdbcType=BIGINT}, #{kgFw,jdbcType=BIGINT}, #{sfSx,jdbcType=BIGINT}, - #{sxFw,jdbcType=VARCHAR} - ) - - - - update JK_FFJ - - SF_SX = #{sfSx,jdbcType=BIGINT}, - - where FFJ_ID = #{ffjId,jdbcType=BIGINT} - - - diff --git a/src/main/java/com/nis/web/dao/jk/JkFwqInfoDao.java b/src/main/java/com/nis/web/dao/jk/JkFwqInfoDao.java deleted file mode 100644 index e354476..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkFwqInfoDao.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.nis.web.dao.jk; - -import com.nis.domain.restful.jk.JkFwqInfo; -import com.nis.web.dao.CrudDao; -import com.nis.web.dao.MyBatisDao; -/** - * - * @ClassName: JkFfjDao.java - * @Description: TODO - * @author (dell) - * @date 2016年9月9日 上午10:01:09 - * @version V1.0 - */ -@MyBatisDao -public interface JkFwqInfoDao extends CrudDao{ - - int insert(JkFwqInfo record); - - int update(JkFwqInfo record); - -} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/jk/JkFwqInfoDao.xml b/src/main/java/com/nis/web/dao/jk/JkFwqInfoDao.xml deleted file mode 100644 index 38ba109..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkFwqInfoDao.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - G_ID, FWQ_ID, FWQ_MC, FWQ_IP, SF_SX, SX_FW - - - - insert into JK_FWQ (FWQ_ID, FWQ_MC, FWQ_IP, SF_SX, SX_FW) - values (#{fwqId,jdbcType=BIGINT}, - #{fwqMc,jdbcType=VARCHAR}, #{fwqIp,jdbcType=VARCHAR}, - #{sfSx,jdbcType=BIGINT}, #{sxFw,jdbcType=VARCHAR} - ) - - - - update JK_FWQ - - SF_SX = #{sfSx,jdbcType=BIGINT}, - - where FWQ_ID = #{fwqId,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/jk/JkLyqDao.java b/src/main/java/com/nis/web/dao/jk/JkLyqDao.java deleted file mode 100644 index eaacf8c..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkLyqDao.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.nis.web.dao.jk; - -import com.nis.domain.restful.jk.JkDmbCk; -import com.nis.domain.restful.jk.JkLyq; -import com.nis.web.dao.CrudDao; -import com.nis.web.dao.MyBatisDao; -/** - * - * @ClassName: DmbCkDao.java - * @Description: TODO - * @author (dell) - * @date 2016年9月9日 上午10:03:33 - * @version V1.0 - */ -@MyBatisDao -public interface JkLyqDao extends CrudDao{ - int delete(long id); - int insert(JkLyq record); - int update(JkLyq record); - int updateValid(JkLyq record); -} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/jk/JkLyqDao.xml b/src/main/java/com/nis/web/dao/jk/JkLyqDao.xml deleted file mode 100644 index 4fc0074..0000000 --- a/src/main/java/com/nis/web/dao/jk/JkLyqDao.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - G_ID, LYQ_ID,LYQ_MC,FWQ_ID,KGFS,GJ_CK_ID,SF_SX,SX_FW ,FWQ_DK - - - - delete from JK_LYQ - where LYQ_ID = #{lyqId,jdbcType=BIGINT} - - - - - insert into JK_LYQ - - - LYQ_ID , - - - LYQ_MC , - - - FWQ_ID , - - - KGFS , - - - GJ_CK_ID , - - - SF_SX , - - - SX_FW , - - - - FWQ_DK , - - - - - #{lyqId,jdbcType=BIGINT}, - - - #{lyqMc,jdbcType=VARCHAR}, - - - #{fwqId,jdbcType=BIGINT}, - - - #{kgfs,jdbcType=BIGINT}, - - - #{gjCkId,jdbcType=BIGINT}, - - - #{sfSx,jdbcType=BIGINT}, - - - #{sxFw,jdbcType=VARCHAR}, - - - - #{fwqDk,jdbcType=BIGINT}, - - - - - update JK_LYQ set SF_SX = #{sfSx,jdbcType=BIGINT} where LYQ_ID = #{lyqId,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/restful/jk/JkDmbCkService.java b/src/main/java/com/nis/web/service/restful/jk/JkDmbCkService.java deleted file mode 100644 index a080b6e..0000000 --- a/src/main/java/com/nis/web/service/restful/jk/JkDmbCkService.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - *@Title: DmbCkService.java - *@Package com.nis.web.service.restful - *@Description TODO - *@author wx - *@date 2016年9月7日 下午3:28:44 - *@version 版本号 - */ -package com.nis.web.service.restful.jk; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.restful.jk.JkDmbCk; -import com.nis.web.dao.jk.JkDmbCkDao; -import com.nis.web.service.CrudService; - -/** - * @ClassName: DmbCkService.java - * @Description: TODO - * @author (wx) - * @date 2016年9月7日 下午3:28:44 - * @version V1.0 - */ -@Service -public class JkDmbCkService extends CrudService { - @Autowired - public JkDmbCkDao jkDmbCkDao; - - public JkDmbCk findById(long id) { - return get(id); - } - public void saveDmbCkBatch(List entity) { - // TODO Auto-generated method stub - super.saveBatch(entity,JkDmbCkDao.class); - } - public void updateDmbCkBatch(List entity) { - // TODO Auto-generated method stub - super.updateBatch(entity, JkDmbCkDao.class); - } - - public void removeDmbCk(long id) { - jkDmbCkDao.delete(id); - } - public void removeDmbCkBatch(List entity) { - super.deleteBatch(entity, JkDmbCkDao.class); - } -} diff --git a/src/main/java/com/nis/web/service/restful/jk/JkFdZbService.java b/src/main/java/com/nis/web/service/restful/jk/JkFdZbService.java deleted file mode 100644 index c892083..0000000 --- a/src/main/java/com/nis/web/service/restful/jk/JkFdZbService.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - *@Title: JkFdZbService.java - *@Package com.nis.web.service.restful - *@Description TODO - *@author wx - *@date 2016年9月7日 下午3:28:44 - *@version 版本号 - */ -package com.nis.web.service.restful.jk; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.jk.JkFdZb; -import com.nis.web.dao.jk.JkFdZbDao; -import com.nis.web.service.CrudService; - -/** - * @ClassName: JkFdZbService.java - * @Description: TODO - * @author (DDM) - * @date 2016年10月19日 下午21:28:44 - * @version V1.0 - */ -@Service -public class JkFdZbService extends CrudService { - @Autowired - public JkFdZbDao dmbCkDao; - public Page getJkFdZb(Page page, JkFdZb entity) { - return findPage(page, entity); - } - - public JkFdZb findById(long zbId) { - return get(zbId); - } - public void saveJkFdZbBatch(List entity) { - super.saveBatch(entity,JkFdZbDao.class); - } - public void updateJkFdZbBatch(List entity) { - super.updateBatch(entity, JkFdZbDao.class); - } - public void removeJkFdZb(long zbId) { - dmbCkDao.delete(zbId); - } - public void removeJkFdZbBatch(List entity) { - super.deleteBatch(entity, JkFdZbDao.class); - } -} diff --git a/src/main/java/com/nis/web/service/restful/jk/JkFfjInfoService.java b/src/main/java/com/nis/web/service/restful/jk/JkFfjInfoService.java deleted file mode 100644 index a46129f..0000000 --- a/src/main/java/com/nis/web/service/restful/jk/JkFfjInfoService.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - *@Title: JkFfjInfoService.java - *@Package com.nis.web.service.restful - *@Description TODO - *@author (zbc) - *@date 2016年10月19日 下午20:04:16 - *@version 版本号 - */ -package com.nis.web.service.restful.jk; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.Page; -import com.nis.domain.restful.jk.JkFdZb; -import com.nis.domain.restful.jk.JkFfjInfo; -import com.nis.web.dao.jk.JkFdZbDao; -import com.nis.web.dao.jk.JkFfjInfoDao; -import com.nis.web.service.CrudService; - -/** - * @ClassName: JkFfjInfoService.java - * @Description: TODO - * @author (zbc) - * @date 2016年10月19日 下午20:04:16 - * @version V1.0 - */ -@Service -public class JkFfjInfoService extends CrudService { - - @Autowired - public JkFfjInfoDao jkFfjInfoDao; - - public void saveJkFfjBatch(List entity) { - super.saveBatch(entity, JkFfjInfoDao.class); - } - - - public void updateJkFfjBatch(List entity) { - super.updateBatch(entity, JkFfjInfoDao.class); - } -} diff --git a/src/main/java/com/nis/web/service/restful/jk/JkFwqInfoService.java b/src/main/java/com/nis/web/service/restful/jk/JkFwqInfoService.java deleted file mode 100644 index e2cc4f0..0000000 --- a/src/main/java/com/nis/web/service/restful/jk/JkFwqInfoService.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - *@Title: JkFfjInfoService.java - *@Package com.nis.web.service.restful - *@Description TODO - *@author (zbc) - *@date 2016年10月19日 下午20:04:16 - *@version 版本号 - */ -package com.nis.web.service.restful.jk; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.restful.jk.JkFwqInfo; -import com.nis.web.dao.jk.JkFwqInfoDao; -import com.nis.web.service.CrudService; - -/** - * @ClassName: JkFfjInfoService.java - * @Description: TODO - * @author (zbc) - * @date 2016年10月19日 下午20:04:16 - * @version V1.0 - */ -@Service -public class JkFwqInfoService extends CrudService { - - @Autowired - public JkFwqInfoDao jkFwqInfoDao; - - public void savejkFwqInfoBatch(List entity) { - super.saveBatch(entity, JkFwqInfoDao.class); - } - - - public void updatejkFwqInfoBatch(List entity) { - super.updateBatch(entity, JkFwqInfoDao.class); - } - -} diff --git a/src/main/java/com/nis/web/service/restful/jk/JkLyqService.java b/src/main/java/com/nis/web/service/restful/jk/JkLyqService.java deleted file mode 100644 index 02e388e..0000000 --- a/src/main/java/com/nis/web/service/restful/jk/JkLyqService.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - *@Title: JkLyqService.java - *@Package com.nis.web.service.restful - *@Description TODO - *@author wx - *@date 2016年9月7日 下午3:28:44 - *@version 版本号 - */ -package com.nis.web.service.restful.jk; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.nis.domain.restful.jk.JkLyq; -import com.nis.web.dao.jk.JkLyqDao; -import com.nis.web.service.CrudService; -import com.nis.web.service.SaveRequestLogThread; - -/** - * @ClassName: JkLyqService.java - * @Description: TODO - * @author (wx) - * @date 2016年9月7日 下午3:28:44 - * @version V1.0 - */ -@Service -public class JkLyqService extends CrudService { - @Autowired - public JkLyqDao jkLyqDao; - - public JkLyq findById(long id) { - return get(id); - } - public void saveJkLyqBatch(List entity) { - // TODO Auto-generated method stub - super.saveBatch(entity,JkLyqDao.class); - } - public void updateJkLyqBatch(List entity) { - // TODO Auto-generated method stub - super.updateBatch(entity, JkLyqDao.class); - } - public void removeJkLyq(long id) { - jkLyqDao.delete(id); - } - public void removeJkLyqBatch(List entity) { - super.deleteBatch(entity, JkLyqDao.class); - } -}