添加 Mongo DB 开关

yun-zuoyi
wei.peng 5 years ago
parent 922e715807
commit 560678f21c

@ -0,0 +1,133 @@
package cn.estsh.i3plus.core.api.iservice.base;
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 io.swagger.annotations.ApiOperation;
import java.util.List;
import java.util.Map;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-2-13 3:43
* @Modify:
**/
public interface ISysLogService {
/********************************************************* 系统异常日志 Start *********************************************************/
@ApiOperation(value = "系统异常日志复杂查询,分页,排序")
ListPager<SysLogException> 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<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName);
@ApiOperation(value = "查询所有日志数量")
long countAllSysLogOperate();
@ApiOperation(value = "操作日志复杂查询,分页,排序",notes = "操作日志复杂查询,分页,排序")
ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager);
@ApiOperation(value = "查询最新的操作日志")
List<SysLogOperate> 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<SysLogSystem> 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<SysLogSystem> 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 *********************************************************/
@ApiOperation(value = "查询时间段内平均请求耗时",notes = "查询时间段内平均请求耗时")
Map<String, Object> querySysLogSystemAvgExecuteTime(String startTime, String endTime);
@ApiOperation(value = "查询时间段内各等级日志数量",notes = "查询时间段内各等级日志数量")
Map<String, Object> querySysLogSystemByLevel(String startTime, String endTime);
/******************************************************* 系统异常日志 End *********************************************************/
}

@ -1,6 +1,8 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
import io.swagger.annotations.ApiOperation;
import java.util.List;
@ -42,7 +44,7 @@ public interface ISysDashboardService {
* @return
*/
@ApiOperation(value = "查询操作日志",notes = "查询最近操作日志")
List findNewSysLogOperateSize(Integer size);
ListPager<SysLogOperate> findNewSysLogOperateSize(Integer size);
/**
*
@ -50,7 +52,7 @@ public interface ISysDashboardService {
* @return
*/
@ApiOperation(value = "查询异常日志",notes = "查询最近异常日志")
List findNewSysLogExceptionSize(Integer size);
ListPager<SysLogOperate> findNewSysLogExceptionSize(Integer size);
/**
*

@ -1,31 +1,31 @@
package cn.estsh.i3plus.core.api.iservice.busi;
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 io.swagger.annotations.ApiOperation;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-11-19 17:28
* @Modify:
**/
public interface ISysLogExceptionService {
/**
*
* @param sysLogException
* @param pager
* @return
*/
@ApiOperation(value = "系统异常日志复杂查询,分页,排序")
ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager);
/**
*
* @param dateTime
*/
long deleteSysLogExceptionByDateTimeAfter(String dateTime);
}
//package cn.estsh.i3plus.core.api.iservice.busi;
//
//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 io.swagger.annotations.ApiOperation;
//
///**
// * @Description : 异常日志服务接口
// * @Reference :
// * @Author : yunhao
// * @CreateDate : 2018-11-19 17:28
// * @Modify:
// **/
//public interface ISysLogExceptionService {
//
// /**
// * 系统异常日志复杂查询,分页,排序
// * @param sysLogException
// * @param pager
// * @return
// */
// @ApiOperation(value = "系统异常日志复杂查询,分页,排序")
// ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager);
//
// /**
// * 删除指定日期之后的日志
// * @param dateTime 日期
// */
// long deleteSysLogExceptionByDateTimeAfter(String dateTime);
//}

@ -1,90 +1,90 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @Date : 2018-10-25 13:49
* @Modify :
**/
public interface ISysLogOperateService {
/**
*
* @param logOperate
* @return
*/
@ApiOperation(value = "添加操作日志",notes = "添加操作日志")
SysLogOperate insertSysLogOperate(SysLogOperate logOperate);
/**
* id
* @param id
*/
@ApiOperation(value = "根据id删除日志",notes = "根据id删除日志")
void deleteSysLogOperateById(Long id);
/**
*
* @return
*/
@ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志")
List listSysLogOperate();
/**
*
* @param ids
*/
@ApiOperation(value = "批量删除日志",notes = "批量删除日志")
void deleteSysLogOperateByIds(Long[] ids);
/**
* id
* @param id
* @return
*/
@ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志")
SysLogOperate getSysLogOperateById(Long id);
/**
*
* @param operateUserName
* @return
*/
@ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志")
List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName);
//查询所有日志数量
@ApiOperation(value = "查询所有日志数量")
long countAllSysLogOperate();
/**
*
* @param logOperate
* @param pager
* @return
*/
@ApiOperation(value = "操作日志复杂查询,分页,排序",notes = "操作日志复杂查询,分页,排序")
ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager);
/**
*
* @param num
* @return
*/
@ApiOperation(value = "查询最新的操作日志")
List<SysLogOperate> findNewSysLogOperate(Integer num);
/**
*
* @param dateTime
*/
long deleteSysLogOperateByDateTimeAfter(String dateTime);
}
//package cn.estsh.i3plus.core.api.iservice.busi;
//
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
//import cn.estsh.i3plus.pojo.base.common.Pager;
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
//import io.swagger.annotations.ApiOperation;
//
//import java.util.List;
//
///**
// * @Description : 操作日志服务接口
// * @Reference :
// * @Author : yunhao
// * @Date : 2018-10-25 13:49
// * @Modify :
// **/
//public interface ISysLogOperateService {
//
// /**
// * 添加操作日志
// * @param logOperate
// * @return
// */
// @ApiOperation(value = "添加操作日志",notes = "添加操作日志")
// SysLogOperate insertSysLogOperate(SysLogOperate logOperate);
//
// /**
// * 根据id删除日志
// * @param id
// */
// @ApiOperation(value = "根据id删除日志",notes = "根据id删除日志")
// void deleteSysLogOperateById(Long id);
//
// /**
// * 查询全部操作日志
// * @return
// */
// @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志")
// List listSysLogOperate();
//
// /**
// * 批量删除日志
// * @param ids
// */
// @ApiOperation(value = "批量删除日志",notes = "批量删除日志")
// void deleteSysLogOperateByIds(Long[] ids);
//
// /**
// * 根据id查询操作日志
// * @param id
// * @return
// */
// @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志")
// SysLogOperate getSysLogOperateById(Long id);
//
// /**
// * 根据操作人姓名模糊查询日志
// * @param operateUserName
// * @return
// */
// @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志")
// List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName);
//
// //查询所有日志数量
// @ApiOperation(value = "查询所有日志数量")
// long countAllSysLogOperate();
//
// /**
// * 操作日志复杂查询,分页,排序
// * @param logOperate
// * @param pager
// * @return
// */
// @ApiOperation(value = "操作日志复杂查询,分页,排序",notes = "操作日志复杂查询,分页,排序")
// ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager);
//
// /**
// * 查询最新的操作日志
// * @param num
// * @return
// */
// @ApiOperation(value = "查询最新的操作日志")
// List<SysLogOperate> findNewSysLogOperate(Integer num);
//
// /**
// * 删除指定日期之后的日志
// * @param dateTime 日期
// */
// long deleteSysLogOperateByDateTimeAfter(String dateTime);
//}

