From 3aa0e7712db9f435892f43f1d7fbdd7acedce981 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 18 Feb 2019 10:08:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysDashboardController.java | 6 ++++++ .../apiservice/controller/busi/SysEnumController.java | 17 +++++++++++++++++ .../serviceimpl/busi/SysDashboardService.java | 9 +++++++++ 3 files changed, 32 insertions(+) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java index fe3c5a8..2c9e4a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.platform.common.tool.SerializeTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -51,6 +52,7 @@ public class SysDashboardController extends CoreBaseController { @Resource(name = "redisCore") private ImppRedis redisCore; + @AnnoIgnoreLog @GetMapping("/get-basic") @ApiOperation(value = "获取基础数据", notes = "获取基础数据，用户，部门，组织等信息") public ResultBean getBasicInfo() { @@ -78,6 +80,7 @@ public class SysDashboardController extends CoreBaseController { } } + @AnnoIgnoreLog @GetMapping(value = "/get-log") @ApiOperation(value = "查询日志", notes = "最近操作，异常日志") public ResultBean getLogInfo() { @@ -105,6 +108,7 @@ public class SysDashboardController extends CoreBaseController { } } + @AnnoIgnoreLog @GetMapping(value = "/get-avg-response-time") @ApiOperation(value = "获取平均响应时间", notes = "获取平均响应时间") public ResultBean getAvgResponseTime() { @@ -134,6 +138,7 @@ public class SysDashboardController extends CoreBaseController { } } + @AnnoIgnoreLog @GetMapping(value = "/get-level-log-num") @ApiOperation(value = "获取各等级日志数量", notes = "获取各等级日志数量") public ResultBean getLevelLogNum() { @@ -163,6 +168,7 @@ public class SysDashboardController extends CoreBaseController { } } + @AnnoIgnoreLog @GetMapping(value = "/get-server-pressure") @ApiOperation(value = "获取服务压力情况", notes = "获取服务压力情况") public ResultBean getServerPressure() { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java index 3bbcbf4..9590260 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java @@ -175,4 +175,21 @@ public class SysEnumController extends CoreBaseController{ return new ResultBean(true, "操作成功", Arrays.asList(ImppEnumUtil.SYS_CONFIG_GROUP.values())); } + + @GetMapping("/internal-notice-method") + @ApiOperation(value = "内部通知方式", notes = "内部通知方式") + public ResultBean getInternalNoticeMethod(){ + List list = new ArrayList<>(); + list.add(ImppEnumUtil.MESSAGE_TYPE.MAIL); + list.add(ImppEnumUtil.MESSAGE_TYPE.LETTER); + return new ResultBean(true, "操作成功",list); + } + + @GetMapping("/external-notice-method") + @ApiOperation(value = "外部通知方式", notes = "外部通知方式") + public ResultBean getExternalNoticeMethod(){ + List list = new ArrayList<>(); + list.add(ImppEnumUtil.MESSAGE_TYPE.MAIL); + return new ResultBean(true, "操作成功",list); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDashboardService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDashboardService.java index f604e96..2431a5a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDashboardService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDashboardService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDashboardService; import cn.estsh.i3plus.core.apiservice.dao.ISysLogSystemDao; +import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; @@ -51,18 +52,21 @@ public class SysDashboardService implements ISysDashboardService { private SysUserRepository sysUserRDao; @Override + @AnnoIgnoreLog @ApiOperation(value = "查询组织个数") public long getSysOrganizeCount() { return sysOrganizeRDao.listCount(); } @Override + @AnnoIgnoreLog @ApiOperation(value = "获取部门数量") public long getSysDepartmentCount() { return sysDepartmentRDao.listCount(); } @Override + @AnnoIgnoreLog @ApiOperation(value = "查询用户登录日志",notes = "查询用户登录日志") public List findSysUserLoginLog(Integer size) { StringBuffer orderString = new StringBuffer(); @@ -72,6 +76,7 @@ public class SysDashboardService implements ISysDashboardService { } @Override + @AnnoIgnoreLog @ApiOperation(value = "查询操作日志",notes = "查询最新的几条操作日志") public List findNewSysLogOperateSize(Integer size) { Pager page = new Pager(); @@ -84,6 +89,7 @@ public class SysDashboardService implements ISysDashboardService { } @Override + @AnnoIgnoreLog @ApiOperation(value = "查询操异常日志",notes = "查询最新的几条异常日志") public List findNewSysLogExceptionSize(Integer size) { Pager page = new Pager(); @@ -96,18 +102,21 @@ public class SysDashboardService implements ISysDashboardService { } @Override + @AnnoIgnoreLog @ApiOperation(value = "查询系统日志",notes = "查询系统日志各级别占比") public Map findSysLogSystempByLevel(String startTime, String endTime) { return null; } @Override + @AnnoIgnoreLog @ApiOperation(value = "查询系统日志",notes = "查询系统日志平均执行时间") public Map querySysLogSystemAvgExecuteTime(String startTime, String endTime) { return sysLogSystemDao.querySysLogSystemAvgExecuteTime(startTime,endTime); } @Override + @AnnoIgnoreLog @ApiOperation(value = "查询系统日志",notes = "查询各模块系统日志数量") public Map querySysLogSystemByLevel(String startTime, String endTime) { return sysLogSystemDao.querySysLogSystemByLevel(startTime,endTime);