From a9500bce13e1d70c971797d35c860bcd404da882 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 11 Mar 2021 10:29:01 +0800 Subject: [PATCH] =?UTF-8?q?core=20=E7=A7=BB=E9=99=A4mongo=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/SysLogFactory.java | 3 - .../serviceimpl/base/SysLogMongoService.java | 488 --------------------- .../serviceimpl/busi/SystemResourceService.java | 2 - .../i3plus/core/apiservice/util/NoSqlPack.java | 84 +--- 4 files changed, 5 insertions(+), 572 deletions(-) delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java 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 index c4f8763..1aae8bd 100644 --- 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 @@ -42,9 +42,6 @@ public class SysLogFactory implements ISysLogService { private SysLogElasticSearchService elasticSearchService; @Autowired - private SysLogMongoService mongoService; - - @Autowired private ImppLog imppLog; private ISysLogService getSysLogService() { 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 deleted file mode 100644 index 9cf1e94..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java +++ /dev/null @@ -1,488 +0,0 @@ -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; -import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.pojo.base.bean.ListPager; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.common.PagerHelper; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; -import cn.estsh.i3plus.pojo.model.platform.LogFieldModel; -import cn.estsh.i3plus.pojo.model.platform.SysLogModel; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogConsole; -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.i3plus.pojo.platform.platrepositorymongo.SysLogExceptionRepository; -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.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 org.bson.Document; -import org.bson.conversions.Bson; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.data.mongodb.MongoDbFactory; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 20-2-13 下午4:16 - * @Modify: - **/ -@Service -public class SysLogMongoService implements ISysLogService { - - public static final Logger LOGGER = LoggerFactory.getLogger(SysLogMongoService.class); - - private SysLogTaskTimeRepository logTaskTimeRDao; - private SysLogSystemRepository logSystemRDao; - private SysLogOperateRepository logOperateRDao; - private SysLogExceptionRepository logExceptionRDao; - private MongoDbFactory mongoDbFactory; - - - public SysLogTaskTimeRepository getSysLogTaskTimeRepository() { - if (logTaskTimeRDao == null && ImppSwitchUtil.isSwitchMongo()) { - try { - logTaskTimeRDao = SpringContextsUtil.getBean(SysLogTaskTimeRepository.class); - } catch (Exception e) { - } - } - - if (logTaskTimeRDao == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) - .setErrorDetail("日志Mongo存储错误") - .setErrorSolution("请检查是否开启MongoDB存储") - .build(); - } - - return logTaskTimeRDao; - } - - public SysLogSystemRepository getSysLogSystemRepository() { - if (logSystemRDao == null && ImppSwitchUtil.isSwitchMongo()) { - try { - logSystemRDao = SpringContextsUtil.getBean(SysLogSystemRepository.class); - } catch (Exception e) { - } - } - - if (logSystemRDao == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) - .setErrorDetail("日志Mongo存储错误") - .setErrorSolution("请检查是否开启MongoDB存储") - .build(); - } - - return logSystemRDao; - } - - public SysLogOperateRepository getSysLogOperateRepository() { - if (logOperateRDao == null && ImppSwitchUtil.isSwitchMongo()) { - try { - logOperateRDao = SpringContextsUtil.getBean(SysLogOperateRepository.class); - } catch (Exception e) { - } - } - - if (logOperateRDao == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) - .setErrorDetail("日志Mongo存储错误") - .setErrorSolution("请检查是否开启MongoDB存储") - .build(); - } - - return logOperateRDao; - } - - public SysLogExceptionRepository getSysLogExceptionRepository() { - if (logExceptionRDao == null && ImppSwitchUtil.isSwitchMongo()) { - try { - logExceptionRDao = SpringContextsUtil.getBean(SysLogExceptionRepository.class); - } catch (Exception e) { - } - } - - if (logExceptionRDao == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) - .setErrorDetail("日志Mongo存储错误") - .setErrorSolution("请检查是否开启MongoDB存储") - .build(); - } - - return logExceptionRDao; - } - - public MongoDbFactory getMongoDbFactory() { - if (mongoDbFactory == null && ImppSwitchUtil.isSwitchMongo()) { - try { - mongoDbFactory = SpringContextsUtil.getBean(MongoDbFactory.class); - } catch (Exception e) { - } - } - - if (mongoDbFactory == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) - .setErrorDetail("日志Mongo存储错误") - .setErrorSolution("请检查是否开启MongoDB存储") - .build(); - } - - return mongoDbFactory; - } - - - @Override - 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 - public List findLogExceptionList(SysLogException log, Pager pager) { - Bson bson = NoSqlPack.packMongoBySysLogException(log); - return getSysLogExceptionRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()); - } - - @Override - public List findLogExceptionList(SysLogException log) { - Bson bson = NoSqlPack.packMongoBySysLogException(log); - return getSysLogExceptionRepository().findByBsonPager(bson, CommonConstWords.getDefaultPager(), log.getOrderByParam(), log.getAscOrDesc()); - } - - @Override - public SysLogException insertLogException(SysLogException log) { - return getSysLogExceptionRepository().save(log); - } - - @Override - public SysLogException getLogException(SysLogException log) { - return getSysLogExceptionRepository().getById(log.getId()); - } - - @Override - public void deleteLogException(SysLogException log) { - getSysLogExceptionRepository().deleteByProperty(NoSqlPack.packMongoBySysLogException(log)); - } - - @Override - 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 List findLogOperateList(SysLogOperate log, Pager pager) { - Bson bson = NoSqlPack.packMongoByLogOperate(log); - return getSysLogOperateRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()); - } - - @Override - public List findLogOperateList(SysLogOperate log) { - Bson bson = NoSqlPack.packMongoByLogOperate(log); - return getSysLogOperateRepository().findByBsonPager(bson, CommonConstWords.getDefaultPager(), log.getOrderByParam(), log.getAscOrDesc()); - } - - @Override - public SysLogOperate insertLogOperate(SysLogOperate log) { - return getSysLogOperateRepository().save(log); - } - - @Override - public SysLogOperate getLogOperate(SysLogOperate log) { - return getSysLogOperateRepository().getById(log.getId()); - } - - @Override - public void deleteLogOperate(SysLogOperate log) { - getSysLogOperateRepository().deleteByProperty(NoSqlPack.packMongoByLogOperate(log)); - } - - @Override - 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 - public List findLogSystemList(SysLogSystem log, Pager pager) { - Bson bson = NoSqlPack.packMongoByLogSystem(log); - return getSysLogSystemRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()); - } - - @Override - public List findLogSystemList(SysLogSystem log) { - Bson bson = NoSqlPack.packMongoByLogSystem(log); - return getSysLogSystemRepository().findByBsonPager(bson, CommonConstWords.getDefaultPager(), log.getOrderByParam(), log.getAscOrDesc()); - } - - @Override - public SysLogSystem insertLogSystem(SysLogSystem log) { - return getSysLogSystemRepository().save(log); - } - - @Override - public SysLogSystem getLogSystem(SysLogSystem log) { - return getSysLogSystemRepository().getById(log.getId()); - } - - @Override - public void deleteLogSystem(SysLogSystem log) { - getSysLogSystemRepository().deleteByProperty(NoSqlPack.packMongoByLogSystem(log)); - } - - @Override - 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 - public List findLogTaskTimeList(SysLogTaskTime log, Pager pager) { - Bson bson = NoSqlPack.packMongoByLogTaskTime(log); - return getSysLogTaskTimeRepository().findByBsonPager(bson, pager, log.getOrderByParam(), log.getAscOrDesc()); - } - - @Override - public List findLogTaskTimeList(SysLogTaskTime log) { - Bson bson = NoSqlPack.packMongoByLogTaskTime(log); - return getSysLogTaskTimeRepository().findByBsonPager(bson, CommonConstWords.getDefaultPager(), log.getOrderByParam(), log.getAscOrDesc()); - } - - @Override - public SysLogTaskTime insertLogTaskTime(SysLogTaskTime log) { - return getSysLogTaskTimeRepository().save(log); - } - - @Override - public SysLogTaskTime getLogTaskTime(SysLogTaskTime log) { - return getSysLogTaskTimeRepository().getById(log.getId()); - } - - @Override - public void deleteLogTaskTime(SysLogTaskTime log) { - getSysLogTaskTimeRepository().deleteByProperty(NoSqlPack.packMongoByLogTaskTime(log)); - } - - @Override - public ListPager queryLogConsolePager(SysLogConsole log, Pager pager) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") - .setErrorSolution("请重新操作") - .build(); - } - - @Override - public List findLogConsoleList(SysLogConsole log, Pager pager) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) - .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") - .setErrorSolution("请重新操作") - .build(); - } - - @Override - public List findLogConsoleList(SysLogConsole log) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) - .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") - .setErrorSolution("请重新操作") - .build(); - } - - @Override - public SysLogConsole insertLogConsoleTime(SysLogConsole log) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) - .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") - .setErrorSolution("请重新操作") - .build(); - } - - @Override - public SysLogConsole getLogConsoleTime(SysLogConsole log) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) - .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") - .setErrorSolution("请重新操作") - .build(); - } - - @Override - public void deleteLogConsoleTime(SysLogConsole log) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) - .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") - .setErrorSolution("请重新操作") - .build(); - } - - /******************************************************* 定时任务日志 End *********************************************************/ - - - @Override - public void actionCleanLog(String startTime, String endTime) { - try { - SysLogOperate operate = new SysLogOperate(); - operate.setCreateDatetime(startTime); - operate.setCreateDateTimeStart(startTime); - operate.setCreateDateTimeEnd(endTime); - deleteLogOperate(operate); - } catch (Exception e) { - } - - try { - SysLogSystem system = new SysLogSystem(); - system.setCreateDatetime(startTime); - system.setCreateDateTimeStart(startTime); - system.setCreateDateTimeEnd(endTime); - deleteLogSystem(system); - } catch (Exception e) { - } - - try { - SysLogException exception = new SysLogException(); - exception.setCreateDatetime(startTime); - exception.setCreateDateTimeStart(startTime); - exception.setCreateDateTimeEnd(endTime); - deleteLogException(exception); - } catch (Exception e) { - } - - try { - SysLogTaskTime taskTime = new SysLogTaskTime(); - taskTime.setCreateDatetime(startTime); - taskTime.setCreateDateTimeStart(startTime); - taskTime.setCreateDateTimeEnd(endTime); - deleteLogTaskTime(taskTime); - } catch (Exception e) { - } - - try { - SysLogConsole console = new SysLogConsole(); - console.setCreateDatetime(startTime); - console.setCreateDateTimeStart(startTime); - console.setCreateDateTimeEnd(endTime); - deleteLogConsoleTime(console); - } catch (Exception e) { - } - } - - @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")); - - - Document match = new Document("$match", sub_match); - Document group = new Document("$group", sub_group); - Document sort = new Document("$sort", new Document("_id", -1)); - - List aggregateList = new ArrayList<>(); - aggregateList.add(match); - aggregateList.add(group); - aggregateList.add(sort); - - AggregateIterable findIter = getMongoDbFactory().getDb() - .getCollection(StringTool.toLowerCaseFirstOne(SysLogSystem.class.getSimpleName())) - .aggregate(aggregateList); - MongoCursor cursor = findIter.iterator(); - - Map resultData = new LinkedHashMap(); - Document item_doc; - while (cursor.hasNext()) { - item_doc = cursor.next(); - resultData.put(item_doc.getString("_id"), MathOperation.round(item_doc.getDouble("avg"), 0)); - } - return resultData; - } - - @Override - public Map querySysLogSystemByLevel(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", "$logLevel"); - sub_group.put("count", new Document("$sum", 1)); - - Document match = new Document("$match", sub_match); - Document group = new Document("$group", sub_group); - - List aggregateList = new ArrayList<>(); - aggregateList.add(match); - aggregateList.add(group); - - AggregateIterable findIter = getMongoDbFactory().getDb() - .getCollection(StringTool.toLowerCaseFirstOne(SysLogSystem.class.getSimpleName())) - .aggregate(aggregateList); - MongoCursor cursor = findIter.iterator(); - - Map resultData = new LinkedHashMap(); - 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)); - } - - return resultData; - } - - @Override - public List querySysLog(SysLogModel logModel, Pager pager) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) - .setErrorDetail("querySysLog 为elasticsearch使用方法") - .setErrorSolution("请联系管理人员") - .build(); - } - - /******************************************************* 系统异常日志 End *********************************************************/ - - -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java index 796a39e..8fea46e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java @@ -8,8 +8,6 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; -import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogOperateRepository; -import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogSystemRepository; import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository; import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java index 7e1d800..a05eb55 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java @@ -4,11 +4,12 @@ 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.*; -import com.mongodb.BasicDBObject; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogConsole; +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 org.apache.commons.lang3.StringUtils; -import org.bson.conversions.Bson; /** * @Description : @@ -43,24 +44,6 @@ public class NoSqlPack { return result; } - /** - * 系统异常日志复杂查询 - * - * @param sysLogException - * @return - */ - public static Bson packMongoBySysLogException(SysLogException sysLogException) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getNumEqualPack(sysLogException.getSoftType(), "softType", bson); - bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson); - bson = BsonPackTool.getStringLikerPack(sysLogException.getExcStack(), "excStack", bson); - bson = BsonPackTool.getStringLikerPack(sysLogException.getExcClassName(), "excClassName", bson); - bson = BsonPackTool.timeBuilder("createDatetime", bson, sysLogException.getCreateDateTimeStart(),sysLogException.getCreateDateTimeEnd()); - - return bson; - } - public static ElasticSearchPack packEsSysLogException(SysLogException bean) { ElasticSearchPack result = packElasticSearchPack(bean); @@ -74,26 +57,6 @@ public class NoSqlPack { 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.getSoftType(), "softType", bson); - bson = BsonPackTool.timeBuilder("createDatetime", bson, logOperate.getCreateDateTimeStart(),logOperate.getCreateDateTimeEnd()); - 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); @@ -111,26 +74,6 @@ public class NoSqlPack { 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.getSoftType(), "softType", bson); - bson = BsonPackTool.timeBuilder("createDatetime", bson, logSystem.getCreateDateTimeStart(),logSystem.getCreateDateTimeEnd()); - 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); @@ -146,23 +89,6 @@ public class NoSqlPack { 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("createDatetime", bson, sysLogTaskTime.getCreateDateTimeStart(),sysLogTaskTime.getCreateDateTimeEnd()); - - return bson; - } - public static ElasticSearchPack packEsSysLogTaskTime(SysLogTaskTime bean) { ElasticSearchPack result = packElasticSearchPack(bean);