@ -1,54 +1,54 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @Date : 2018-10-25 10:36
* @Modify :
**/
public interface ISysLogSystemService {
@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<SysLogSystem> 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);
/**
*
* @param min
* @param max
* @return
*/
@ApiOperation(value = "系统日志按id区间查询",notes = "系统日志按id区间查询")
List<SysLogSystem> findSysLogSystemByIdInterval(long min, long max);
/**
*
* @param dateTime
*/
long deleteSysLogSystemByDateTimeAfter(String dateTime);
}
//package cn.estsh.i3plus.core.api.iservice.busi;
//
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
//import cn.estsh.i3plus.pojo.base.common.Pager;
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
//import io.swagger.annotations.ApiOperation;
//
//import java.util.List;
//
///**
// * @Description : 系统日志服务接口
// * @Reference :
// * @Author : yunhao
// * @Date : 2018-10-25 10:36
// * @Modify :
// **/
//public interface ISysLogSystemService {
//
// @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<SysLogSystem> 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);
//
// /**
// * 压力测试
// * @param min
// * @param max
// * @return
// */
// @ApiOperation(value = "系统日志按id区间查询",notes = "系统日志按id区间查询")
// List<SysLogSystem> findSysLogSystemByIdInterval(long min, long max);
//
// /**
// * 删除指定日期之后的日志
// * @param dateTime 日期
// */
// long deleteSysLogSystemByDateTimeAfter(String dateTime);
//}

@ -1,53 +1,53 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
import io.swagger.annotations.ApiOperation;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-01-04 15:06
* @Modify:
**/
public interface ISysLogTaskTimeService {
/**
*
* @param sysLogTaskTime
*/
@ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志")
void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime);
/**
* id
* @param id
*/
@ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志")
void deleteSysLogTaskTimeById(Long id);
/**
* id
* @param id
* @return
*/
@ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志")
SysLogTaskTime getSysLogTaskTimeById(Long id);
/**
*
* @param sysLogTaskTime
* @param pager
* @return
*/
@ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询")
ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager);
/**
*
* @param dateTime
*/
long deleteSysLogTaskTimeByDateTimeAfter(String dateTime);
}
//package cn.estsh.i3plus.core.api.iservice.busi;
//
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
//import cn.estsh.i3plus.pojo.base.common.Pager;
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
//import io.swagger.annotations.ApiOperation;
//
///**
// * @Description : 定时任务日志服务接口
// * @Reference :
// * @Author : yunhao
// * @CreateDate : 2019-01-04 15:06
// * @Modify:
// **/
//public interface ISysLogTaskTimeService {
//
// /**
// * 添加定时任务日志
// * @param sysLogTaskTime
// */
// @ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志")
// void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime);
//
// /**
// * 根据id删除定时任务日志
// * @param id
// */
// @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志")
// void deleteSysLogTaskTimeById(Long id);
//
// /**
// * 根据id查询定时任务日志
// * @param id
// * @return
// */
// @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志")
// SysLogTaskTime getSysLogTaskTimeById(Long id);
//
// /**
// * 定时任务日志复杂查询
// * @param sysLogTaskTime
// * @param pager
// * @return
// */
// @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询")
// ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager);
//
// /**
// * 删除指定日期之后的日志
// * @param dateTime 日期
// */
// long deleteSysLogTaskTimeByDateTimeAfter(String dateTime);
//}

@ -0,0 +1,34 @@
package cn.estsh.i3plus.core.apiservice.configuration;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.jpa.factory.BaseMongoRepositoryFactoryBean;
import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
/**
* @Description :
*
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-12-12 20:49
* @Modify:
**/
@Configuration
@ConditionalOnExpression("'${" + CommonConstWords.PROP_SWITCH_MONGO + ":false}' == 'true'")
//扫描需要单独处理的持久化包
@EnableMongoRepositories(basePackages = {
"cn.estsh.i3plus.**.platrepositorymongo"
},repositoryFactoryBeanClass = BaseMongoRepositoryFactoryBean.class)
public class ScanMongoPackageConfiguration {
public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG);
public ScanMongoPackageConfiguration(){
LOGGER.info("【扫描关联包...】");
}
}

