diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysConfigService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysConfigService.java index 9bc45ea..dbf2936 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysConfigService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysConfigService.java @@ -75,6 +75,9 @@ public interface ISysConfigService { @ApiOperation(value = "查询系统邮件配置项") List findMailConfig(); + @ApiOperation(value = "查询系统配置信息项") + List findSystemInfoConfig(); + /** * 根据系统配置代码修改配置项 * @param code 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 ffecf03..7229843 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 @@ -80,6 +80,9 @@ public class WhiteController extends CoreBaseController { @Autowired private ISysLabelTemplateService sysLabelTemplateService; + @Autowired + private ISysConfigService configService; + @Resource(name="redisRes") private ImppRedis redisRes; @@ -96,6 +99,18 @@ public class WhiteController extends CoreBaseController { } } + @GetMapping(value = "/system-info") + @ApiOperation(value = "查询可用语言",notes = "查询可用语言") + public ResultBean getSystemInfo(){ + try { + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(configService.findSystemInfoConfig()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + /** * * @return diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java index 332fed9..f73f9fa 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java @@ -345,9 +345,4 @@ public class SysConfigController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } - - public static void main(String[] args) { - SnowflakeIdMaker snowflakeIdMaker = new SnowflakeIdMaker(); - System.out.println(snowflakeIdMaker.nextId()); - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java index edeeb7a..212954c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java @@ -100,6 +100,19 @@ public class SysConfigService implements ISysConfigService { } @Override + public List findSystemInfoConfig() { + List mailConfig = new ArrayList(); + mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.SYSTEM_HOME_LOGO)); + mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.SYSTEM_LOGO)); + mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.SYSTEM_COMPANY_NAME)); + mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.SYSTEM_NAME)); + mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.SYSTEM_TITLE_NAME)); + mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.SYSTEM_COPYRIGHT)); + + return mailConfig; + } + + @Override @ApiOperation(value = "根据code修改系统配置") public void updateSysConfigByCode(String code, String value) { SysConfigRDao.updateByProperties("configCode",code,"configValue",value);