From 7749d038271f263108dba1d2bbdf1cfb93ea0c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:41:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/base/ISysLogService.java | 2 -- .../controller/busi/ImppLogController.java | 42 +++++++++++++++++++++- .../core/apiservice/mq/ScheduleQueueReceiver.java | 3 +- .../core/apiservice/schedulejob/DemoJob.java | 19 +++++++--- .../i3plus/core/apiservice/util/NoSqlPack.java | 1 + 5 files changed, 58 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogService.java index f6ddc9e..0cca652 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogService.java @@ -5,7 +5,6 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.platbean.*; import io.swagger.annotations.ApiOperation; -import java.util.Date; import java.util.List; import java.util.Map; @@ -61,5 +60,4 @@ public interface ISysLogService { @ApiOperation(value = "查询时间段内各等级日志数量",notes = "查询时间段内各等级日志数量") Map querySysLogSystemByLevel(String startTime, String endTime); - } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java index 842b10b..d6e72f9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java @@ -2,8 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; 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.platform.plugin.elasticsearch.ElasticSearchTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -12,14 +12,18 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Calendar; import java.util.Date; +import java.util.List; /** * @Description : @@ -131,6 +135,42 @@ public class ImppLogController extends CoreBaseController { } } + /** + * 定时任务控制台日志，分页，排序 + * @param bean 查询条件 + * @return 处理结果 + */ + @GetMapping(value = "/console/query-schedule") + @ApiOperation(value = "定时任务控制台日志，分页，排序",notes = "定时任务控制台日志") + public ResultBean querySchdeuleLogConsoleByPager(SysLogConsole bean){ + try { + ValidatorBean.beginValid(bean) + .notNull("logGroup",bean.getLogGroup()); + // 参数 + // 1. group = CommonConstWords.SCHEDULE_LOG:Gourp.Name + // 2. + + bean.setLogGroup(CommonConstWords.SCHEDULE_LOG + ":" + bean.getLogGroup()); + + // 开始时间默认为上一分钟 + if (StringUtils.isBlank(bean.getCreateDateTimeStart())) { + Date lastMinute = TimeTool.timeCalc(new Date(), Calendar.MINUTE, -1); + bean.setCreateDateTimeStart(TimeTool.pareDateToString(lastMinute)); + } + + // 结束时间默认为当前时间 + if (StringUtils.isBlank(bean.getCreateDateTimeEnd())) { + bean.setCreateDateTimeEnd(TimeTool.getNowTime(true)); + } + List logExceptionList = logService.findLogConsoleList(bean); + return ResultBean.success("查询成功").setResultList(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + @GetMapping(value = "/clean-log") @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化") public ResultBean logClean(String time) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java index c104b08..6edde9a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; import cn.estsh.impp.framework.boot.log.ImppLog; import com.alibaba.fastjson.JSON; @@ -110,7 +111,7 @@ public class ScheduleQueueReceiver { // 设置收件人名称 String[] messageReceiver = taskPlan.getNoticeChannel().split(","); String receiversName = sysUserService.findSysUserByIds(StringTool.getArrayLong(messageReceiver)) - .stream().map(e -> e.getUserName()).collect(Collectors.joining(",")); + .stream().map(SysUser::getUserName).collect(Collectors.joining(",")); sysMessage.setMessageReceiversNameRdd(receiversName); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java index 1d70422..f4bf088 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; /** @@ -21,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; @DisallowConcurrentExecution @ApiOperation("定时任务demo") public class DemoJob extends BaseImppScheduleJob { - public static final Logger LOGGER = LoggerFactory.getLogger(DemoJob.class); + private static final long serialVersionUID = 2582480740831583839L; public DemoJob() { @@ -48,7 +46,18 @@ public class DemoJob extends BaseImppScheduleJob { } catch (InterruptedException e) { e.printStackTrace(); } - System.out.println("定时任务被执行"); - LOGGER.info("projectName：{},port:{}", applicationProperties.getApplicationName(),applicationProperties.getServerPort()); + + LOGGER.debug("debug /////BaseImppScheduleJob/// ///////projectName：{},port:{}", + applicationProperties.getApplicationName(), + applicationProperties.getServerPort()); + LOGGER.info("info ///////////BaseImppScheduleJob// ////projectName：{},port:{}", + applicationProperties.getApplicationName(), + applicationProperties.getServerPort()); + LOGGER.warn("warn /////////BaseImppScheduleJob////////////////////projectName：{},port:{}", + applicationProperties.getApplicationName(), + applicationProperties.getServerPort()); + LOGGER.error("error ////////////BaseImppScheduleJob////////////////////projectName：{},port:{}", + applicationProperties.getApplicationName(), + applicationProperties.getServerPort()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java index 5789835..c8eac5a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java @@ -180,6 +180,7 @@ public class NoSqlPack { result.andNumberEquals("softType",bean.getSoftType()); result.andStringLeftLike("logHost",bean.getLogHost()); result.andStringLike("userLoginName",bean.getUserLoginName()); + result.andStringEquals("logGroup",bean.getLogGroup()); result.andStringEquals("logLevel",bean.getLogLevel()); result.andStringLeftLike("executeClassName",bean.getExecuteClassName()); result.andStringLike("executeMethod",bean.getExecuteMethod());