@ -1,20 +1,12 @@
package cn.estsh.i3plus.core.apiservice.configuration;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.jpa.factory.BaseMongoRepositoryFactoryBean;
import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean;
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.platrepositorymongo.SysLogExceptionRepository;
import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogOperateRepository;
import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogSystemRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
/**
* @Description :
@ -34,11 +26,6 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie
@EnableJpaRepositories(basePackages = {
"cn.estsh.i3plus.**.platrepository"
}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class)
//扫描需要单独处理的持久化包
@EnableMongoRepositories(basePackages = {
"cn.estsh.i3plus.**.platrepositorymongo"
},repositoryFactoryBeanClass = BaseMongoRepositoryFactoryBean.class)
public class ScanPackageConfiguration {
public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG);

@ -1,7 +1,6 @@
package cn.estsh.i3plus.core.apiservice.controller;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
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;
@ -30,6 +29,9 @@ public class DemoExceptionController {
private static final Logger LOGGER = LoggerFactory.getLogger(DemoExceptionController.class);
@Autowired
private ISysLogService logService;
/**
*
* @param type
@ -58,9 +60,6 @@ public class DemoExceptionController {
}
@Autowired
private ISysLogExceptionService sysLogExceptionService;
/**
*
@ -73,7 +72,7 @@ public class DemoExceptionController {
public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager){
try {
System.out.println("1===============");
ListPager logExceptionList = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager);
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());
@ -85,8 +84,6 @@ public class DemoExceptionController {
}
@Autowired
private ISysLogSystemService syslogSystemService;
/**
* /query-logSystem
@ -99,7 +96,7 @@ public class DemoExceptionController {
public ResultBean querySysLogSystemByPager(SysLogSystem sysLog, Pager pager){
try {
System.out.println("2===============");
ListPager logSystemList = syslogSystemService.querySysLogSystemByPager(sysLog,pager);
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());
@ -125,7 +122,7 @@ public class DemoExceptionController {
SysLogSystem logSystem = new SysLogSystem();
System.out.println("2===============");
ListPager logSystemList = syslogSystemService.querySysLogSystemByPager(logSystem,pager);
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());

@ -1,6 +1,6 @@
package cn.estsh.i3plus.core.apiservice.controller;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService;
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;
@ -33,7 +33,7 @@ public class DemoMongoController extends CoreBaseController {
private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class);
@Autowired
private ISysLogOperateService logOperateService;
private ISysLogService logService;
/**
*
@ -45,7 +45,7 @@ public class DemoMongoController extends CoreBaseController {
@ApiOperation(value = "添加操作日志", notes = "添加操作日志,可用于国际化")
public ResultBean insertLogOperate(SysLogOperate logOperate) {
try {
logOperateService.insertSysLogOperate(logOperate);
logService.insertSysLogOperate(logOperate);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep).build();
@ -63,7 +63,7 @@ public class DemoMongoController extends CoreBaseController {
@ApiOperation(value = "删除日志", notes = "删除日志")
public ResultBean deleteLog(@PathVariable String id) {
try {
logOperateService.deleteSysLogOperateById(Long.parseLong(id));
logService.deleteSysLogOperateById(Long.parseLong(id));
return ResultBean.success("删除日志成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep).build();
@ -83,7 +83,7 @@ public class DemoMongoController extends CoreBaseController {
@ApiOperation(value = "查询日志", notes = "查询日志")
public ResultBean queryLanguage(SysLogOperate logOperate, Pager pager) {
try {
List logList = logOperateService.listSysLogOperate();
List logList = logService.listSysLogOperate();
return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep).build();
@ -102,9 +102,9 @@ public class DemoMongoController extends CoreBaseController {
@ApiOperation(value = "查询日志", notes = "查询日志")
public ResultBean queryLanguage(String OperateUserName) {
try {
List<SysLogOperate> logList = logOperateService.listSysLogOperateByOperateUserName(OperateUserName);
List<SysLogOperate> logList = logService.listSysLogOperateByOperateUserName(OperateUserName);
long count = logOperateService.countAllSysLogOperate();
long count = logService.countAllSysLogOperate();
LOGGER.info("=log size= " + count);
return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -123,7 +123,7 @@ public class DemoMongoController extends CoreBaseController {
@ApiOperation(value = "根据id查询日志", notes = "根据id查询日志")
public ResultBean getLogById(@PathVariable String id) {
try {
logOperateService.getSysLogOperateById(Long.parseLong(id));
logService.getSysLogOperateById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep).build();

@ -1,8 +1,8 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.platform.common.tool.FileTool;
@ -49,7 +49,7 @@ public class SysLogExceptionController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionController.class);
@Autowired
private ISysLogExceptionService sysLogExceptionService;
private ISysLogService logService;
@Autowired
private ISysConfigService sysConfigService;
@ -76,7 +76,7 @@ public class SysLogExceptionController extends CoreBaseController {
@ApiOperation(value = "异常日志复杂查询,分页,排序",notes = "异常日志复杂查询,分页,排序")
public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager){
try {
ListPager logExceptionList = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager);
ListPager logExceptionList = logService.querySysLogExceptionByPager(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 = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager);
listPager = logService.querySysLogExceptionByPager(sysLogException, pager);
pager = listPager.getObjectPager();
// 将excel导出至临时文件夹并上传

@ -1,6 +1,10 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.*;
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.platform.common.tool.FileTool;
import cn.estsh.i3plus.platform.common.tool.ZipTool;
@ -45,7 +49,7 @@ public class SysLogOperateController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateController.class);
@Autowired
private ISysLogOperateService logOperateService;
private ISysLogService logService;
@Autowired
private ISysDictionaryService sysDictionaryService;
@ -74,7 +78,7 @@ public class SysLogOperateController extends CoreBaseController {
@ApiOperation(value = "添加操作日志",notes = "添加操作日志")
public ResultBean insertSysLogOperateController(SysLogOperate logOperate){
try {
logOperateService.insertSysLogOperate(logOperate);
logService.insertSysLogOperate(logOperate);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -95,7 +99,7 @@ public class SysLogOperateController extends CoreBaseController {
// 条件验证
ValidatorBean.checkNotNull(id,"id不能为空");
logOperateService.deleteSysLogOperateById(Long.parseLong(id));
logService.deleteSysLogOperateById(Long.parseLong(id));
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -112,7 +116,7 @@ public class SysLogOperateController extends CoreBaseController {
@ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志")
public ResultBean findSysLogOperateAll(){
try {
List logOperateList = logOperateService.listSysLogOperate();
List logOperateList = logService.listSysLogOperate();
return ResultBean.success("操作成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -130,7 +134,7 @@ public class SysLogOperateController extends CoreBaseController {
@ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志")
public ResultBean getSysLogOperateById(@PathVariable("id") String id){
try{
SysLogOperate logOperate = logOperateService.getSysLogOperateById(Long.parseLong(id));
SysLogOperate logOperate = logService.getSysLogOperateById(Long.parseLong(id));
if (logOperate != null) {
return ResultBean.success("操作成功")
.setResultObject(logOperate)
@ -156,7 +160,7 @@ public class SysLogOperateController extends CoreBaseController {
@ApiOperation(value = "操作日志复杂查询,分页,排序",notes = "操作日志复杂查询,分页,排序")
public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager){
try {
ListPager logSystemList = logOperateService.querySysLogOperateByPager(logOperate, pager);
ListPager logSystemList = logService.querySysLogOperateByPager(logOperate, pager);
return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -224,7 +228,7 @@ public class SysLogOperateController extends CoreBaseController {
ExcelTool excelTool = new ExcelTool(entityManager, redisCore);
do {
listPager = logOperateService.querySysLogOperateByPager(sysLogOperate, pager);
listPager = logService.querySysLogOperateByPager(sysLogOperate, pager);
pager = listPager.getObjectPager();
// 将excel导出至临时文件夹并上传

@ -1,8 +1,8 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.platform.common.tool.FileTool;
@ -48,7 +48,7 @@ public class SysLogSystemController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class);
@Autowired
private ISysLogSystemService logSystemService;
private ISysLogService logService;
@Autowired
private ISysConfigService sysConfigService;
@ -74,7 +74,7 @@ public class SysLogSystemController extends CoreBaseController{
@ApiOperation(value="新增系统日志",notes = "新增系统日志")
public ResultBean insertSysLogSystem(SysLogSystem logSystem) {
try {
logSystemService.insertSysLogSystem(logSystem);
logService.insertSysLogSystem(logSystem);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -95,7 +95,7 @@ public class SysLogSystemController extends CoreBaseController{
// 条件校验
ValidatorBean.checkNotNull(id,"id不能为空");
logSystemService.deleteSysLogSystemById(Long.parseLong(id));
logService.deleteSysLogSystemById(Long.parseLong(id));
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -112,7 +112,7 @@ public class SysLogSystemController extends CoreBaseController{
@ApiOperation(value = "查询全部系统日志",notes = "查询全部系统日志")
public ResultBean findSysLogSystemAll(){
try {
List<SysLogSystem> logSystemList = logSystemService.listSysLogSystem();
List<SysLogSystem> logSystemList = logService.listSysLogSystem();
return ResultBean.success("操作成功").setResultList(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -130,7 +130,7 @@ public class SysLogSystemController extends CoreBaseController{
@ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志")
public ResultBean getSysLogSystemById(String id){
try {
SysLogSystem logSystem = logSystemService.getSysLogSystemById(Long.parseLong(id));
SysLogSystem logSystem = logService.getSysLogSystemById(Long.parseLong(id));
return ResultBean.success("操作成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -149,7 +149,7 @@ public class SysLogSystemController extends CoreBaseController{
@ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询")
public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager){
try {
ListPager logSystemList = logSystemService.querySysLogSystemByPager(logSystem, pager);
ListPager logSystemList = logService.querySysLogSystemByPager(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 = logSystemService.querySysLogSystemByPager(sysLogSystem, pager);
listPager = logService.querySysLogSystemByPager(sysLogSystem, pager);
pager = listPager.getObjectPager();
// 将excel导出至临时文件夹并上传

@ -1,6 +1,6 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogTaskTimeService;
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
@ -32,7 +32,7 @@ public class SysLogTaskTimeController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogTaskTimeController.class);
@Autowired
private ISysLogTaskTimeService logTaskTimeService;
private ISysLogService logService;
/**
*
@ -43,7 +43,7 @@ public class SysLogTaskTimeController extends CoreBaseController{
@ApiOperation(value="新增定时任务日志",notes = "新增定时任务日志")
public ResultBean insertSyslogTaskTime(SysLogTaskTime sysLogTaskTime) {
try {
logTaskTimeService.insertSysLogTaskTime(sysLogTaskTime);
logService.insertSysLogTaskTime(sysLogTaskTime);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -64,7 +64,7 @@ public class SysLogTaskTimeController extends CoreBaseController{
// 条件校验
ValidatorBean.checkNotNull(id,"id不能为空");
logTaskTimeService.deleteSysLogTaskTimeById(Long.parseLong(id));
logService.deleteSysLogTaskTimeById(Long.parseLong(id));
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -82,7 +82,7 @@ public class SysLogTaskTimeController extends CoreBaseController{
@ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志")
public ResultBean getSysLogTaskTimeById(String id){
try {
SysLogTaskTime logTaskTime = logTaskTimeService.getSysLogTaskTimeById(Long.parseLong(id));
SysLogTaskTime logTaskTime = logService.getSysLogTaskTimeById(Long.parseLong(id));
if (logTaskTime != null) {
return ResultBean.success("操作成功").setResultObject(logTaskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else {
@ -105,7 +105,7 @@ public class SysLogTaskTimeController extends CoreBaseController{
@ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询")
public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager){
try {
ListPager logSystemList = logTaskTimeService.querySysLogTaskTimeByPager(sysLogTaskTime, pager);
ListPager logSystemList = logService.querySysLogTaskTimeByPager(sysLogTaskTime, pager);
return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);

@ -1,31 +1,31 @@
package cn.estsh.i3plus.core.apiservice.dao;
import java.util.Map;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-12-11 13:22
* @Modify:
**/
public interface ISysLogSystemDao {
/**
*
*
* @param startTime
* @param endTime
* @return
*/
Map<String, Object> querySysLogSystemAvgExecuteTime(String startTime, String endTime);
/**
*
*
* @param startTime
* @param endTime
* @return
*/
Map<String, Object> querySysLogSystemByLevel(String startTime, String endTime);
}
//package cn.estsh.i3plus.core.apiservice.dao;
//
//import java.util.Map;
//
///**
// * @Description : 操作日志
// * @Reference :
// * @Author : yunhao
// * @CreateDate : 2018-12-11 13:22
// * @Modify:
// **/
//public interface ISysLogSystemDao {
//
// /**
// * 查询时间段内平均请求耗时
// *
// * @param startTime 开始时间
// * @param endTime 结束时间
// * @return 查询结果
// */
// Map<String, Object> querySysLogSystemAvgExecuteTime(String startTime, String endTime);
//
// /**
// * 查询时间段内各等级日志数量
// *
// * @param startTime 开始时间
// * @param endTime 结束时间
// * @return 查询结果
// */
// Map<String, Object> querySysLogSystemByLevel(String startTime, String endTime);
//}

