From 44c7ee028dcdff16a5c51152ead4f6104cd5f713 Mon Sep 17 00:00:00 2001
From: "feng.liu" <123456>
Date: Thu, 14 Jul 2022 10:39:13 +0800
Subject: [PATCH] =?UTF-8?q?21047-=E6=9D=BE=E4=B8=8BEP-=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E6=A8=A1=E5=9D=97=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E3=80=81=E5=8A=9F=E8=83=BD=E7=95=8C=E9=9D=A2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E5=B7=A5=E5=8E=82=E5=90=8D=E5=AD=97=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=9B=B4=E6=94=B9=E6=88=90=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?-2022-07-10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/core/api/iservice/busi/ISysConfigService.java  |  3 +++
 .../core/apiservice/controller/base/WhiteController.java  | 12 ++++++++++++
 .../apiservice/serviceimpl/busi/SysConfigService.java     | 15 +++++++++++++++
 3 files changed, 30 insertions(+)

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 e2cbea0..eeb0f40 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
@@ -77,6 +77,9 @@ public interface ISysConfigService {
     @ApiOperation(value = "查询系统配置信息项")
     List findSystemInfoConfig();
 
+    @ApiOperation(value = "查询松下系统配置信息项")
+    List findSystemInfoConfigPanasonic(String organizeCode);
+
     /**
      * 根据系统配置代码修改配置项
      * @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 d521801..dc17295 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
@@ -199,6 +199,18 @@ public class WhiteController extends CoreBaseController {
         }
     }
 
+    @GetMapping(value = "/system-info-panasonic")
+    @ApiOperation(value = "查询可用语言", notes = "查询可用语言")
+    public ResultBean getSystemInfoPanasonic(String organizeCode) {
+        try {
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(configService.findSystemInfoConfigPanasonic(organizeCode));
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
     @GetMapping(value = "/session-user")
     @ApiOperation(value = "获取用户信息", notes = "获取当前登录用户账号详细信息")
     public ResultBean getSession() {
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 8b2dcf8..d093e83 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
@@ -6,6 +6,7 @@ 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.platform.bean.SysConfig;
 import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
@@ -114,6 +115,20 @@ public class SysConfigService implements ISysConfigService {
     }
 
     @Override
+    public List findSystemInfoConfigPanasonic(String organizeCode) {
+        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(new String[]{"configCode", "organizeCode"},
+                new Object[]{PlatformConstWords.SYSTEM_COPYRIGHT,organizeCode}));
+
+        return mailConfig;
+    }
+
+    @Override
     @ApiOperation(value = "根据code修改系统配置")
     public void updateSysConfigByCode(String code, String value) {
         SysConfigRDao.updateByProperties("configCode",code,"configValue",value);