From 17d655bf1fd377408887c9d9e70b07e3415da2cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 25 Aug 2020 19:03:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E6=9D=A1=E7=A0=81=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/base/ISystemInitService.java | 3 +++ .../apiservice/controller/base/AuthController.java | 4 ++++ .../controller/base/PressureTestController.java | 15 ++++++++++++ .../controller/busi/SysBarcodeRuleController.java | 27 +++++++++++++++++++++- .../serviceimpl/base/SystemInitService.java | 22 +++++++++++++++--- 5 files changed, 67 insertions(+), 4 deletions(-) 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 72d2807..8d32f45 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 @@ -55,4 +55,7 @@ public interface ISystemInitService { @ApiOperation(value = "定时任务日志等级") void reloadTaskPlanLogLevel(); + + @ApiOperation(value = "定时任务日志等级") + void reloadBarcodeRule(); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index 5c74f44..45be333 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -127,8 +127,12 @@ public class AuthController extends CoreBaseController { @GetMapping(value = "/menu/find-home-list") @ApiOperation(value = "获取登录用户功能权限信息", notes = "获取首页权限信息") public ResultBean findHomeList() { + Long startTime = System.currentTimeMillis(); List menuList = memTreeService.packTreeSysMenuByUserId(getSessionUser().getUser().getId()); + Long menuSelectTime = System.currentTimeMillis(); + LOGGER.info("第一段耗时：{}",menuSelectTime-startTime); List list = memTreeService.packTreeSysMenuByParentIdAndMenuType(menuList, CommonConstWords.SYSTEM_MENU_ROOT_ID, CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue()); + LOGGER.info("第二段耗时：{}", System.currentTimeMillis() - menuSelectTime); if (list != null && list.size() > 0) { // 内存排序 Sort 降序 code 升序 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 index c892a93..527f5fa 100644 --- 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 @@ -127,6 +127,21 @@ public class PressureTestController extends CoreBaseController { } } + @GetMapping("/redis-get") + @ApiOperation(value = "redisGet", notes = "redisGet") + public ResultBean redisGet(){ + try { + for (int i = 0; i < 1000; i++) { + imppRedis.getObject(i + ""); + } + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + @GetMapping("/redis-put-test") @ApiOperation(value = "redisPutTest", notes = "redisPutTest") public ResultBean redisPutTest(){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java index 9be0444..a4aeab9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysBarcodeRuleService; import cn.estsh.i3plus.core.apiservice.util.BarcodeParseUtil; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -12,6 +13,7 @@ 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.i3plus.platform.common.exception.ImppExceptionEnum; +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 io.swagger.annotations.Api; @@ -21,6 +23,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.Map; /** @@ -40,6 +43,9 @@ public class SysBarcodeRuleController extends CoreBaseController { @Autowired private ISysBarcodeRuleService sysBarcodeRuleService; + @Resource(name= CommonConstWords.IMPP_REDIS_RES) + private ImppRedis redisRes; + /** * 新增条码规则 * @param sysBarcodeRule 条码规则 @@ -55,7 +61,10 @@ public class SysBarcodeRuleController extends CoreBaseController { .notNull("barcodeRuleCode",sysBarcodeRule.getBarcodeRuleCode()) .notNull("barcodeRule",sysBarcodeRule.getBarcodeRule()); - sysBarcodeRuleService.insertSysBarcodeRule(sysBarcodeRule); + sysBarcodeRule = sysBarcodeRuleService.insertSysBarcodeRule(sysBarcodeRule); + + saveRedis(sysBarcodeRule); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -80,6 +89,9 @@ public class SysBarcodeRuleController extends CoreBaseController { .notNull("barcodeRule",sysBarcodeRule.getBarcodeRule()); sysBarcodeRuleService.updateSysBarcodeRule(sysBarcodeRule); + + saveRedis(sysBarcodeRule); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -112,6 +124,9 @@ public class SysBarcodeRuleController extends CoreBaseController { } sysBarcodeRuleService.deleteSysBarcodeRuleById(Long.parseLong(idStr)); + + removeRedis(sysBarcodeRule); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -171,4 +186,14 @@ public class SysBarcodeRuleController extends CoreBaseController { } } + private void saveRedis(SysBarcodeRule barcodeRule){ + String redisKey = CommonConstWords.REDIS_PREFIX_BARCODE_RULE + ":" + barcodeRule.getBarcodeRuleCode(); + redisRes.putObject(redisKey, barcodeRule, -1); + } + + private void removeRedis(SysBarcodeRule barcodeRule){ + String redisKey = CommonConstWords.REDIS_PREFIX_BARCODE_RULE + ":" + barcodeRule.getBarcodeRuleCode(); + redisRes.deleteKey(redisKey); + } + } 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 ae6e5a4..d025ada 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 @@ -69,6 +69,9 @@ public class SystemInitService implements ISystemInitService { @Autowired private ISysTaskPlanService sysTaskPlanService; + @Autowired + private ISysBarcodeRuleService sysBarcodeRuleService; + @Resource(name= CommonConstWords.IMPP_REDIS_RES) private ImppRedis redisRes; @@ -104,6 +107,10 @@ public class SystemInitService implements ISystemInitService { LOGGER.info("加载 定时任务日志等级"); reloadTaskPlanLogLevel(); LOGGER.info("加载 定时任务日志等级 信息完成"); + + LOGGER.info("加载 条码规则"); + reloadBarcodeRule(); + LOGGER.info("加载 条码规则 信息完成"); }catch (Exception e){ e.printStackTrace(); } @@ -114,9 +121,7 @@ public class SystemInitService implements ISystemInitService { public void putAndLoadSysConfig() { List list = configRDao.findAll(); if(list != null && list.size() > 0){ - list.forEach(config -> { - RedisCacheTool.setSysConfigByConfigCode(config); - }); + list.forEach(RedisCacheTool::setSysConfigByConfigCode); LOGGER.info("加载系统配置数量：【{}】",list.size()); } } @@ -430,4 +435,15 @@ public class SystemInitService implements ISystemInitService { } } } + + @Override + public void reloadBarcodeRule() { + List sysBarcodeRuleList = sysBarcodeRuleService.listSysBarcodeRule(); + if (CollectionUtils.isNotEmpty(sysBarcodeRuleList)) { + for (SysBarcodeRule barcodeRule : sysBarcodeRuleList) { + String redisKey = CommonConstWords.REDIS_PREFIX_BARCODE_RULE + ":" + barcodeRule.getBarcodeRuleCode(); + redisRes.putObject(redisKey, barcodeRule, -1); + } + } + } } From b3d36453e2230d9505fa576c012301bcf49b46eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 16:58:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(log=E6=96=87=E4=BB=B6):=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9=E4=BF=9D=E7=95=99=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/log4j2-spring.xml | 45 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 2 deletions(-) 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 e80dd41..da25c13 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml +++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring.xml @@ -23,7 +23,7 @@ + filePattern="${logFileRootPath}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz"> @@ -39,6 +39,11 @@ + + + + + @@ -46,11 +51,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + filePattern="${logFileRootPath}/schedule/$${date:yyyy-MM}/task-name-%d{yyyy-MM-dd}-%i.log.gz"> @@ -66,6 +101,11 @@ + + + + + @@ -89,6 +129,7 @@ + \ No newline at end of file From 176e6dacf0459d76d279f71224a7e4532079397a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 17:18:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E7=A7=BB=E9=99=A4mongo=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8C=81=E4=B9=85=E5=8C=96=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/SysLogFactory.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 0b137f4..8600b42 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 @@ -16,7 +16,6 @@ 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; @@ -45,18 +44,19 @@ public class SysLogFactory implements ISysLogService { private ISysLogService getSysLogService(){ ImppEnumUtil.LOG_STORAGE storage = imppLog.getLogStorageCase(); - if(ImppEnumUtil.LOG_STORAGE.MONGO.equals(storage)){ - if(ImppSwitchUtil.isSwitchMongo() && mongoService != null){ - return mongoService; - }else{ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) - .setErrorDetail("没有开启Mongo储存技术,请联系管理员") - .setErrorSolution("请检查配置文件") - .build(); - } - }else if(ImppEnumUtil.LOG_STORAGE.ELASTICSEARCH.equals(storage)){ +// if(ImppEnumUtil.LOG_STORAGE.MONGO.equals(storage)){ +// if(ImppSwitchUtil.isSwitchMongo() && mongoService != null){ +// return mongoService; +// }else{ +// throw ImppExceptionBuilder.newInstance() +// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) +// .setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode()) +// .setErrorDetail("没有开启Mongo储存技术,请联系管理员") +// .setErrorSolution("请检查配置文件") +// .build(); +// } +// }else + if(ImppEnumUtil.LOG_STORAGE.ELASTICSEARCH.equals(storage)){ if(ImppSwitchUtil.isElasticSearchSwitch() && elasticSearchService != null){ return elasticSearchService; }else{ From 1f61c06a1dd8343a14290c1f22788efd2a6ef2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 18:37:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:Redis-find=E4=BC=98=E5=8C=96=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E9=98=BB=E5=A1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/base/CoreCommonController.java | 5 +---- .../core/apiservice/serviceimpl/busi/SysLocaleResourceService.java | 2 +- .../i3plus/core/apiservice/serviceimpl/busi/SysUserService.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java index d2dbe49..17d4360 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.impp.framework.base.controller.BaseCommonController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -19,8 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; -import java.util.Map; /** * @Description :通用功能服务 @@ -46,7 +43,7 @@ public class CoreCommonController extends BaseCommonController { ValidatorBean.checkNotNull(softType,"不存在的产品信息"); String redisKey = CommonConstWords.REDIS_PREFIX_BEAN_INFO + ":" + softType.getCode(); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultList(redisRes.scan(redisKey + "*",Integer.MAX_VALUE)); + .setResultList(redisRes.findObject(redisKey + "*",Integer.MAX_VALUE)); } 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/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index e413d37..9ecab39 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -233,7 +233,7 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { @Override public List findMissResourceModelByTop(int num) { - List listStr = redisRes.scan(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES + "*",num); + List listStr = redisRes.findObject(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES + "*",num); MissResourceModel missResourceModel = null; List missResourceModelList = new ArrayList<>(listStr.size()); 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 9c4a170..49cd5c7 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 @@ -172,7 +172,7 @@ public class SysUserService implements ISysUserService { return; } - List ds = redisSession.scan(redisKey); + List ds = redisSession.findObject(redisKey); if (CollectionUtils.isNotEmpty(ds)) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())