@ -1,100 +1,102 @@
package cn.estsh.i3plus.core.apiservice.daoimpl;
import cn.estsh.i3plus.core.apiservice.dao.ISysLogSystemDao;
import cn.estsh.i3plus.platform.common.tool.MathOperation;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
import com.mongodb.client.AggregateIterable;
import com.mongodb.client.MongoCursor;
import org.bson.Document;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.MongoDbFactory;
import org.springframework.stereotype.Service;
import java.util.*;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-12-11 13:24
* @Modify:
**/
@Service
public class SysLogSystemDaoImpl implements ISysLogSystemDao {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemDaoImpl.class);
@Autowired
private MongoDbFactory mongoDbFactory;
@Override
public Map<String, Object> 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<Document> aggregateList = new ArrayList<>();
aggregateList.add(match);
aggregateList.add(group);
aggregateList.add(sort);
AggregateIterable<Document> findIter = mongoDbFactory.getDb()
.getCollection(StringTool.toLowerCaseFirstOne(SysLogSystem.class.getSimpleName()))
.aggregate(aggregateList);
MongoCursor<Document> 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<String,Object> 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<Document> aggregateList = new ArrayList<>();
aggregateList.add(match);
aggregateList.add(group);
AggregateIterable<Document> findIter = mongoDbFactory.getDb()
.getCollection(StringTool.toLowerCaseFirstOne(SysLogSystem.class.getSimpleName()))
.aggregate(aggregateList);
MongoCursor<Document> 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;
}
}
//package cn.estsh.i3plus.core.apiservice.daoimpl;
//
//import cn.estsh.i3plus.core.apiservice.dao.ISysLogSystemDao;
//import cn.estsh.i3plus.platform.common.tool.MathOperation;
//import cn.estsh.i3plus.platform.common.tool.StringTool;
//import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
//import com.mongodb.client.AggregateIterable;
//import com.mongodb.client.MongoCursor;
//import org.bson.Document;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.data.mongodb.MongoDbFactory;
//import org.springframework.stereotype.Service;
//
//import java.util.*;
//
///**
// * @Description :
// * @Reference :
// * @Author : yunhao
// * @CreateDate : 2018-12-11 13:24
// * @Modify:
// **/
//@Service
//public class SysLogSystemDaoImpl implements ISysLogSystemDao {
//
// public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemDaoImpl.class);
//
//// @Autowired
//// private MongoDbFactory mongoDbFactory;
//
// @Override
// public Map<String, Object> 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<Document> aggregateList = new ArrayList<>();
//// aggregateList.add(match);
//// aggregateList.add(group);
//// aggregateList.add(sort);
////
//// AggregateIterable<Document> findIter = mongoDbFactory.getDb()
//// .getCollection(StringTool.toLowerCaseFirstOne(SysLogSystem.class.getSimpleName()))
//// .aggregate(aggregateList);
//// MongoCursor<Document> 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;
// return null;
// }
//
// @Override
// public Map<String,Object> 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<Document> aggregateList = new ArrayList<>();
//// aggregateList.add(match);
//// aggregateList.add(group);
////
//// AggregateIterable<Document> findIter = mongoDbFactory.getDb()
//// .getCollection(StringTool.toLowerCaseFirstOne(SysLogSystem.class.getSimpleName()))
//// .aggregate(aggregateList);
//// MongoCursor<Document> 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;
// return null;
// }
//
//}

@ -1,9 +1,6 @@
package cn.estsh.i3plus.core.apiservice.schedulejob;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogTaskTimeService;
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob;
import cn.estsh.impp.framework.boot.init.ApplicationProperties;
@ -14,6 +11,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import java.util.Calendar;
import java.util.Date;
@ -34,20 +32,12 @@ public class CoreLogClearJob extends BaseImppScheduleJob {
super(CoreLogClearJob.class, "日志清除");
}
@Value("${impp.log.retention-time:-1}")
@Value("${impp.logService.retention-time:-1}")
private Integer retentionTime;
@Autowired
private ISysLogSystemService sysLogSystemService;
@Autowired
private ISysLogExceptionService sysLogExceptionService;
private ISysLogService logService;
@Autowired
private ISysLogOperateService sysLogOperateService;
@Autowired
private ISysLogTaskTimeService sysLogTaskTimeService;
@Override
public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
@ -63,28 +53,28 @@ public class CoreLogClearJob extends BaseImppScheduleJob {
// 系统日志
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 = sysLogSystemService.deleteSysLogSystemByDateTimeAfter(dateTime);
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 = sysLogExceptionService.deleteSysLogExceptionByDateTimeAfter(dateTime);
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 = sysLogOperateService.deleteSysLogOperateByDateTimeAfter(dateTime);
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 = sysLogTaskTimeService.deleteSysLogTaskTimeByDateTimeAfter(dateTime);
count = logService.deleteSysLogTaskTimeByDateTimeAfter(dateTime);
LOGGER.info("【日志清理】 清理定时任务日志 {} 条", count);
}
}

