From 88fe498fea1250a4d1ae6ac3b7296ca75a8befbe Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 11 Mar 2020 14:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/base/ISysLogService.java | 121 ++------- .../configuration/AppStartSystemInit.java | 2 +- .../core/apiservice/controller/DemoController.java | 2 - .../controller/DemoExceptionController.java | 135 ---------- .../apiservice/controller/DemoMongoController.java | 134 ---------- .../controller/DemoUserInfoController.java | 38 ++- .../controller/busi/SysLogExceptionController.java | 4 +- .../controller/busi/SysLogOperateController.java | 164 ++++++------ .../controller/busi/SysLogSystemController.java | 150 +++++------ .../controller/busi/SysLogTaskTimeController.java | 118 ++++----- .../apiservice/schedulejob/CoreLogClearJob.java | 72 +++--- .../base/SysLogElasticSearchService.java | 141 ++++------ .../apiservice/serviceimpl/base/SysLogFactory.java | 177 +++++++++++++ .../serviceimpl/base/SysLogMongoService.java | 288 +++++---------------- .../serviceimpl/busi/SysDashboardService.java | 7 +- .../serviceimpl/busi/SysLogExceptionService.java | 2 +- .../serviceimpl/busi/SysLogSystemService.java | 2 +- .../serviceimpl/busi/SysLogTaskTimeService.java | 2 +- .../serviceimpl/busi/SysTaskPlanService.java | 2 +- .../i3plus/core/apiservice/util/NoSqlPack.java | 171 ++++++++++++ 20 files changed, 786 insertions(+), 946 deletions(-) delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java 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 9f76e08..452069f 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 @@ -20,107 +20,25 @@ import java.util.Map; **/ public interface ISysLogService { - /********************************************************* 系统异常日志 Start *********************************************************/ - - @ApiOperation(value = "系统异常日志复杂查询，分页，排序") - ListPager querySysLogExceptionByPager(SysLogException sysLogException, Pager pager); - - @ApiOperation(value = "删除指定日期之后的日志") - long deleteSysLogExceptionByDateTimeAfter(String dateTime); - - /******************************************************* 系统异常日志 End *********************************************************/ - - - /********************************************************* 操作日志 Start *********************************************************/ - - @ApiOperation(value = "添加操作日志",notes = "添加操作日志") - SysLogOperate insertSysLogOperate(SysLogOperate logOperate); - - @ApiOperation(value = "根据id删除日志",notes = "根据id删除日志") - void deleteSysLogOperateById(Long id); - - @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") - List listSysLogOperate(); - - @ApiOperation(value = "批量删除日志",notes = "批量删除日志") - void deleteSysLogOperateByIds(Long[] ids); - - @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志") - SysLogOperate getSysLogOperateById(Long id); - - @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志") - List listSysLogOperateByOperateUserName(String operateUserName); - - @ApiOperation(value = "查询所有日志数量") - long countAllSysLogOperate(); - - @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") - ListPager querySysLogOperateByPager(SysLogOperate logOperate, Pager pager); - - @ApiOperation(value = "查询最新的操作日志") - List findNewSysLogOperate(Integer num); - - @ApiOperation(value = "删除指定日期之后的日志") - long deleteSysLogOperateByDateTimeAfter(String dateTime); - - @ApiOperation(value = "操作日志数量") - long countSysLogOperate(); - - /******************************************************* 操作日志 End *********************************************************/ - - - /******************************************************* 系统日志 Start *********************************************************/ - - @ApiOperation(value = "添加系统日志",notes = "添加系统日志") - void insertSysLogSystem(SysLogSystem logSystem); - - @ApiOperation(value = "造数据系统日志",notes = "造数据") - void insertSysLogBatch(int num,int waitTime); - - @ApiOperation(value = "删除日志",notes = "删除日志") - long deleteSysLogSystemById(Long id); - - @ApiOperation(value = "查询全部日志",notes = "查询全部日志") - List listSysLogSystem(); - - @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志") - SysLogSystem getSysLogSystemById(long id); - - @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") - ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager); - - @ApiOperation(value = "系统日志批量删除",notes = "系统日志批量删除") - long deleteSysLogSystemByIds(Long[] ids); - - @ApiOperation(value = "系统日志按id区间查询",notes = "系统日志按id区间查询") - List findSysLogSystemByIdInterval(long min, long max); - - @ApiOperation(value = "删除指定日期之后的日志",notes = "系统日志按id区间查询") - long deleteSysLogSystemByDateTimeAfter(String dateTime); - - /******************************************************* 系统日志 End *********************************************************/ - - - /******************************************************* 定时任务日志 Start *********************************************************/ - @ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志") - void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime); - - @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志") - void deleteSysLogTaskTimeById(Long id); - - @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志") - SysLogTaskTime getSysLogTaskTimeById(Long id); - - @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") - ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager); - - @ApiOperation(value = "删除指定日期之后的日志",notes = "删除指定日期之后的日志") - long deleteSysLogTaskTimeByDateTimeAfter(String dateTime); - - /******************************************************* 定时任务日志 End *********************************************************/ - - - /********************************************************* 操作日志 Start *********************************************************/ + ListPager queryLogExceptionPager(SysLogException log, Pager pager); + List findLogExceptionList(SysLogException log, Pager pager); + SysLogException insertLogException(SysLogException log); + SysLogException getLogException(SysLogException log); + + ListPager queryLogOperatePager(SysLogOperate log, Pager pager); + List findLogOperateList(SysLogOperate log, Pager pager); + SysLogOperate insertLogOperate(SysLogOperate log); + SysLogOperate getLogOperate(SysLogOperate log); + + ListPager queryLogSystemPager(SysLogSystem log, Pager pager); + List findLogSystemList(SysLogSystem log, Pager pager); + SysLogSystem insertLogSystem(SysLogSystem log); + SysLogSystem getLogSystem(SysLogSystem log); + + ListPager queryLogTaskTimePager(SysLogTaskTime log, Pager pager); + List findLogTaskTimeList(SysLogTaskTime log, Pager pager); + SysLogTaskTime insertLogTaskTime(SysLogTaskTime log); + SysLogTaskTime getLogTaskTime(SysLogTaskTime log); @ApiOperation(value = "查询时间段内平均请求耗时",notes = "查询时间段内平均请求耗时") Map querySysLogSystemAvgExecuteTime(String startTime, String endTime); @@ -128,6 +46,5 @@ public interface ISysLogService { @ApiOperation(value = "查询时间段内各等级日志数量",notes = "查询时间段内各等级日志数量") Map querySysLogSystemByLevel(String startTime, String endTime); - /******************************************************* 系统异常日志 End *********************************************************/ } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java index 6d47127..d80b1e6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java @@ -105,7 +105,7 @@ public class AppStartSystemInit implements CommandLineRunner { try { if(ImppSwitchUtil.isElasticSearchSwitch()){ if(StringUtils.isNotBlank(PROP_IMPP_ELASTICSEARCH_URL)){ -// ElasticSearchTool.init("http://192.168.3.40:9200"); + ElasticSearchTool.init(PROP_IMPP_ELASTICSEARCH_URL); }else { LOGGER.info("【启动加载】启动加载 ElasticSearch 组件错误,url 参数缺失"); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java index ca3b9ad..152a710 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.core.apiservice.controller; -import cn.estsh.i3plus.platform.common.tool.ExcelTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; @@ -13,7 +12,6 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java deleted file mode 100644 index 4d9f9b1..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java +++ /dev/null @@ -1,135 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.controller; - -import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; -import cn.estsh.i3plus.pojo.base.bean.ListPager; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; -import cn.estsh.impp.framework.boot.exception.ImppBusiException; -import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; -import cn.estsh.impp.framework.boot.util.ResultBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -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.sql.SQLException; - -@RestController -@RequestMapping("/impp") -@Api(tags="异常服务测试") -public class DemoExceptionController { - - private static final Logger LOGGER = LoggerFactory.getLogger(DemoExceptionController.class); - - @Autowired - private ISysLogService logService; - - /** - * 测试异常 - * @param type 异常参数 - * @return 处理结果 - * @throws Exception - */ - @GetMapping(value="/test-exception") - @ApiOperation(value="测试异常") - public ResultBean testException(int type) throws Exception{ - try{ - if(type == 1){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()) - .setErrorDetail("手动抛出异常") - .build(); - }else if(type == 2){ - throw new SQLException("测试数据库异常"); - }else { - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - }catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); - return ResultBean.fail(busExcep); - } - } - - - - /** - * 异常日志复杂查询，分页，排序 - * @param sysLogException 查询条件 - * @param pager 分页数据 - * @return 处理结果 - */ - @GetMapping(value = "/query") - @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") - public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager){ - try { - System.out.println("1==============="); - ListPager logExceptionList = logService.querySysLogExceptionByPager(sysLogException, pager); - System.out.println(logExceptionList.getObjectList().size()); - System.out.println("===============pager:" + pager); - return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - - - /** - * /query-logSystem - * @param sysLog 查询条件 - * @param pager 分页数据 - * @return 处理结果 - */ - @GetMapping(value = "/query-logSystem") - @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") - public ResultBean querySysLogSystemByPager(SysLogSystem sysLog, Pager pager){ - try { - System.out.println("2==============="); - ListPager logSystemList = logService.querySysLogSystemByPager(sysLog,pager); - System.out.println(logSystemList.getObjectList().size()); - System.out.println("===============pager:" + pager); - return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 异常日志复杂查询 - * @return 处理结果 - */ - @GetMapping(value = "/query-logSystemtest2") - @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") - public ResultBean querySysLogSystemTest(){ - try { - Pager pager = new Pager(); - pager.setStartRow(0); - pager.setPageSize(10); - - SysLogSystem logSystem = new SysLogSystem(); - - System.out.println("2==============="); - ListPager logSystemList = logService.querySysLogSystemByPager(logSystem,pager); - System.out.println(logSystemList.getObjectList().size()); - System.out.println("===============pager:" + pager); - return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java deleted file mode 100644 index fef5216..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java +++ /dev/null @@ -1,134 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.controller; - -import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; -import cn.estsh.i3plus.platform.common.util.PlatformConstWords; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; -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.exception.ImppExceptionEnum; -import cn.estsh.impp.framework.boot.util.ResultBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @Description : 系统资源服务demo - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-26 10:34 - * @Modify: - **/ -@RestController -@Api(tags = "系统服务demo") -@RequestMapping(PlatformConstWords.BASE_URL + "/demo-mongo-service") -public class DemoMongoController extends CoreBaseController { - private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class); - - @Autowired - private ISysLogService logService; - - /** - * 添加操作日志 - * - * @param logOperate 操作日志 - * @return 处理结果 - */ - @PostMapping(value = "/logoperate/insert") - @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化") - public ResultBean insertLogOperate(SysLogOperate logOperate) { - try { - logService.insertSysLogOperate(logOperate); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep).build(); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 修改系统语言，可用于国际化 - * - * @return 处理结果 - */ - @DeleteMapping(value = "/logoperate/delete/{id}") - @ApiOperation(value = "删除日志", notes = "删除日志") - public ResultBean deleteLog(@PathVariable String id) { - try { - logService.deleteSysLogOperateById(Long.parseLong(id)); - return ResultBean.success("删除日志成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep).build(); - } catch (Exception e) { - return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); - } - } - - /** - * 查询日志 - * - * @param logOperate 查询条件 - * @param pager 分页信息 - * @return 处理结果 - */ - @GetMapping(value = "/logoperate/query") - @ApiOperation(value = "查询日志", notes = "查询日志") - public ResultBean queryLanguage(SysLogOperate logOperate, Pager pager) { - try { - List logList = logService.listSysLogOperate(); - return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep).build(); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 查询日志 - * - * @param OperateUserName 操作人名称 - * @return 处理结果 - */ - @GetMapping(value = "/logoperate/operate-user-name") - @ApiOperation(value = "查询日志", notes = "查询日志") - public ResultBean queryLanguage(String OperateUserName) { - try { - List logList = logService.listSysLogOperateByOperateUserName(OperateUserName); - - long count = logService.countAllSysLogOperate(); - LOGGER.info("=log size= " + count); - - return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep).build(); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * @param id - * @return - */ - @GetMapping(value = "/logoperate/get/{id}") - @ApiOperation(value = "根据id查询日志", notes = "根据id查询日志") - public ResultBean getLogById(@PathVariable String id) { - try { - logService.getSysLogOperateById(Long.parseLong(id)); - return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep).build(); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUserInfoController.java index 715102f..0a1bfa1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUserInfoController.java @@ -63,7 +63,7 @@ public class DemoUserInfoController extends CoreBaseController { @Autowired private ISysDictionaryService dictionaryService; - ExecutorService executorService = Executors.newFixedThreadPool(50); + ExecutorService executorService = Executors.newFixedThreadPool(100); private List roleList; private List departmentList; @@ -88,7 +88,7 @@ public class DemoUserInfoController extends CoreBaseController { public ResultBean insertLogOperate() { try { initData(); - for (int i = 0; i < 50; i++) { + for (int i = 0; i < 350; i++) { executorService.execute(new Runnable() { @Override public void run() { @@ -199,4 +199,38 @@ public class DemoUserInfoController extends CoreBaseController { } return result; } + + + + +//➜ ~ df -h +//文件系统 容量 已用 可用 已用% 挂载点 +//udev 12G 0 12G 0% /dev +//tmpfs 2.4G 4.2M 2.4G 1% /run +///dev/mapper/ubuntu--vg-root 457G 130G 304G 30% / +//tmpfs 12G 206M 12G 2% /dev/shm +//tmpfs 5.0M 4.0K 5.0M 1% /run/lock +//tmpfs 12G 0 12G 0% /sys/fs/cgroup +///dev/loop1 25M 25M 0 100% /snap/snapd/6434 +///dev/loop2 55M 55M 0 100% /snap/core18/1668 +///dev/loop3 397M 397M 0 100% /snap/redis-desktop-manager/332 +///dev/loop4 92M 92M 0 100% /snap/core/8689 +///dev/loop5 25M 25M 0 100% /snap/snapd/6240 +///dev/loop6 398M 398M 0 100% /snap/redis-desktop-manager/335 +///dev/loop11 45M 45M 0 100% /snap/gtk-common-themes/1440 +///dev/loop8 45M 45M 0 100% /snap/gtk-common-themes/1353 +///dev/loop9 225M 225M 0 100% /snap/wine-platform-runtime/89 +///dev/loop10 74M 74M 0 100% /snap/wine-platform-3-stable/6 +///dev/loop12 4.0M 4.0M 0 100% /snap/notepad-plus-plus/225 +///dev/loop13 55M 55M 0 100% /snap/core18/1650 +///dev/loop14 92M 92M 0 100% /snap/core/8592 +///dev/nvme0n1p1 511M 6.1M 505M 2% /boot/efi +///dev/sda1 1.8T 286G 1.5T 17% /works +//tmpfs 2.4G 16K 2.4G 1% /run/user/121 +//tmpfs 2.4G 80K 2.4G 1% /run/user/1001 +///dev/loop15 4.0M 4.0M 0 100% /snap/notepad-plus-plus/227 +///dev/loop16 225M 225M 0 100% /snap/wine-platform-runtime/94 +//➜ ~ +// + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java index fae9af4..72e5e36 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java @@ -76,7 +76,7 @@ public class SysLogExceptionController extends CoreBaseController { @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager){ try { - ListPager logExceptionList = logService.querySysLogExceptionByPager(sysLogException, pager); + ListPager logExceptionList = logService.queryLogExceptionPager(sysLogException, pager); return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -145,7 +145,7 @@ public class SysLogExceptionController extends CoreBaseController { excelDir = new File(System.getProperty("java.io.tmpdir") + File.separator + new Date().getTime()); excelDir.mkdir(); do { - listPager = logService.querySysLogExceptionByPager(sysLogException, pager); + listPager = logService.queryLogExceptionPager(sysLogException, pager); pager = listPager.getObjectPager(); // 将excel导出至临时文件夹并上传 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index 479394b..bae41d3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -69,86 +69,86 @@ public class SysLogOperateController extends CoreBaseController { @Resource(name="redisRes") private ImppRedis redisRes; - /** - * 添加操作日志 - * @param logOperate 操作日志 - * @return 处理结果 - */ - @PostMapping(value = "/insert") - @ApiOperation(value = "添加操作日志",notes = "添加操作日志") - public ResultBean insertSysLogOperateController(SysLogOperate logOperate){ - try { - logService.insertSysLogOperate(logOperate); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 根据id删除操作日志 - * @param id 操作日志id - * @return 处理结果 - */ - @DeleteMapping(value = "/delete") - @ApiOperation(value = "根据id删除操作日志",notes = "根据id删除操作日志") - public ResultBean deleteSysLogOperateById(String id){ - try { - // 条件验证 - ValidatorBean.checkNotNull(id,"id不能为空！"); - - logService.deleteSysLogOperateById(Long.parseLong(id)); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 查询全部操作日志 - * @return 处理结果 - */ - @GetMapping(value = "/list") - @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") - public ResultBean findSysLogOperateAll(){ - try { - List logOperateList = logService.listSysLogOperate(); - return ResultBean.success("操作成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 根据id查询操作日志 - * @param id 操作日志 - * @return 处理结果 - */ - @GetMapping(value = "/get/{id}") - @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志") - public ResultBean getSysLogOperateById(@PathVariable("id") String id){ - try{ - SysLogOperate logOperate = logService.getSysLogOperateById(Long.parseLong(id)); - if (logOperate != null) { - return ResultBean.success("操作成功") - .setResultObject(logOperate) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }else { - return ResultBean.fail("操作日志不存在") - .setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); - } - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } +// /** +// * 添加操作日志 +// * @param logOperate 操作日志 +// * @return 处理结果 +// */ +// @PostMapping(value = "/insert") +// @ApiOperation(value = "添加操作日志",notes = "添加操作日志") +// public ResultBean insertSysLogOperateController(SysLogOperate logOperate){ +// try { +// logService.insertSysLogOperate(logOperate); +// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } +// +// /** +// * 根据id删除操作日志 +// * @param id 操作日志id +// * @return 处理结果 +// */ +// @DeleteMapping(value = "/delete") +// @ApiOperation(value = "根据id删除操作日志",notes = "根据id删除操作日志") +// public ResultBean deleteSysLogOperateById(String id){ +// try { +// // 条件验证 +// ValidatorBean.checkNotNull(id,"id不能为空！"); +// +// logService.deleteSysLogOperateById(Long.parseLong(id)); +// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } +// +// /** +// * 查询全部操作日志 +// * @return 处理结果 +// */ +// @GetMapping(value = "/list") +// @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") +// public ResultBean findSysLogOperateAll(){ +// try { +// List logOperateList = logService.listSysLogOperate(); +// return ResultBean.success("操作成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } +// +// /** +// * 根据id查询操作日志 +// * @param id 操作日志 +// * @return 处理结果 +// */ +// @GetMapping(value = "/get/{id}") +// @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志") +// public ResultBean getSysLogOperateById(@PathVariable("id") String id){ +// try{ +// SysLogOperate logOperate = logService.getSysLogOperateById(Long.parseLong(id)); +// if (logOperate != null) { +// return ResultBean.success("操作成功") +// .setResultObject(logOperate) +// .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }else { +// return ResultBean.fail("操作日志不存在") +// .setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); +// } +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } /** * 操作日志复杂查询，分页，排序 @@ -160,7 +160,7 @@ public class SysLogOperateController extends CoreBaseController { @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager){ try { - ListPager logSystemList = logService.querySysLogOperateByPager(logOperate, pager); + ListPager logSystemList = logService.queryLogOperatePager(logOperate, pager); return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -228,7 +228,7 @@ public class SysLogOperateController extends CoreBaseController { ExcelTool excelTool = new ExcelTool(entityManager, redisCore); do { - listPager = logService.querySysLogOperateByPager(sysLogOperate, pager); + listPager = logService.queryLogOperatePager(sysLogOperate, pager); pager = listPager.getObjectPager(); // 将excel导出至临时文件夹并上传 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 944f449..6f17f3b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -65,79 +65,79 @@ public class SysLogSystemController extends CoreBaseController{ @Resource(name="redisRes") private ImppRedis redisRes; - /** - * 新增系统日志 - * @param logSystem 系统日志 - * @return 处理结果 - */ - @PostMapping(value = "/insert") - @ApiOperation(value="新增系统日志",notes = "新增系统日志") - public ResultBean insertSysLogSystem(SysLogSystem logSystem) { - try { - logService.insertSysLogSystem(logSystem); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 删除系统日志 - * @param id 日志id - * @return 处理结果 - */ - @DeleteMapping(value = "/delete") - @ApiOperation(value = "删除系统日志",notes = "删除系统日志") - public ResultBean deleteSysLogSystemById(String id) { - try { - // 条件校验 - ValidatorBean.checkNotNull(id,"id不能为空"); - - logService.deleteSysLogSystemById(Long.parseLong(id)); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 查询全部系统日志 - * @return 处理结果 - */ - @GetMapping(value = "/list") - @ApiOperation(value = "查询全部系统日志",notes = "查询全部系统日志") - public ResultBean findSysLogSystemAll(){ - try { - List logSystemList = logService.listSysLogSystem(); - return ResultBean.success("操作成功").setResultList(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 根据id查询系统日志 - * @param id 系统日志id - * @return 处理结果 - */ - @GetMapping(value = "/get") - @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志") - public ResultBean getSysLogSystemById(String id){ - try { - SysLogSystem logSystem = logService.getSysLogSystemById(Long.parseLong(id)); - return ResultBean.success("操作成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } +// /** +// * 新增系统日志 +// * @param logSystem 系统日志 +// * @return 处理结果 +// */ +// @PostMapping(value = "/insert") +// @ApiOperation(value="新增系统日志",notes = "新增系统日志") +// public ResultBean insertSysLogSystem(SysLogSystem logSystem) { +// try { +// logService.insertSysLogSystem(logSystem); +// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } + +// /** +// * 删除系统日志 +// * @param id 日志id +// * @return 处理结果 +// */ +// @DeleteMapping(value = "/delete") +// @ApiOperation(value = "删除系统日志",notes = "删除系统日志") +// public ResultBean deleteSysLogSystemById(String id) { +// try { +// // 条件校验 +// ValidatorBean.checkNotNull(id,"id不能为空"); +// +// logService.deleteSysLogSystemById(Long.parseLong(id)); +// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } +// +// /** +// * 查询全部系统日志 +// * @return 处理结果 +// */ +// @GetMapping(value = "/list") +// @ApiOperation(value = "查询全部系统日志",notes = "查询全部系统日志") +// public ResultBean findSysLogSystemAll(){ +// try { +// List logSystemList = logService.listSysLogSystem(); +// return ResultBean.success("操作成功").setResultList(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } + +// /** +// * 根据id查询系统日志 +// * @param id 系统日志id +// * @return 处理结果 +// */ +// @GetMapping(value = "/get") +// @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志") +// public ResultBean getSysLogSystemById(String id){ +// try { +// SysLogSystem logSystem = logService.getSysLogSystemById(Long.parseLong(id)); +// return ResultBean.success("操作成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } /** * 系统日志分页复杂查询 @@ -149,7 +149,7 @@ public class SysLogSystemController extends CoreBaseController{ @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager){ try { - ListPager logSystemList = logService.querySysLogSystemByPager(logSystem, pager); + ListPager logSystemList = logService.queryLogSystemPager(logSystem, pager); return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -218,7 +218,7 @@ public class SysLogSystemController extends CoreBaseController{ excelDir = new File(System.getProperty("java.io.tmpdir") + File.separator + new Date().getTime()); excelDir.mkdir(); do { - listPager = logService.querySysLogSystemByPager(sysLogSystem, pager); + listPager = logService.queryLogSystemPager(sysLogSystem, pager); pager = listPager.getObjectPager(); // 将excel导出至临时文件夹并上传 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java index c20bd4b..f9b07b6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java @@ -34,66 +34,66 @@ public class SysLogTaskTimeController extends CoreBaseController{ @Autowired private ISysLogService logService; - /** - * 新增定时任务日志 - * @param sysLogTaskTime 定时任务日志 - * @return 处理结果 - */ - @PostMapping(value = "/insert") - @ApiOperation(value="新增定时任务日志",notes = "新增定时任务日志") - public ResultBean insertSyslogTaskTime(SysLogTaskTime sysLogTaskTime) { - try { - logService.insertSysLogTaskTime(sysLogTaskTime); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } +// /** +// * 新增定时任务日志 +// * @param sysLogTaskTime 定时任务日志 +// * @return 处理结果 +// */ +// @PostMapping(value = "/insert") +// @ApiOperation(value="新增定时任务日志",notes = "新增定时任务日志") +// public ResultBean insertSyslogTaskTime(SysLogTaskTime sysLogTaskTime) { +// try { +// logService.insertSysLogTaskTime(sysLogTaskTime); +// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } - /** - * 删除定时任务 - * @param id 定时任务id - * @return 处理结果 - */ - @DeleteMapping(value = "/delete") - @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志") - public ResultBean deleteSysLogTaskTimeById(String id) { - try { - // 条件校验 - ValidatorBean.checkNotNull(id,"id不能为空"); +// /** +// * 删除定时任务 +// * @param id 定时任务id +// * @return 处理结果 +// */ +// @DeleteMapping(value = "/delete") +// @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志") +// public ResultBean deleteSysLogTaskTimeById(String id) { +// try { +// // 条件校验 +// ValidatorBean.checkNotNull(id,"id不能为空"); +// +// logService.deleteSysLogTaskTimeById(Long.parseLong(id)); +// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } - logService.deleteSysLogTaskTimeById(Long.parseLong(id)); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 根据id查询定时任务日志 - * @param id 定时任务id - * @return 处理结果 - */ - @GetMapping(value = "/get") - @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志") - public ResultBean getSysLogTaskTimeById(String id){ - try { - SysLogTaskTime logTaskTime = logService.getSysLogTaskTimeById(Long.parseLong(id)); - if (logTaskTime != null) { - return ResultBean.success("操作成功").setResultObject(logTaskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }else { - return ResultBean.fail("日志不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); - } - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } +// /** +// * 根据id查询定时任务日志 +// * @param id 定时任务id +// * @return 处理结果 +// */ +// @GetMapping(value = "/get") +// @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志") +// public ResultBean getSysLogTaskTimeById(String id){ +// try { +// SysLogTaskTime logTaskTime = logService.getSysLogTaskTimeById(Long.parseLong(id)); +// if (logTaskTime != null) { +// return ResultBean.success("操作成功").setResultObject(logTaskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }else { +// return ResultBean.fail("日志不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); +// } +// }catch(ImppBusiException busExcep){ +// return ResultBean.fail(busExcep); +// }catch(Exception e){ +// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); +// } +// } /** * 定时任务日志分页复杂查询 @@ -105,7 +105,7 @@ public class SysLogTaskTimeController extends CoreBaseController{ @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager){ try { - ListPager logSystemList = logService.querySysLogTaskTimeByPager(sysLogTaskTime, pager); + ListPager logSystemList = logService.queryLogTaskTimePager(sysLogTaskTime, pager); return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java index 1b479b6..360bcb2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java @@ -41,42 +41,42 @@ public class CoreLogClearJob extends BaseImppScheduleJob { @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { - // 判断日志保留时间 -1 永久 - if (getJobParam() == null) { - return; - } - JSONObject clearParam = JSONObject.parseObject(getJobParam()); - - // 计算保留日期 - String dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -retentionTime,"yyyy-MM-dd HH:mm:ss"); - long count; - // 系统日志 - if (clearParam.containsKey("logSystem") && clearParam.getInteger("logSystem") != -1) { - dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logSystem"),"yyyy-MM-dd HH:mm:ss"); - count = logService.deleteSysLogSystemByDateTimeAfter(dateTime); - LOGGER.info("【日志清理】 清理系统日志 {} 条", count); - } - - // 异常日志 - if (clearParam.containsKey("logException") && clearParam.getInteger("logException") != -1) { - dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logException"),"yyyy-MM-dd HH:mm:ss"); - count = logService.deleteSysLogExceptionByDateTimeAfter(dateTime); - LOGGER.info("【日志清理】 清理异常日志 {} 条", count); - } - - // 操作日志 - if (clearParam.containsKey("logOperate") && clearParam.getInteger("logOperate") != -1) { - dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logException"),"yyyy-MM-dd HH:mm:ss"); - count = logService.deleteSysLogOperateByDateTimeAfter(dateTime); - LOGGER.info("【日志清理】 清理操作日志 {} 条", count); - } - - // 任务日志 - if (clearParam.containsKey("logTask") && clearParam.getInteger("logTask") != -1) { - dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logException"),"yyyy-MM-dd HH:mm:ss"); - count = logService.deleteSysLogTaskTimeByDateTimeAfter(dateTime); - LOGGER.info("【日志清理】 清理定时任务日志 {} 条", count); - } +// // 判断日志保留时间 -1 永久 +// if (getJobParam() == null) { +// return; +// } +// JSONObject clearParam = JSONObject.parseObject(getJobParam()); +// +// // 计算保留日期 +// String dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -retentionTime,"yyyy-MM-dd HH:mm:ss"); +// long count; +// // 系统日志 +// if (clearParam.containsKey("logSystem") && clearParam.getInteger("logSystem") != -1) { +// dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logSystem"),"yyyy-MM-dd HH:mm:ss"); +// count = logService.deleteSysLogSystemByDateTimeAfter(dateTime); +// LOGGER.info("【日志清理】 清理系统日志 {} 条", count); +// } +// +// // 异常日志 +// if (clearParam.containsKey("logException") && clearParam.getInteger("logException") != -1) { +// dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logException"),"yyyy-MM-dd HH:mm:ss"); +// count = logService.deleteSysLogExceptionByDateTimeAfter(dateTime); +// LOGGER.info("【日志清理】 清理异常日志 {} 条", count); +// } +// +// // 操作日志 +// if (clearParam.containsKey("logOperate") && clearParam.getInteger("logOperate") != -1) { +// dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logException"),"yyyy-MM-dd HH:mm:ss"); +// count = logService.deleteSysLogOperateByDateTimeAfter(dateTime); +// LOGGER.info("【日志清理】 清理操作日志 {} 条", count); +// } +// +// // 任务日志 +// if (clearParam.containsKey("logTask") && clearParam.getInteger("logTask") != -1) { +// dateTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logException"),"yyyy-MM-dd HH:mm:ss"); +// count = logService.deleteSysLogTaskTimeByDateTimeAfter(dateTime); +// LOGGER.info("【日志清理】 清理定时任务日志 {} 条", count); +// } } public static void main(String[] args) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java index 7f5b765..dac2bf2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.base; import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; -import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack; +import cn.estsh.i3plus.core.apiservice.util.NoSqlPack; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -10,9 +10,12 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; import cn.estsh.impp.framework.boot.util.ImppLog; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -20,159 +23,117 @@ import java.util.Map; * @Description : * @Reference : * @Author : wei.peng - * @CreateDate : 20-2-19 下午9:17 + * @CreateDate : 20-2-13 下午4:16 * @Modify: **/ @Service public class SysLogElasticSearchService implements ISysLogService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysLogElasticSearchService.class); + @Autowired private ImppLog imppLog; @Override - public ListPager querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) { - return null; - } - - @Override - public long deleteSysLogExceptionByDateTimeAfter(String dateTime) { - return 0; - } - - @Override - public SysLogOperate insertSysLogOperate(SysLogOperate logOperate) { - imppLog.insertSysLogOperate(logOperate); - return logOperate; - } - - @Override - public void deleteSysLogOperateById(Long id) { -// ElasticSearchTool.deletePrimaryKey(); - } - - @Override - public List listSysLogOperate() { - return null; - } - - @Override - public void deleteSysLogOperateByIds(Long[] ids) { - - } - - @Override - public SysLogOperate getSysLogOperateById(Long id) { -// return ElasticSearchTool.getPrimaryKey(); - return null; + public ListPager queryLogExceptionPager(SysLogException log, Pager pager) { + return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogException(log),pager,SysLogException.class); } @Override - public List listSysLogOperateByOperateUserName(String operateUserName) { - return null; + public List findLogExceptionList(SysLogException log, Pager pager) { + return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogException(log),pager,SysLogException.class); } @Override - public long countAllSysLogOperate() { - return 0; + public SysLogException insertLogException(SysLogException log) { + imppLog.insertSysLogException(log); + return log; } @Override - public ListPager querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) { - return null; + public SysLogException getLogException(SysLogException log) { + return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogException.class); } @Override - public List findNewSysLogOperate(Integer num) { - return null; + public ListPager queryLogOperatePager(SysLogOperate log, Pager pager) { + return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogOperate(log),pager,SysLogOperate.class); } @Override - public long deleteSysLogOperateByDateTimeAfter(String dateTime) { - return 0; + public List findLogOperateList(SysLogOperate log, Pager pager) { + return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogOperate(log),pager,SysLogOperate.class); } @Override - public long countSysLogOperate() { - return 0; - } - - @Override - public void insertSysLogSystem(SysLogSystem logSystem) { - + public SysLogOperate insertLogOperate(SysLogOperate log) { + imppLog.insertSysLogOperate(log); + return log; } @Override - public void insertSysLogBatch(int num, int waitTime) { - + public SysLogOperate getLogOperate(SysLogOperate log) { + return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogOperate.class); } @Override - public long deleteSysLogSystemById(Long id) { - return 0; + public ListPager queryLogSystemPager(SysLogSystem log, Pager pager) { + return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogSystem(log),pager,SysLogSystem.class); } @Override - public List listSysLogSystem() { - return null; + public List findLogSystemList(SysLogSystem log, Pager pager) { + return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogSystem(log),pager,SysLogSystem.class); } @Override - public SysLogSystem getSysLogSystemById(long id) { - return null; + public SysLogSystem insertLogSystem(SysLogSystem log) { + imppLog.insertSysLogSystem(log); + return log; } @Override - public ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) { - return null; + public SysLogSystem getLogSystem(SysLogSystem log) { + return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogSystem.class); } @Override - public long deleteSysLogSystemByIds(Long[] ids) { - return 0; + public ListPager queryLogTaskTimePager(SysLogTaskTime log, Pager pager) { + return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogTaskTime(log),pager,SysLogTaskTime.class); } @Override - public List findSysLogSystemByIdInterval(long min, long max) { - return null; + public List findLogTaskTimeList(SysLogTaskTime log, Pager pager) { + return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogTaskTime(log),pager,SysLogTaskTime.class); } @Override - public long deleteSysLogSystemByDateTimeAfter(String dateTime) { - return 0; + public SysLogTaskTime insertLogTaskTime(SysLogTaskTime log) { + imppLog.insertSysLogTaskTime(log); + return log; } @Override - public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) { - + public SysLogTaskTime getLogTaskTime(SysLogTaskTime log) { + return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogTaskTime.class); } - @Override - public void deleteSysLogTaskTimeById(Long id) { + /******************************************************* 定时任务日志 End *********************************************************/ - } @Override - public SysLogTaskTime getSysLogTaskTimeById(Long id) { - return null; + public Map querySysLogSystemAvgExecuteTime(String startTime, String endTime) { + Map resultData = new LinkedHashMap(); + return resultData; } @Override - public ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager) { - return null; + public Map querySysLogSystemByLevel(String startTime, String endTime) { + Map resultData = new LinkedHashMap(); + return resultData; } - @Override - public long deleteSysLogTaskTimeByDateTimeAfter(String dateTime) { - return 0; - } + /******************************************************* 系统异常日志 End *********************************************************/ - @Override - public Map querySysLogSystemAvgExecuteTime(String startTime, String endTime) { - return null; - } - @Override - public Map querySysLogSystemByLevel(String startTime, String endTime) { - return null; - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java new file mode 100644 index 0000000..89eb9e9 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java @@ -0,0 +1,177 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ImppLog; +import cn.estsh.impp.framework.boot.util.ImppSwitchUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-2-13 下午4:16 + * @Modify: + **/ +@Service +@Primary +public class SysLogFactory implements ISysLogService { + + public static final Logger LOGGER = LoggerFactory.getLogger(SysLogFactory.class); + + @Autowired + private SysLogElasticSearchService elasticSearchService; + + @Autowired + private SysLogMongoService mongoService; + + @Autowired + private ImppLog imppLog; + + private ISysLogService getSysLogService(){ + ImppEnumUtil.LOG_STORAGE storage = imppLog.getLogStorageCase(); + + if(ImppEnumUtil.LOG_STORAGE.MONGO.equals(storage)){ + if(ImppSwitchUtil.isSwitchMongo() && mongoService != null){ + return mongoService; + }else{ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) + .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) + .setErrorDetail("没有开启Mongo储存技术,请联系管理员") + .setErrorSolution("请检查配置文件") + .build(); + } + }else if(ImppEnumUtil.LOG_STORAGE.ELASTICSEARCH.equals(storage)){ + if(ImppSwitchUtil.isElasticSearchSwitch() && elasticSearchService != null){ + return elasticSearchService; + }else{ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) + .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) + .setErrorDetail("没有开启Elasticsearch储存技术,请联系管理员") + .setErrorSolution("请检查配置文件") + .build(); + } + } + + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) + .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) + .setErrorDetail("没有开启日志储存技术,请联系管理员") + .setErrorSolution("请检查日志配置,或者配置文件") + .build(); + } + + @Override + public ListPager queryLogExceptionPager(SysLogException log, Pager pager) { + return getSysLogService().queryLogExceptionPager(log,pager); + } + + @Override + public List findLogExceptionList(SysLogException log, Pager pager) { + return getSysLogService().findLogExceptionList(log,pager); + } + + @Override + public SysLogException insertLogException(SysLogException log) { + return getSysLogService().insertLogException(log); + } + + @Override + public SysLogException getLogException(SysLogException log) { + return getSysLogService().getLogException(log); + } + + @Override + public ListPager queryLogOperatePager(SysLogOperate log, Pager pager) { + return getSysLogService().queryLogOperatePager(log,pager); + } + + @Override + public List findLogOperateList(SysLogOperate log, Pager pager) { + return getSysLogService().findLogOperateList(log,pager); + } + + @Override + public SysLogOperate insertLogOperate(SysLogOperate log) { + return getSysLogService().insertLogOperate(log); + } + + @Override + public SysLogOperate getLogOperate(SysLogOperate log) { + return getSysLogService().getLogOperate(log); + } + + @Override + public ListPager queryLogSystemPager(SysLogSystem log, Pager pager) { + return getSysLogService().queryLogSystemPager(log,pager); + } + + @Override + public List findLogSystemList(SysLogSystem log, Pager pager) { + return getSysLogService().findLogSystemList(log,pager); + } + + @Override + public SysLogSystem insertLogSystem(SysLogSystem log) { + return getSysLogService().insertLogSystem(log); + } + + @Override + public SysLogSystem getLogSystem(SysLogSystem log) { + return getSysLogService().getLogSystem(log); + } + + @Override + public ListPager queryLogTaskTimePager(SysLogTaskTime log, Pager pager) { + return getSysLogService().queryLogTaskTimePager(log,pager); + } + + @Override + public List findLogTaskTimeList(SysLogTaskTime log, Pager pager) { + return getSysLogService().findLogTaskTimeList(log,pager); + } + + @Override + public SysLogTaskTime insertLogTaskTime(SysLogTaskTime log) { + return getSysLogService().insertLogTaskTime(log); + } + + @Override + public SysLogTaskTime getLogTaskTime(SysLogTaskTime log) { + return getSysLogService().getLogTaskTime(log); + } + + /******************************************************* 定时任务日志 End *********************************************************/ + + + @Override + public Map querySysLogSystemAvgExecuteTime(String startTime, String endTime) { + return getSysLogService().querySysLogSystemAvgExecuteTime(startTime, endTime); + } + + @Override + public Map querySysLogSystemByLevel(String startTime, String endTime) { + return getSysLogService().querySysLogSystemByLevel(startTime, endTime); + } + + /******************************************************* 系统异常日志 End *********************************************************/ + + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java index 51f9c8f..75ad73c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.base; import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; +import cn.estsh.i3plus.core.apiservice.util.NoSqlPack; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.MathOperation; import cn.estsh.i3plus.platform.common.tool.StringTool; @@ -17,19 +18,15 @@ import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogExceptionReposito import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogOperateRepository; import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogSystemRepository; import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepository; -import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ImppSwitchUtil; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import com.mongodb.client.AggregateIterable; import com.mongodb.client.MongoCursor; -import com.mongodb.client.model.Filters; -import io.swagger.annotations.ApiOperation; import org.bson.Document; import org.bson.conversions.Bson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Primary; import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.stereotype.Service; @@ -46,7 +43,6 @@ import java.util.Map; * @Modify: **/ @Service -@Primary public class SysLogMongoService implements ISysLogService { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogMongoService.class); @@ -58,15 +54,15 @@ public class SysLogMongoService implements ISysLogService { private MongoDbFactory mongoDbFactory; - public SysLogTaskTimeRepository getSysLogTaskTimeRepository(){ - if(logTaskTimeRDao == null && ImppSwitchUtil.propSwitchMongo()){ + public SysLogTaskTimeRepository getSysLogTaskTimeRepository() { + if (logTaskTimeRDao == null && ImppSwitchUtil.isSwitchMongo()) { logTaskTimeRDao = SpringContextsUtil.getBean(SysLogTaskTimeRepository.class); } - if(logTaskTimeRDao == null){ + if (logTaskTimeRDao == null) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode()) + .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) .setErrorDetail("日志Mongo存储错误") .setErrorSolution("请检查是否开启MongoDB存储") .build(); @@ -75,15 +71,15 @@ public class SysLogMongoService implements ISysLogService { return logTaskTimeRDao; } - public SysLogSystemRepository getSysLogSystemRepository(){ - if(logSystemRDao == null && ImppSwitchUtil.propSwitchMongo()){ + public SysLogSystemRepository getSysLogSystemRepository() { + if (logSystemRDao == null && ImppSwitchUtil.isSwitchMongo()) { logSystemRDao = SpringContextsUtil.getBean(SysLogSystemRepository.class); } - if(logSystemRDao == null){ + if (logSystemRDao == null) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode()) + .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) .setErrorDetail("日志Mongo存储错误") .setErrorSolution("请检查是否开启MongoDB存储") .build(); @@ -92,15 +88,15 @@ public class SysLogMongoService implements ISysLogService { return logSystemRDao; } - public SysLogOperateRepository getSysLogOperateRepository(){ - if(logOperateRDao == null && ImppSwitchUtil.propSwitchMongo()){ + public SysLogOperateRepository getSysLogOperateRepository() { + if (logOperateRDao == null && ImppSwitchUtil.isSwitchMongo()) { logOperateRDao = SpringContextsUtil.getBean(SysLogOperateRepository.class); } - if(logOperateRDao == null){ + if (logOperateRDao == null) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode()) + .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) .setErrorDetail("日志Mongo存储错误") .setErrorSolution("请检查是否开启MongoDB存储") .build(); @@ -109,15 +105,15 @@ public class SysLogMongoService implements ISysLogService { return logOperateRDao; } - public SysLogExceptionRepository getSysLogExceptionRepository(){ - if(logExceptionRDao == null && ImppSwitchUtil.propSwitchMongo()){ + public SysLogExceptionRepository getSysLogExceptionRepository() { + if (logExceptionRDao == null && ImppSwitchUtil.isSwitchMongo()) { logExceptionRDao = SpringContextsUtil.getBean(SysLogExceptionRepository.class); } - if(logExceptionRDao == null){ + if (logExceptionRDao == null) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode()) + .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) .setErrorDetail("日志Mongo存储错误") .setErrorSolution("请检查是否开启MongoDB存储") .build(); @@ -126,15 +122,15 @@ public class SysLogMongoService implements ISysLogService { return logExceptionRDao; } - public MongoDbFactory getMongoDbFactory(){ - if(mongoDbFactory == null && ImppSwitchUtil.propSwitchMongo()){ + public MongoDbFactory getMongoDbFactory() { + if (mongoDbFactory == null && ImppSwitchUtil.isSwitchMongo()) { mongoDbFactory = SpringContextsUtil.getBean(MongoDbFactory.class); } - if(mongoDbFactory == null){ + if (mongoDbFactory == null) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode()) + .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) .setErrorDetail("日志Mongo存储错误") .setErrorSolution("请检查是否开启MongoDB存储") .build(); @@ -145,253 +141,107 @@ public class SysLogMongoService implements ISysLogService { - /********************************************************* 系统异常日志 Start *********************************************************/ - - @Override - @ApiOperation(value = "系统异常日志复杂查询，分页，排序") - public ListPager querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) { - if(sysLogException == null) { - pager = PagerHelper.getPager(pager, (int) getSysLogExceptionRepository().count()); - return new ListPager(getSysLogExceptionRepository().findAll(),pager); - }else{ - Bson bson = CoreBsonPack.packBsonBySysLogException(sysLogException); - pager = PagerHelper.getPager(pager,getSysLogExceptionRepository().findByBsonCount(bson)); - //分页，排序 - return new ListPager(getSysLogExceptionRepository().findByBsonPager(bson,pager,sysLogException.getOrderByParam() - ,sysLogException.getAscOrDesc()),pager); - } - } - - @Override - public long deleteSysLogExceptionByDateTimeAfter(String dateTime) { - return getSysLogExceptionRepository().deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime)); - } - - /******************************************************* 系统异常日志 End *********************************************************/ - - - /********************************************************* 操作日志 Start *********************************************************/ - - @Override - @ApiOperation(value = "添加操作日志",notes = "添加操作日志") - public SysLogOperate insertSysLogOperate(SysLogOperate logOperate) { - return getSysLogOperateRepository().insert(logOperate); - } - - @Override - @ApiOperation(value = "根据id删除日志",notes = "根据id删除日志") - public void deleteSysLogOperateById(Long id) { - getSysLogOperateRepository().deleteById(id); - } - - @Override - @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") - public List listSysLogOperate() { - return getSysLogOperateRepository().listPager(null); - } - - @Override - public void deleteSysLogOperateByIds(Long[] ids) { - for(Long id : ids){ - getSysLogOperateRepository().deleteById(id); - } - } - - @Override - @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志") - public SysLogOperate getSysLogOperateById(Long id) { - return getSysLogOperateRepository().getById(id); - } - @Override - @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志") - public List listSysLogOperateByOperateUserName(String operateUserName) { - return getSysLogOperateRepository().findByProperty("operateUserName",operateUserName); + public ListPager queryLogExceptionPager(SysLogException log, Pager pager) { + Bson bson = NoSqlPack.packMongoBySysLogException(log); + pager = PagerHelper.getPager(pager, getSysLogTaskTimeRepository().findByBsonCount(bson)); + return new ListPager(getSysLogExceptionRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()), pager); } @Override - @ApiOperation(value = "查询所有日志数量") - public long countAllSysLogOperate() { - return getSysLogOperateRepository().listCount(); + public List findLogExceptionList(SysLogException log, Pager pager) { + Bson bson = NoSqlPack.packMongoBySysLogException(log); + return getSysLogExceptionRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()); } @Override - @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") - public ListPager querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) { - if(logOperate == null) { - pager = PagerHelper.getPager(pager, (int) getSysLogOperateRepository().count()); - return new ListPager(getSysLogOperateRepository().findAll(),pager); - }else{ - Bson bson = CoreBsonPack.packBsonByLogOperate(logOperate); - pager = PagerHelper.getPager(pager,getSysLogOperateRepository().findByBsonCount(bson)); - //分页，排序 - return new ListPager(getSysLogOperateRepository().findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager); - } + public SysLogException insertLogException(SysLogException log) { + return getSysLogExceptionRepository().save(log); } @Override - public List findNewSysLogOperate(Integer num) { - Pager page = new Pager(); - page.setCurrentPage(1); - page.setPageSize(num); - SysLogOperate sysLogOperate = new SysLogOperate(); - sysLogOperate.setOrderByParam("createDatetime"); - sysLogOperate.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); - return getSysLogOperateRepository().findByBsonPager(null,page,sysLogOperate.getOrderByParam(),sysLogOperate.getAscOrDesc()); + public SysLogException getLogException(SysLogException log) { + return getSysLogExceptionRepository().getById(log.getId()); } @Override - public long deleteSysLogOperateByDateTimeAfter(String dateTime) { - return getSysLogOperateRepository().deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime)); + public ListPager queryLogOperatePager(SysLogOperate log, Pager pager) { + Bson bson = NoSqlPack.packMongoByLogOperate(log); + pager = PagerHelper.getPager(pager, getSysLogTaskTimeRepository().findByBsonCount(bson)); + return new ListPager(getSysLogOperateRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()), pager); } @Override - public long countSysLogOperate() { - return getSysLogOperateRepository().listCount(); + public List findLogOperateList(SysLogOperate log, Pager pager) { + Bson bson = NoSqlPack.packMongoByLogOperate(log); + return getSysLogOperateRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()); } - /******************************************************* 操作日志 End *********************************************************/ - - - - /******************************************************* 系统日志 Start *********************************************************/ - @Override - @ApiOperation(value = "添加系统日志",notes = "添加系统日志") - public void insertSysLogSystem(SysLogSystem logSystem) { - getSysLogSystemRepository().insert(logSystem); + public SysLogOperate insertLogOperate(SysLogOperate log) { + return getSysLogOperateRepository().save(log); } - @Override - public void insertSysLogBatch(int num,int waitTime){ - long t1 = System.currentTimeMillis(); - SysLogSystem sysLogSystem = null; - for (int i = 0; i < num * 1000; i++) { - sysLogSystem = new SysLogSystem(); - sysLogSystem.setLogClass("新增测试class"); - sysLogSystem.setLogMethod("新增测试method" +System.currentTimeMillis()); - sysLogSystem.setLogArgs("新增测试参数" + System.currentTimeMillis()); - sysLogSystem.setExecuteTime(0L); - sysLogSystem.setArgsCount(1); - sysLogSystem.setLogDetail("2333"); - sysLogSystem.setLogLevel(ImppEnumUtil.LOG_LEVEL.DEBUG.getValue()); - sysLogSystem.setLogModuleId(CommonEnumUtil.SOFT_TYPE.CORE.getValue()); - sysLogSystem.setLogTitle("新增测试"); - - getSysLogSystemRepository().insert(sysLogSystem); - try { - this.wait(waitTime); - } catch (InterruptedException e) { - e.printStackTrace(); - } - LOGGER.info("插入SysLog耗时：" + (System.currentTimeMillis() - t1) + ",idx：" + i); - } + public SysLogOperate getLogOperate(SysLogOperate log) { + return getSysLogOperateRepository().getById(log.getId()); } @Override - @ApiOperation(value = "删除日志",notes = "删除日志") - public long deleteSysLogSystemById(Long id) { - Bson bson = Filters.eq("id",id); - return getSysLogSystemRepository().deleteByProperty(bson); + public ListPager queryLogSystemPager(SysLogSystem log, Pager pager) { + Bson bson = NoSqlPack.packMongoByLogSystem(log); + pager = PagerHelper.getPager(pager, getSysLogTaskTimeRepository().findByBsonCount(bson)); + return new ListPager(getSysLogSystemRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()), pager); } @Override - @ApiOperation(value = "查询全部日志",notes = "查询全部日志") - public List listSysLogSystem() { - return getSysLogSystemRepository().findAll(); + public List findLogSystemList(SysLogSystem log, Pager pager) { + Bson bson = NoSqlPack.packMongoByLogSystem(log); + return getSysLogSystemRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()); } @Override - @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志") - public SysLogSystem getSysLogSystemById(long id) { - return getSysLogSystemRepository().getById(id); + public SysLogSystem insertLogSystem(SysLogSystem log) { + return getSysLogSystemRepository().save(log); } @Override - @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") - public ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) { - if (logSystem == null) { - pager = PagerHelper.getPager(pager,getSysLogSystemRepository().listCount()); - return new ListPager(getSysLogSystemRepository().listPager(pager),pager); - } else { - Bson bson = CoreBsonPack.packBsonByLogSystem(logSystem); - pager = PagerHelper.getPager(pager,getSysLogSystemRepository().findByBsonCount(bson)); - return new ListPager(getSysLogSystemRepository().findByBsonPager(bson,pager,logSystem.getOrderByParam() - ,logSystem.getAscOrDesc()),pager); - } + public SysLogSystem getLogSystem(SysLogSystem log) { + return getSysLogSystemRepository().getById(log.getId()); } @Override - @ApiOperation(value = "系统日志批量删除",notes = "系统日志批量删除") - public long deleteSysLogSystemByIds(Long[] ids) { - return getSysLogSystemRepository().deleteByIds(ids); + public ListPager queryLogTaskTimePager(SysLogTaskTime log, Pager pager) { + Bson bson = NoSqlPack.packMongoByLogTaskTime(log); + pager = PagerHelper.getPager(pager, getSysLogTaskTimeRepository().findByBsonCount(bson)); + return new ListPager(getSysLogTaskTimeRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()), pager); } @Override - @ApiOperation(value = "系统日志按id区间查询",notes = "系统日志按id区间查询") - public List findSysLogSystemByIdInterval(long min, long max) { - return getSysLogSystemRepository().findByBson(CoreBsonPack.packBsonByInterval("_id",min,max)); + public List findLogTaskTimeList(SysLogTaskTime log, Pager pager) { + Bson bson = NoSqlPack.packMongoByLogTaskTime(log); + return getSysLogTaskTimeRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()); } @Override - public long deleteSysLogSystemByDateTimeAfter(String dateTime) { - return getSysLogSystemRepository().deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime)); + public SysLogTaskTime insertLogTaskTime(SysLogTaskTime log) { + return getSysLogTaskTimeRepository().save(log); } - - /******************************************************* 系统日志 End *********************************************************/ - - - /******************************************************* 定时任务日志 Start *********************************************************/ - @Override - @ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志") - public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) { - getSysLogTaskTimeRepository().insert(sysLogTaskTime); + public SysLogTaskTime getLogTaskTime(SysLogTaskTime log) { + return getSysLogTaskTimeRepository().getById(log.getId()); } - @Override - @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志") - public void deleteSysLogTaskTimeById(Long id) { - getSysLogTaskTimeRepository().deleteById(id); - } - - @Override - @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志") - public SysLogTaskTime getSysLogTaskTimeById(Long id) { - return getSysLogTaskTimeRepository().getById(id); - } - - @Override - @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") - public ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager) { - if (sysLogTaskTime == null) { - pager = PagerHelper.getPager(pager,getSysLogTaskTimeRepository().listCount()); - return new ListPager(getSysLogTaskTimeRepository().listPager(pager),pager); - } else { - Bson bson = CoreBsonPack.packBsonByLogTaskTime(sysLogTaskTime); - pager = PagerHelper.getPager(pager,getSysLogTaskTimeRepository().findByBsonCount(bson)); - return new ListPager(getSysLogTaskTimeRepository().findByBsonPager(bson,pager,sysLogTaskTime.getOrderByParam() - ,sysLogTaskTime.getAscOrDesc()),pager); - } - } - - @Override - public long deleteSysLogTaskTimeByDateTimeAfter(String dateTime) { - return getSysLogTaskTimeRepository().deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime)); - } /******************************************************* 定时任务日志 End *********************************************************/ - /********************************************************* 操作日志 Start *********************************************************/ - @Override public Map querySysLogSystemAvgExecuteTime(String startTime, String endTime) { // 筛选 Document sub_match = new Document(); sub_match.put("createDatetime", new Document("$gte", startTime).append("$lte", endTime)); - // 分组 + // 分组 Document sub_group = new Document(); sub_group.put("_id", "$createDatetime"); sub_group.put("avg", new Document("$avg", "$executeTime")); @@ -415,13 +265,13 @@ public class SysLogMongoService implements ISysLogService { Document item_doc; while (cursor.hasNext()) { item_doc = cursor.next(); - resultData.put(item_doc.getString("_id"),MathOperation.round(item_doc.getDouble("avg"),0)); + resultData.put(item_doc.getString("_id"), MathOperation.round(item_doc.getDouble("avg"), 0)); } return resultData; } @Override - public Map querySysLogSystemByLevel(String startTime, String endTime){ + public Map querySysLogSystemByLevel(String startTime, String endTime) { // 筛选 Document sub_match = new Document(); sub_match.put("createDatetime", new Document("$gte", startTime).append("$lte", endTime)); @@ -446,7 +296,7 @@ public class SysLogMongoService implements ISysLogService { Document item_doc; while (cursor.hasNext()) { item_doc = cursor.next(); - resultData.put(ImppEnumUtil.LOG_LEVEL.valueOfName(item_doc.getInteger("_id")),MathOperation.round(item_doc.getInteger("count"),0)); + resultData.put(ImppEnumUtil.LOG_LEVEL.valueOfName(item_doc.getInteger("_id")), MathOperation.round(item_doc.getInteger("count"), 0)); } return resultData; 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 d3b77c3..e6298d2 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 @@ -44,7 +44,8 @@ public class SysDashboardService implements ISysDashboardService { @AnnoIgnoreLog @ApiOperation(value = "查询组织个数") public long getSysOrganizeCount() { - return logService.countSysLogOperate(); +// return logService.countSysLogOperate(); + return 0L; } @Override @@ -74,7 +75,7 @@ public class SysDashboardService implements ISysDashboardService { SysLogOperate sysLogOperate = new SysLogOperate(); sysLogOperate.setOrderByParam("createDatetime"); sysLogOperate.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); - return logService.querySysLogOperateByPager(sysLogOperate,page); + return logService.queryLogOperatePager(sysLogOperate,page); } @Override @@ -87,7 +88,7 @@ public class SysDashboardService implements ISysDashboardService { SysLogOperate sysLogOperate = new SysLogOperate(); sysLogOperate.setOrderByParam("createDatetime"); sysLogOperate.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); - return logService.querySysLogOperateByPager(sysLogOperate,page); + return logService.queryLogOperatePager(sysLogOperate,page); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java index 85770db..7ee62ad 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java @@ -35,7 +35,7 @@ //// pager = PagerHelper.getPager(pager, (int) sysLogExceptionRDao.count()); //// return new ListPager(sysLogExceptionRDao.findAll(),pager); //// }else{ -//// Bson bson = CoreBsonPack.packBsonBySysLogException(sysLogException); +//// Bson bson = CoreBsonPack.packMongoBySysLogException(sysLogException); //// pager = PagerHelper.getPager(pager,sysLogExceptionRDao.findByBsonCount(bson)); //// //分页，排序 //// return new ListPager(sysLogExceptionRDao.findByBsonPager(bson,pager,sysLogException.getOrderByParam() diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java index 53eea83..8e22f1c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java @@ -96,7 +96,7 @@ //// pager = PagerHelper.getPager(pager,logSystemRDao.listCount()); //// return new ListPager(logSystemRDao.listPager(pager),pager); //// } else { -//// Bson bson = CoreBsonPack.packBsonByLogSystem(logSystem); +//// Bson bson = CoreBsonPack.packMongoByLogSystem(logSystem); //// pager = PagerHelper.getPager(pager,logSystemRDao.findByBsonCount(bson)); //// return new ListPager(logSystemRDao.findByBsonPager(bson,pager,logSystem.getOrderByParam() //// ,logSystem.getAscOrDesc()),pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java index 5259959..5853095 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java @@ -55,7 +55,7 @@ //// pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.listCount()); //// return new ListPager(sysLogTaskTimeRDao.listPager(pager),pager); //// } else { -//// Bson bson = CoreBsonPack.packBsonByLogTaskTime(sysLogTaskTime); +//// Bson bson = CoreBsonPack.packMongoByLogTaskTime(sysLogTaskTime); //// pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.findByBsonCount(bson)); //// return new ListPager(sysLogTaskTimeRDao.findByBsonPager(bson,pager,sysLogTaskTime.getOrderByParam() //// ,sysLogTaskTime.getAscOrDesc()),pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java index 9021245..1fb59ea 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java @@ -178,6 +178,6 @@ public class SysTaskPlanService implements ISysTaskPlanService { @Override @ApiOperation(value = "添加定时任务执行日志", notes = "添加定时任务执行日志") public void logInsertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) { - logService.insertSysLogTaskTime(sysLogTaskTime); + logService.insertLogTaskTime(sysLogTaskTime); } } 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 new file mode 100644 index 0000000..f5f0524 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java @@ -0,0 +1,171 @@ +package cn.estsh.i3plus.core.apiservice.util; + +import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; +import com.mongodb.BasicDBObject; +import org.apache.commons.lang3.StringUtils; +import org.bson.conversions.Bson; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-3-10 下午4:12 + * @Modify: + **/ +public class NoSqlPack { + /** + * Es 查询构建基类 + * @param bean + * @return + */ + public static ElasticSearchPack packElasticSearchPack(BaseBean bean){ + ElasticSearchPack result = null; + if(StringUtils.isNotBlank(bean.getCreateDatetime())){ + result = ElasticSearchPack.imppBuild(TimeTool.parseDate(bean.getCreateDatetime()),bean.getClass()); + }else{ + result = ElasticSearchPack.imppBuild(bean.getClass()); + } + + if(StringUtils.isNotBlank(bean.getOrderByParam())){ + if(CommonEnumUtil.ASC_OR_DESC.ASC.getValue() == bean.getAscOrDesc()){ + result.asc(bean.getOrderByParam()); + }else { + result.desc(bean.getOrderByParam()); + } + }else{ + result.orderKeywordDesc("createDatetime"); + } + return result; + } + + /** + * 系统异常日志复杂查询 + * + * @param sysLogException + * @return + */ + public static Bson packMongoBySysLogException(SysLogException sysLogException) { + Bson bson = new BasicDBObject(); + + bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson); + bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson); + bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false); + + return bson; + } + + public static ElasticSearchPack packEsSysLogException(SysLogException bean) { + ElasticSearchPack result = packElasticSearchPack(bean); + + result.andTextEquals("excModule",bean.getExcModule()); + result.andKeywordLike("excMessage",bean.getExcMessage()); + result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd()); + + return result; + } + + /** + * 系统操作日志 + * + * @param logOperate + * @return + */ + public static Bson packMongoByLogOperate(SysLogOperate logOperate) { + Bson bson = new BasicDBObject(); + + bson = BsonPackTool.getNumEqualPack(logOperate.getId(), "id", bson); + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson); + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson); + bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false); + bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson); + bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson); + bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson); + + return bson; + } + + public static ElasticSearchPack packEsSysLogOperate(SysLogOperate bean) { + ElasticSearchPack result = packElasticSearchPack(bean); + + result.andKeywordEquals("id",bean.getId()); + result.andKeywordEquals("operateType",bean.getOperateType()); + result.andKeywordEquals("operateModule",bean.getOperateModule()); + result.andStringEquals("remoteIp",bean.getRemoteIp()); + result.andStringEquals("createUser",bean.getCreateUser()); + result.andTextLike("operateMessage",bean.getOperateMessage()); + result.andStringDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd()); + + return result; + } + + /** + * 日志复杂查询 + * + * @param logSystem + * @return + */ + public static Bson packMongoByLogSystem(SysLogSystem logSystem) { + Bson bson = new BasicDBObject(); + + bson = BsonPackTool.getNumEqualPack(logSystem.getId(), "id", bson); + bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson); + bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson); + bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false); + bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson); + + return bson; + } + + public static ElasticSearchPack packEsSysLogSystem(SysLogSystem bean) { + ElasticSearchPack result = packElasticSearchPack(bean); + + result.andTextEquals("id",bean.getId()); + result.andTextEquals("logLevel",bean.getLogLevel()); + result.andTextEquals("logModuleId",bean.getLogModuleId()); + result.andStringEquals("remoteIp",bean.getRemoteIp()); + result.andTextLike("requestUrl",bean.getRequestUrl()); + result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd()); + + return result; + } + + /** + * 定时任务日志复杂查询 + * + * @param sysLogTaskTime + * @return + */ + public static Bson packMongoByLogTaskTime(SysLogTaskTime sysLogTaskTime) { + Bson bson = new BasicDBObject(); + + bson = BsonPackTool.getNumEqualPack(sysLogTaskTime.getId(), "id", bson); + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson); + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson); + bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false); + + return bson; + } + + public static ElasticSearchPack packEsSysLogTaskTime(SysLogTaskTime bean) { + ElasticSearchPack result = packElasticSearchPack(bean); + + result.andKeywordEquals("id",bean.getId()); + result.andTextLike("name",bean.getName()); + result.andStringEquals("groupName",bean.getGroupName()); + result.andStringEquals("schedulerServerIp",bean.getSchedulerServerIp()); + result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd()); + + return result; + } + +}