diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index 18f5d2d..d202ba1 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -13,6 +13,11 @@ i3plus-core-api jar + + + impp.framework + impp-framework-boot + i3plus.pojo i3plus-pojo-platform diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogConsoleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogConsoleService.java deleted file mode 100644 index 5958e19..0000000 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogConsoleService.java +++ /dev/null @@ -1,26 +0,0 @@ -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.*; -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 ISysLogConsoleService { - - ListPager queryLogConsolePager(SysLogConsole log, Pager pager); - List findLogConsoleList(SysLogConsole log, Pager pager); - List findLogConsoleList(SysLogConsole log); - SysLogConsole insertLogConsole(SysLogConsole log); - SysLogConsole getLogConsole(SysLogConsole log); - void deleteLogConsole(SysLogConsole log); -} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogService.java index 0de257e..f6ddc9e 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogService.java @@ -2,12 +2,10 @@ 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 cn.estsh.i3plus.pojo.platform.platbean.*; import io.swagger.annotations.ApiOperation; +import java.util.Date; import java.util.List; import java.util.Map; @@ -48,6 +46,15 @@ public interface ISysLogService { SysLogTaskTime getLogTaskTime(SysLogTaskTime log); void deleteLogTaskTime(SysLogTaskTime log); + ListPager queryLogConsolePager(SysLogConsole log, Pager pager); + List findLogConsoleList(SysLogConsole log, Pager pager); + List findLogConsoleList(SysLogConsole log); + SysLogConsole insertLogConsoleTime(SysLogConsole log); + SysLogConsole getLogConsoleTime(SysLogConsole log); + void deleteLogConsoleTime(SysLogConsole log); + + void actionCleanLog(String startTime, String endTime); + @ApiOperation(value = "查询时间段内平均请求耗时",notes = "查询时间段内平均请求耗时") Map querySysLogSystemAvgExecuteTime(String startTime, String endTime); diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogExceptionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogExceptionService.java deleted file mode 100644 index e547bd2..0000000 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogExceptionService.java +++ /dev/null @@ -1,31 +0,0 @@ -//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 querySysLogExceptionByPager(SysLogException sysLogException, Pager pager); -// -// /** -// * 删除指定日期之后的日志 -// * @param dateTime 日期 -// */ -// long deleteSysLogExceptionByDateTimeAfter(String dateTime); -//} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java deleted file mode 100644 index 5ca20bd..0000000 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java +++ /dev/null @@ -1,90 +0,0 @@ -//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 listSysLogOperateByOperateUserName(String operateUserName); -// -// //查询所有日志数量 -// @ApiOperation(value = "查询所有日志数量") -// long countAllSysLogOperate(); -// -// /** -// * 操作日志复杂查询，分页，排序 -// * @param logOperate -// * @param pager -// * @return -// */ -// @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") -// ListPager querySysLogOperateByPager(SysLogOperate logOperate, Pager pager); -// -// /** -// * 查询最新的操作日志 -// * @param num -// * @return -// */ -// @ApiOperation(value = "查询最新的操作日志") -// List findNewSysLogOperate(Integer num); -// -// /** -// * 删除指定日期之后的日志 -// * @param dateTime 日期 -// */ -// long deleteSysLogOperateByDateTimeAfter(String dateTime); -//} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogSystemService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogSystemService.java deleted file mode 100644 index 50eae86..0000000 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogSystemService.java +++ /dev/null @@ -1,54 +0,0 @@ -//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 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 findSysLogSystemByIdInterval(long min, long max); -// -// /** -// * 删除指定日期之后的日志 -// * @param dateTime 日期 -// */ -// long deleteSysLogSystemByDateTimeAfter(String dateTime); -//} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogTaskTimeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogTaskTimeService.java deleted file mode 100644 index 8d0e67b..0000000 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogTaskTimeService.java +++ /dev/null @@ -1,53 +0,0 @@ -//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); -//} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionDetailService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionDetailService.java new file mode 100644 index 0000000..2acc5f1 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionDetailService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail; +import cn.estsh.impp.framework.base.service.ICrudService; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-21 下午2:21 + * @Modify: + **/ +public interface ISysPojoVersionDetailService extends ICrudService { +} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionPlanService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionPlanService.java new file mode 100644 index 0000000..d6a2f8e --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionPlanService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan; +import cn.estsh.impp.framework.base.service.ICrudService; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-21 下午2:21 + * @Modify: + **/ +public interface ISysPojoVersionPlanService extends ICrudService { +} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionService.java new file mode 100644 index 0000000..968d1fc --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; +import cn.estsh.impp.framework.base.service.ICrudService; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-21 下午2:21 + * @Modify: + **/ +public interface ISysPojoVersionService extends ICrudService { +} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITestService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITestService.java deleted file mode 100644 index 2040d19..0000000 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITestService.java +++ /dev/null @@ -1,42 +0,0 @@ -//package cn.estsh.i3plus.core.api.iservice.busi; -// -//import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -//import cn.estsh.i3plus.pojo.base.bean.ListPager; -//import cn.estsh.i3plus.pojo.base.common.Pager; -//import cn.estsh.i3plus.pojo.platform.bean.SysUser; -//import io.swagger.annotations.ApiOperation; -// -//import javax.transaction.Transactional; -//import java.util.List; -// -///** -// * @Description : -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2019-02-20 21:23 -// * @Modify: -// **/ -//public interface ITestService { -// -// @ApiOperation(value = "多表查询") -// List queryToolAndToolType(Pager pager); -// -// @ApiOperation(value = "条件查询") -// public ListPager querySysUserByPager(SysUser user, Pager pager); -// -// @ApiOperation(value = "in条件封装查询") -// List querySysUserByPack(DdlPackBean packBean); -// -// @ApiOperation(value = "添加用户") -// void insertSysUser(SysUser sysUser); -// -// @ApiOperation(value = "修改用户") -// void updateSysUser(SysUser sysUser); -// -// @ApiOperation(value = "查询用户") -// List listSysUser(); -// -// @ApiOperation(value = "读写分离测试写") -// @Transactional -// void write(); -//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java index a298bef..b0da1c8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java @@ -4,7 +4,9 @@ import cn.estsh.i3plus.core.apiservice.schedulejob.CoreLogClearJob; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; +import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; import cn.estsh.i3plus.pojo.model.license.ImppLicense; +import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; @@ -14,11 +16,16 @@ import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.ResolvableType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; import java.util.List; /** @@ -36,6 +43,9 @@ public class DemoController extends CoreBaseController { @Autowired private CoreLogClearJob coreLogClearJob; + @Autowired + private SysUserRepository repository; + @GetMapping(value = "/query") @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化") public ResultBean insertLogOperate() { @@ -87,4 +97,28 @@ public class DemoController extends CoreBaseController { + @GetMapping(value = "/repository") + @ApiOperation(value = "repository 测试") + public ResultBean repository() { + try{ + ResolvableType resolvableType = ResolvableType.forClass(SysUserRepository.class).as(SysUserRepository.class); + System.out.println(resolvableType.getGeneric(0));//User + System.out.println(resolvableType.getGeneric(1));//Long + + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep).build(); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + public static void main(String[] args)throws Exception { + ResolvableType resolvableType = ResolvableType.forClass(SysUserRepository.class).as(SysUserRepository.class); + System.out.println(resolvableType.getGeneric(0));//User + System.out.println(resolvableType.getGeneric(1));//Long + + } + + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java index b74ff6f..5f564cd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java @@ -123,50 +123,6 @@ public class BackstageController extends CoreBaseController { } - @GetMapping(value = "/clean-log") - @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化") - public ResultBean logClean(String time) { - try{ - Date thisTime = TimeTool.parseDate(time); - String startTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 00:00:00"; - String endTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 23:59:59"; - - SysLogOperate operate = new SysLogOperate(); - operate.setCreateDatetime(startTime); - operate.setCreateDateTimeStart(startTime); - operate.setCreateDateTimeEnd(endTime); - - SysLogSystem system = new SysLogSystem(); - system.setCreateDatetime(startTime); - system.setCreateDateTimeStart(startTime); - system.setCreateDateTimeEnd(endTime); - - SysLogException exception = new SysLogException(); - exception.setCreateDatetime(startTime); - exception.setCreateDateTimeStart(startTime); - exception.setCreateDateTimeEnd(endTime); - - SysLogTaskTime taskTime = new SysLogTaskTime(); - taskTime.setCreateDatetime(startTime); - taskTime.setCreateDateTimeStart(startTime); - taskTime.setCreateDateTimeEnd(endTime); - - ElasticSearchTool.reload(); - logService.deleteLogOperate(operate); - logService.deleteLogSystem(system); - logService.deleteLogException(exception); - logService.deleteLogTaskTime(taskTime); - -// mongoService.deleteLogOperate(operate); -// mongoService.deleteLogSystem(system); -// mongoService.deleteLogException(exception); -// mongoService.deleteLogTaskTime(taskTime); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep).build(); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java new file mode 100644 index 0000000..842b10b --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java @@ -0,0 +1,151 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; +import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.platbean.*; +import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-18 下午3:50 + * @Modify: + **/ +@RestController +@Api(tags = "系统日志查询服务") +@RequestMapping(PlatformConstWords.BASE_URL + "/log") +public class ImppLogController extends CoreBaseController { + + @Autowired + private ISysLogService logService; + + /** + * 系统日志分页复杂查询 + * @param logSystem 查询条件 + * @param pager 分页数据 + * @return 处理结果 + */ + @GetMapping("/system/query") + @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") + public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager){ + try { + ListPager logSystemList = logService.queryLogSystemPager(logSystem, pager); + return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + /** + * 定时任务日志分页复杂查询 + * @param sysLogTaskTime 查询日志 + * @param pager 分页数据 + * @return 处理结果 + */ + @GetMapping("/task-time/query") + @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") + public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager){ + try { + ListPager logSystemList = logService.queryLogTaskTimePager(sysLogTaskTime, pager); + return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + /** + * 操作日志复杂查询，分页，排序 + * @param logOperate 操作日志 + * @param pager 分页数据 + * @return 处理结果 + */ + @GetMapping(value = "/operate/query") + @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") + public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager){ + try { + ListPager logSystemList = logService.queryLogOperatePager(logOperate, pager); + return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + /** + * 异常日志复杂查询，分页，排序 + * @param sysLogException 查询条件 + * @param pager 分页信息 + * @return 处理结果 + */ + @GetMapping(value = "/exception/query") + @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") + public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager){ + try { + ListPager logExceptionList = logService.queryLogExceptionPager(sysLogException, pager); + return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + /** + * 异常日志复杂查询，分页，排序 + * @param bean 查询条件 + * @param pager 分页信息 + * @return 处理结果 + */ + @GetMapping(value = "/console/query") + @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") + public ResultBean querySysLogConsoleByPager(SysLogConsole bean, Pager pager){ + try { + ListPager logExceptionList = logService.queryLogConsolePager(bean, pager); + return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/clean-log") + @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化") + public ResultBean logClean(String time) { + try{ + Date thisTime = TimeTool.parseDate(time); + String startTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 00:00:00"; + String endTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 23:59:59"; + + logService.actionCleanLog(startTime,endTime); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep).build(); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java index 02096b2..08100f9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java @@ -73,6 +73,7 @@ public class SysLogExceptionController extends CoreBaseController { * @param pager 分页信息 * @return 处理结果 */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping(value = "/query") @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager){ @@ -90,6 +91,7 @@ public class SysLogExceptionController extends CoreBaseController { * 获取系统操作日志 * @return 处理结果 */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping("/get-col") @ApiOperation(value = "获取系统操作日志字段") public ResultBean getSysLogExceptionCol(){ @@ -110,6 +112,7 @@ public class SysLogExceptionController extends CoreBaseController { * @param isZip 是否发送 * @return */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping(value = "/export") @ApiOperation(value = "导出系统异常日志") public ResultBean exportSysLogException(SysLogException sysLogException, String[] colName, int pageSize,boolean isZip) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index 7634d35..2d2e508 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -43,6 +43,7 @@ import java.util.List; * @Date : 2018-10-25 14:08 * @Modify : **/ +@Deprecated // 推荐使用 ImppLogController 查询日志相关 @RestController @Api(tags = "操作日志") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-operate") @@ -53,9 +54,6 @@ public class SysLogOperateController extends CoreBaseController { private ISysLogService logService; @Autowired - private ISysDictionaryService sysDictionaryService; - - @Autowired private ISysConfigService sysConfigService; @Autowired @@ -67,89 +65,6 @@ public class SysLogOperateController extends CoreBaseController { @Autowired private EntityManager entityManager; - @Resource(name= CommonConstWords.IMPP_REDIS_RES) - private ImppRedis redisRes; - -// /** -// * 添加操作日志 -// * @param logOperate 操作日志 -// * @return 处理结果 -// */ -// @PostMapping(value = "/insert") -// @ApiOperation(value = "添加操作日志",notes = "添加操作日志") -// public ResultBean insertSysLogOperateController(SysLogOperate logOperate){ -// try { -// logService.insertSysLogOperate(logOperate); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// /** -// * 根据id删除操作日志 -// * @param id 操作日志id -// * @return 处理结果 -// */ -// @DeleteMapping(value = "/delete") -// @ApiOperation(value = "根据id删除操作日志",notes = "根据id删除操作日志") -// public ResultBean deleteSysLogOperateById(String id){ -// try { -// // 条件验证 -// ValidatorBean.checkNotNull(id,"id不能为空！"); -// -// logService.deleteSysLogOperateById(Long.parseLong(id)); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// /** -// * 查询全部操作日志 -// * @return 处理结果 -// */ -// @GetMapping(value = "/list") -// @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") -// public ResultBean findSysLogOperateAll(){ -// try { -// List logOperateList = logService.listSysLogOperate(); -// return ResultBean.success("操作成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// /** -// * 根据id查询操作日志 -// * @param id 操作日志 -// * @return 处理结果 -// */ -// @GetMapping(value = "/get/{id}") -// @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志") -// public ResultBean getSysLogOperateById(@PathVariable("id") String id){ -// try{ -// SysLogOperate logOperate = logService.getSysLogOperateById(Long.parseLong(id)); -// if (logOperate != null) { -// return ResultBean.success("操作成功") -// .setResultObject(logOperate) -// .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }else { -// return ResultBean.fail("操作日志不存在") -// .setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); -// } -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } /** * 操作日志复杂查询，分页，排序 @@ -157,6 +72,7 @@ public class SysLogOperateController extends CoreBaseController { * @param pager 分页数据 * @return 处理结果 */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping(value = "/query") @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager){ @@ -174,6 +90,7 @@ public class SysLogOperateController extends CoreBaseController { * 获取系统操作日志字段 * @return 处理结果 */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping("/get-col") @ApiOperation(value = "获取系统操作日志字段") public ResultBean getSysLogOperateCol(){ @@ -194,6 +111,7 @@ public class SysLogOperateController extends CoreBaseController { * @param isZip 是否发送邮件 * @return 处理结果 */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping(value = "/export") @ApiOperation(value = "导出操作日志") public ResultBean exportSysLogOperate(SysLogOperate sysLogOperate, String[] colName, int pageSize, boolean isZip) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 2d920a1..6da1bde 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -43,6 +43,7 @@ import java.util.Objects; * @Date : 2018-10-25 10:50 * @Modify : **/ +@Deprecated // 推荐使用 ImppLogController 查询日志相关 @RestController @Api(tags = "系统日志服务") @RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-system") @@ -67,79 +68,6 @@ public class SysLogSystemController extends CoreBaseController{ @Resource(name="redisRes") private ImppRedis redisRes; -// /** -// * 新增系统日志 -// * @param logSystem 系统日志 -// * @return 处理结果 -// */ -// @PostMapping(value = "/insert") -// @ApiOperation(value="新增系统日志",notes = "新增系统日志") -// public ResultBean insertSysLogSystem(SysLogSystem logSystem) { -// try { -// logService.insertSysLogSystem(logSystem); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } - -// /** -// * 删除系统日志 -// * @param id 日志id -// * @return 处理结果 -// */ -// @DeleteMapping(value = "/delete") -// @ApiOperation(value = "删除系统日志",notes = "删除系统日志") -// public ResultBean deleteSysLogSystemById(String id) { -// try { -// // 条件校验 -// ValidatorBean.checkNotNull(id,"id不能为空"); -// -// logService.deleteSysLogSystemById(Long.parseLong(id)); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// /** -// * 查询全部系统日志 -// * @return 处理结果 -// */ -// @GetMapping(value = "/list") -// @ApiOperation(value = "查询全部系统日志",notes = "查询全部系统日志") -// public ResultBean findSysLogSystemAll(){ -// try { -// List logSystemList = logService.listSysLogSystem(); -// return ResultBean.success("操作成功").setResultList(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } - -// /** -// * 根据id查询系统日志 -// * @param id 系统日志id -// * @return 处理结果 -// */ -// @GetMapping(value = "/get") -// @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志") -// public ResultBean getSysLogSystemById(String id){ -// try { -// SysLogSystem logSystem = logService.getSysLogSystemById(Long.parseLong(id)); -// return ResultBean.success("操作成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } /** * 系统日志分页复杂查询 @@ -147,6 +75,7 @@ public class SysLogSystemController extends CoreBaseController{ * @param pager 分页数据 * @return 处理结果 */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping("/query") @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager){ @@ -164,6 +93,7 @@ public class SysLogSystemController extends CoreBaseController{ * 获取系统日志字段 * @return 处理结果 */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping("/get-col") @ApiOperation(value = "获取系统日志字段") public ResultBean getSysLogSystem(){ @@ -184,6 +114,7 @@ public class SysLogSystemController extends CoreBaseController{ * @param isZip 是否发送站内信 * @return 处理结果 */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping(value = "/export") @ApiOperation(value = "导出系统异常日志") public ResultBean exportSysLogSystem(SysLogSystem sysLogSystem, String[] colName, int pageSize, boolean isZip) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java index f9b07b6..081e887 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java @@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*; * @Date : 2019-01-04 * @Modify : **/ +@Deprecated // 推荐使用 ImppLogController 查询日志相关 @RestController @Api(tags = "定时任务日志服务") @RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-task-time") @@ -34,73 +35,13 @@ public class SysLogTaskTimeController extends CoreBaseController{ @Autowired private ISysLogService logService; -// /** -// * 新增定时任务日志 -// * @param sysLogTaskTime 定时任务日志 -// * @return 处理结果 -// */ -// @PostMapping(value = "/insert") -// @ApiOperation(value="新增定时任务日志",notes = "新增定时任务日志") -// public ResultBean insertSyslogTaskTime(SysLogTaskTime sysLogTaskTime) { -// try { -// logService.insertSysLogTaskTime(sysLogTaskTime); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } - -// /** -// * 删除定时任务 -// * @param id 定时任务id -// * @return 处理结果 -// */ -// @DeleteMapping(value = "/delete") -// @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志") -// public ResultBean deleteSysLogTaskTimeById(String id) { -// try { -// // 条件校验 -// ValidatorBean.checkNotNull(id,"id不能为空"); -// -// logService.deleteSysLogTaskTimeById(Long.parseLong(id)); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } - -// /** -// * 根据id查询定时任务日志 -// * @param id 定时任务id -// * @return 处理结果 -// */ -// @GetMapping(value = "/get") -// @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志") -// public ResultBean getSysLogTaskTimeById(String id){ -// try { -// SysLogTaskTime logTaskTime = logService.getSysLogTaskTimeById(Long.parseLong(id)); -// if (logTaskTime != null) { -// return ResultBean.success("操作成功").setResultObject(logTaskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }else { -// return ResultBean.fail("日志不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); -// } -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } - /** * 定时任务日志分页复杂查询 * @param sysLogTaskTime 查询日志 * @param pager 分页数据 * @return 处理结果 */ + @Deprecated // 推荐使用 ImppLogController 查询日志相关 @GetMapping("/query") @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java new file mode 100644 index 0000000..df48082 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; +import cn.estsh.impp.framework.base.controller.CrudBaseController; +import cn.estsh.impp.framework.base.service.ICrudService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-21 下午2:56 + * @Modify: + **/ +@RestController +@Api(tags = "报表服务") +@RequestMapping(CommonConstWords.BASE_URL_CORE+"/pojo-version") +public class SysPojoVersionController extends CrudBaseController { + @Autowired + private ISysPojoVersionService pojoVersionService; + + @Override + public ICrudService getCrudService() { + return pojoVersionService; + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionDetailController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionDetailController.java new file mode 100644 index 0000000..730bc96 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionDetailController.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionDetailService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail; +import cn.estsh.impp.framework.base.controller.CrudBaseController; +import cn.estsh.impp.framework.base.service.ICrudService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-21 下午2:56 + * @Modify: + **/ +@RestController +@Api(tags = "报表服务") +@RequestMapping(CommonConstWords.BASE_URL_CORE+"/pojo-version-detail") +public class SysPojoVersionDetailController extends CrudBaseController { + @Autowired + private ISysPojoVersionDetailService pojoVersionService; + + @Override + public ICrudService getCrudService() { + return pojoVersionService; + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionPlanDetailController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionPlanDetailController.java new file mode 100644 index 0000000..e610d51 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionPlanDetailController.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionDetailService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionPlanService; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan; +import cn.estsh.impp.framework.base.controller.CrudBaseController; +import cn.estsh.impp.framework.base.service.ICrudService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-21 下午2:56 + * @Modify: + **/ +@RestController +@Api(tags = "报表服务") +@RequestMapping(CommonConstWords.BASE_URL_CORE+"/pojo-version-plan") +public class SysPojoVersionPlanDetailController extends CrudBaseController { + @Autowired + private ISysPojoVersionPlanService pojoVersionService; + + @Override + public ICrudService getCrudService() { + return pojoVersionService; + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java index f1a446a..606a56e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; +import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogElasticSearchService; import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogMongoService; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -40,10 +41,7 @@ public class CoreLogClearJob extends BaseImppScheduleJob { } @Autowired - private SysLogElasticSearchService elasticSearchService; - - @Autowired - private SysLogMongoService mongoService; + private ISysLogService logService; @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { @@ -51,37 +49,7 @@ public class CoreLogClearJob extends BaseImppScheduleJob { Date thisTime = new Date(); String startTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, to)) + " 00:00:00"; String endTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, to)) + " 23:59:59"; - - SysLogOperate operate = new SysLogOperate(); - operate.setCreateDatetime(startTime); - operate.setCreateDateTimeStart(startTime); - operate.setCreateDateTimeEnd(endTime); - - SysLogSystem system = new SysLogSystem(); - system.setCreateDatetime(startTime); - system.setCreateDateTimeStart(startTime); - system.setCreateDateTimeEnd(endTime); - - SysLogException exception = new SysLogException(); - exception.setCreateDatetime(startTime); - exception.setCreateDateTimeStart(startTime); - exception.setCreateDateTimeEnd(endTime); - - SysLogTaskTime taskTime = new SysLogTaskTime(); - taskTime.setCreateDatetime(startTime); - taskTime.setCreateDateTimeStart(startTime); - taskTime.setCreateDateTimeEnd(endTime); - - ElasticSearchTool.reload(); - elasticSearchService.deleteLogOperate(operate); - elasticSearchService.deleteLogSystem(system); - elasticSearchService.deleteLogException(exception); - elasticSearchService.deleteLogTaskTime(taskTime); - - mongoService.deleteLogOperate(operate); - mongoService.deleteLogSystem(system); - mongoService.deleteLogException(exception); - mongoService.deleteLogTaskTime(taskTime); + logService.actionCleanLog(startTime,endTime); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogConsoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogConsoleService.java deleted file mode 100644 index 27bc7ed..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogConsoleService.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.base; - -import cn.estsh.i3plus.core.api.iservice.base.ISysLogConsoleService; -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.platform.platbean.SysLogConsole; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 20-4-16 上午10:39 - * @Modify: - **/ -@Service -public class SysLogConsoleService implements ISysLogConsoleService { - public static final Logger LOGGER = LoggerFactory.getLogger(SysLogElasticSearchService.class); - - @Override - public ListPager queryLogConsolePager(SysLogConsole log, Pager pager) { - return null; - } - - @Override - public List findLogConsoleList(SysLogConsole log, Pager pager) { - return null; - } - - @Override - public List findLogConsoleList(SysLogConsole log) { - return null; - } - - @Override - public SysLogConsole insertLogConsole(SysLogConsole log) { - return null; - } - - @Override - public SysLogConsole getLogConsole(SysLogConsole log) { - return null; - } - - @Override - public void deleteLogConsole(SysLogConsole log) { - - } -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java index 346be80..5a377bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java @@ -2,16 +2,14 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.base; import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; import cn.estsh.i3plus.core.apiservice.util.NoSqlPack; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.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.platbean.*; import cn.estsh.impp.framework.boot.log.ImppLog; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.bucket.terms.ParsedTerms; @@ -22,10 +20,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * @Description : @@ -165,10 +160,95 @@ public class SysLogElasticSearchService implements ISysLogService { public void deleteLogTaskTime(SysLogTaskTime log) { ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogTaskTime(log)); } - /******************************************************* 定时任务日志 End *********************************************************/ + /******************************************************* 控制台日志 Start *********************************************************/ + + @Override + public ListPager queryLogConsolePager(SysLogConsole log, Pager pager) { + return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogConsole(log),pager,SysLogConsole.class); + } + + @Override + public List findLogConsoleList(SysLogConsole log, Pager pager) { + return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogConsole(log),pager,SysLogConsole.class); + } + + @Override + public List findLogConsoleList(SysLogConsole log) { + return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogConsole(log),SysLogConsole.class); + } + + @Override + public SysLogConsole insertLogConsoleTime(SysLogConsole log) { + ElasticSearchPack pack = ElasticSearchPack.imppBuild(TimeTool.parseDate(log.getCreateDatetime()), SysLogConsole.class); + ElasticSearchTool.insert(pack.getIndexName(),log); + return log; + } + + @Override + public SysLogConsole getLogConsoleTime(SysLogConsole log) { + return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogConsole.class); + } + + @Override + public void deleteLogConsoleTime(SysLogConsole log) { + ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogConsole(log)); + } + + + /******************************************************* 控制台日志 End *********************************************************/ + + @Override + public void actionCleanLog(String startTime, String endTime) { + ElasticSearchTool.reload(); + try{ + SysLogOperate operate = new SysLogOperate(); + operate.setCreateDatetime(startTime); + operate.setCreateDateTimeStart(startTime); + operate.setCreateDateTimeEnd(endTime); + deleteLogOperate(operate); + }catch (Exception e){ + } + + try { + SysLogSystem system = new SysLogSystem(); + system.setCreateDatetime(startTime); + system.setCreateDateTimeStart(startTime); + system.setCreateDateTimeEnd(endTime); + deleteLogSystem(system); + }catch (Exception e){ + } + + try { + SysLogException exception = new SysLogException(); + exception.setCreateDatetime(startTime); + exception.setCreateDateTimeStart(startTime); + exception.setCreateDateTimeEnd(endTime); + deleteLogException(exception); + }catch (Exception e){ + } + + try { + SysLogTaskTime taskTime = new SysLogTaskTime(); + taskTime.setCreateDatetime(startTime); + taskTime.setCreateDateTimeStart(startTime); + taskTime.setCreateDateTimeEnd(endTime); + deleteLogTaskTime(taskTime); + }catch (Exception e){ + } + + try { + SysLogConsole console = new SysLogConsole(); + console.setCreateDatetime(startTime); + console.setCreateDateTimeStart(startTime); + console.setCreateDateTimeEnd(endTime); + deleteLogConsoleTime(console); + }catch (Exception e){ + } + } + @Override public Map querySysLogSystemAvgExecuteTime(String startTime, String endTime) { Map resultData = new LinkedHashMap(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java index 147ee37..0b137f4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java @@ -6,10 +6,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; +import cn.estsh.i3plus.pojo.platform.platbean.*; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.log.ImppLog; import cn.estsh.impp.framework.boot.util.ImppSwitchUtil; @@ -19,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.Map; @@ -199,8 +197,44 @@ public class SysLogFactory implements ISysLogService { getSysLogService().deleteLogTaskTime(log); } + + @Override + public ListPager queryLogConsolePager(SysLogConsole log, Pager pager) { + return getSysLogService().queryLogConsolePager(log,pager); + } + + @Override + public List findLogConsoleList(SysLogConsole log, Pager pager) { + return getSysLogService().findLogConsoleList(log,pager); + } + + @Override + public List findLogConsoleList(SysLogConsole log) { + return getSysLogService().findLogConsoleList(log); + } + + @Override + public SysLogConsole insertLogConsoleTime(SysLogConsole log) { + return getSysLogService().insertLogConsoleTime(log); + } + + @Override + public SysLogConsole getLogConsoleTime(SysLogConsole log) { + return getSysLogService().getLogConsoleTime(log); + } + + @Override + public void deleteLogConsoleTime(SysLogConsole log) { + getSysLogService().deleteLogConsoleTime(log); + } + + /******************************************************* 定时任务日志 End *********************************************************/ + @Override + public void actionCleanLog(String startTime, String endTime) { + getSysLogService().actionCleanLog(startTime,endTime); + } @Override public Map querySysLogSystemAvgExecuteTime(String startTime, String endTime) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java index 2861987..ace4c78 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java @@ -6,15 +6,13 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.MathOperation; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.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.platbean.*; import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogExceptionRepository; import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogOperateRepository; import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogSystemRepository; @@ -293,10 +291,118 @@ public class SysLogMongoService implements ISysLogService { getSysLogTaskTimeRepository().deleteByProperty(NoSqlPack.packMongoByLogTaskTime(log)); } + @Override + public ListPager queryLogConsolePager(SysLogConsole log, Pager pager) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.FORM.getCode()) + .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") + .setErrorSolution("请重新操作") + .build(); + } + + @Override + public List findLogConsoleList(SysLogConsole log, Pager pager) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.FORM.getCode()) + .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) + .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") + .setErrorSolution("请重新操作") + .build(); + } + + @Override + public List findLogConsoleList(SysLogConsole log) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.FORM.getCode()) + .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) + .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") + .setErrorSolution("请重新操作") + .build(); + } + + @Override + public SysLogConsole insertLogConsoleTime(SysLogConsole log) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.FORM.getCode()) + .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) + .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") + .setErrorSolution("请重新操作") + .build(); + } + + @Override + public SysLogConsole getLogConsoleTime(SysLogConsole log) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.FORM.getCode()) + .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) + .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") + .setErrorSolution("请重新操作") + .build(); + } + + @Override + public void deleteLogConsoleTime(SysLogConsole log) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.FORM.getCode()) + .setErrorCode(cn.estsh.impp.framework.boot.exception.ImppExceptionEnum.DATABASE_EXCEPTION.getCode()) + .setErrorDetail("日志数据量太大,推荐使用Elasticsearch技术存储") + .setErrorSolution("请重新操作") + .build(); + } + /******************************************************* 定时任务日志 End *********************************************************/ @Override + public void actionCleanLog(String startTime, String endTime) { + try{ + SysLogOperate operate = new SysLogOperate(); + operate.setCreateDatetime(startTime); + operate.setCreateDateTimeStart(startTime); + operate.setCreateDateTimeEnd(endTime); + deleteLogOperate(operate); + }catch (Exception e){ + } + + try { + SysLogSystem system = new SysLogSystem(); + system.setCreateDatetime(startTime); + system.setCreateDateTimeStart(startTime); + system.setCreateDateTimeEnd(endTime); + deleteLogSystem(system); + }catch (Exception e){ + } + + try { + SysLogException exception = new SysLogException(); + exception.setCreateDatetime(startTime); + exception.setCreateDateTimeStart(startTime); + exception.setCreateDateTimeEnd(endTime); + deleteLogException(exception); + }catch (Exception e){ + } + + try { + SysLogTaskTime taskTime = new SysLogTaskTime(); + taskTime.setCreateDatetime(startTime); + taskTime.setCreateDateTimeStart(startTime); + taskTime.setCreateDateTimeEnd(endTime); + deleteLogTaskTime(taskTime); + }catch (Exception e){ + } + + try { + SysLogConsole console = new SysLogConsole(); + console.setCreateDatetime(startTime); + console.setCreateDateTimeStart(startTime); + console.setCreateDateTimeEnd(endTime); + deleteLogConsoleTime(console); + }catch (Exception e){ + } + } + + @Override public Map querySysLogSystemAvgExecuteTime(String startTime, String endTime) { // 筛选 Document sub_match = new Document(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java deleted file mode 100644 index 7ee62ad..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java +++ /dev/null @@ -1,52 +0,0 @@ -//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 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.packMongoBySysLogException(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; -// } -//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java deleted file mode 100644 index cf1eaee..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java +++ /dev/null @@ -1,115 +0,0 @@ -//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 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 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 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; -// } -//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java deleted file mode 100644 index 8e22f1c..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java +++ /dev/null @@ -1,126 +0,0 @@ -//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 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.packMongoByLogSystem(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 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; -// } -//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java deleted file mode 100644 index 5853095..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java +++ /dev/null @@ -1,71 +0,0 @@ -//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.packMongoByLogTaskTime(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; -// } -//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionDetailService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionDetailService.java new file mode 100644 index 0000000..1e15b7b --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionDetailService.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; +import cn.estsh.i3plus.pojo.platform.repository.SysPojoVersionRepository; +import cn.estsh.impp.framework.base.service.CrudService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-21 下午2:28 + * @Modify: + **/ +@Service +public class SysPojoVersionDetailService extends CrudService implements ISysPojoVersionService { + + @Autowired + private SysPojoVersionRepository pojoVersionRDao; + + @Override + public BaseRepository getRepository() { + return pojoVersionRDao; + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionPlanService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionPlanService.java new file mode 100644 index 0000000..50e7106 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionPlanService.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionPlanService; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan; +import cn.estsh.i3plus.pojo.platform.repository.SysPojoVersionPlanRepository; +import cn.estsh.impp.framework.base.service.CrudService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-21 下午2:28 + * @Modify: + **/ +@Service +public class SysPojoVersionPlanService extends CrudService implements ISysPojoVersionPlanService { + + @Autowired + private SysPojoVersionPlanRepository pojoVersionPlanRDao; + + @Override + public BaseRepository getRepository() { + return pojoVersionPlanRDao; + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java new file mode 100644 index 0000000..634067d --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; +import cn.estsh.i3plus.pojo.platform.repository.SysPojoVersionRepository; +import cn.estsh.impp.framework.base.service.CrudService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-21 下午2:28 + * @Modify: + **/ +@Service +public class SysPojoVersionService extends CrudService implements ISysPojoVersionService { + + @Autowired + private SysPojoVersionRepository pojoVersionRDao; + + @Override + public BaseRepository getRepository() { + return pojoVersionRDao; + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java deleted file mode 100644 index 8cded5e..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java +++ /dev/null @@ -1,123 +0,0 @@ -//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -// -//import cn.estsh.i3plus.core.api.iservice.busi.ITestService; -//import cn.estsh.i3plus.core.apiservice.dao.ITestDao; -//import cn.estsh.i3plus.platform.common.tool.StringTool; -//import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -//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.tool.DdlPreparedPack; -//import cn.estsh.i3plus.pojo.base.tool.HqlPack; -//import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; -//import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; -//import cn.estsh.i3plus.pojo.platform.bean.SysUser; -//import cn.estsh.i3plus.pojo.platform.bean.TestTransUser; -//import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; -//import cn.estsh.i3plus.pojo.platform.repository.TestTransUserRepository; -//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; -//import io.swagger.annotations.ApiOperation; -//import org.apache.commons.lang3.StringUtils; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -// -//import java.util.ArrayList; -//import java.util.List; -//import java.util.Random; -// -///** -// * @Description : -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2019-02-20 21:24 -// * @Modify: -// **/ -//@Service -//public class TestService implements ITestService { -// -// public static final Logger LOGGER = LoggerFactory.getLogger(TestService.class); -// -// @Autowired -// ITestDao testDao; -// -// @Autowired -// private SysUserRepository sysUserRDao; -// -// @Autowired -// private TestTransUserRepository testTransUserRepository; -// -// @Override -// @ApiOperation(value = "多表查询") -// public List queryToolAndToolType(Pager pager) { -// return testDao.queryToolAndToolType(pager); -// } -// -// @Override -// @ApiOperation(value = "账号分页查询", notes = "组合查询") -// public ListPager querySysUserByPager(SysUser user, Pager pager) { -// LOGGER.debug("系统用户 SysUser find user :{} page :{}", user, pager); -// -// //生成hql查询语句 -// String hqlPack = CoreHqlPack.packHqlSysUser(user); -// pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(hqlPack)); -// ListPager list = new ListPager(sysUserRDao.findByHqlWherePage(hqlPack + user.orderBy(), pager), pager); -// LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager()); -// -//// DdlPackBean packBean = new DdlPackBean(); -//// DdlPreparedPack.getNumEqualPackOverZero(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean); -//// DdlPreparedPack.getNumEqualPackOverZero(user.getDepartmentId(),"departmentId",packBean); -//// DdlPreparedPack.getNumEqualPackOverZero(user.getUserStatus(),"userStatus",packBean); -//// DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",packBean); -//// DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",packBean); -//// DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",packBean); -//// DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",packBean); -// -// DdlPackBean packBean = CoreHqlPack.packDdlSysUser(user); -// System.out.println("getPackedHql=="+packBean.getPackedHql()); -// System.out.println("getPackedHqlAll=="+packBean.getPackedHqlAll()); -// System.out.println("getHqlAppend=="+packBean.getHqlAppend()); -// System.out.println("getWhereAppend=="+packBean.getWhereAppend()); -// System.out.println("getOrderByStr=="+packBean.getOrderByStr()); -// -// pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(packBean)); -// list = new ListPager(sysUserRDao.findByHqlWherePage(packBean, pager), pager); -// LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager()); -// -// return list; -// } -// -// @Override -// public List querySysUserByPack(DdlPackBean packBean) { -// return sysUserRDao.findByHqlWhere(packBean); -// } -// -// @Override -// public void write() { -// Random ran = new Random(10000); -// TestTransUser u = new TestTransUser(); -// u.setName("na2me" + ran.nextInt(100)); -// u.setSalary(ran.nextDouble()); -// System.out.println("插入对象：" + u); -// -// u = testTransUserRepository.insert(u); -// System.out.println("插入对象：" + u); -// } -// -// @Override -// public void insertSysUser(SysUser sysUser) { -// sysUserRDao.insert(sysUser); -// } -// -// @Override -// public void updateSysUser(SysUser sysUser) { -// sysUserRDao.update(sysUser); -// } -// -// @Override -// public List listSysUser() { -// return sysUserRDao.list(); -// } -//}