@ -0,0 +1,456 @@
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.platform.common.tool.MathOperation;
import cn.estsh.i3plus.platform.common.tool.StringTool;
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.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.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.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 SysLogService implements ISysLogService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogService.class);
private SysLogTaskTimeRepository logTaskTimeRDao;
private SysLogSystemRepository logSystemRDao;
private SysLogOperateRepository logOperateRDao;
private SysLogExceptionRepository logExceptionRDao;
private MongoDbFactory mongoDbFactory;
public SysLogTaskTimeRepository getSysLogTaskTimeRepository(){
if(logTaskTimeRDao == null && ImppSwitchUtil.propSwitchMongo()){
logTaskTimeRDao = SpringContextsUtil.getBean(SysLogTaskTimeRepository.class);
}
if(logTaskTimeRDao == null){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode())
.setErrorDetail("日志Mongo存储错误")
.setErrorSolution("请检查是否开启MongoDB存储")
.build();
}
return logTaskTimeRDao;
}
public SysLogSystemRepository getSysLogSystemRepository(){
if(logSystemRDao == null && ImppSwitchUtil.propSwitchMongo()){
logSystemRDao = SpringContextsUtil.getBean(SysLogSystemRepository.class);
}
if(logSystemRDao == null){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode())
.setErrorDetail("日志Mongo存储错误")
.setErrorSolution("请检查是否开启MongoDB存储")
.build();
}
return logSystemRDao;
}
public SysLogOperateRepository getSysLogOperateRepository(){
if(logOperateRDao == null && ImppSwitchUtil.propSwitchMongo()){
logOperateRDao = SpringContextsUtil.getBean(SysLogOperateRepository.class);
}
if(logOperateRDao == null){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode())
.setErrorDetail("日志Mongo存储错误")
.setErrorSolution("请检查是否开启MongoDB存储")
.build();
}
return logOperateRDao;
}
public SysLogExceptionRepository getSysLogExceptionRepository(){
if(logExceptionRDao == null && ImppSwitchUtil.propSwitchMongo()){
logExceptionRDao = SpringContextsUtil.getBean(SysLogExceptionRepository.class);
}
if(logExceptionRDao == null){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode())
.setErrorDetail("日志Mongo存储错误")
.setErrorSolution("请检查是否开启MongoDB存储")
.build();
}
return logExceptionRDao;
}
public MongoDbFactory getMongoDbFactory(){
if(mongoDbFactory == null && ImppSwitchUtil.propSwitchMongo()){
mongoDbFactory = SpringContextsUtil.getBean(MongoDbFactory.class);
}
if(mongoDbFactory == null){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
.setErrorCode(ImppExceptionEnum.LOG_SAVE_MONGO_ERROR.getCode())
.setErrorDetail("日志Mongo存储错误")
.setErrorSolution("请检查是否开启MongoDB存储")
.build();
}
return mongoDbFactory;
}
/********************************************************* 系统异常日志 Start *********************************************************/
@Override
@ApiOperation(value = "系统异常日志复杂查询,分页,排序")
public ListPager<SysLogException> 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<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName) {
return getSysLogOperateRepository().findByProperty("operateUserName",operateUserName);
}
@Override
@ApiOperation(value = "查询所有日志数量")
public long countAllSysLogOperate() {
return getSysLogOperateRepository().listCount();
}
@Override
@ApiOperation(value = "操作日志复杂查询,分页,排序",notes = "操作日志复杂查询,分页,排序")
public ListPager<SysLogOperate> 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);
}
}
@Override
public List<SysLogOperate> 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());
}
@Override
public long deleteSysLogOperateByDateTimeAfter(String dateTime) {
return getSysLogOperateRepository().deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
}
@Override
public long countSysLogOperate() {
return getSysLogOperateRepository().listCount();
}
/******************************************************* 操作日志 End *********************************************************/
/******************************************************* 系统日志 Start *********************************************************/
@Override
@ApiOperation(value = "添加系统日志",notes = "添加系统日志")
public void insertSysLogSystem(SysLogSystem logSystem) {
getSysLogSystemRepository().insert(logSystem);
}
@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);
}
}
@Override
@ApiOperation(value = "删除日志",notes = "删除日志")
public long deleteSysLogSystemById(Long id) {
Bson bson = Filters.eq("id",id);
return getSysLogSystemRepository().deleteByProperty(bson);
}
@Override
@ApiOperation(value = "查询全部日志",notes = "查询全部日志")
public List<SysLogSystem> listSysLogSystem() {
return getSysLogSystemRepository().findAll();
}
@Override
@ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志")
public SysLogSystem getSysLogSystemById(long id) {
return getSysLogSystemRepository().getById(id);
}
@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);
}
}
@Override
@ApiOperation(value = "系统日志批量删除",notes = "系统日志批量删除")
public long deleteSysLogSystemByIds(Long[] ids) {
return getSysLogSystemRepository().deleteByIds(ids);
}
@Override
@ApiOperation(value = "系统日志按id区间查询",notes = "系统日志按id区间查询")
public List<SysLogSystem> findSysLogSystemByIdInterval(long min, long max) {
return getSysLogSystemRepository().findByBson(CoreBsonPack.packBsonByInterval("_id",min,max));
}
@Override
public long deleteSysLogSystemByDateTimeAfter(String dateTime) {
return getSysLogSystemRepository().deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
}
/******************************************************* 系统日志 End *********************************************************/
/******************************************************* 定时任务日志 Start *********************************************************/
@Override
@ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志")
public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) {
getSysLogTaskTimeRepository().insert(sysLogTaskTime);
}
@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<String, Object> 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<Document> aggregateList = new ArrayList<>();
aggregateList.add(match);
aggregateList.add(group);
aggregateList.add(sort);
AggregateIterable<Document> findIter = getMongoDbFactory().getDb()
.getCollection(StringTool.toLowerCaseFirstOne(SysLogSystem.class.getSimpleName()))
.aggregate(aggregateList);
MongoCursor<Document> 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<String,Object> 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<Document> aggregateList = new ArrayList<>();
aggregateList.add(match);
aggregateList.add(group);
AggregateIterable<Document> findIter = getMongoDbFactory().getDb()
.getCollection(StringTool.toLowerCaseFirstOne(SysLogSystem.class.getSimpleName()))
.aggregate(aggregateList);
MongoCursor<Document> 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;
}
/******************************************************* 系统异常日志 End *********************************************************/
}

