diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java index 592c4b2..c67852a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java @@ -309,5 +309,22 @@ public class SysEnumController extends CoreBaseController { LocaleUtils.getEnumLocaleResValuesToList(ImppEnumUtil.DICTIONARY_GROUP.values())); } + @GetMapping("/log-storage-type") + @ApiOperation(value = "日志存储类型") + public ResultBean getLogStorageType() { + return new ResultBean(true, "操作成功", + LocaleUtils.getEnumLocaleResValuesToList(ImppEnumUtil.LOG_STORAGE.values())); + } + + /** + * @return 处理结果 + */ + @GetMapping("/log-print-type") + @ApiOperation(value = "系统参数值类型", notes = "用户状态") + public ResultBean getLogPrintType() { + return new ResultBean(true, "操作成功", + LocaleUtils.getEnumLocaleResValuesToList(CommonEnumUtil.LOG_DETAIL_SHOW_TYPE.values())); + } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java index e9e33ed..1d70422 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java @@ -39,7 +39,7 @@ public class DemoJob extends BaseImppScheduleJob { // .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) // .setErrorDetail("定时任务异常测试!") // .setErrorSolution("请检查异常通知邮件") -// .build(); +// .buildSearch(); // } try { if(getJobParam() != null && StringUtils.isNotBlank(getJobParam())) { 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 new file mode 100644 index 0000000..7f5b765 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java @@ -0,0 +1,178 @@ +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.platform.plugin.elasticsearch.ElasticSearchTool; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.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.util.ImppLog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-2-19 下午9:17 + * @Modify: + **/ +@Service +public class SysLogElasticSearchService implements ISysLogService { + + @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; + } + + @Override + public List listSysLogOperateByOperateUserName(String operateUserName) { + return null; + } + + @Override + public long countAllSysLogOperate() { + return 0; + } + + @Override + public ListPager querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) { + return null; + } + + @Override + public List findNewSysLogOperate(Integer num) { + return null; + } + + @Override + public long deleteSysLogOperateByDateTimeAfter(String dateTime) { + return 0; + } + + @Override + public long countSysLogOperate() { + return 0; + } + + @Override + public void insertSysLogSystem(SysLogSystem logSystem) { + + } + + @Override + public void insertSysLogBatch(int num, int waitTime) { + + } + + @Override + public long deleteSysLogSystemById(Long id) { + return 0; + } + + @Override + public List listSysLogSystem() { + return null; + } + + @Override + public SysLogSystem getSysLogSystemById(long id) { + return null; + } + + @Override + public ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) { + return null; + } + + @Override + public long deleteSysLogSystemByIds(Long[] ids) { + return 0; + } + + @Override + public List findSysLogSystemByIdInterval(long min, long max) { + return null; + } + + @Override + public long deleteSysLogSystemByDateTimeAfter(String dateTime) { + return 0; + } + + @Override + public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) { + + } + + @Override + public void deleteSysLogTaskTimeById(Long id) { + + } + + @Override + public SysLogTaskTime getSysLogTaskTimeById(Long id) { + return null; + } + + @Override + public ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager) { + return null; + } + + @Override + public long deleteSysLogTaskTimeByDateTimeAfter(String dateTime) { + return 0; + } + + @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/SysLogService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java similarity index 99% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogService.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java index bd778f0..a8c4b7a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java @@ -45,9 +45,9 @@ import java.util.Map; * @Modify: **/ @Service -public class SysLogService implements ISysLogService { +public class SysLogMongoService implements ISysLogService { - public static final Logger LOGGER = LoggerFactory.getLogger(SysLogService.class); + public static final Logger LOGGER = LoggerFactory.getLogger(SysLogMongoService.class); private SysLogTaskTimeRepository logTaskTimeRDao; private SysLogSystemRepository logSystemRDao; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 50061bd..0ead1ec 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -735,7 +735,7 @@ public class PersonnelServiceService implements IPersonnelService { // .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) // .setErrorDetail("存在用户关系引用信息无法删除!") // .setErrorSolution("请先删除用户关系信息再操作") -// .build(); +// .buildSearch(); // } List userInfoList = userInfoRDao.findByProperty("positionId", positionId); if (userInfoList != null && userInfoList.size() >= 1) { @@ -808,7 +808,7 @@ public class PersonnelServiceService implements IPersonnelService { // .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) // .setErrorDetail("存在用户关系引用信息无法删除!") // .setErrorSolution("请先删除用户关系信息再操作") -// .build(); +// .buildSearch(); // } List departmentList = departmentRDao.findByProperty("organizeId", organizeId);