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 new file mode 100644 index 0000000..6c8105e --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.core.apiservice.controller.base; + +import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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; + +/** + * @Description : 后台服务 + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019-06-19 下午2:32 + * @Modify: + **/ +@RestController +@Api(description = "后台运维服务") +@RequestMapping("/impp/white/backstage") +public class BackstageController extends CoreBaseController { + + public static final Logger LOGGER = LoggerFactory.getLogger(BackstageController.class); + + @Autowired + private ISystemInitService systemInitService; + + @GetMapping(value = "/redis-put-all") + @ApiOperation(value = "重新加载所有缓存数据",notes = "重新加载所有缓存数据") + public ResultBean redisPutAll(){ + try { + systemInitService.putAndLoadAll(); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/redis-put-system-language") + @ApiOperation(value = "重新加载语言数据",notes = "重新加载语言数据") + public ResultBean redisPutSystemLanguage(){ + try { + systemInitService.putAndLoadSysLocaleLanguage(); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/redis-put-system-config") + @ApiOperation(value = "重新加载系统配置数据",notes = "重新加载系统配置数据") + public ResultBean redisPutSystemConfig(){ + try { + systemInitService.putAndLoadSysConfig(); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/redis-put-system-dictionary") + @ApiOperation(value = "重新加载系统字典数据",notes = "重新加载系统字典数据") + public ResultBean redisPutSystemDictionary(){ + try { + systemInitService.putAndLoadSysDictionary(); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }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/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index c8d641c..a9f9b95 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 @@ -397,6 +397,7 @@ public class SysMenuController extends CoreBaseController { } } } + file.delete(); // 删除临时文件 return ResultBean.success("下载").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); 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 107bb59..8f822ee 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 @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository; import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository; import cn.estsh.impp.framework.boot.util.ImppRedis; +import cn.estsh.impp.framework.boot.util.RedisUtilTool; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,13 +62,11 @@ public class SystemInitService implements ISystemInitService { @Override @ApiOperation(value = "加载系统配置",notes = "加载系统配置") public void putAndLoadSysConfig() { - String redisKey = null; List list = configRDao.findAll(); - for (SysConfig config : list) { - redisKey = CommonConstWords.REDIS_PREFIX_CACHE_CONFIG + ":" + config.getConfigCode(); - - //存放于缓存 - putDataToCache(redisKey, config,Object.class); + if(list != null && list.size() > 0){ + list.forEach(config -> { + RedisUtilTool.setSysConfigByConfigCode(redisRes, config); + }); } LOGGER.info("加载系统配置数量:【{}】",list.size()); } @@ -84,13 +83,12 @@ public class SystemInitService implements ISystemInitService { for (String key : parentCodeMap.keySet()) { //存放于缓存 - putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + ":" + key, - parentCodeMap.get(key),Object.class); + RedisUtilTool.setSysDictionaryListByCode(redisRes, key, parentCodeMap.get(key)); } for (long key : parentIdMap.keySet()) { - putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + ":" + key, - parentIdMap.get(key),Object.class); + putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + ":" + key, parentIdMap.get(key),Object.class); + RedisUtilTool.setSysDictionaryListByParentId(redisRes,key,parentIdMap.get(key)); } } }catch (Exception e){