@ -1,17 +1,15 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysDashboardService;
import cn.estsh.i3plus.core.apiservice.dao.ISysLogSystemDao;
import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogExceptionRepository;
import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogOperateRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysDepartmentRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysOrganizeRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
@ -34,19 +32,10 @@ public class SysDashboardService implements ISysDashboardService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigService.class);
@Autowired
private SysOrganizeRepository sysOrganizeRDao;
@Autowired
private SysDepartmentRepository sysDepartmentRDao;
@Autowired
private SysLogOperateRepository sysLogOperateRDao;
@Autowired
private SysLogExceptionRepository sysLogExceptionRDao;
@Autowired
private ISysLogSystemDao sysLogSystemDao;
private ISysLogService logService;
@Autowired
private SysUserRepository sysUserRDao;
@ -55,7 +44,7 @@ public class SysDashboardService implements ISysDashboardService {
@AnnoIgnoreLog
@ApiOperation(value = "查询组织个数")
public long getSysOrganizeCount() {
return sysOrganizeRDao.listCount();
return logService.countSysLogOperate();
}
@Override
@ -78,27 +67,27 @@ public class SysDashboardService implements ISysDashboardService {
@Override
@AnnoIgnoreLog
@ApiOperation(value = "查询操作日志",notes = "查询最新的几条操作日志")
public List findNewSysLogOperateSize(Integer size) {
public ListPager<SysLogOperate> findNewSysLogOperateSize(Integer size) {
Pager page = new Pager();
page.setCurrentPage(1);
page.setPageSize(size);
SysLogOperate sysLogOperate = new SysLogOperate();
sysLogOperate.setOrderByParam("createDatetime");
sysLogOperate.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
return sysLogOperateRDao.findByBsonPager(null,page,sysLogOperate.getOrderByParam(),sysLogOperate.getAscOrDesc());
return logService.querySysLogOperateByPager(sysLogOperate,page);
}
@Override
@AnnoIgnoreLog
@ApiOperation(value = "查询操异常日志",notes = "查询最新的几条异常日志")
public List findNewSysLogExceptionSize(Integer size) {
public ListPager<SysLogOperate> findNewSysLogExceptionSize(Integer size) {
Pager page = new Pager();
page.setCurrentPage(1);
page.setPageSize(size);
SysLogOperate sysLogOperate = new SysLogOperate();
sysLogOperate.setOrderByParam("createDatetime");
sysLogOperate.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
return sysLogExceptionRDao.findByBsonPager(null,page,sysLogOperate.getOrderByParam(),sysLogOperate.getAscOrDesc());
return logService.querySysLogOperateByPager(sysLogOperate,page);
}
@Override
@ -112,13 +101,13 @@ public class SysDashboardService implements ISysDashboardService {
@AnnoIgnoreLog
@ApiOperation(value = "查询系统日志",notes = "查询系统日志平均执行时间")
public Map querySysLogSystemAvgExecuteTime(String startTime, String endTime) {
return sysLogSystemDao.querySysLogSystemAvgExecuteTime(startTime,endTime);
return logService.querySysLogSystemAvgExecuteTime(startTime,endTime);
}
@Override
@AnnoIgnoreLog
@ApiOperation(value = "查询系统日志",notes = "查询各模块系统日志数量")
public Map querySysLogSystemByLevel(String startTime, String endTime) {
return sysLogSystemDao.querySysLogSystemByLevel(startTime,endTime);
return logService.querySysLogSystemByLevel(startTime,endTime);
}
}

@ -1,50 +1,52 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
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.platform.platbean.SysLogException;
import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogExceptionRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
import io.swagger.annotations.ApiOperation;
import org.bson.conversions.Bson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-11-19 17:30
* @Modify:
**/
@Service
public class SysLogExceptionService implements ISysLogExceptionService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionService.class);
@Autowired
private SysLogExceptionRepository sysLogExceptionRDao;
@Override
@ApiOperation(value = "系统异常日志复杂查询,分页,排序")
public ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) {
if(sysLogException == null) {
pager = PagerHelper.getPager(pager, (int) sysLogExceptionRDao.count());
return new ListPager(sysLogExceptionRDao.findAll(),pager);
}else{
Bson bson = CoreBsonPack.packBsonBySysLogException(sysLogException);
pager = PagerHelper.getPager(pager,sysLogExceptionRDao.findByBsonCount(bson));
//分页,排序
return new ListPager(sysLogExceptionRDao.findByBsonPager(bson,pager,sysLogException.getOrderByParam()
,sysLogException.getAscOrDesc()),pager);
}
}
@Override
public long deleteSysLogExceptionByDateTimeAfter(String dateTime) {
return sysLogExceptionRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
}
}
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
//
//import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
//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.platform.platbean.SysLogException;
//import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogExceptionRepository;
//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
//import io.swagger.annotations.ApiOperation;
//import org.bson.conversions.Bson;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
///**
// * @Description :异常日志服务接口实现
// * @Reference :
// * @Author : yunhao
// * @CreateDate : 2018-11-19 17:30
// * @Modify:
// **/
//@Service
//public class SysLogExceptionService implements ISysLogExceptionService {
// public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionService.class);
//
//// @Autowired
//// private SysLogExceptionRepository sysLogExceptionRDao;
//
// @Override
// @ApiOperation(value = "系统异常日志复杂查询,分页,排序")
// public ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) {
//// if(sysLogException == null) {
//// pager = PagerHelper.getPager(pager, (int) sysLogExceptionRDao.count());
//// return new ListPager(sysLogExceptionRDao.findAll(),pager);
//// }else{
//// Bson bson = CoreBsonPack.packBsonBySysLogException(sysLogException);
//// pager = PagerHelper.getPager(pager,sysLogExceptionRDao.findByBsonCount(bson));
//// //分页,排序
//// return new ListPager(sysLogExceptionRDao.findByBsonPager(bson,pager,sysLogException.getOrderByParam()
//// ,sysLogException.getAscOrDesc()),pager);
//// }
// return null;
// }
//
// @Override
// public long deleteSysLogExceptionByDateTimeAfter(String dateTime) {
//// return sysLogExceptionRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
// return 0;
// }
//}

@ -1,107 +1,115 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService;
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.platform.platbean.SysLogOperate;
import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogOperateRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
import io.swagger.annotations.ApiOperation;
import org.bson.conversions.Bson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @Date : 2018-10-25 13:54
* @Modify :
**/
@Service
public class SysLogOperateService implements ISysLogOperateService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateService.class);
@Autowired
public SysLogOperateRepository logOperateRDao;
@Override
@ApiOperation(value = "添加操作日志",notes = "添加操作日志")
public SysLogOperate insertSysLogOperate(SysLogOperate logOperate) {
return logOperateRDao.insert(logOperate);
}
@Override
@ApiOperation(value = "根据id删除日志",notes = "根据id删除日志")
public void deleteSysLogOperateById(Long id) {
logOperateRDao.deleteById(id);
}
@Override
@ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志")
public List listSysLogOperate() {
return logOperateRDao.listPager(null);
}
@Override
public void deleteSysLogOperateByIds(Long[] ids) {
for(Long id : ids){
logOperateRDao.deleteById(id);
}
}
@Override
@ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志")
public SysLogOperate getSysLogOperateById(Long id) {
return logOperateRDao.getById(id);
}
@Override
@ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志")
public List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName) {
return logOperateRDao.findByProperty("operateUserName",operateUserName);
}
@Override
@ApiOperation(value = "查询所有日志数量")
public long countAllSysLogOperate() {
return logOperateRDao.listCount();
}
@Override
@ApiOperation(value = "操作日志复杂查询,分页,排序",notes = "操作日志复杂查询,分页,排序")
public ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) {
if(logOperate == null) {
pager = PagerHelper.getPager(pager, (int) logOperateRDao.count());
return new ListPager(logOperateRDao.findAll(),pager);
}else{
Bson bson = CoreBsonPack.packBsonByLogOperate(logOperate);
pager = PagerHelper.getPager(pager,logOperateRDao.findByBsonCount(bson));
//分页,排序
return new ListPager(logOperateRDao.findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager);
}
}
@Override
public List<SysLogOperate> 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 logOperateRDao.findByBsonPager(null,page,sysLogOperate.getOrderByParam(),sysLogOperate.getAscOrDesc());
}
@Override
public long deleteSysLogOperateByDateTimeAfter(String dateTime) {
return logOperateRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
}
}
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
//
//import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService;
//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.platform.platbean.SysLogOperate;
//import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogOperateRepository;
//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
//import io.swagger.annotations.ApiOperation;
//import org.bson.conversions.Bson;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
//import java.util.List;
//
///**
// * @Description : 操作日志服务接口实现
// * @Reference :
// * @Author : yunhao
// * @Date : 2018-10-25 13:54
// * @Modify :
// **/
//@Service
//public class SysLogOperateService implements ISysLogOperateService {
//
// public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateService.class);
//
//// @Autowired
//// public SysLogOperateRepository logOperateRDao;
//
// @Override
// @ApiOperation(value = "添加操作日志",notes = "添加操作日志")
// public SysLogOperate insertSysLogOperate(SysLogOperate logOperate) {
//// return logOperateRDao.insert(logOperate);
// return null;
// }
//
// @Override
// @ApiOperation(value = "根据id删除日志",notes = "根据id删除日志")
// public void deleteSysLogOperateById(Long id) {
//// logOperateRDao.deleteById(id);
// }
//
// @Override
// @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志")
// public List listSysLogOperate() {
//// return logOperateRDao.listPager(null);
// return null;
// }
//
// @Override
// public void deleteSysLogOperateByIds(Long[] ids) {
// for(Long id : ids){
//// logOperateRDao.deleteById(id);
// }
// }
//
// @Override
// @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志")
// public SysLogOperate getSysLogOperateById(Long id) {
//// return logOperateRDao.getById(id);
// return null;
// }
//
// @Override
// @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志")
// public List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName) {
//// return logOperateRDao.findByProperty("operateUserName",operateUserName);
// return null;
// }
//
// @Override
// @ApiOperation(value = "查询所有日志数量")
// public long countAllSysLogOperate() {
//// return logOperateRDao.listCount();
// return 0;
// }
//
// @Override
// @ApiOperation(value = "操作日志复杂查询,分页,排序",notes = "操作日志复杂查询,分页,排序")
// public ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) {
//// if(logOperate == null) {
//// pager = PagerHelper.getPager(pager, (int) logOperateRDao.count());
//// return new ListPager(logOperateRDao.findAll(),pager);
//// }else{
//// Bson bson = CoreBsonPack.packBsonByLogOperate(logOperate);
//// pager = PagerHelper.getPager(pager,logOperateRDao.findByBsonCount(bson));
//// //分页,排序
//// return new ListPager(logOperateRDao.findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager);
//// }
// return null;
// }
//
// @Override
// public List<SysLogOperate> 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 logOperateRDao.findByBsonPager(null,page,sysLogOperate.getOrderByParam(),sysLogOperate.getAscOrDesc());
// return null;
// }
//
// @Override
// public long deleteSysLogOperateByDateTimeAfter(String dateTime) {
//// return logOperateRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
// return 0;
// }
//}

