From 3af34fbc119e6840a7076197b9b1d47608935d39 Mon Sep 17 00:00:00 2001 From: gaoyoulong <774597026@qq.com> Date: Thu, 21 Mar 2024 17:48:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BAcc.iotkit.common.service?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=B1=BB=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AE=9E=E7=8E=B0=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/iotkit/system/service/impl/SysConfigServiceImpl.java | 4 +++- .../cc/iotkit/system/service/impl/SysDeptServiceImpl.java | 4 +++- .../cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java | 2 ++ .../java/cc/iotkit/system/service/impl/SysOssServiceImpl.java | 4 +++- .../cc/iotkit/system/service/impl/SysUserServiceImpl.java | 4 +++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java index 9ddd5527..4631d256 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java @@ -6,6 +6,7 @@ import cc.iotkit.common.constant.CacheNames; import cc.iotkit.common.constant.UserConstants; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.redis.utils.CacheUtils; +import cc.iotkit.common.service.ConfigService; import cc.iotkit.common.utils.*; import cc.iotkit.data.ICommonData; import cc.iotkit.data.manager.*; @@ -38,7 +39,7 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class SysConfigServiceImpl implements ISysConfigService { +public class SysConfigServiceImpl implements ISysConfigService, ConfigService { @Autowired private ISysConfigData sysConfigData; @@ -184,6 +185,7 @@ public class SysConfigServiceImpl implements ISysConfigService { * @param configKey 参数 key * @return 参数值 */ + @Override public String getConfigValue(String configKey) { return SpringUtils.getAopProxy(this).selectConfigByKey(configKey); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDeptServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDeptServiceImpl.java index fbbf0234..17607d72 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDeptServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDeptServiceImpl.java @@ -4,6 +4,7 @@ import cc.iotkit.common.constant.UserConstants; import cc.iotkit.common.enums.ErrCode; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.satoken.utils.LoginHelper; +import cc.iotkit.common.service.DeptService; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.common.utils.SpringUtils; import cc.iotkit.common.utils.StringUtils; @@ -33,7 +34,7 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service -public class SysDeptServiceImpl implements ISysDeptService { +public class SysDeptServiceImpl implements ISysDeptService, DeptService { private final ISysDeptData sysDeptData; @@ -121,6 +122,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @param deptIds 部门ID串逗号分隔 * @return 部门名称串逗号分隔 */ + @Override public String selectDeptNameByIds(String deptIds) { List list = new ArrayList<>(); for (Long id : StringUtils.splitTo(deptIds, Convert::toLong)) { diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java index d433364e..f80e9489 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java @@ -183,6 +183,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 字典标签 */ @SuppressWarnings("unchecked cast") + @Override public String getDictLabel(String dictType, String dictValue, String separator) { // 优先从本地缓存获取 List datas = (List) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType); @@ -210,6 +211,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 字典值 */ @SuppressWarnings("unchecked cast") + @Override public String getDictValue(String dictType, String dictLabel, String separator) { // 优先从本地缓存获取 List datas = (List) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java index dc3cbc92..fb915e80 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java @@ -9,6 +9,7 @@ import cc.iotkit.common.oss.entity.UploadResult; import cc.iotkit.common.oss.enumd.AccessPolicyType; import cc.iotkit.common.oss.exception.OssException; import cc.iotkit.common.oss.factory.OssFactory; +import cc.iotkit.common.service.OssService; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.common.utils.SpringUtils; import cc.iotkit.common.utils.StringUtils; @@ -38,7 +39,7 @@ import java.util.List; @Slf4j @RequiredArgsConstructor @Service -public class SysOssServiceImpl implements ISysOssService { +public class SysOssServiceImpl implements ISysOssService, OssService { private final ISysOssData sysOssData; @@ -60,6 +61,7 @@ public class SysOssServiceImpl implements ISysOssService { return list; } + @Override public String selectUrlByIds(String ossIds) { List list = new ArrayList<>(); for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) { diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java index c04e67e6..d4269247 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java @@ -6,6 +6,7 @@ import cc.iotkit.common.constant.UserConstants; import cc.iotkit.common.enums.ErrCode; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.satoken.utils.LoginHelper; +import cc.iotkit.common.service.UserService; import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.common.utils.StreamUtils; import cc.iotkit.data.system.*; @@ -34,7 +35,7 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class SysUserServiceImpl implements ISysUserService { +public class SysUserServiceImpl implements ISysUserService, UserService { @Autowired private ISysUserData sysUserData; @@ -55,6 +56,7 @@ public class SysUserServiceImpl implements ISysUserService { private ISysUserPostData sysUserPostData; + @Override public String selectUserNameById(Long userId) { return null; }