diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index 02b3cac..42c86a0 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/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/base/ISystemInitService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java index 9b3e918..f3d58c0 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java @@ -46,4 +46,7 @@ public interface ISystemInitService { */ @ApiOperation(value = "获取缓存中的数据",notes = "获取缓存中的数据") Object getDataFromCache(String key,Class dataType); + + @ApiOperation(value = "重新加载Elasticsearch 客户端信息") + void reloadElasticSearchClient(); } 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/ISysToolService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java index 0e4712d..f608cd3 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java @@ -45,12 +45,6 @@ public interface ISysToolService { void updateSysTool(SysTool tool); /** - * 修改硬件 - */ - @ApiOperation(value = "造数据") - void insertBatch(int num,int waitTime); - - /** * 查找全部硬件 * @return */ 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/configuration/AppStartSystemInit.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java index 0cbb20d..877ffd2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java @@ -14,8 +14,8 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; +import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -35,15 +35,13 @@ public class AppStartSystemInit implements CommandLineRunner { @Autowired private ISystemInitService systemInitService; - @Value("${spring.profiles.active}") - public String SPRING_PROFILES_ACTIVE; + @Autowired + private Environment environment; + // 限制组织数量 - public static int organizeCount = 5; + private static final int organizeCount = 5; // 限制账号数量 - public static int userInfoCount = 100; - -// @Value("${" + CommonConstWords.PROP_IMPP_ELASTICSEARCH_URL + "}") - public String PROP_IMPP_ELASTICSEARCH_URL; + private static final int userInfoCount = 100; @Resource(name = CommonConstWords.IMPP_REDIS_RES) private ImppRedis redisRes; @@ -73,9 +71,6 @@ public class AppStartSystemInit implements CommandLineRunner { systemConfig.loadSystemConfig(CommonEnumUtil.SOFT_TYPE.CORE.getCode()); LOGGER.info("【IMPP-Core 加载系统配置文件到缓存完成】"); - LOGGER.info("【IMPP-Core 加载 ElasticSearch中 ...】"); - initImppElasticSearch(); - LOGGER.info("【IMPP-Core 加载 ElasticSearch完成】"); } /** @@ -104,8 +99,9 @@ public class AppStartSystemInit implements CommandLineRunner { public void initImppElasticSearch(){ try { if(ImppSwitchUtil.isElasticSearchSwitch()){ - if(StringUtils.isNotBlank(PROP_IMPP_ELASTICSEARCH_URL)){ - ElasticSearchTool.init(PROP_IMPP_ELASTICSEARCH_URL); + String rul = environment.getProperty(CommonConstWords.PROP_IMPP_ELASTICSEARCH_URL); + if(StringUtils.isNotBlank(rul)){ + ElasticSearchTool.init(rul); }else { LOGGER.info("【启动加载】启动加载 ElasticSearch 组件错误,url 参数缺失"); } @@ -278,4 +274,6 @@ public class AppStartSystemInit implements CommandLineRunner { LOGGER.info("【资源配置文件已全部加载】");*/ } + + } 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 11c9abc..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 @@ -1,30 +1,31 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.apiservice.schedulejob.CoreLogClearJob; -import cn.estsh.i3plus.platform.common.tool.HttpClientTool; -import cn.estsh.i3plus.platform.common.tool.SerializeTool; 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.platform.plugin.license.ImppLicense; -import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool; -import cn.estsh.i3plus.platform.plugin.license.serviceimpl.SenseLockUtil; +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; 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 com.alibaba.fastjson.JSON; 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.util.Base64; -import java.util.HashMap; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; import java.util.List; /** @@ -42,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() { @@ -93,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/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 37b9966..4f0cd58 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -45,37 +45,26 @@ import java.util.Locale; public class DemoResourceController extends CoreBaseController { private static final Logger LOGGER = LoggerFactory.getLogger(DemoResourceController.class); - /** - * 缓存 - */ - @Resource(name = CommonConstWords.IMPP_REDIS_CORE) - private ImppRedis redisCore; - - /** - * rabbitMQ队列 - */ - @Autowired - private RabbitTemplate rabbitTemplate; @Autowired private ISystemResourceService systemResourceService; @PutMapping(value="/language/insert") @ApiOperation(value="添加语言",notes = "添加系统语言，可用于国际化") - public ResultBean insertLanguage(SysLocaleLanguage lang) { + public ResultBean insertLanguage(SysLocaleLanguage bean) { try { //登陆用户 SessionUser user = AuthUtil.getSessionUser(); //条件验证 - ValidatorBean.beginValid(lang) - .notNull("languageName",lang.getLanguageName()) - .notNull("languageCode",lang.getLanguageCode()); + ValidatorBean.beginValid(bean) + .notNull("languageName", bean.getLanguageName()) + .notNull("languageCode", bean.getLanguageCode()); //新增初始化 - ConvertBean.modelInitialize(lang,user); + ConvertBean.modelInitialize(bean,user); - systemResourceService.insertSysLocaleLanguage(lang); + systemResourceService.insertSysLocaleLanguage(bean); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep).build(); @@ -86,24 +75,24 @@ public class DemoResourceController extends CoreBaseController { /** * 修改系统语言，可用于国际化 - * @param lang 国际化语言 + * @param bean 国际化语言 * @return */ @PutMapping(value="/language/update") @ApiOperation(value="修改语言",notes = "修改系统语言，可用于国际化") - public ResultBean updateLanguage(SysLocaleLanguage lang) { + public ResultBean updateLanguage(SysLocaleLanguage bean) { try { //登陆用户 SessionUser user = AuthUtil.getSessionUser(); //条件验证 - ValidatorBean.beginValid(lang) - .notNull("languageName",lang.getLanguageName()) - .notNull("languageCode",lang.getLanguageCode()); + ValidatorBean.beginValid(bean) + .notNull("languageName", bean.getLanguageName()) + .notNull("languageCode", bean.getLanguageCode()); //修改条件 - ConvertBean.modelUpdate(lang,user); - systemResourceService.updateSysLocaleLanguage(lang); + ConvertBean.modelUpdate(bean,user); + systemResourceService.updateSysLocaleLanguage(bean); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep).build(); @@ -114,15 +103,15 @@ public class DemoResourceController extends CoreBaseController { /** * 查询语言 - * @param lang 查询条件 + * @param bean 查询条件 * @param pager 分页信息 * @return 处理结果 */ @PutMapping(value="/language/query") @ApiOperation(value="查询语言",notes = "添加系统语言，可用于国际化") - public ResultBean queryLanguage(SysLocaleLanguage lang,Pager pager) { + public ResultBean queryLanguage(SysLocaleLanguage bean, Pager pager) { try { - ListPager listPager = systemResourceService.listSysLocaleLanguageByPager(lang,pager); + ListPager listPager = systemResourceService.listSysLocaleLanguageByPager(bean,pager); return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -233,88 +222,4 @@ public class DemoResourceController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } - - - @Autowired - private ISysUserService userService; - - @Autowired - private ISysUserInfoService userInfoServicer; - - /** - * 测试重复ID1 - * @param key id - * @return 处理结果 - */ - @GetMapping(value="/dup-id1") - @ApiOperation(value="测试重复ID1",notes="测试重复ID1") - public ResultBean testDuplicatedIdOne(long key) { - try { - LOGGER.info("获取：{}",key); - - SysUser user = userService.getSysUserById(key); - System.out.println("1==="+user.toString()); - - return ResultBean.success("操作成功"); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - - /** - * 测试重复ID2 - * @param key id - * @return 处理结果 - */ - @GetMapping(value="/dup-id2") - @ApiOperation(value="测试重复ID2",notes="测试重复ID2") - public ResultBean testDuplicatedIdTwo(long key) { - try { - LOGGER.info("获取：{}",key); - - SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key); - System.out.println("2==="+userInfo.toString()); - - return ResultBean.success("操作成功"); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - /** - * 测试重复ID - * @param key id - * @return 处理结果 - * @return 处理结果 - */ - @GetMapping(value="/dup-id") - @ApiOperation(value="测试重复ID",notes="测试重复ID") - public ResultBean testDuplicatedId(long key) { - try { - LOGGER.info("获取：{}",key); -// SysUser u1 = new SysUser(); -// u1.setId(key); -// SysUserInfo u2 = new SysUserInfo(); -// u2.setId(key); -// System.out.println(u1.equals(u2)); -// System.out.println("1====" + u1.hashCode()); -// System.out.println("2====" + u2.hashCode()); - -// SysUser user = userService.getSysUserById(key); -// System.out.println("1==="+user); -// SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key); -// System.out.println("2==="+userInfo); - - return ResultBean.success("操作成功"); - }catch(ImppBusiException busExcep){ - return ResultBean.fail(busExcep); - }catch(Exception e){ - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java index 068fed2..4b2eee7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java @@ -76,7 +76,7 @@ // // private String TEXT = "飓风黑兹尔是1954年大西洋飓风季期间造成死亡人数最多、经济损失最惨重的飓风。这场风暴夺走了海地多达1000人的生命，然后又以四级飓风强度从南、北卡罗莱纳州边境附近袭击美国，造成95人丧生。之后黑兹尔转变成温带风暴，但仍然致使81人遇难，其中大部分来自多伦多。由于风暴造成了重大人员伤亡和财产损失，其名称“黑兹尔”因此从大西洋风暴命名名单上退役。黑兹尔摧毁了海地40%的咖啡树和50%的可可作物，对当地经济的影响持续了数年之久。飓风在南、北卡罗莱纳州登陆，冲击点附近的大部分海滨住宅被毁。气旋从北卡罗莱纳州沿大西洋海岸北上，先后影响了弗吉尼亚州、西弗吉尼亚州、马里兰州、特拉华州、新泽西州、宾夕法尼亚州和纽约州，产生的阵风时速有近160公里，造成的经济损失高达3.08亿美元。多伦多市内及周边有许多溪流溢出，导致严重的洪涝灾害。加拿大遭受的损失达到1.35亿加拿大元。由于缺少应对热带气旋的经验，加上风暴强度的保持时间异常之长，多伦多所受影响的严重程度是前所未有的"; // -// private SnowflakeIdMaker snowflakeIdMaker = SnowflakeIdMaker.getSnowflakeIdMaker(10,10); +// private SnowflakeIdMaker snowflakeIdMaker = SnowflakeIdMaker.getSnowflake(10,10); // // @Autowired // private PersonnelController personnelController; 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 c183bda..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 @@ -1,20 +1,12 @@ package cn.estsh.i3plus.core.apiservice.controller.base; +import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; -import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService; -import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; -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.SerializeTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; -import cn.estsh.i3plus.platform.plugin.license.ImppLicense; -import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.model.license.ImppLicense; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; @@ -22,10 +14,8 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; 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.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -35,9 +25,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; import java.util.Date; -import java.util.List; /** * @Description : 后台服务 @@ -55,21 +43,9 @@ public class BackstageController extends CoreBaseController { @Autowired private ISystemInitService systemInitService; - - @Autowired - private ISysMenuService menuService; - - @Autowired - private ICoreMemTreeService memTreeService; - - @Autowired - private SysLogElasticSearchService elasticSearchService; - @Autowired - private SysLogMongoService mongoService; + private ISysLogService logService; - @Resource(name= CommonConstWords.IMPP_REDIS_CORE) - private ImppRedis redisRes; @GetMapping(value = "/redis-put-all") @ApiOperation(value = "重新加载所有缓存数据",notes = "重新加载所有缓存数据") @@ -147,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(); - elasticSearchService.deleteLogOperate(operate); - elasticSearchService.deleteLogSystem(system); - elasticSearchService.deleteLogException(exception); - elasticSearchService.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/base/PressureTestController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/PressureTestController.java deleted file mode 100644 index ce9ae98..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/PressureTestController.java +++ /dev/null @@ -1,176 +0,0 @@ -//package cn.estsh.i3plus.core.apiservice.controller.base; -// -//import cn.estsh.i3plus.platform.common.tool.HttpClientTool; -//import cn.estsh.i3plus.platform.plugin.opc.pojo.OpcUAParam; -//import cn.estsh.i3plus.platform.plugin.opc.service.OpcUAService; -//import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog; -//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -//import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -//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 com.alibaba.fastjson.JSON; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaSubscription; -//import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.web.bind.annotation.GetMapping; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//import java.util.HashMap; -//import java.util.Hashtable; -//import java.util.Map; -// -///** -// * @Description : -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2020-01-08 11:53 -// * @Modify: -// **/ -//@RestController -//@Api(tags = "压测接口") -//@RequestMapping("/impp/pressure-test") -//public class PressureTestController extends CoreBaseController { -// public static final Logger LOGGER = LoggerFactory.getLogger(PressureTestController.class); -// -// private static Map uaServiceMap = new Hashtable<>(); -// -// public static Map upcSub = new Hashtable<>(); -// -// private OpcUAService getOpcUaService(OpcUAParam opcUAParam){ -// if(!uaServiceMap.containsKey(opcUAParam.getServerUrl())){ -// OpcUAService opcService = new OpcUAService(); -// opcService.connUaService(opcUAParam); -// uaServiceMap.put(opcUAParam.getServerUrl(),opcService); -// } -// return uaServiceMap.get(opcUAParam.getServerUrl()); -// } -// -// @GetMapping("/opc-write") -// @ApiOperation(value = "写Opc", notes = "写Opc") -// @AnnoIgnoreLog -// public ResultBean writeOpc(OpcUAParam opcUA){ -// try { -// OpcUAService opcService = new OpcUAService(); -// boolean editResult = opcService.editOpcParamValue(opcUA); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(editResult); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/opc-read") -// @ApiOperation(value = "读Opc", notes = "读Opc") -// @AnnoIgnoreLog -// public ResultBean readOpc(OpcUAParam opcUA){ -// try { -// Object readResult = getOpcUaService(opcUA).getOpcParamValue(opcUA); -// if(readResult == null){ -// return ResultBean.fail(); -// } -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(readResult); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// -// @GetMapping("/opc-sub") -// @ApiOperation(value = "订阅Opc", notes = "订阅Opc") -// @AnnoIgnoreLog -// public ResultBean subOpc(OpcUAParam opcUA,String callbackMethod,String callbackUrl){ -// try { -// UaSubscription subscription = getOpcUaService(opcUA).createSubscription(opcUA, (uaMonitoredItem, integer) -> { -// uaMonitoredItem.setValueConsumer((node, value) -> { -// LOGGER.info("OPC订阅回调： {} - {} , callback {}", node.getReadValueId().getNodeId(), value.getValue(), -// callbackMethod+callbackUrl); -// HashMap param = new HashMap<>(); -// param.put("key",node.getReadValueId().getNodeId().toString()); -// param.put("value",value.getValue().toString()); -// -// HttpClientTool.doHttpUrl(CommonEnumUtil.HTTP_METHOD_TYPE.valueOf(callbackMethod), callbackUrl, param); -// } ); -// }); -// upcSub.put(subscription.getSubscriptionId(),opcUA); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(subscription.getSubscriptionId().toString()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/remove-opc-sub") -// @ApiOperation(value = "移除Opc订阅", notes = "移除Opc订阅") -// @AnnoIgnoreLog -// public ResultBean removeSubOpc(OpcUAParam opcUA,String subscriptionId){ -// try { -// getOpcUaService(opcUA).deleteSubscription(opcUA,UInteger.valueOf(subscriptionId)); -// upcSub.remove(UInteger.valueOf(subscriptionId)); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/remove-all-opc-sub") -// @ApiOperation(value = "移除Opc订阅", notes = "移除Opc订阅") -// @AnnoIgnoreLog -// public ResultBean removeAllSubOpc(OpcUAParam opcUA){ -// try { -// OpcUAService opcService = getOpcUaService(opcUA); -// for (UInteger uInteger : upcSub.keySet()) { -// opcService.deleteSubscription(opcUA,uInteger); -// } -// upcSub.clear(); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/show-opc-sub-list") -// @ApiOperation(value = "查询Opc订阅", notes = "查询Opc订阅") -// @AnnoIgnoreLog -// public ResultBean showSubOpcList(){ -// try { -// HashMap resultMap = new HashMap<>(); -// for (UInteger uInteger : upcSub.keySet()) { -// resultMap.put(uInteger.toString(), JSON.toJSONString(upcSub.get(uInteger))); -// } -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resultMap); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/test-callback") -// @ApiOperation(value = "查询Opc订阅", notes = "查询Opc订阅") -// @AnnoIgnoreLog -// public ResultBean showSubOpcList(String key,String value){ -// try { -// LOGGER.info("回调：{} : {}", key,value); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(key+":"+value); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 34e0081..7f31df3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -268,11 +268,11 @@ public class WhiteController extends CoreBaseController { @PostMapping(value = "/find-resource") @ApiOperation(value = "按条件查询资源") - public ResultBean findSysLocaleResource(@RequestBody SysLocaleResource sysLocaleResource){ + public ResultBean findSysLocaleResource(@RequestBody SysLocaleResource resource){ try { startMultiService(); - List resourceList = sysLocaleResourceService.findSysLocaleResource(sysLocaleResource); + List resourceList = sysLocaleResourceService.findSysLocaleResource(resource); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resourceList); }catch(ImppBusiException busExcep){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/log.txt b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/log.txt deleted file mode 100644 index e69de29..0000000 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/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index b48c330..d46d275 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -10,6 +10,8 @@ import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.model.license.ImppLicense; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -253,9 +255,7 @@ public class PersonnelController extends CoreBaseController { personnelService.checkSysUserOnly(user); SysDepartment userDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getUserDepartmentId())); - if (userDepartment == null) { - ValidatorBean.checkNotNull(userDepartment, "账号主部门不存在"); - } + ValidatorBean.checkNotNull(userDepartment, "账号主部门不存在"); SysOrganize userOrganize = personnelService.getSysOrganizeById(userDepartment.getOrganizeId()); user.setDepartmentId(userDepartment.getId()); @@ -800,4 +800,22 @@ public class PersonnelController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + /** + * 查询所有组织信息 + * @return 处理结果 + */ + @GetMapping(value = "/license") + @ApiOperation(value = "获取授权信息") + public ResultBean getLicense(){ + try{ + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(ImppLicenseTool.getLicense()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index cbeeb6d..7c5be56 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -153,9 +153,6 @@ public class SysDictionaryController extends CoreBaseController{ ValidatorBean.checkNotNull(idStr,"id不能为空"); SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById(Long.parseLong(idStr)); List childList = null; - if(sysDictionary.getParentIdVal() == CommonEnumUtil.PARENT.DEFAULT.getValue()){ - childList = sysDictionaryService.findSysDictionaryByParentId(sysDictionary.getId()); - } if(sysDictionary == null){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -163,7 +160,13 @@ public class SysDictionaryController extends CoreBaseController{ .setErrorDetail("字典不存在") .setErrorSolution("请重新选择") .build(); - }else if(childList!= null && !childList.isEmpty()){ + } + + if(sysDictionary.getParentIdVal() == CommonEnumUtil.PARENT.DEFAULT.getValue()){ + childList = sysDictionaryService.findSysDictionaryByParentId(sysDictionary.getId()); + } + + if(childList!= null && !childList.isEmpty()){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) 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 f65b2c2..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) { @@ -257,7 +175,7 @@ public class SysLogOperateController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } finally { // 清理临时文件文件 - if(excelDir == null) { + if(excelDir != null) { FileTool.deleteFile(excelDir.getPath()); } } 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/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index bad3b6b..3c84b38 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -26,6 +26,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.compress.utils.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -408,15 +409,14 @@ public class SysMenuController extends CoreBaseController { ,"menuCss","menuIcon","menuDescription" }); - InputStream targetStream = new DataInputStream(new FileInputStream(excle)); response.setContentType("application/force-download"); // 设置强制下载不打开 response.addHeader("Content-Disposition", "attachment;fileName=" + fileName); // 设置文件名 response.addHeader("Content-type", FileContentTypeTool.getContentType(StringTool.getStringFileSuffix(fileName,true))); - // 设置文件名 + // 设置文件名 BufferedInputStream bis = null; try { - bis = new BufferedInputStream(targetStream); + bis = new BufferedInputStream(new DataInputStream(new FileInputStream(excle))); OutputStream os = response.getOutputStream(); byte[] buffer = new byte[1024]; int i = bis.read(buffer); @@ -427,19 +427,14 @@ public class SysMenuController extends CoreBaseController { } catch (Exception e) { e.printStackTrace(); } finally { - if (bis != null) { - try { - bis.close(); - targetStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } + IOUtils.closeQuietly(bis); } file.delete(); // 删除临时文件 ResultBean.success("下载").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ ResultBean.fail(busExcep); + } catch (FileNotFoundException e) { + ImppExceptionBuilder.newInstance().buildExceptionResult(e); } catch (Exception e) { ImppExceptionBuilder.newInstance().buildExceptionResult(e); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index 7d45ff3..d8e0806 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @Description : 组织对外接口 @@ -320,7 +321,7 @@ public class SysOrganizeController extends CoreBaseController{ LOGGER.info("Copy Wms Process Config:{}",config); if(config != null){ - if(config.getConfigValue().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue())){ + if(Objects.equals(config.getConfigValue(),CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue())){ // 获取目标组织代码 redisKey = CommonConstWords.REDIS_PREFIX_CACHE_CONFIG + "_" + CommonConstWords.CONFIG_ORGANIZE_INSERT_INIT_WMS_COPY_PROCESS_CODE; 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..4682144 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionPlanDetailController.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionPlanService; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +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/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 0e3c075..4f2027d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -248,11 +248,7 @@ public class SysUserInfoController extends CoreBaseController{ SysUserInfo userInfo = sysUserInfoService.getSysUserInfoById(Long.parseLong(id)); ValidatorBean.beginValid(userInfo).notNull("id",userInfo.getId()); - if(userInfo != null){ - return ResultBean.success("操作成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }else { - return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); - } + return ResultBean.success("操作成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/CoreReportController.java similarity index 99% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/CoreReportController.java index 20e5d83..923e943 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/CoreReportController.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.controller.report; +package cn.estsh.i3plus.core.apiservice.controller.cloud; import cn.estsh.i3plus.core.api.iservice.base.IReportService; import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/ReportPojoCloudController.java similarity index 96% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/ReportPojoCloudController.java index f5e0e81..15f8118 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/ReportPojoCloudController.java @@ -1,7 +1,6 @@ -package cn.estsh.i3plus.core.apiservice.controller.report; +package cn.estsh.i3plus.core.apiservice.controller.cloud; import cn.estsh.i3plus.core.api.iservice.base.IReportService; -import cn.estsh.i3plus.icloud.core.sdk.ICoreReportPojoCloud; import cn.estsh.i3plus.platform.common.tool.ClassTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/SwebMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/SwebMessageController.java similarity index 98% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/SwebMessageController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/SwebMessageController.java index 392d932..9597ca0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/SwebMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/SwebMessageController.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.controller.message; +package cn.estsh.i3plus.core.apiservice.controller.cloud; import cn.estsh.i3plus.core.apiservice.controller.base.BaseMessageController; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WMSMessageController.java similarity index 98% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WMSMessageController.java index 31cf075..8000d49 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WMSMessageController.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.controller.message; +package cn.estsh.i3plus.core.apiservice.controller.cloud; import cn.estsh.i3plus.core.apiservice.controller.base.BaseMessageController; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WhiteCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WhiteCloudController.java new file mode 100644 index 0000000..e6691da --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WhiteCloudController.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.core.apiservice.controller.cloud; + +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.model.softswitch.SuitImppCloudModel; +import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * 微服务白名单调用接口 + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-18 上午10:41 + * @Modify: + **/ +@RestController +@Api(tags = "Cloud 白名单服务") +@RequestMapping("/impp/white/cloud") +public class WhiteCloudController extends CoreBaseController { + private static final Logger LOGGER = LoggerFactory.getLogger(WhiteCloudController.class); + + + @PostMapping(value = "/softwitch/result") + @ApiOperation(value = "数据源列表", notes = "获取服务的数据源列表") + public BaseResultBean softwitchResult(@RequestBody SuitImppCloudModel model) { + LOGGER.info("Cloud Message : {}", model); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setMsg("这是 Core 返回的一段数据 -> " + System.currentTimeMillis()); + } + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java index 506604b..b43b614 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java @@ -52,4 +52,4 @@ public class ReportDaoImpl implements IReportDao { entityManager.clear(); return (Long)queryObject.getSingleResult(); } -} +} \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java index 669651d..f7565b0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java @@ -11,7 +11,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import cn.estsh.impp.framework.boot.util.RedisUtilTool; +import cn.estsh.impp.framework.boot.util.RedisCacheTool; import com.alibaba.fastjson.JSON; import com.rabbitmq.client.Channel; import org.apache.commons.lang3.StringUtils; @@ -71,7 +71,7 @@ public class MessageMailQueueReceiver { if (msg.getMessageReceiverType() != null) { if (msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.URGENT.getValue()) { // 判断是否为系统紧急提示 微服注册状态提示 - mailUtil.setTo(RedisUtilTool.getSysConfigStrVal(PlatformConstWords.CONTACT_MAIL)); + mailUtil.setTo(RedisCacheTool.getSysConfigStrVal(PlatformConstWords.CONTACT_MAIL)); // 次数过于频繁 mailUtil.send(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java index 853dd1f..389221f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java @@ -12,7 +12,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; -import cn.estsh.impp.framework.boot.util.ImppLog; +import cn.estsh.impp.framework.boot.log.ImppLog; import com.alibaba.fastjson.JSON; import com.rabbitmq.client.Channel; import org.slf4j.Logger; 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 2103ec2..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; @@ -11,7 +12,7 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; import cn.estsh.impp.framework.boot.init.ApplicationProperties; -import cn.estsh.impp.framework.boot.util.RedisUtilTool; +import cn.estsh.impp.framework.boot.util.RedisCacheTool; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.slf4j.Logger; @@ -40,48 +41,15 @@ public class CoreLogClearJob extends BaseImppScheduleJob { } @Autowired - private SysLogElasticSearchService elasticSearchService; - - @Autowired - private SysLogMongoService mongoService; + private ISysLogService logService; @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { - int to = RedisUtilTool.getSysConfigIntVal(CommonConstWords.LOG_STORAGE_DAYS, CommonConstWords.LOG_STORAGE_DAYS_DEFAULT); + int to = RedisCacheTool.getSysConfigIntVal(CommonConstWords.LOG_STORAGE_DAYS, CommonConstWords.LOG_STORAGE_DAYS_DEFAULT); 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/SysLogElasticSearchService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java index b88d1c2..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,17 +2,15 @@ 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.impp.framework.boot.util.ImppLog; +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; import org.elasticsearch.search.aggregations.bucket.terms.Terms; @@ -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 1d3b038..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,12 +6,9 @@ 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.util.ImppLog; +import cn.estsh.impp.framework.boot.log.ImppLog; import cn.estsh.impp.framework.boot.util.ImppSwitchUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -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 dff35ed..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; @@ -57,7 +55,10 @@ public class SysLogMongoService implements ISysLogService { public SysLogTaskTimeRepository getSysLogTaskTimeRepository() { if (logTaskTimeRDao == null && ImppSwitchUtil.isSwitchMongo()) { - logTaskTimeRDao = SpringContextsUtil.getBean(SysLogTaskTimeRepository.class); + try { + logTaskTimeRDao = SpringContextsUtil.getBean(SysLogTaskTimeRepository.class); + }catch (Exception e){ + } } if (logTaskTimeRDao == null) { @@ -74,7 +75,10 @@ public class SysLogMongoService implements ISysLogService { public SysLogSystemRepository getSysLogSystemRepository() { if (logSystemRDao == null && ImppSwitchUtil.isSwitchMongo()) { - logSystemRDao = SpringContextsUtil.getBean(SysLogSystemRepository.class); + try { + logSystemRDao = SpringContextsUtil.getBean(SysLogSystemRepository.class); + }catch (Exception e){ + } } if (logSystemRDao == null) { @@ -91,7 +95,10 @@ public class SysLogMongoService implements ISysLogService { public SysLogOperateRepository getSysLogOperateRepository() { if (logOperateRDao == null && ImppSwitchUtil.isSwitchMongo()) { - logOperateRDao = SpringContextsUtil.getBean(SysLogOperateRepository.class); + try { + logOperateRDao = SpringContextsUtil.getBean(SysLogOperateRepository.class); + }catch (Exception e){ + } } if (logOperateRDao == null) { @@ -108,7 +115,10 @@ public class SysLogMongoService implements ISysLogService { public SysLogExceptionRepository getSysLogExceptionRepository() { if (logExceptionRDao == null && ImppSwitchUtil.isSwitchMongo()) { - logExceptionRDao = SpringContextsUtil.getBean(SysLogExceptionRepository.class); + try { + logExceptionRDao = SpringContextsUtil.getBean(SysLogExceptionRepository.class); + }catch (Exception e){ + } } if (logExceptionRDao == null) { @@ -125,7 +135,10 @@ public class SysLogMongoService implements ISysLogService { public MongoDbFactory getMongoDbFactory() { if (mongoDbFactory == null && ImppSwitchUtil.isSwitchMongo()) { - mongoDbFactory = SpringContextsUtil.getBean(MongoDbFactory.class); + try { + mongoDbFactory = SpringContextsUtil.getBean(MongoDbFactory.class); + }catch (Exception e){ + } } if (mongoDbFactory == null) { @@ -278,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/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index c5333cd..8b93184 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -16,7 +18,8 @@ import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository; import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository; import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository; import cn.estsh.impp.framework.boot.util.ImppRedis; -import cn.estsh.impp.framework.boot.util.RedisUtilTool; +import cn.estsh.impp.framework.boot.util.ImppSystemTool; +import cn.estsh.impp.framework.boot.util.RedisCacheTool; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -25,10 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PREFIX_MENU; @@ -75,6 +75,15 @@ public class SystemInitService implements ISystemInitService { putAndLoadSysConfig(); putAndLoadSysDictionary(); putAndLoadSysLocaleLanguage(); + + LOGGER.info("加载ElasticSearch Client Url 信息"); + reloadElasticSearchClient(); + LOGGER.info("加载ElasticSearch Client Url 信息完成"); + + LOGGER.info("【IMPP-License 加载 License ...】"); + ImppLicenseTool.cloneLicense(); + ImppLicenseTool.getLicense(); + LOGGER.info("【IMPP-License 加载 License完成】"); } @Override @@ -83,10 +92,10 @@ public class SystemInitService implements ISystemInitService { List list = configRDao.findAll(); if(list != null && list.size() > 0){ list.forEach(config -> { - RedisUtilTool.setSysConfigByConfigCode(config); + RedisCacheTool.setSysConfigByConfigCode(config); }); + LOGGER.info("加载系统配置数量：【{}】",list.size()); } - LOGGER.info("加载系统配置数量：【{}】",list.size()); } @Override @@ -96,17 +105,16 @@ public class SystemInitService implements ISystemInitService { List list = dictionaryRDao.findAll(); if(list != null && list.size() > 0){ list.stream().filter(sysDictionary-> sysDictionary.getParentCodeRdd() != null).forEach(System.out :: print); - Map> parentCodeMap = list.stream().filter(sysDictionary-> sysDictionary.getParentCodeRdd() != null).collect(Collectors.groupingBy(SysDictionary::getParentCodeRdd)); + Map> parentCodeMap = list.stream().filter(sysDictionary-> StringUtils.isNotBlank(sysDictionary.getParentCodeRdd())).collect(Collectors.groupingBy(SysDictionary::getParentCodeRdd)); Map> parentIdMap = list.stream().collect(Collectors.groupingBy(SysDictionary::getParentId)); for (String key : parentCodeMap.keySet()) { //存放于缓存 - RedisUtilTool.setSysDictionaryListByCode(key, parentCodeMap.get(key)); + RedisCacheTool.setSysDictionaryListByCode(key, parentCodeMap.get(key)); } for (long key : parentIdMap.keySet()) { - putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + ":" + key, parentIdMap.get(key),Object.class); - RedisUtilTool.setSysDictionaryListByParentId(key,parentIdMap.get(key)); + RedisCacheTool.setSysDictionaryListByParentId(key,parentIdMap.get(key)); } } }catch (Exception e){ @@ -234,7 +242,7 @@ public class SystemInitService implements ISystemInitService { for (SysLocaleResource res : resListPage.getObjectList()) { resKey = CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + res.getSoftType() + ":" + res.getResourceKey(); resMap = langSoftMap.computeIfAbsent(resKey, k -> new HashMap<>()); - resMap.put(res.getResourceKey(), res.getResourceValue()); + resMap.put(res.getLanguageCode(), res.getResourceValue()); } LOGGER.info("【加载资源】数据分类中 {} / {} ", pager.getEndRow(), pager.getTotalRows()); @@ -347,4 +355,21 @@ public class SystemInitService implements ISystemInitService { } return null; } + + @Override + public void reloadElasticSearchClient() { + String url = RedisCacheTool.getSysConfigStrVal(CommonConstWords.PROP_IMPP_ELASTICSEARCH_CONFIG_URL); + if(StringUtils.isBlank(url)){ + if(Objects.nonNull(ImppSystemTool.getEnvironment())){ + url = ImppSystemTool.getEnvironment().getProperty(CommonConstWords.PROP_IMPP_ELASTICSEARCH_URL); + } + } + + if(StringUtils.isBlank(url)){ + url = CommonConstWords.PROP_IMPP_ELASTICSEARCH_DEFAULT_URL; + } + + LOGGER.info("加载ElasticSearch Client Url:{}",url); + ElasticSearchTool.init(url); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index a5af288..9897e53 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -84,14 +84,7 @@ public class SystemLoginService implements ISystemLoginService { @Override @ApiOperation(value = "封装用户",notes = "封装超级管理员信息") public SessionUser queryCheckSaAdminLogin(SaAdminToken saAdminToken) { - //SysUser user = getUserLoginInfo(saAdminToken.getLoginName(),saAdminToken.getLoginPwd()); - SysUser user = null; - /** - * to do - * - * 此处外网获取sa超级管理员用户名密码 - * 或者导入加密证书生成内存超级管理员用户名密码 - */ + SysUser user = getUserLoginInfo(saAdminToken.getLoginName(),saAdminToken.getLoginPwd()); return packSessionUser(user,CommonEnumUtil.USER_TYPE.SA.getCode(),saAdminToken.getLanguageCode()); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LicenseClickService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LicenseClickService.java index 68b682b..acdde31 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LicenseClickService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LicenseClickService.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ILicenseClickService; import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 0ead1ec..61ec43c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -1116,7 +1116,7 @@ public class PersonnelServiceService implements IPersonnelService { @Override public void refreshRefSysUserInfoPosition(Long userInfoId, Long[] positionIds) { - LOGGER.info("用户岗位关系信息 RefSysUserInfoPosition userInfoId:{} positionIds:{} userName:{}",userInfoId,positionIds); + LOGGER.info("用户岗位关系信息 RefSysUserInfoPosition userInfoId:{} positionIds:{} ",userInfoId,positionIds); SysUserInfo userInfo = userInfoRDao.getById(userInfoId); if(userInfo != null ){ 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/SysMessageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index 4fe3265..db4228d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java @@ -95,7 +95,7 @@ public class SysMessageService implements ISysMessageService { SysFile sysFile; for (SysFileAttach sysFileAttach : sysMessage.getSysFileAttachList()) { sysFile = sysFileRDao.getById(sysFileAttach.getFileId()); - if(sysFile == null){ + if(sysFile != null){ sysFileAttach.setRefId(sysMessage.getId()); sysFileAttach.setFileNameRdd(sysFile.getName()); sysFileAttach.setFilePathRdd(sysFile.getFilePath()); 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/SysToolService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java index 051a240..68bc7cf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java @@ -103,16 +103,6 @@ public class SysToolService implements ISysToolService { } @Override - public void insertBatch(int num,int waitTime){ - try { -// testDao.insertBatch(num,waitTime); - Thread.sleep(waitTime); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - - @Override @ApiOperation(value = "查询设备信息",notes = "查询所有设备信息") public List listSysTool() { LOGGER.info("硬件 TOOL list"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 9cea4ad..9e146dd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -28,7 +28,7 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; -import cn.estsh.impp.framework.boot.util.RedisUtilTool; +import cn.estsh.impp.framework.boot.util.RedisCacheTool; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationException; @@ -609,7 +609,7 @@ public class SysUserService implements ISysUserService { @Override public SessionUser packPageSessionUser(SessionUser sessionUser, SysUser user) { - SysConfig configPageList = RedisUtilTool.getSysConfigByConfigCode(CommonConstWords.CONFIG_PAGE_SIZE_LIST); + SysConfig configPageList = RedisCacheTool.getSysConfigByConfigCode(CommonConstWords.CONFIG_PAGE_SIZE_LIST); try { if(configPageList != null && StringUtils.isNotBlank(configPageList.getConfigValue())){ String[] split = configPageList.getConfigValue().split(","); @@ -623,7 +623,7 @@ public class SysUserService implements ISysUserService { sessionUser.setPageSizeArray(CommonConstWords.CONFIG_PAGE_SIZE_LIST_DEFAULT); } - SysConfig configPageSize = RedisUtilTool.getSysConfigByConfigCode(CommonConstWords.CONFIG_PAGE_DEFAULT_SIZE); + SysConfig configPageSize = RedisCacheTool.getSysConfigByConfigCode(CommonConstWords.CONFIG_PAGE_DEFAULT_SIZE); try { if(configPageSize != null && StringUtils.isNotBlank(configPageSize.getConfigValue())){ sessionUser.setPageDefaultSize(Integer.parseInt(configPageSize.getConfigValue())); @@ -641,7 +641,7 @@ public class SysUserService implements ISysUserService { @Override public SessionUser packConfigSessionUser(SessionUser sessionUser, SysUser user) { packPageSessionUser(sessionUser, user); - String fileViewUrl = RedisUtilTool.getSysConfigStrVal(CommonConstWords.CONFIG_FILE_VIEW_URL, + String fileViewUrl = RedisCacheTool.getSysConfigStrVal(CommonConstWords.CONFIG_FILE_VIEW_URL, CommonConstWords.CONFIG_FILE_VIEW_URL_DEFAULT); sessionUser.setFileViewUrl(fileViewUrl); return sessionUser; 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(); -// } -//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java index 411b0b4..82be81c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java @@ -7,7 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.MailConfig; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ImppRedis; -import cn.estsh.impp.framework.boot.util.RedisUtilTool; +import cn.estsh.impp.framework.boot.util.RedisCacheTool; import com.sun.mail.smtp.SMTPAddressFailedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,14 +64,14 @@ public class MailUtil { public MailUtil init() { try { // 查询是否开启邮件服务器 - this.mailSwitch = RedisUtilTool.getSysConfigIntVal(PlatformConstWords.MAIL_SWITCH, + this.mailSwitch = RedisCacheTool.getSysConfigIntVal(PlatformConstWords.MAIL_SWITCH, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - this.smtpHost = RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_HOST); - this.smtpPort = RedisUtilTool.getSysConfigIntVal(PlatformConstWords.MAIL_PORT); - this.from = RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_USER); - this.nick = RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_NICK); - this.smtpUser =RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_USER); - this.smtpPassword = RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_PASSWORD); + this.smtpHost = RedisCacheTool.getSysConfigStrVal(PlatformConstWords.MAIL_HOST); + this.smtpPort = RedisCacheTool.getSysConfigIntVal(PlatformConstWords.MAIL_PORT); + this.from = RedisCacheTool.getSysConfigStrVal(PlatformConstWords.MAIL_USER); + this.nick = RedisCacheTool.getSysConfigStrVal(PlatformConstWords.MAIL_NICK); + this.smtpUser = RedisCacheTool.getSysConfigStrVal(PlatformConstWords.MAIL_USER); + this.smtpPassword = RedisCacheTool.getSysConfigStrVal(PlatformConstWords.MAIL_PASSWORD); this.isAuthenticationSMTP = true; return this; } catch (Exception e) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java index 2e8bb6e..41510a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java @@ -5,10 +5,7 @@ import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; +import cn.estsh.i3plus.pojo.platform.platbean.*; import com.mongodb.BasicDBObject; import org.apache.commons.lang3.StringUtils; import org.bson.conversions.Bson; @@ -168,4 +165,23 @@ public class NoSqlPack { return result; } + public static ElasticSearchPack packEsSysLogConsole(SysLogConsole bean) { + ElasticSearchPack result = packElasticSearchPack(bean); + + result.andStringEquals("softType",bean.getSoftType()); + result.andStringLeftLike("logHost",bean.getLogHost()); + result.andStringLike("userLoginName",bean.getUserLoginName()); + result.andStringEquals("logLevel",bean.getLogLevel()); + result.andStringLeftLike("executeClassName",bean.getExecuteClassName()); + result.andStringLike("executeMethod",bean.getExecuteMethod()); + result.andStringLike("executeArgs",bean.getExecuteArgs()); + result.andStringLike("executeTitle",bean.getExecuteTitle()); + result.andStringLike("executeMessage",bean.getExecuteMessage()); + result.andStringLike("errorStackTrace",bean.getErrorStackTrace()); +// result.andNumberBetween("executeTime",bean.getErrorStackTrace()); + result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd()); + + return result; + } + } diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-dev.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-dev.xml index d4107e7..5d41628 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-dev.xml +++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-dev.xml @@ -1,33 +1,42 @@ - - - - - - [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n - [SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n - - - - - - - - - - - - - - - - ${info_pattern} - - - - - - ${system_log_pattern} - - - + + + + + + + + + + + + [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l 信息:%m%n + [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n + [SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml.bak b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml.bak deleted file mode 100644 index 5dfcb6c..0000000 --- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml.bak +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - ../logs/log4j2Logs - - - - %d{yyyy-MM-dd HH:mm:ss} [%-5level] %l - %m%n - - %d{yyyy-MM-dd HH:mm:ss} [%-5level] %c(%M:%L) - %m%n - - - 20MB - - DEBUG - - - ${basePath}/all.log - - ${basePath}/%d{yyyy-MM}/all-%d{yyyy-MM-dd}-%i.log.gz - - - 50 - - - ${basePath}/info.log - - ${basePath}/%d{yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log.gz - - - 10 - - - ${basePath}/warn.log - - ${basePath}/%d{yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log.gz - - - 10 - - - ${basePath}/error.log - - ${basePath}/%d{yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log.gz - - - 10 - - - INFO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml index 255404f..f57a191 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml +++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml @@ -2,7 +2,7 @@ - + @@ -14,88 +14,38 @@ [SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n - - - - - - ${info_pattern} - - + + + + + - + - - - - - - ${system_log_pattern} - - - - - - - - - ${pattern} - - - - - - - - - - - ${pattern} - - - - - - - - + + + - ${pattern} + ${info_pattern} - - - - - - + - + - - - + + - - - - + + - - - - - \ No newline at end of file