@ -1,119 +1,126 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
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.platform.platbean.SysLogSystem;
import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogSystemRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
import com.mongodb.client.model.Filters;
import io.swagger.annotations.ApiOperation;
import org.bson.conversions.Bson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @Date : 2018-10-25 10:41
* @Modify :
**/
@Service
public class SysLogSystemService implements ISysLogSystemService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemService.class);
@Autowired
private SysLogSystemRepository logSystemRDao;
@Override
@ApiOperation(value = "添加系统日志",notes = "添加系统日志")
public void insertSysLogSystem(SysLogSystem logSystem) {
logSystemRDao.insert(logSystem);
}
@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("新增测试");
logSystemRDao.insert(sysLogSystem);
try {
this.wait(waitTime);
} catch (InterruptedException e) {
e.printStackTrace();
}
LOGGER.info("插入SysLog耗时" + (System.currentTimeMillis() - t1) + ",idx" + i);
}
}
@Override
@ApiOperation(value = "删除日志",notes = "删除日志")
public long deleteSysLogSystemById(Long id) {
Bson bson = Filters.eq("id",id);
return logSystemRDao.deleteByProperty(bson);
}
@Override
@ApiOperation(value = "查询全部日志",notes = "查询全部日志")
public List<SysLogSystem> listSysLogSystem() {
return logSystemRDao.findAll();
}
@Override
@ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志")
public SysLogSystem getSysLogSystemById(long id) {
return logSystemRDao.getById(id);
}
@Override
@ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询")
public ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) {
if (logSystem == null) {
pager = PagerHelper.getPager(pager,logSystemRDao.listCount());
return new ListPager(logSystemRDao.listPager(pager),pager);
} else {
Bson bson = CoreBsonPack.packBsonByLogSystem(logSystem);
pager = PagerHelper.getPager(pager,logSystemRDao.findByBsonCount(bson));
return new ListPager(logSystemRDao.findByBsonPager(bson,pager,logSystem.getOrderByParam()
,logSystem.getAscOrDesc()),pager);
}
}
@Override
@ApiOperation(value = "系统日志批量删除",notes = "系统日志批量删除")
public long deleteSysLogSystemByIds(Long[] ids) {
return logSystemRDao.deleteByIds(ids);
}
@Override
@ApiOperation(value = "系统日志按id区间查询",notes = "系统日志按id区间查询")
public List<SysLogSystem> findSysLogSystemByIdInterval(long min, long max) {
return logSystemRDao.findByBson(CoreBsonPack.packBsonByInterval("_id",min,max));
}
@Override
public long deleteSysLogSystemByDateTimeAfter(String dateTime) {
return logSystemRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
}
}
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
//
//import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
//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.platform.platbean.SysLogSystem;
//import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogSystemRepository;
//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
//import com.mongodb.client.model.Filters;
//import io.swagger.annotations.ApiOperation;
//import org.bson.conversions.Bson;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
//import java.util.List;
//
///**
// * @Description : 系统日志服务接口实现
// * @Reference :
// * @Author : yunhao
// * @Date : 2018-10-25 10:41
// * @Modify :
// **/
//@Service
//public class SysLogSystemService implements ISysLogSystemService {
//
// public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemService.class);
//
//// @Autowired
//// private SysLogSystemRepository logSystemRDao;
//
// @Override
// @ApiOperation(value = "添加系统日志",notes = "添加系统日志")
// public void insertSysLogSystem(SysLogSystem logSystem) {
//// logSystemRDao.insert(logSystem);
// }
//
//
// @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("新增测试");
//
//// logSystemRDao.insert(sysLogSystem);
// try {
// this.wait(waitTime);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
// LOGGER.info("插入SysLog耗时" + (System.currentTimeMillis() - t1) + ",idx" + i);
// }
// }
//
// @Override
// @ApiOperation(value = "删除日志",notes = "删除日志")
// public long deleteSysLogSystemById(Long id) {
// Bson bson = Filters.eq("id",id);
//// return logSystemRDao.deleteByProperty(bson);
// return 0;
// }
//
// @Override
// @ApiOperation(value = "查询全部日志",notes = "查询全部日志")
// public List<SysLogSystem> listSysLogSystem() {
//// return logSystemRDao.findAll();
// return null;
// }
//
// @Override
// @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志")
// public SysLogSystem getSysLogSystemById(long id) {
//// return logSystemRDao.getById(id);
// return null;
// }
//
// @Override
// @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询")
// public ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) {
//// if (logSystem == null) {
//// pager = PagerHelper.getPager(pager,logSystemRDao.listCount());
//// return new ListPager(logSystemRDao.listPager(pager),pager);
//// } else {
//// Bson bson = CoreBsonPack.packBsonByLogSystem(logSystem);
//// pager = PagerHelper.getPager(pager,logSystemRDao.findByBsonCount(bson));
//// return new ListPager(logSystemRDao.findByBsonPager(bson,pager,logSystem.getOrderByParam()
//// ,logSystem.getAscOrDesc()),pager);
//// }
// return null;
// }
//
// @Override
// @ApiOperation(value = "系统日志批量删除",notes = "系统日志批量删除")
// public long deleteSysLogSystemByIds(Long[] ids) {
//// return logSystemRDao.deleteByIds(ids);
// return 0;
// }
//
// @Override
// @ApiOperation(value = "系统日志按id区间查询",notes = "系统日志按id区间查询")
// public List<SysLogSystem> findSysLogSystemByIdInterval(long min, long max) {
//// return logSystemRDao.findByBson(CoreBsonPack.packBsonByInterval("_id",min,max));
// return null;
// }
//
// @Override
// public long deleteSysLogSystemByDateTimeAfter(String dateTime) {
//// return logSystemRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
// return 0;
// }
//}

