From 47a133a065b5c858b588bf77ad51bb9fc38d1222 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 16 Jan 2024 22:49:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=80=82=E9=85=8D=20ContiNew=20Sta?= =?UTF-8?q?rter=20IService=20=E6=8E=A5=E5=8F=A3=EF=BC=8CCRUD=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AF=A6=E6=83=85=E6=96=B9=E6=B3=95=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 计划后期 IXxx 系列接口，区别于 Base 系列基类。Base 系列将主要为 CRUD API 服务。 --- .../auth/service/impl/LoginServiceImpl.java | 24 ++++++++----------- .../system/service/AnnouncementService.java | 8 ++++--- .../admin/system/service/DeptService.java | 4 +++- .../admin/system/service/DictItemService.java | 8 ++++--- .../admin/system/service/DictService.java | 4 +++- .../admin/system/service/FileService.java | 9 +++---- .../admin/system/service/MenuService.java | 10 ++++---- .../admin/system/service/RoleService.java | 9 +++---- .../admin/system/service/StorageService.java | 3 ++- .../admin/system/service/UserService.java | 3 ++- .../system/service/impl/FileServiceImpl.java | 5 ++-- 11 files changed, 48 insertions(+), 39 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java index f034824e..7e66ba34 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java @@ -16,14 +16,6 @@ package top.charles7c.continew.admin.auth.service.impl; -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -import lombok.RequiredArgsConstructor; - -import org.springframework.stereotype.Service; - import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; @@ -33,7 +25,9 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; - +import lombok.RequiredArgsConstructor; +import me.zhyd.oauth.model.AuthUser; +import org.springframework.stereotype.Service; import top.charles7c.continew.admin.auth.model.resp.MetaResp; import top.charles7c.continew.admin.auth.model.resp.RouteResp; import top.charles7c.continew.admin.auth.service.LoginService; @@ -48,11 +42,11 @@ import top.charles7c.continew.admin.common.model.dto.LoginUser; import top.charles7c.continew.admin.common.util.SecureUtils; import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.admin.system.enums.MessageTemplateEnum; +import top.charles7c.continew.admin.system.model.entity.DeptDO; import top.charles7c.continew.admin.system.model.entity.RoleDO; import top.charles7c.continew.admin.system.model.entity.UserDO; import top.charles7c.continew.admin.system.model.entity.UserSocialDO; import top.charles7c.continew.admin.system.model.req.MessageReq; -import top.charles7c.continew.admin.system.model.resp.DeptDetailResp; import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.admin.system.service.*; import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; @@ -60,7 +54,9 @@ import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.annotation.TreeField; import top.charles7c.continew.starter.extension.crud.util.TreeUtils; -import me.zhyd.oauth.model.AuthUser; +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; /** * 登录业务实现 @@ -140,7 +136,7 @@ public class LoginServiceImpl implements LoginService { userSocial.setOpenId(openId); this.sendSystemMsg(user); } else { - user = BeanUtil.copyProperties(userService.get(userSocial.getUserId()), UserDO.class); + user = BeanUtil.copyProperties(userService.getById(userSocial.getUserId()), UserDO.class); } this.checkUserStatus(user); userSocial.setMetaJson(JSONUtil.toJsonStr(authUser)); @@ -209,8 +205,8 @@ public class LoginServiceImpl implements LoginService { */ private void checkUserStatus(UserDO user) { CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, user.getStatus(), "此账号已被禁用，如有疑问，请联系管理员"); - DeptDetailResp deptDetailResp = deptService.get(user.getDeptId()); - CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, deptDetailResp.getStatus(), "此账号所属部门已被禁用，如有疑问，请联系管理员"); + DeptDO dept = deptService.getById(user.getDeptId()); + CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, dept.getStatus(), "此账号所属部门已被禁用，如有疑问，请联系管理员"); } /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java index f02ddb77..2f790468 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java @@ -16,14 +16,16 @@ package top.charles7c.continew.admin.system.service; -import java.util.List; - +import top.charles7c.continew.admin.system.model.entity.AnnouncementDO; import top.charles7c.continew.admin.system.model.query.AnnouncementQuery; import top.charles7c.continew.admin.system.model.req.AnnouncementReq; import top.charles7c.continew.admin.system.model.resp.AnnouncementDetailResp; import top.charles7c.continew.admin.system.model.resp.AnnouncementResp; import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import top.charles7c.continew.starter.extension.crud.base.IService; + +import java.util.List; /** * 公告业务接口 @@ -31,7 +33,7 @@ import top.charles7c.continew.starter.extension.crud.base.BaseService; * @author Charles7c * @since 2023/8/20 10:55 */ -public interface AnnouncementService extends BaseService { +public interface AnnouncementService extends BaseService, IService { /** * 查询仪表盘公告列表 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java index f3969644..37d135aa 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java @@ -16,11 +16,13 @@ package top.charles7c.continew.admin.system.service; +import top.charles7c.continew.admin.system.model.entity.DeptDO; import top.charles7c.continew.admin.system.model.query.DeptQuery; import top.charles7c.continew.admin.system.model.req.DeptReq; import top.charles7c.continew.admin.system.model.resp.DeptDetailResp; import top.charles7c.continew.admin.system.model.resp.DeptResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import top.charles7c.continew.starter.extension.crud.base.IService; /** * 部门业务接口 @@ -28,4 +30,4 @@ import top.charles7c.continew.starter.extension.crud.base.BaseService; * @author Charles7c * @since 2023/1/22 17:54 */ -public interface DeptService extends BaseService {} +public interface DeptService extends BaseService, IService {} diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java index 4203c9e9..9a36a6c0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java @@ -16,14 +16,16 @@ package top.charles7c.continew.admin.system.service; -import java.util.List; - import top.charles7c.continew.admin.common.model.resp.LabelValueResp; +import top.charles7c.continew.admin.system.model.entity.DictItemDO; import top.charles7c.continew.admin.system.model.query.DictItemQuery; import top.charles7c.continew.admin.system.model.req.DictItemReq; import top.charles7c.continew.admin.system.model.resp.DictItemDetailResp; import top.charles7c.continew.admin.system.model.resp.DictItemResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import top.charles7c.continew.starter.extension.crud.base.IService; + +import java.util.List; /** * 字典项业务接口 @@ -31,7 +33,7 @@ import top.charles7c.continew.starter.extension.crud.base.BaseService; * @author Charles7c * @since 2023/9/11 21:29 */ -public interface DictItemService extends BaseService { +public interface DictItemService extends BaseService, IService { /** * 根据字典 ID 查询 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java index dcaa61ee..8ce5da9a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java @@ -16,11 +16,13 @@ package top.charles7c.continew.admin.system.service; +import top.charles7c.continew.admin.system.model.entity.DictDO; import top.charles7c.continew.admin.system.model.query.DictQuery; import top.charles7c.continew.admin.system.model.req.DictReq; import top.charles7c.continew.admin.system.model.resp.DictDetailResp; import top.charles7c.continew.admin.system.model.resp.DictResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import top.charles7c.continew.starter.extension.crud.base.IService; /** * 字典业务接口 @@ -28,4 +30,4 @@ import top.charles7c.continew.starter.extension.crud.base.BaseService; * @author Charles7c * @since 2023/9/11 21:29 */ -public interface DictService extends BaseService {} \ No newline at end of file +public interface DictService extends BaseService, IService {} \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java index a885d02b..a33c125e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java @@ -16,15 +16,16 @@ package top.charles7c.continew.admin.system.service; -import java.util.List; - import org.dromara.x.file.storage.core.FileInfo; import org.springframework.web.multipart.MultipartFile; - +import top.charles7c.continew.admin.system.model.entity.FileDO; import top.charles7c.continew.admin.system.model.query.FileQuery; import top.charles7c.continew.admin.system.model.req.FileReq; import top.charles7c.continew.admin.system.model.resp.FileResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import top.charles7c.continew.starter.extension.crud.base.IService; + +import java.util.List; /** * 文件业务接口 @@ -32,7 +33,7 @@ import top.charles7c.continew.starter.extension.crud.base.BaseService; * @author Charles7c * @since 2023/12/23 10:38 */ -public interface FileService extends BaseService { +public interface FileService extends BaseService, IService { /** * 上传到默认存储库 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java index ece18ca8..48418ba9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java @@ -16,13 +16,15 @@ package top.charles7c.continew.admin.system.service; -import java.util.List; -import java.util.Set; - +import top.charles7c.continew.admin.system.model.entity.MenuDO; import top.charles7c.continew.admin.system.model.query.MenuQuery; import top.charles7c.continew.admin.system.model.req.MenuReq; import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import top.charles7c.continew.starter.extension.crud.base.IService; + +import java.util.List; +import java.util.Set; /** * 菜单业务接口 @@ -30,7 +32,7 @@ import top.charles7c.continew.starter.extension.crud.base.BaseService; * @author Charles7c * @since 2023/2/15 20:30 */ -public interface MenuService extends BaseService { +public interface MenuService extends BaseService, IService { /** * 根据用户 ID 查询 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java index a013de11..637d42c6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java @@ -16,9 +16,6 @@ package top.charles7c.continew.admin.system.service; -import java.util.List; -import java.util.Set; - import top.charles7c.continew.admin.common.model.dto.RoleDTO; import top.charles7c.continew.admin.common.model.resp.LabelValueResp; import top.charles7c.continew.admin.system.model.entity.RoleDO; @@ -27,6 +24,10 @@ import top.charles7c.continew.admin.system.model.req.RoleReq; import top.charles7c.continew.admin.system.model.resp.RoleDetailResp; import top.charles7c.continew.admin.system.model.resp.RoleResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import top.charles7c.continew.starter.extension.crud.base.IService; + +import java.util.List; +import java.util.Set; /** * 角色业务接口 @@ -34,7 +35,7 @@ import top.charles7c.continew.starter.extension.crud.base.BaseService; * @author Charles7c * @since 2023/2/8 23:15 */ -public interface RoleService extends BaseService { +public interface RoleService extends BaseService, IService { /** * 构建字典 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java index 45b6199a..1e8189ff 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java @@ -22,6 +22,7 @@ import top.charles7c.continew.admin.system.model.req.StorageReq; import top.charles7c.continew.admin.system.model.resp.StorageDetailResp; import top.charles7c.continew.admin.system.model.resp.StorageResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import top.charles7c.continew.starter.extension.crud.base.IService; /** * 存储库业务接口 @@ -29,7 +30,7 @@ import top.charles7c.continew.starter.extension.crud.base.BaseService; * @author Charles7c * @since 2023/12/26 22:09 */ -public interface StorageService extends BaseService { +public interface StorageService extends BaseService, IService { /** * 查询默认存储库 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java index f5e553cf..80d40d52 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java @@ -25,6 +25,7 @@ import top.charles7c.continew.admin.system.model.req.UserRoleUpdateReq; import top.charles7c.continew.admin.system.model.resp.UserDetailResp; import top.charles7c.continew.admin.system.model.resp.UserResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import top.charles7c.continew.starter.extension.crud.base.IService; import java.util.List; @@ -34,7 +35,7 @@ import java.util.List; * @author Charles7c * @since 2022/12/21 21:48 */ -public interface UserService extends BaseService { +public interface UserService extends BaseService, IService { /** * 新增 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java index 7b8eef31..8c581a96 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java @@ -34,7 +34,6 @@ import top.charles7c.continew.admin.system.model.entity.StorageDO; import top.charles7c.continew.admin.system.model.query.FileQuery; import top.charles7c.continew.admin.system.model.req.FileReq; import top.charles7c.continew.admin.system.model.resp.FileResp; -import top.charles7c.continew.admin.system.model.resp.StorageDetailResp; import top.charles7c.continew.admin.system.service.FileService; import top.charles7c.continew.admin.system.service.StorageService; import top.charles7c.continew.starter.core.constant.StringConstants; @@ -66,7 +65,7 @@ public class FileServiceImpl extends BaseServiceImpl fileList = baseMapper.lambdaQuery().in(FileDO::getId, ids).list(); Map> fileListGroup = fileList.stream().collect(Collectors.groupingBy(FileDO::getStorageId)); for (Map.Entry> entry : fileListGroup.entrySet()) { - StorageDetailResp storage = storageService.get(entry.getKey()); + StorageDO storage = storageService.getById(entry.getKey()); for (FileDO file : entry.getValue()) { FileInfo fileInfo = file.toFileInfo(storage.getCode()); fileStorageService.delete(fileInfo); @@ -118,7 +117,7 @@ public class FileServiceImpl extends BaseServiceImpl