@ -1,68 +1,71 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogTaskTimeService;
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.platform.platbean.SysLogSystem;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
import io.swagger.annotations.ApiOperation;
import org.bson.conversions.Bson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-01-04 15:10
* @Modify:
**/
@Service
public class SysLogTaskTimeService implements ISysLogTaskTimeService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogTaskTimeService.class);
@Autowired
private SysLogTaskTimeRepository sysLogTaskTimeRDao;
@Override
@ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志")
public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) {
sysLogTaskTimeRDao.insert(sysLogTaskTime);
}
@Override
@ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志")
public void deleteSysLogTaskTimeById(Long id) {
sysLogTaskTimeRDao.deleteById(id);
}
@Override
@ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志")
public SysLogTaskTime getSysLogTaskTimeById(Long id) {
return sysLogTaskTimeRDao.getById(id);
}
@Override
@ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询")
public ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager) {
if (sysLogTaskTime == null) {
pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.listCount());
return new ListPager(sysLogTaskTimeRDao.listPager(pager),pager);
} else {
Bson bson = CoreBsonPack.packBsonByLogTaskTime(sysLogTaskTime);
pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.findByBsonCount(bson));
return new ListPager(sysLogTaskTimeRDao.findByBsonPager(bson,pager,sysLogTaskTime.getOrderByParam()
,sysLogTaskTime.getAscOrDesc()),pager);
}
}
@Override
public long deleteSysLogTaskTimeByDateTimeAfter(String dateTime) {
return sysLogTaskTimeRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
}
}
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
//
//import cn.estsh.i3plus.core.api.iservice.busi.ISysLogTaskTimeService;
//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.platform.platbean.SysLogSystem;
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
//import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepository;
//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
//import io.swagger.annotations.ApiOperation;
//import org.bson.conversions.Bson;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
///**
// * @Description : 定时任务服务接口实现
// * @Reference :
// * @Author : yunhao
// * @CreateDate : 2019-01-04 15:10
// * @Modify:
// **/
//@Service
//public class SysLogTaskTimeService implements ISysLogTaskTimeService {
// public static final Logger LOGGER = LoggerFactory.getLogger(SysLogTaskTimeService.class);
//
//// @Autowired
//// private SysLogTaskTimeRepository sysLogTaskTimeRDao;
//
// @Override
// @ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志")
// public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) {
//// sysLogTaskTimeRDao.insert(sysLogTaskTime);
// }
//
// @Override
// @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志")
// public void deleteSysLogTaskTimeById(Long id) {
//// sysLogTaskTimeRDao.deleteById(id);
// }
//
// @Override
// @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志")
// public SysLogTaskTime getSysLogTaskTimeById(Long id) {
//// return sysLogTaskTimeRDao.getById(id);
// return null;
// }
//
// @Override
// @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询")
// public ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager) {
//// if (sysLogTaskTime == null) {
//// pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.listCount());
//// return new ListPager(sysLogTaskTimeRDao.listPager(pager),pager);
//// } else {
//// Bson bson = CoreBsonPack.packBsonByLogTaskTime(sysLogTaskTime);
//// pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.findByBsonCount(bson));
//// return new ListPager(sysLogTaskTimeRDao.findByBsonPager(bson,pager,sysLogTaskTime.getOrderByParam()
//// ,sysLogTaskTime.getAscOrDesc()),pager);
//// }
// return null;
// }
//
// @Override
// public long deleteSysLogTaskTimeByDateTimeAfter(String dateTime) {
//// return sysLogTaskTimeRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
// return 0;
// }
//}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
@ -46,7 +47,7 @@ public class SysTaskPlanService implements ISysTaskPlanService {
private SysRefTaskCyclePlanRepository sysRefTaskCyclePlanRDao;
@Autowired
private SysLogTaskTimeRepository sysLogTaskTimeRDao;
private ISysLogService logService;
@Override
@ApiOperation(value = "新增任务计划", notes = "新增任务计划")
@ -177,6 +178,6 @@ public class SysTaskPlanService implements ISysTaskPlanService {
@Override
@ApiOperation(value = "添加定时任务执行日志", notes = "添加定时任务执行日志")
public void logInsertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) {
sysLogTaskTimeRDao.insert(sysLogTaskTime);
logService.insertSysLogTaskTime(sysLogTaskTime);
}
}

@ -41,12 +41,6 @@ public class SystemResourceService implements ISystemResourceService {
@Autowired
private SysLocaleResourceRepository sysLocaleResourceRDao;
@Autowired
private SysLogOperateRepository logOperateRDao;
@Autowired
private SysLogSystemRepository logSystemRDao;
@Override
public SysLocaleLanguage insertSysLocaleLanguage(SysLocaleLanguage lang) {
return sysLocaleLanguageRDao.insert(lang);

Loading…
Cancel
Save