ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-21 04:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 💥 调整后端请求、响应参数模型命名风格

Browse Source 
XxxRequest => XxxReq
XxxVO => XxxResp
This commit is contained in:
Charles7c
2023-11-04 17:19:00 +08:00
parent 598dd3991c
commit 87f90567db
136 changed files with 828 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/AccountLoginRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/AccountLoginReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.request;
package top.charles7c.cnadmin.auth.model.req;
import java.io.Serializable;
@@ -32,7 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@Schema(description = "账号登录信息")
public class AccountLoginRequest implements Serializable {
public class AccountLoginReq implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/EmailLoginRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/EmailLoginReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.request;
package top.charles7c.cnadmin.auth.model.req;
import java.io.Serializable;
@@ -37,7 +37,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
*/
@Data
@Schema(description = "邮箱登录信息")
public class EmailLoginRequest implements Serializable {
public class EmailLoginReq implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/PhoneLoginRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/PhoneLoginReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.request;
package top.charles7c.cnadmin.auth.model.req;
import java.io.Serializable;
@@ -37,7 +37,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
*/
@Data
@Schema(description = "手机号登录信息")
public class PhoneLoginRequest implements Serializable {
public class PhoneLoginReq implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/LoginVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/LoginResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.vo;
package top.charles7c.cnadmin.auth.model.resp;
import java.io.Serializable;
@@ -32,7 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Data
@Builder
@Schema(description = "令牌信息")
public class LoginVO implements Serializable {
public class LoginResp implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/MetaVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/MetaResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.vo;
package top.charles7c.cnadmin.auth.model.resp;
import java.io.Serializable;
@@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@Schema(description = "元数据信息")
public class MetaVO implements Serializable {
public class MetaResp implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/OnlineUserVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/OnlineUserResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.vo;
package top.charles7c.cnadmin.auth.model.resp;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -31,7 +31,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@Schema(description = "在线用户信息")
public class OnlineUserVO implements Serializable {
public class OnlineUserResp implements Serializable {
private static final long serialVersionUID = 1L;

8
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/RouteVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/RouteResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.vo;
package top.charles7c.cnadmin.auth.model.resp;
import java.io.Serializable;
import java.util.List;
@@ -34,7 +34,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
@Data
@Schema(description = "路由信息")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class RouteVO implements Serializable {
public class RouteResp implements Serializable {
private static final long serialVersionUID = 1L;
@@ -60,11 +60,11 @@ public class RouteVO implements Serializable {
* 元数据
*/
@Schema(description = "元数据")
private MetaVO meta;
private MetaResp meta;
/**
* 子路由列表
*/
@Schema(description = "子路由列表")
private List<RouteVO> children;
private List<RouteResp> children;
}

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/UserInfoResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.auth.model.vo;
package top.charles7c.cnadmin.auth.model.resp;
import java.io.Serializable;
import java.time.LocalDate;
@@ -39,7 +39,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum;
*/
@Data
@Schema(description = "用户信息")
public class UserInfoVO implements Serializable {
public class UserInfoResp implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/LoginService.java
View File

@@ -18,7 +18,7 @@ package top.charles7c.cnadmin.auth.service;
import java.util.List;
import top.charles7c.cnadmin.auth.model.vo.RouteVO;
import top.charles7c.cnadmin.auth.model.resp.RouteResp;
import me.zhyd.oauth.model.AuthUser;
@@ -75,5 +75,5 @@ public interface LoginService {
* 用户 ID
* @return 路由树
*/
List<RouteVO> buildRouteTree(Long userId);
List<RouteResp> buildRouteTree(Long userId);
}

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/OnlineUserService.java
View File

@@ -19,10 +19,10 @@ package top.charles7c.cnadmin.auth.service;
import java.util.List;
import top.charles7c.cnadmin.auth.model.query.OnlineUserQuery;
import top.charles7c.cnadmin.auth.model.vo.OnlineUserVO;
import top.charles7c.cnadmin.auth.model.resp.OnlineUserResp;
import top.charles7c.cnadmin.common.model.dto.LoginUser;
import top.charles7c.cnadmin.common.model.query.PageQuery;
import top.charles7c.cnadmin.common.model.vo.PageDataVO;
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
/**
* 在线用户业务接口
@@ -41,7 +41,7 @@ public interface OnlineUserService {
* 分页查询条件
* @return 分页列表信息
*/
PageDataVO<OnlineUserVO> page(OnlineUserQuery query, PageQuery pageQuery);
PageDataResp<OnlineUserResp> page(OnlineUserQuery query, PageQuery pageQuery);
/**
* 查询列表

48
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java
View File

@@ -34,8 +34,8 @@ import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import top.charles7c.cnadmin.auth.model.vo.MetaVO;
import top.charles7c.cnadmin.auth.model.vo.RouteVO;
import top.charles7c.cnadmin.auth.model.resp.MetaResp;
import top.charles7c.cnadmin.auth.model.resp.RouteResp;
import top.charles7c.cnadmin.auth.service.LoginService;
import top.charles7c.cnadmin.auth.service.PermissionService;
import top.charles7c.cnadmin.common.annotation.TreeField;
@@ -55,9 +55,9 @@ import top.charles7c.cnadmin.system.enums.MessageTemplateEnum;
import top.charles7c.cnadmin.system.model.entity.RoleDO;
import top.charles7c.cnadmin.system.model.entity.UserDO;
import top.charles7c.cnadmin.system.model.entity.UserSocialDO;
import top.charles7c.cnadmin.system.model.request.MessageRequest;
import top.charles7c.cnadmin.system.model.vo.DeptDetailVO;
import top.charles7c.cnadmin.system.model.vo.MenuVO;
import top.charles7c.cnadmin.system.model.req.MessageReq;
import top.charles7c.cnadmin.system.model.resp.DeptDetailResp;
import top.charles7c.cnadmin.system.model.resp.MenuResp;
import top.charles7c.cnadmin.system.service.*;
import me.zhyd.oauth.model.AuthUser;
@@ -150,22 +150,22 @@ public class LoginServiceImpl implements LoginService {
}
@Override
public List<RouteVO> buildRouteTree(Long userId) {
public List<RouteResp> buildRouteTree(Long userId) {
Set<String> roleCodeSet = permissionService.listRoleCodeByUserId(userId);
if (CollUtil.isEmpty(roleCodeSet)) {
return new ArrayList<>(0);
}
// 查询菜单列表
Set<MenuVO> menuSet = new LinkedHashSet<>();
Set<MenuResp> menuSet = new LinkedHashSet<>();
if (roleCodeSet.contains(SysConsts.ADMIN_ROLE_CODE)) {
menuSet.addAll(menuService.list());
} else {
roleCodeSet.forEach(roleCode -> menuSet.addAll(menuService.listByRoleCode(roleCode)));
}
List<MenuVO> menuList =
List<MenuResp> menuList =
menuSet.stream().filter(m -> !MenuTypeEnum.BUTTON.equals(m.getType())).collect(Collectors.toList());
// 构建路由树
TreeField treeField = MenuVO.class.getDeclaredAnnotation(TreeField.class);
TreeField treeField = MenuResp.class.getDeclaredAnnotation(TreeField.class);
TreeNodeConfig treeNodeConfig = TreeUtils.genTreeNodeConfig(treeField);
List<Tree<Long>> treeList = TreeUtils.build(menuList, treeNodeConfig, (m, tree) -> {
tree.setId(m.getId());
@@ -175,15 +175,15 @@ public class LoginServiceImpl implements LoginService {
tree.putExtra("path", m.getPath());
tree.putExtra("name", m.getName());
tree.putExtra("component", m.getComponent());
MetaVO metaVO = new MetaVO();
metaVO.setLocale(m.getTitle());
metaVO.setIcon(m.getIcon());
metaVO.setIgnoreCache(!m.getIsCache());
metaVO.setHideInMenu(m.getIsHidden());
metaVO.setOrder(m.getSort());
tree.putExtra("meta", metaVO);
MetaResp metaResp = new MetaResp();
metaResp.setLocale(m.getTitle());
metaResp.setIcon(m.getIcon());
metaResp.setIgnoreCache(!m.getIsCache());
metaResp.setHideInMenu(m.getIsHidden());
metaResp.setOrder(m.getSort());
tree.putExtra("meta", metaResp);
});
return BeanUtil.copyToList(treeList, RouteVO.class);
return BeanUtil.copyToList(treeList, RouteResp.class);
}
/**
@@ -210,8 +210,8 @@ public class LoginServiceImpl implements LoginService {
*/
private void checkUserStatus(UserDO user) {
CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, user.getStatus(), "此账号已被禁用，如有疑问，请联系管理员");
DeptDetailVO deptDetailVO = deptService.get(user.getDeptId());
CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, deptDetailVO.getStatus(), "此账号所属部门已被禁用，如有疑问，请联系管理员");
DeptDetailResp deptDetailResp = deptService.get(user.getDeptId());
CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, deptDetailResp.getStatus(), "此账号所属部门已被禁用，如有疑问，请联系管理员");
}
/**
@@ -221,11 +221,11 @@ public class LoginServiceImpl implements LoginService {
* 用户信息
*/
private void sendSystemMsg(UserDO user) {
MessageRequest request = new MessageRequest();
MessageReq req = new MessageReq();
MessageTemplateEnum socialRegister = MessageTemplateEnum.SOCIAL_REGISTER;
request.setTitle(StrUtil.format(socialRegister.getTitle(), projectProperties.getName()));
request.setContent(StrUtil.format(socialRegister.getContent(), user.getNickname()));
request.setType(MessageTypeEnum.SYSTEM);
messageService.add(request, CollUtil.toList(user.getId()));
req.setTitle(StrUtil.format(socialRegister.getTitle(), projectProperties.getName()));
req.setContent(StrUtil.format(socialRegister.getContent(), user.getNickname()));
req.setType(MessageTypeEnum.SYSTEM);
messageService.add(req, CollUtil.toList(user.getId()));
}
}

14
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java
View File

@@ -32,12 +32,12 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import top.charles7c.cnadmin.auth.model.query.OnlineUserQuery;
import top.charles7c.cnadmin.auth.model.vo.OnlineUserVO;
import top.charles7c.cnadmin.auth.model.resp.OnlineUserResp;
import top.charles7c.cnadmin.auth.service.OnlineUserService;
import top.charles7c.cnadmin.common.constant.StringConsts;
import top.charles7c.cnadmin.common.model.dto.LoginUser;
import top.charles7c.cnadmin.common.model.query.PageQuery;
import top.charles7c.cnadmin.common.model.vo.PageDataVO;
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
/**
@@ -51,12 +51,12 @@ import top.charles7c.cnadmin.common.util.helper.LoginHelper;
public class OnlineUserServiceImpl implements OnlineUserService {
@Override
public PageDataVO<OnlineUserVO> page(OnlineUserQuery query, PageQuery pageQuery) {
public PageDataResp<OnlineUserResp> page(OnlineUserQuery query, PageQuery pageQuery) {
List<LoginUser> loginUserList = this.list(query);
List<OnlineUserVO> list = BeanUtil.copyToList(loginUserList, OnlineUserVO.class);
PageDataVO<OnlineUserVO> pageDataVO = PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), list);
pageDataVO.getList().forEach(u -> u.setNickname(LoginHelper.getNickname(u.getId())));
return pageDataVO;
List<OnlineUserResp> list = BeanUtil.copyToList(loginUserList, OnlineUserResp.class);
PageDataResp<OnlineUserResp> pageDataResp = PageDataResp.build(pageQuery.getPage(), pageQuery.getSize(), list);
pageDataResp.getList().forEach(u -> u.setNickname(LoginHelper.getNickname(u.getId())));
return pageDataResp;
}
@Override

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/AnnouncementMapper.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
import top.charles7c.cnadmin.common.base.BaseMapper;
import top.charles7c.cnadmin.system.model.entity.AnnouncementDO;
import top.charles7c.cnadmin.system.model.vo.DashboardAnnouncementVO;
import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp;
/**
* 公告 Mapper
@@ -35,5 +35,5 @@ public interface AnnouncementMapper extends BaseMapper<AnnouncementDO> {
*
* @return 仪表盘公告列表
*/
List<DashboardAnnouncementVO> selectDashboardList();
List<DashboardAnnouncementResp> selectDashboardList();
}

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/DictItemMapper.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
import top.charles7c.cnadmin.common.base.BaseMapper;
import top.charles7c.cnadmin.common.model.vo.LabelValueVO;
import top.charles7c.cnadmin.common.model.resp.LabelValueResp;
import top.charles7c.cnadmin.system.model.entity.DictItemDO;
/**
@@ -39,5 +39,5 @@ public interface DictItemMapper extends BaseMapper<DictItemDO> {
* 字典编码
* @return 字典项列表
*/
List<LabelValueVO> listByDictCode(@Param("dictCode") String dictCode);
List<LabelValueResp> listByDictCode(@Param("dictCode") String dictCode);
}

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/MessageMapper.java
View File

@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import top.charles7c.cnadmin.common.base.BaseMapper;
import top.charles7c.cnadmin.system.model.entity.MessageDO;
import top.charles7c.cnadmin.system.model.vo.MessageVO;
import top.charles7c.cnadmin.system.model.resp.MessageResp;
/**
* 消息 Mapper
@@ -43,6 +43,6 @@ public interface MessageMapper extends BaseMapper<MessageDO> {
* 查询条件
* @return 分页信息
*/
IPage<MessageVO> selectVoPage(@Param("page") IPage<Object> page,
IPage<MessageResp> selectPageByUserId(@Param("page") IPage<Object> page,
@Param(Constants.WRAPPER) QueryWrapper<MessageDO> queryWrapper);
}

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/AnnouncementRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/AnnouncementReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import java.time.LocalDateTime;
@@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
/**
* 创建或修改公告信息
@@ -36,7 +36,7 @@ import top.charles7c.cnadmin.common.base.BaseRequest;
*/
@Data
@Schema(description = "创建或修改公告信息")
public class AnnouncementRequest extends BaseRequest {
public class AnnouncementReq extends BaseReq {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DeptReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
@@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
import top.charles7c.cnadmin.common.base.ValidateGroup;
import top.charles7c.cnadmin.common.constant.RegexConsts;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
@@ -40,7 +40,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
*/
@Data
@Schema(description = "创建或修改部门信息")
public class DeptRequest extends BaseRequest {
public class DeptReq extends BaseReq {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DictItemRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictItemReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.*;
@@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
/**
* 创建或修改字典项信息
@@ -34,7 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseRequest;
*/
@Data
@Schema(description = "创建或修改字典项信息")
public class DictItemRequest extends BaseRequest {
public class DictItemReq extends BaseReq {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DictRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DictReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.*;
@@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
import top.charles7c.cnadmin.common.constant.RegexConsts;
/**
@@ -35,7 +35,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
*/
@Data
@Schema(description = "创建或修改字典信息")
public class DictRequest extends BaseRequest {
public class DictReq extends BaseReq {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MenuReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
@@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
import top.charles7c.cnadmin.common.constant.RegexConsts;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
import top.charles7c.cnadmin.common.enums.MenuTypeEnum;
@@ -40,7 +40,7 @@ import top.charles7c.cnadmin.common.enums.MenuTypeEnum;
*/
@Data
@Schema(description = "创建或修改菜单信息")
public class MenuRequest extends BaseRequest {
public class MenuReq extends BaseReq {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MessageRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MessageReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -25,7 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
/**
@@ -36,7 +36,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
*/
@Data
@Schema(description = "创建消息信息")
public class MessageRequest extends BaseRequest {
public class MessageReq extends BaseReq {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/OptionRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import javax.validation.constraints.NotBlank;
@@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
/**
* 修改参数信息
@@ -34,7 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseRequest;
*/
@Data
@Schema(description = "修改参数信息")
public class OptionRequest extends BaseRequest {
public class OptionReq extends BaseReq {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/OptionResetValueRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/OptionResetValueReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import java.io.Serializable;
import java.util.List;
@@ -33,7 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@Schema(description = "参数重置信息")
public class OptionResetValueRequest implements Serializable {
public class OptionResetValueReq implements Serializable {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/RoleReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +29,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
import top.charles7c.cnadmin.common.constant.RegexConsts;
import top.charles7c.cnadmin.common.enums.DataScopeEnum;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
@@ -42,7 +42,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
*/
@Data
@Schema(description = "创建或修改角色信息")
public class RoleRequest extends BaseRequest {
public class RoleReq extends BaseReq {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserBasicInfoUpdateRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserBasicInfoUpdateReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import java.io.Serializable;
@@ -37,7 +37,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum;
*/
@Data
@Schema(description = "用户基础信息修改信息")
public class UserBasicInfoUpdateRequest implements Serializable {
public class UserBasicInfoUpdateReq implements Serializable {
private static final long serialVersionUID = 1L;

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserEmailUpdateRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserEmailUpdateRequest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import java.io.Serializable;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserPasswordUpdateRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPasswordUpdateReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import java.io.Serializable;
@@ -32,7 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@Schema(description = "用户密码修改信息")
public class UserPasswordUpdateRequest implements Serializable {
public class UserPasswordUpdateReq implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserPhoneUpdateRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPhoneUpdateReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import java.io.Serializable;
@@ -37,7 +37,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
*/
@Data
@Schema(description = "用户手机号修改信息")
public class UserPhoneUpdateRequest implements Serializable {
public class UserPhoneUpdateReq implements Serializable {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import java.util.List;
@@ -29,7 +29,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.charles7c.cnadmin.common.base.BaseRequest;
import top.charles7c.cnadmin.common.base.BaseReq;
import top.charles7c.cnadmin.common.constant.RegexConsts;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
import top.charles7c.cnadmin.common.enums.GenderEnum;
@@ -42,7 +42,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum;
*/
@Data
@Schema(description = "创建或修改用户信息")
public class UserRequest extends BaseRequest {
public class UserReq extends BaseReq {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRoleUpdateRequest.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserRoleUpdateReq.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.request;
package top.charles7c.cnadmin.system.model.req;
import java.io.Serializable;
import java.util.List;
@@ -33,7 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@Schema(description = "用户角色修改信息")
public class UserRoleUpdateRequest implements Serializable {
public class UserRoleUpdateReq implements Serializable {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementDetailVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementDetailResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.time.LocalDateTime;
@@ -25,7 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import top.charles7c.cnadmin.common.base.BaseDetailVO;
import top.charles7c.cnadmin.common.base.BaseDetailResp;
/**
* 公告详情信息
@@ -36,7 +36,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailVO;
@Data
@ExcelIgnoreUnannotated
@Schema(description = "公告详情信息")
public class AnnouncementDetailVO extends BaseDetailVO {
public class AnnouncementDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AnnouncementResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.time.LocalDateTime;
@@ -22,7 +22,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.base.BaseVO;
import top.charles7c.cnadmin.common.base.BaseResp;
import top.charles7c.cnadmin.system.enums.AnnouncementStatusEnum;
/**
@@ -33,7 +33,7 @@ import top.charles7c.cnadmin.system.enums.AnnouncementStatusEnum;
*/
@Data
@Schema(description = "公告信息")
public class AnnouncementVO extends BaseVO {
public class AnnouncementResp extends BaseResp {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AvatarVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AvatarResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serializable;
@@ -32,7 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Data
@Builder
@Schema(description = "头像信息")
public class AvatarVO implements Serializable {
public class AvatarResp implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DashboardAnnouncementVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DashboardAnnouncementResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serializable;
@@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@Schema(description = "仪表盘-公告信息")
public class DashboardAnnouncementVO implements Serializable {
public class DashboardAnnouncementResp implements Serializable {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptDetailResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import lombok.Data;
@@ -24,7 +24,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import top.charles7c.cnadmin.common.base.BaseDetailVO;
import top.charles7c.cnadmin.common.base.BaseDetailResp;
import top.charles7c.cnadmin.common.config.easyexcel.ExcelBaseEnumConverter;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
@@ -37,7 +37,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
@Data
@ExcelIgnoreUnannotated
@Schema(description = "部门详情信息")
public class DeptDetailVO extends BaseDetailVO {
public class DeptDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptResp.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.annotation.TreeField;
import top.charles7c.cnadmin.common.base.BaseVO;
import top.charles7c.cnadmin.common.base.BaseResp;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
/**
@@ -33,7 +33,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
@Data
@TreeField(value = "id", nameKey = "name")
@Schema(description = "部门信息")
public class DeptVO extends BaseVO {
public class DeptResp extends BaseResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DictDetailVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictDetailResp.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.base.BaseDetailVO;
import top.charles7c.cnadmin.common.base.BaseDetailResp;
/**
* 字典详情信息
@@ -30,7 +30,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailVO;
*/
@Data
@Schema(description = "字典详情信息")
public class DictDetailVO extends BaseDetailVO {
public class DictDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DictItemDetailVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemDetailResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import lombok.Data;
@@ -23,7 +23,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import top.charles7c.cnadmin.common.base.BaseDetailVO;
import top.charles7c.cnadmin.common.base.BaseDetailResp;
/**
* 字典项详情信息
@@ -34,7 +34,7 @@ import top.charles7c.cnadmin.common.base.BaseDetailVO;
@Data
@ExcelIgnoreUnannotated
@Schema(description = "字典项详情信息")
public class DictItemDetailVO extends BaseDetailVO {
public class DictItemDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DictItemVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictItemResp.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.base.BaseVO;
import top.charles7c.cnadmin.common.base.BaseResp;
/**
* 字典项信息
@@ -30,7 +30,7 @@ import top.charles7c.cnadmin.common.base.BaseVO;
*/
@Data
@Schema(description = "字典项信息")
public class DictItemVO extends BaseVO {
public class DictItemResp extends BaseResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DictVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DictResp.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.base.BaseVO;
import top.charles7c.cnadmin.common.base.BaseResp;
/**
* 字典信息
@@ -30,7 +30,7 @@ import top.charles7c.cnadmin.common.base.BaseVO;
*/
@Data
@Schema(description = "字典信息")
public class DictVO extends BaseVO {
public class DictResp extends BaseResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MenuResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import lombok.Data;
@@ -24,7 +24,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import top.charles7c.cnadmin.common.annotation.TreeField;
import top.charles7c.cnadmin.common.base.BaseVO;
import top.charles7c.cnadmin.common.base.BaseResp;
import top.charles7c.cnadmin.common.config.easyexcel.ExcelBaseEnumConverter;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
import top.charles7c.cnadmin.common.enums.MenuTypeEnum;
@@ -39,7 +39,7 @@ import top.charles7c.cnadmin.common.enums.MenuTypeEnum;
@TreeField(value = "id")
@ExcelIgnoreUnannotated
@Schema(description = "菜单信息")
public class MenuVO extends BaseVO {
public class MenuResp extends BaseResp {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MessageVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -35,7 +35,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
*/
@Data
@Schema(description = "消息信息")
public class MessageVO implements Serializable {
public class MessageResp implements Serializable {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MessageTypeUnreadVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageTypeUnreadResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serializable;
@@ -32,7 +32,7 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
*/
@Data
@Schema(description = "各类型未读消息信息")
public class MessageTypeUnreadVO implements Serializable {
public class MessageTypeUnreadResp implements Serializable {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MessageUnreadVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MessageUnreadResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serializable;
import java.util.List;
@@ -34,7 +34,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
@Data
@Schema(description = "未读消息信息")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class MessageUnreadVO implements Serializable {
public class MessageUnreadResp implements Serializable {
private static final long serialVersionUID = 1L;
@@ -48,5 +48,5 @@ public class MessageUnreadVO implements Serializable {
* 各类型未读消息数量
*/
@Schema(description = "各类型未读消息数量")
private List<MessageTypeUnreadVO> details;
private List<MessageTypeUnreadResp> details;
}

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/OptionVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/OptionResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serializable;
@@ -34,7 +34,7 @@ import cn.hutool.core.util.StrUtil;
*/
@Data
@Schema(description = "参数信息")
public class OptionVO implements Serializable {
public class OptionResp implements Serializable {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleDetailResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.util.List;
@@ -25,7 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import top.charles7c.cnadmin.common.base.BaseDetailVO;
import top.charles7c.cnadmin.common.base.BaseDetailResp;
import top.charles7c.cnadmin.common.config.easyexcel.ExcelBaseEnumConverter;
import top.charles7c.cnadmin.common.enums.DataScopeEnum;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
@@ -39,7 +39,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
@Data
@ExcelIgnoreUnannotated
@Schema(description = "角色详情信息")
public class RoleDetailVO extends BaseDetailVO {
public class RoleDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleResp.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.charles7c.cnadmin.common.base.BaseVO;
import top.charles7c.cnadmin.common.base.BaseResp;
import top.charles7c.cnadmin.common.enums.DataScopeEnum;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
@@ -32,7 +32,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
*/
@Data
@Schema(description = "角色信息")
public class RoleVO extends BaseVO {
public class RoleResp extends BaseResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserDetailResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.time.LocalDateTime;
import java.util.List;
@@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import top.charles7c.cnadmin.common.base.BaseDetailVO;
import top.charles7c.cnadmin.common.base.BaseDetailResp;
import top.charles7c.cnadmin.common.config.easyexcel.ExcelBaseEnumConverter;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
import top.charles7c.cnadmin.common.enums.GenderEnum;
@@ -42,7 +42,7 @@ import top.charles7c.cnadmin.common.util.helper.LoginHelper;
@Data
@ExcelIgnoreUnannotated
@Schema(description = "用户详情信息")
public class UserDetailVO extends BaseDetailVO {
public class UserDetailResp extends BaseDetailResp {
private static final long serialVersionUID = 1L;

6
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.util.Objects;
@@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import cn.hutool.core.util.DesensitizedUtil;
import top.charles7c.cnadmin.common.base.BaseVO;
import top.charles7c.cnadmin.common.base.BaseResp;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
import top.charles7c.cnadmin.common.enums.GenderEnum;
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
@@ -37,7 +37,7 @@ import top.charles7c.cnadmin.common.util.helper.LoginHelper;
*/
@Data
@Schema(description = "用户信息")
public class UserVO extends BaseVO {
public class UserResp extends BaseResp {
private static final long serialVersionUID = 1L;

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserSocialBindVO.java → continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserSocialBindResp.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package top.charles7c.cnadmin.system.model.vo;
package top.charles7c.cnadmin.system.model.resp;
import java.io.Serializable;
@@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
*/
@Data
@Schema(description = "第三方账号绑定信息")
public class UserSocialBindVO implements Serializable {
public class UserSocialBindResp implements Serializable {
private static final long serialVersionUID = 1L;

12
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/AnnouncementService.java
View File

@@ -20,10 +20,10 @@ import java.util.List;
import top.charles7c.cnadmin.common.base.BaseService;
import top.charles7c.cnadmin.system.model.query.AnnouncementQuery;
import top.charles7c.cnadmin.system.model.request.AnnouncementRequest;
import top.charles7c.cnadmin.system.model.vo.AnnouncementDetailVO;
import top.charles7c.cnadmin.system.model.vo.AnnouncementVO;
import top.charles7c.cnadmin.system.model.vo.DashboardAnnouncementVO;
import top.charles7c.cnadmin.system.model.req.AnnouncementReq;
import top.charles7c.cnadmin.system.model.resp.AnnouncementDetailResp;
import top.charles7c.cnadmin.system.model.resp.AnnouncementResp;
import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp;
/**
* 公告业务接口
@@ -32,12 +32,12 @@ import top.charles7c.cnadmin.system.model.vo.DashboardAnnouncementVO;
* @since 2023/8/20 10:55
*/
public interface AnnouncementService
extends BaseService<AnnouncementVO, AnnouncementDetailVO, AnnouncementQuery, AnnouncementRequest> {
extends BaseService<AnnouncementResp, AnnouncementDetailResp, AnnouncementQuery, AnnouncementReq> {
/**
* 查询仪表盘公告列表
*
* @return 仪表盘公告列表
*/
List<DashboardAnnouncementVO> listDashboard();
List<DashboardAnnouncementResp> listDashboard();
}

8
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DeptService.java
View File

@@ -18,9 +18,9 @@ package top.charles7c.cnadmin.system.service;
import top.charles7c.cnadmin.common.base.BaseService;
import top.charles7c.cnadmin.system.model.query.DeptQuery;
import top.charles7c.cnadmin.system.model.request.DeptRequest;
import top.charles7c.cnadmin.system.model.vo.DeptDetailVO;
import top.charles7c.cnadmin.system.model.vo.DeptVO;
import top.charles7c.cnadmin.system.model.req.DeptReq;
import top.charles7c.cnadmin.system.model.resp.DeptDetailResp;
import top.charles7c.cnadmin.system.model.resp.DeptResp;
/**
* 部门业务接口
@@ -28,4 +28,4 @@ import top.charles7c.cnadmin.system.model.vo.DeptVO;
* @author Charles7c
* @since 2023/1/22 17:54
*/
public interface DeptService extends BaseService<DeptVO, DeptDetailVO, DeptQuery, DeptRequest> {}
public interface DeptService extends BaseService<DeptResp, DeptDetailResp, DeptQuery, DeptReq> {}

14
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DictItemService.java
View File

@@ -19,11 +19,11 @@ package top.charles7c.cnadmin.system.service;
import java.util.List;
import top.charles7c.cnadmin.common.base.BaseService;
import top.charles7c.cnadmin.common.model.vo.LabelValueVO;
import top.charles7c.cnadmin.common.model.resp.LabelValueResp;
import top.charles7c.cnadmin.system.model.query.DictItemQuery;
import top.charles7c.cnadmin.system.model.request.DictItemRequest;
import top.charles7c.cnadmin.system.model.vo.DictItemDetailVO;
import top.charles7c.cnadmin.system.model.vo.DictItemVO;
import top.charles7c.cnadmin.system.model.req.DictItemReq;
import top.charles7c.cnadmin.system.model.resp.DictItemDetailResp;
import top.charles7c.cnadmin.system.model.resp.DictItemResp;
/**
* 字典项业务接口
@@ -31,7 +31,7 @@ import top.charles7c.cnadmin.system.model.vo.DictItemVO;
* @author Charles7c
* @since 2023/9/11 21:29
*/
public interface DictItemService extends BaseService<DictItemVO, DictItemDetailVO, DictItemQuery, DictItemRequest> {
public interface DictItemService extends BaseService<DictItemResp, DictItemDetailResp, DictItemQuery, DictItemReq> {
/**
* 根据字典 ID 查询
@@ -40,7 +40,7 @@ public interface DictItemService extends BaseService<DictItemVO, DictItemDetailV
* 字典 ID
* @return 字典项列表
*/
List<DictItemDetailVO> listByDictId(Long dictId);
List<DictItemDetailResp> listByDictId(Long dictId);
/**
* 根据字典编码查询
@@ -49,7 +49,7 @@ public interface DictItemService extends BaseService<DictItemVO, DictItemDetailV
* 字典编码
* @return 字典项列表
*/
List<LabelValueVO> listByDictCode(String dictCode);
List<LabelValueResp> listByDictCode(String dictCode);
/**
* 根据字典 ID 列表删除

8
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DictService.java
View File

@@ -18,9 +18,9 @@ package top.charles7c.cnadmin.system.service;
import top.charles7c.cnadmin.common.base.BaseService;
import top.charles7c.cnadmin.system.model.query.DictQuery;
import top.charles7c.cnadmin.system.model.request.DictRequest;
import top.charles7c.cnadmin.system.model.vo.DictDetailVO;
import top.charles7c.cnadmin.system.model.vo.DictVO;
import top.charles7c.cnadmin.system.model.req.DictReq;
import top.charles7c.cnadmin.system.model.resp.DictDetailResp;
import top.charles7c.cnadmin.system.model.resp.DictResp;
/**
* 字典业务接口
@@ -28,4 +28,4 @@ import top.charles7c.cnadmin.system.model.vo.DictVO;
* @author Charles7c
* @since 2023/9/11 21:29
*/
public interface DictService extends BaseService<DictVO, DictDetailVO, DictQuery, DictRequest> {}
public interface DictService extends BaseService<DictResp, DictDetailResp, DictQuery, DictReq> {}

10
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/MenuService.java
View File

@@ -21,8 +21,8 @@ import java.util.Set;
import top.charles7c.cnadmin.common.base.BaseService;
import top.charles7c.cnadmin.system.model.query.MenuQuery;
import top.charles7c.cnadmin.system.model.request.MenuRequest;
import top.charles7c.cnadmin.system.model.vo.MenuVO;
import top.charles7c.cnadmin.system.model.req.MenuReq;
import top.charles7c.cnadmin.system.model.resp.MenuResp;
/**
* 菜单业务接口
@@ -30,7 +30,7 @@ import top.charles7c.cnadmin.system.model.vo.MenuVO;
* @author Charles7c
* @since 2023/2/15 20:30
*/
public interface MenuService extends BaseService<MenuVO, MenuVO, MenuQuery, MenuRequest> {
public interface MenuService extends BaseService<MenuResp, MenuResp, MenuQuery, MenuReq> {
/**
* 根据用户 ID 查询
@@ -48,12 +48,12 @@ public interface MenuService extends BaseService<MenuVO, MenuVO, MenuQuery, Menu
* 角色编码
* @return 菜单列表
*/
List<MenuVO> listByRoleCode(String roleCode);
List<MenuResp> listByRoleCode(String roleCode);
/**
* 查询所有菜单
*
* @return 菜单列表
*/
List<MenuVO> list();
List<MenuResp> list();
}

14
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/MessageService.java
View File

@@ -19,10 +19,10 @@ package top.charles7c.cnadmin.system.service;
import java.util.List;
import top.charles7c.cnadmin.common.model.query.PageQuery;
import top.charles7c.cnadmin.common.model.vo.PageDataVO;
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
import top.charles7c.cnadmin.system.model.query.MessageQuery;
import top.charles7c.cnadmin.system.model.request.MessageRequest;
import top.charles7c.cnadmin.system.model.vo.MessageVO;
import top.charles7c.cnadmin.system.model.req.MessageReq;
import top.charles7c.cnadmin.system.model.resp.MessageResp;
/**
* 消息业务接口
@@ -41,17 +41,17 @@ public interface MessageService {
* 分页查询条件
* @return 分页列表信息
*/
PageDataVO<MessageVO> page(MessageQuery query, PageQuery pageQuery);
PageDataResp<MessageResp> page(MessageQuery query, PageQuery pageQuery);
/**
* 新增
*
* @param request
* 消息
* @param req
* 新增信息
* @param userIdList
* 接收人列表
*/
void add(MessageRequest request, List<Long> userIdList);
void add(MessageReq req, List<Long> userIdList);
/**
* 删除

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/MessageUserService.java
View File

@@ -18,7 +18,7 @@ package top.charles7c.cnadmin.system.service;
import java.util.List;
import top.charles7c.cnadmin.system.model.vo.MessageUnreadVO;
import top.charles7c.cnadmin.system.model.resp.MessageUnreadResp;
/**
* 消息和用户关联业务接口
@@ -37,7 +37,7 @@ public interface MessageUserService {
* 是否查询详情
* @return 未读消息信息
*/
MessageUnreadVO countUnreadMessageByUserId(Long userId, Boolean isDetail);
MessageUnreadResp countUnreadMessageByUserId(Long userId, Boolean isDetail);
/**
* 新增

16
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/OptionService.java
View File

@@ -19,9 +19,9 @@ package top.charles7c.cnadmin.system.service;
import java.util.List;
import top.charles7c.cnadmin.system.model.query.OptionQuery;
import top.charles7c.cnadmin.system.model.request.OptionRequest;
import top.charles7c.cnadmin.system.model.request.OptionResetValueRequest;
import top.charles7c.cnadmin.system.model.vo.OptionVO;
import top.charles7c.cnadmin.system.model.req.OptionReq;
import top.charles7c.cnadmin.system.model.req.OptionResetValueReq;
import top.charles7c.cnadmin.system.model.resp.OptionResp;
/**
* 参数业务接口
@@ -38,21 +38,21 @@ public interface OptionService {
* 查询条件
* @return 列表信息
*/
List<OptionVO> list(OptionQuery query);
List<OptionResp> list(OptionQuery query);
/**
* 修改参数
*
* @param request
* @param req
* 参数信息
*/
void update(List<OptionRequest> request);
void update(List<OptionReq> req);
/**
* 重置参数
*
* @param request
* @param req
* 重置信息
*/
void resetValue(OptionResetValueRequest request);
void resetValue(OptionResetValueReq req);
}

12
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleService.java
View File

@@ -21,12 +21,12 @@ import java.util.Set;
import top.charles7c.cnadmin.common.base.BaseService;
import top.charles7c.cnadmin.common.model.dto.RoleDTO;
import top.charles7c.cnadmin.common.model.vo.LabelValueVO;
import top.charles7c.cnadmin.common.model.resp.LabelValueResp;
import top.charles7c.cnadmin.system.model.entity.RoleDO;
import top.charles7c.cnadmin.system.model.query.RoleQuery;
import top.charles7c.cnadmin.system.model.request.RoleRequest;
import top.charles7c.cnadmin.system.model.vo.RoleDetailVO;
import top.charles7c.cnadmin.system.model.vo.RoleVO;
import top.charles7c.cnadmin.system.model.req.RoleReq;
import top.charles7c.cnadmin.system.model.resp.RoleDetailResp;
import top.charles7c.cnadmin.system.model.resp.RoleResp;
/**
* 角色业务接口
@@ -34,7 +34,7 @@ import top.charles7c.cnadmin.system.model.vo.RoleVO;
* @author Charles7c
* @since 2023/2/8 23:15
*/
public interface RoleService extends BaseService<RoleVO, RoleDetailVO, RoleQuery, RoleRequest> {
public interface RoleService extends BaseService<RoleResp, RoleDetailResp, RoleQuery, RoleReq> {
/**
* 构建字典
@@ -43,7 +43,7 @@ public interface RoleService extends BaseService<RoleVO, RoleDetailVO, RoleQuery
* 原始列表数据
* @return 字典列表
*/
List<LabelValueVO<Long>> buildDict(List<RoleVO> list);
List<LabelValueResp<Long>> buildDict(List<RoleResp> list);
/**
* 根据 ID 列表查询

20
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/UserService.java
View File

@@ -23,11 +23,11 @@ import org.springframework.web.multipart.MultipartFile;
import top.charles7c.cnadmin.common.base.BaseService;
import top.charles7c.cnadmin.system.model.entity.UserDO;
import top.charles7c.cnadmin.system.model.query.UserQuery;
import top.charles7c.cnadmin.system.model.request.UserBasicInfoUpdateRequest;
import top.charles7c.cnadmin.system.model.request.UserRequest;
import top.charles7c.cnadmin.system.model.request.UserRoleUpdateRequest;
import top.charles7c.cnadmin.system.model.vo.UserDetailVO;
import top.charles7c.cnadmin.system.model.vo.UserVO;
import top.charles7c.cnadmin.system.model.req.UserBasicInfoUpdateReq;
import top.charles7c.cnadmin.system.model.req.UserReq;
import top.charles7c.cnadmin.system.model.req.UserRoleUpdateReq;
import top.charles7c.cnadmin.system.model.resp.UserDetailResp;
import top.charles7c.cnadmin.system.model.resp.UserResp;
/**
* 用户业务接口
@@ -35,7 +35,7 @@ import top.charles7c.cnadmin.system.model.vo.UserVO;
* @author Charles7c
* @since 2022/12/21 21:48
*/
public interface UserService extends BaseService<UserVO, UserDetailVO, UserQuery, UserRequest> {
public interface UserService extends BaseService<UserResp, UserDetailResp, UserQuery, UserReq> {
/**
* 保存用户信息
@@ -60,12 +60,12 @@ public interface UserService extends BaseService<UserVO, UserDetailVO, UserQuery
/**
* 修改基础信息
*
* @param updateRequest
* @param updateReq
* 修改信息
* @param id
* ID
*/
void updateBasicInfo(UserBasicInfoUpdateRequest updateRequest, Long id);
void updateBasicInfo(UserBasicInfoUpdateReq updateReq, Long id);
/**
* 修改密码
@@ -114,12 +114,12 @@ public interface UserService extends BaseService<UserVO, UserDetailVO, UserQuery
/**
* 修改角色
*
* @param updateRequest
* @param updateReq
* 修改信息
* @param id
* ID
*/
void updateRole(UserRoleUpdateRequest updateRequest, Long id);
void updateRole(UserRoleUpdateReq updateReq, Long id);
/**
* 根据用户名查询

14
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/AnnouncementServiceImpl.java
View File

@@ -26,10 +26,10 @@ import top.charles7c.cnadmin.common.base.BaseServiceImpl;
import top.charles7c.cnadmin.system.mapper.AnnouncementMapper;
import top.charles7c.cnadmin.system.model.entity.AnnouncementDO;
import top.charles7c.cnadmin.system.model.query.AnnouncementQuery;
import top.charles7c.cnadmin.system.model.request.AnnouncementRequest;
import top.charles7c.cnadmin.system.model.vo.AnnouncementDetailVO;
import top.charles7c.cnadmin.system.model.vo.AnnouncementVO;
import top.charles7c.cnadmin.system.model.vo.DashboardAnnouncementVO;
import top.charles7c.cnadmin.system.model.req.AnnouncementReq;
import top.charles7c.cnadmin.system.model.resp.AnnouncementDetailResp;
import top.charles7c.cnadmin.system.model.resp.AnnouncementResp;
import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp;
import top.charles7c.cnadmin.system.service.AnnouncementService;
/**
@@ -40,11 +40,11 @@ import top.charles7c.cnadmin.system.service.AnnouncementService;
*/
@Service
@RequiredArgsConstructor
public class AnnouncementServiceImpl extends BaseServiceImpl<AnnouncementMapper, AnnouncementDO, AnnouncementVO,
AnnouncementDetailVO, AnnouncementQuery, AnnouncementRequest> implements AnnouncementService {
public class AnnouncementServiceImpl extends BaseServiceImpl<AnnouncementMapper, AnnouncementDO, AnnouncementResp,
AnnouncementDetailResp, AnnouncementQuery, AnnouncementReq> implements AnnouncementService {
@Override
public List<DashboardAnnouncementVO> listDashboard() {
public List<DashboardAnnouncementResp> listDashboard() {
return baseMapper.selectDashboardList();
}
}

46
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
View File

@@ -39,9 +39,9 @@ import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.system.mapper.DeptMapper;
import top.charles7c.cnadmin.system.model.entity.DeptDO;
import top.charles7c.cnadmin.system.model.query.DeptQuery;
import top.charles7c.cnadmin.system.model.request.DeptRequest;
import top.charles7c.cnadmin.system.model.vo.DeptDetailVO;
import top.charles7c.cnadmin.system.model.vo.DeptVO;
import top.charles7c.cnadmin.system.model.req.DeptReq;
import top.charles7c.cnadmin.system.model.resp.DeptDetailResp;
import top.charles7c.cnadmin.system.model.resp.DeptResp;
import top.charles7c.cnadmin.system.service.DeptService;
import top.charles7c.cnadmin.system.service.RoleDeptService;
import top.charles7c.cnadmin.system.service.UserService;
@@ -54,7 +54,7 @@ import top.charles7c.cnadmin.system.service.UserService;
*/
@Service
@RequiredArgsConstructor
public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO, DeptDetailVO, DeptQuery, DeptRequest>
public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptResp, DeptDetailResp, DeptQuery, DeptReq>
implements DeptService {
private final RoleDeptService roleDeptService;
@@ -63,28 +63,28 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO,
@Override
@Transactional(rollbackFor = Exception.class)
public Long add(DeptRequest request) {
String name = request.getName();
boolean isExists = this.isNameExists(name, request.getParentId(), null);
public Long add(DeptReq req) {
String name = req.getName();
boolean isExists = this.isNameExists(name, req.getParentId(), null);
CheckUtils.throwIf(isExists, "新增失败，[{}] 已存在", name);
request.setAncestors(this.getAncestors(request.getParentId()));
request.setStatus(DisEnableStatusEnum.DISABLE);
return super.add(request);
req.setAncestors(this.getAncestors(req.getParentId()));
req.setStatus(DisEnableStatusEnum.DISABLE);
return super.add(req);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(DeptRequest request, Long id) {
String name = request.getName();
boolean isExists = this.isNameExists(name, request.getParentId(), id);
public void update(DeptReq req, Long id) {
String name = req.getName();
boolean isExists = this.isNameExists(name, req.getParentId(), id);
CheckUtils.throwIf(isExists, "修改失败，[{}] 已存在", name);
DeptDO oldDept = super.getById(id);
String oldName = oldDept.getName();
DisEnableStatusEnum newStatus = request.getStatus();
DisEnableStatusEnum newStatus = req.getStatus();
Long oldParentId = oldDept.getParentId();
if (oldDept.getIsSystem()) {
CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, newStatus, "[{}] 是系统内置部门，不允许禁用", oldName);
CheckUtils.throwIfNotEqual(request.getParentId(), oldParentId, "[{}] 是系统内置部门，不允许变更上级部门", oldName);
CheckUtils.throwIfNotEqual(req.getParentId(), oldParentId, "[{}] 是系统内置部门，不允许变更上级部门", oldName);
}
// 启用/禁用部门
if (ObjectUtil.notEqual(newStatus, oldDept.getStatus())) {
@@ -98,14 +98,14 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO,
&& DisEnableStatusEnum.DISABLE.equals(oldParentDept.getStatus()), "启用 [{}] 前，请先启用其所有上级部门", oldName);
}
// 变更上级部门
if (ObjectUtil.notEqual(request.getParentId(), oldParentId)) {
if (ObjectUtil.notEqual(req.getParentId(), oldParentId)) {
// 更新祖级列表
String newAncestors = this.getAncestors(request.getParentId());
request.setAncestors(newAncestors);
String newAncestors = this.getAncestors(req.getParentId());
req.setAncestors(newAncestors);
// 更新子级的祖级列表
this.updateChildrenAncestors(newAncestors, oldDept.getAncestors(), id);
}
super.update(request, id);
super.update(req, id);
}
@Override
@@ -127,12 +127,12 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO,
@Override
public void fillDetail(Object detailObj) {
super.fillDetail(detailObj);
if (detailObj instanceof DeptDetailVO) {
DeptDetailVO detailVO = (DeptDetailVO)detailObj;
if (Objects.equals(SysConsts.SUPER_PARENT_ID, detailVO.getParentId())) {
if (detailObj instanceof DeptDetailResp) {
DeptDetailResp detail = (DeptDetailResp)detailObj;
if (Objects.equals(SysConsts.SUPER_PARENT_ID, detail.getParentId())) {
return;
}
detailVO.setParentName(ExceptionUtils.exToNull(() -> this.get(detailVO.getParentId()).getName()));
detail.setParentName(ExceptionUtils.exToNull(() -> this.get(detail.getParentId()).getName()));
}
}

32
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictItemServiceImpl.java
View File

@@ -28,14 +28,14 @@ import org.springframework.transaction.annotation.Transactional;
import top.charles7c.cnadmin.common.base.BaseServiceImpl;
import top.charles7c.cnadmin.common.constant.CacheConsts;
import top.charles7c.cnadmin.common.model.query.SortQuery;
import top.charles7c.cnadmin.common.model.vo.LabelValueVO;
import top.charles7c.cnadmin.common.model.resp.LabelValueResp;
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.system.mapper.DictItemMapper;
import top.charles7c.cnadmin.system.model.entity.DictItemDO;
import top.charles7c.cnadmin.system.model.query.DictItemQuery;
import top.charles7c.cnadmin.system.model.request.DictItemRequest;
import top.charles7c.cnadmin.system.model.vo.DictItemDetailVO;
import top.charles7c.cnadmin.system.model.vo.DictItemVO;
import top.charles7c.cnadmin.system.model.req.DictItemReq;
import top.charles7c.cnadmin.system.model.resp.DictItemDetailResp;
import top.charles7c.cnadmin.system.model.resp.DictItemResp;
import top.charles7c.cnadmin.system.service.DictItemService;
/**
@@ -48,40 +48,40 @@ import top.charles7c.cnadmin.system.service.DictItemService;
@RequiredArgsConstructor
@CacheConfig(cacheNames = CacheConsts.DICT_KEY_PREFIX)
public class DictItemServiceImpl
extends BaseServiceImpl<DictItemMapper, DictItemDO, DictItemVO, DictItemDetailVO, DictItemQuery, DictItemRequest>
extends BaseServiceImpl<DictItemMapper, DictItemDO, DictItemResp, DictItemDetailResp, DictItemQuery, DictItemReq>
implements DictItemService {
@Override
@CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class)
public Long add(DictItemRequest request) {
String value = request.getValue();
CheckUtils.throwIf(this.isValueExists(value, null, request.getDictId()), "新增失败，字典值 [{}] 已存在", value);
return super.add(request);
public Long add(DictItemReq req) {
String value = req.getValue();
CheckUtils.throwIf(this.isValueExists(value, null, req.getDictId()), "新增失败，字典值 [{}] 已存在", value);
return super.add(req);
}
@Override
@CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class)
public void update(DictItemRequest request, Long id) {
String value = request.getValue();
CheckUtils.throwIf(this.isValueExists(value, id, request.getDictId()), "修改失败，字典值 [{}] 已存在", value);
super.update(request, id);
public void update(DictItemReq req, Long id) {
String value = req.getValue();
CheckUtils.throwIf(this.isValueExists(value, id, req.getDictId()), "修改失败，字典值 [{}] 已存在", value);
super.update(req, id);
}
@Override
public List<DictItemDetailVO> listByDictId(Long dictId) {
public List<DictItemDetailResp> listByDictId(Long dictId) {
DictItemQuery dictItemQuery = new DictItemQuery();
dictItemQuery.setDictId(dictId);
SortQuery sortQuery = new SortQuery();
sortQuery.setSort(new String[] {"sort,asc"});
List<DictItemDetailVO> detailList = super.list(dictItemQuery, sortQuery, DictItemDetailVO.class);
List<DictItemDetailResp> detailList = super.list(dictItemQuery, sortQuery, DictItemDetailResp.class);
detailList.forEach(super::fillDetail);
return detailList;
}
@Override
public List<LabelValueVO> listByDictCode(String dictCode) {
public List<LabelValueResp> listByDictCode(String dictCode) {
return baseMapper.listByDictCode(dictCode);
}

37
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictServiceImpl.java
View File

@@ -34,8 +34,8 @@ import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.system.mapper.DictMapper;
import top.charles7c.cnadmin.system.model.entity.DictDO;
import top.charles7c.cnadmin.system.model.query.DictQuery;
import top.charles7c.cnadmin.system.model.request.DictRequest;
import top.charles7c.cnadmin.system.model.vo.*;
import top.charles7c.cnadmin.system.model.req.DictReq;
import top.charles7c.cnadmin.system.model.resp.*;
import top.charles7c.cnadmin.system.service.DictItemService;
import top.charles7c.cnadmin.system.service.DictService;
@@ -47,34 +47,33 @@ import top.charles7c.cnadmin.system.service.DictService;
*/
@Service
@RequiredArgsConstructor
public class DictServiceImpl extends BaseServiceImpl<DictMapper, DictDO, DictVO, DictDetailVO, DictQuery, DictRequest>
public class DictServiceImpl extends BaseServiceImpl<DictMapper, DictDO, DictResp, DictDetailResp, DictQuery, DictReq>
implements DictService {
private final DictItemService dictItemService;
@Override
@Transactional(rollbackFor = Exception.class)
public Long add(DictRequest request) {
String name = request.getName();
public Long add(DictReq req) {
String name = req.getName();
CheckUtils.throwIf(this.isNameExists(name, null), "新增失败，[{}] 已存在", name);
String code = request.getCode();
String code = req.getCode();
CheckUtils.throwIf(this.isCodeExists(code, null), "新增失败，[{}] 已存在", code);
return super.add(request);
return super.add(req);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(DictRequest request, Long id) {
String name = request.getName();
public void update(DictReq req, Long id) {
String name = req.getName();
CheckUtils.throwIf(this.isNameExists(name, id), "修改失败，[{}] 已存在", name);
String code = request.getCode();
String code = req.getCode();
CheckUtils.throwIf(this.isCodeExists(code, id), "修改失败，[{}] 已存在", code);
DictDO oldDict = super.getById(id);
if (oldDict.getIsSystem()) {
CheckUtils.throwIfNotEqual(request.getCode(), oldDict.getCode(), "[{}] 是系统内置字典，不允许修改字典编码",
oldDict.getName());
CheckUtils.throwIfNotEqual(req.getCode(), oldDict.getCode(), "[{}] 是系统内置字典，不允许修改字典编码", oldDict.getName());
}
super.update(request, id);
super.update(req, id);
}
@Override
@@ -91,17 +90,17 @@ public class DictServiceImpl extends BaseServiceImpl<DictMapper, DictDO, DictVO,
@Override
public void export(DictQuery query, SortQuery sortQuery, HttpServletResponse response) {
List<DictVO> dictList = this.list(query, sortQuery);
List<DictItemDetailVO> dictItemList = new ArrayList<>();
for (DictVO dict : dictList) {
List<DictItemDetailVO> tempDictItemList = dictItemService.listByDictId(dict.getId());
for (DictItemDetailVO dictItem : tempDictItemList) {
List<DictResp> dictList = this.list(query, sortQuery);
List<DictItemDetailResp> dictItemList = new ArrayList<>();
for (DictResp dict : dictList) {
List<DictItemDetailResp> tempDictItemList = dictItemService.listByDictId(dict.getId());
for (DictItemDetailResp dictItem : tempDictItemList) {
dictItem.setDictName(dict.getName());
dictItem.setDictCode(dict.getCode());
dictItemList.add(dictItem);
}
}
ExcelUtils.export(dictItemList, "导出数据", DictItemDetailVO.class, response);
ExcelUtils.export(dictItemList, "导出数据", DictItemDetailResp.class, response);
}
/**

30
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java
View File

@@ -35,8 +35,8 @@ import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.system.mapper.MenuMapper;
import top.charles7c.cnadmin.system.model.entity.MenuDO;
import top.charles7c.cnadmin.system.model.query.MenuQuery;
import top.charles7c.cnadmin.system.model.request.MenuRequest;
import top.charles7c.cnadmin.system.model.vo.MenuVO;
import top.charles7c.cnadmin.system.model.req.MenuReq;
import top.charles7c.cnadmin.system.model.resp.MenuResp;
import top.charles7c.cnadmin.system.service.MenuService;
/**
@@ -48,26 +48,26 @@ import top.charles7c.cnadmin.system.service.MenuService;
@Service
@RequiredArgsConstructor
@CacheConfig(cacheNames = CacheConsts.MENU_KEY_PREFIX)
public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuVO, MenuVO, MenuQuery, MenuRequest>
public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuResp, MenuResp, MenuQuery, MenuReq>
implements MenuService {
@Override
@CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class)
public Long add(MenuRequest request) {
String title = request.getTitle();
CheckUtils.throwIf(this.isNameExists(title, request.getParentId(), null), "新增失败，[{}] 已存在", title);
request.setStatus(DisEnableStatusEnum.ENABLE);
return super.add(request);
public Long add(MenuReq req) {
String title = req.getTitle();
CheckUtils.throwIf(this.isNameExists(title, req.getParentId(), null), "新增失败，[{}] 已存在", title);
req.setStatus(DisEnableStatusEnum.ENABLE);
return super.add(req);
}
@Override
@CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class)
public void update(MenuRequest request, Long id) {
String title = request.getTitle();
CheckUtils.throwIf(this.isNameExists(title, request.getParentId(), id), "修改失败，[{}] 已存在", title);
super.update(request, id);
public void update(MenuReq req, Long id) {
String title = req.getTitle();
CheckUtils.throwIf(this.isNameExists(title, req.getParentId(), id), "修改失败，[{}] 已存在", title);
super.update(req, id);
}
@Override
@@ -85,16 +85,16 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuVO,
@Override
@Cacheable(key = "#roleCode")
public List<MenuVO> listByRoleCode(String roleCode) {
public List<MenuResp> listByRoleCode(String roleCode) {
List<MenuDO> menuList = baseMapper.selectListByRoleCode(roleCode);
List<MenuVO> list = BeanUtil.copyToList(menuList, MenuVO.class);
List<MenuResp> list = BeanUtil.copyToList(menuList, MenuResp.class);
list.forEach(this::fill);
return list;
}
@Override
@Cacheable(key = "'ALL'")
public List<MenuVO> list() {
public List<MenuResp> list() {
MenuQuery menuQuery = new MenuQuery();
menuQuery.setStatus(DisEnableStatusEnum.ENABLE.getValue());
return super.list(menuQuery, null);

18
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MessageServiceImpl.java
View File

@@ -31,7 +31,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.extra.spring.SpringUtil;
import top.charles7c.cnadmin.common.model.query.PageQuery;
import top.charles7c.cnadmin.common.model.vo.PageDataVO;
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
import top.charles7c.cnadmin.common.service.CommonUserService;
import top.charles7c.cnadmin.common.util.ExceptionUtils;
import top.charles7c.cnadmin.common.util.helper.QueryHelper;
@@ -39,8 +39,8 @@ import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.system.mapper.MessageMapper;
import top.charles7c.cnadmin.system.model.entity.MessageDO;
import top.charles7c.cnadmin.system.model.query.MessageQuery;
import top.charles7c.cnadmin.system.model.request.MessageRequest;
import top.charles7c.cnadmin.system.model.vo.MessageVO;
import top.charles7c.cnadmin.system.model.req.MessageReq;
import top.charles7c.cnadmin.system.model.resp.MessageResp;
import top.charles7c.cnadmin.system.service.MessageService;
import top.charles7c.cnadmin.system.service.MessageUserService;
@@ -58,19 +58,19 @@ public class MessageServiceImpl implements MessageService {
private final MessageUserService messageUserService;
@Override
public PageDataVO<MessageVO> page(MessageQuery query, PageQuery pageQuery) {
public PageDataResp<MessageResp> page(MessageQuery query, PageQuery pageQuery) {
QueryWrapper<MessageDO> queryWrapper = QueryHelper.build(query);
queryWrapper.apply(null != query.getUserId(), "t2.user_id={0}", query.getUserId())
.apply(null != query.getIsRead(), "t2.is_read={0}", query.getIsRead());
IPage<MessageVO> page = baseMapper.selectVoPage(pageQuery.toPage(), queryWrapper);
IPage<MessageResp> page = baseMapper.selectPageByUserId(pageQuery.toPage(), queryWrapper);
page.getRecords().forEach(this::fill);
return PageDataVO.build(page);
return PageDataResp.build(page);
}
@Override
public void add(MessageRequest request, List<Long> userIdList) {
public void add(MessageReq req, List<Long> userIdList) {
CheckUtils.throwIf(() -> CollUtil.isEmpty(userIdList), "消息接收人不能为空");
MessageDO message = BeanUtil.copyProperties(request, MessageDO.class);
MessageDO message = BeanUtil.copyProperties(req, MessageDO.class);
baseMapper.insert(message);
messageUserService.add(message.getId(), userIdList);
}
@@ -88,7 +88,7 @@ public class MessageServiceImpl implements MessageService {
* @param message
* 待填充信息
*/
private void fill(MessageVO message) {
private void fill(MessageResp message) {
Long createUser = message.getCreateUser();
if (null == createUser) {
return;

18
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MessageUserServiceImpl.java
View File

@@ -31,8 +31,8 @@ import top.charles7c.cnadmin.common.enums.MessageTypeEnum;
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.system.mapper.MessageUserMapper;
import top.charles7c.cnadmin.system.model.entity.MessageUserDO;
import top.charles7c.cnadmin.system.model.vo.MessageTypeUnreadVO;
import top.charles7c.cnadmin.system.model.vo.MessageUnreadVO;
import top.charles7c.cnadmin.system.model.resp.MessageTypeUnreadResp;
import top.charles7c.cnadmin.system.model.resp.MessageUnreadResp;
import top.charles7c.cnadmin.system.service.MessageUserService;
/**
@@ -48,17 +48,17 @@ public class MessageUserServiceImpl implements MessageUserService {
private final MessageUserMapper baseMapper;
@Override
public MessageUnreadVO countUnreadMessageByUserId(Long userId, Boolean isDetail) {
MessageUnreadVO result = new MessageUnreadVO();
public MessageUnreadResp countUnreadMessageByUserId(Long userId, Boolean isDetail) {
MessageUnreadResp result = new MessageUnreadResp();
Long total = 0L;
if (Boolean.TRUE.equals(isDetail)) {
List<MessageTypeUnreadVO> detailList = new ArrayList<>();
List<MessageTypeUnreadResp> detailList = new ArrayList<>();
for (MessageTypeEnum messageType : MessageTypeEnum.values()) {
MessageTypeUnreadVO vo = new MessageTypeUnreadVO();
vo.setType(messageType);
MessageTypeUnreadResp resp = new MessageTypeUnreadResp();
resp.setType(messageType);
Long count = baseMapper.selectUnreadCountByUserIdAndType(userId, messageType.getValue());
vo.setCount(count);
detailList.add(vo);
resp.setCount(count);
detailList.add(resp);
total += count;
}
result.setDetails(detailList);

18
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/OptionServiceImpl.java
View File

@@ -31,9 +31,9 @@ import top.charles7c.cnadmin.common.util.helper.QueryHelper;
import top.charles7c.cnadmin.system.mapper.OptionMapper;
import top.charles7c.cnadmin.system.model.entity.OptionDO;
import top.charles7c.cnadmin.system.model.query.OptionQuery;
import top.charles7c.cnadmin.system.model.request.OptionRequest;
import top.charles7c.cnadmin.system.model.request.OptionResetValueRequest;
import top.charles7c.cnadmin.system.model.vo.OptionVO;
import top.charles7c.cnadmin.system.model.req.OptionReq;
import top.charles7c.cnadmin.system.model.req.OptionResetValueReq;
import top.charles7c.cnadmin.system.model.resp.OptionResp;
import top.charles7c.cnadmin.system.service.OptionService;
/**
@@ -50,19 +50,19 @@ public class OptionServiceImpl implements OptionService {
private final OptionMapper baseMapper;
@Override
public List<OptionVO> list(OptionQuery query) {
return BeanUtil.copyToList(baseMapper.selectList(QueryHelper.build(query)), OptionVO.class);
public List<OptionResp> list(OptionQuery query) {
return BeanUtil.copyToList(baseMapper.selectList(QueryHelper.build(query)), OptionResp.class);
}
@Override
@CacheEvict(allEntries = true)
public void update(List<OptionRequest> request) {
baseMapper.updateBatchById(BeanUtil.copyToList(request, OptionDO.class));
public void update(List<OptionReq> req) {
baseMapper.updateBatchById(BeanUtil.copyToList(req, OptionDO.class));
}
@Override
@CacheEvict(allEntries = true)
public void resetValue(OptionResetValueRequest request) {
baseMapper.lambdaUpdate().set(OptionDO::getValue, null).in(OptionDO::getCode, request.getCode()).update();
public void resetValue(OptionResetValueReq req) {
baseMapper.lambdaUpdate().set(OptionDO::getValue, null).in(OptionDO::getCode, req.getCode()).update();
}
}

64
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
View File

@@ -36,15 +36,15 @@ import top.charles7c.cnadmin.common.constant.SysConsts;
import top.charles7c.cnadmin.common.enums.DataScopeEnum;
import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
import top.charles7c.cnadmin.common.model.dto.RoleDTO;
import top.charles7c.cnadmin.common.model.vo.LabelValueVO;
import top.charles7c.cnadmin.common.model.resp.LabelValueResp;
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.system.mapper.RoleMapper;
import top.charles7c.cnadmin.system.model.entity.RoleDO;
import top.charles7c.cnadmin.system.model.query.RoleQuery;
import top.charles7c.cnadmin.system.model.request.RoleRequest;
import top.charles7c.cnadmin.system.model.vo.MenuVO;
import top.charles7c.cnadmin.system.model.vo.RoleDetailVO;
import top.charles7c.cnadmin.system.model.vo.RoleVO;
import top.charles7c.cnadmin.system.model.req.RoleReq;
import top.charles7c.cnadmin.system.model.resp.MenuResp;
import top.charles7c.cnadmin.system.model.resp.RoleDetailResp;
import top.charles7c.cnadmin.system.model.resp.RoleResp;
import top.charles7c.cnadmin.system.service.*;
/**
@@ -55,7 +55,7 @@ import top.charles7c.cnadmin.system.service.*;
*/
@Service
@RequiredArgsConstructor
public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleVO, RoleDetailVO, RoleQuery, RoleRequest>
public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleResp, RoleDetailResp, RoleQuery, RoleReq>
implements RoleService {
private final MenuService menuService;
@@ -66,51 +66,49 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleVO,
@Override
@Transactional(rollbackFor = Exception.class)
public Long add(RoleRequest request) {
String name = request.getName();
public Long add(RoleReq req) {
String name = req.getName();
CheckUtils.throwIf(this.isNameExists(name, null), "新增失败，[{}] 已存在", name);
String code = request.getCode();
String code = req.getCode();
CheckUtils.throwIf(this.isCodeExists(code, null), "新增失败，[{}] 已存在", code);
// 新增信息
request.setStatus(DisEnableStatusEnum.ENABLE);
Long roleId = super.add(request);
req.setStatus(DisEnableStatusEnum.ENABLE);
Long roleId = super.add(req);
// 保存角色和菜单关联
roleMenuService.save(request.getMenuIds(), roleId);
roleMenuService.save(req.getMenuIds(), roleId);
// 保存角色和部门关联
roleDeptService.save(request.getDeptIds(), roleId);
roleDeptService.save(req.getDeptIds(), roleId);
return roleId;
}
@Override
@CacheEvict(cacheNames = CacheConsts.MENU_KEY_PREFIX, key = "#request.code == 'admin' ? 'ALL' : #request.code")
@CacheEvict(cacheNames = CacheConsts.MENU_KEY_PREFIX, key = "#req.code == 'admin' ? 'ALL' : #req.code")
@Transactional(rollbackFor = Exception.class)
public void update(RoleRequest request, Long id) {
String name = request.getName();
public void update(RoleReq req, Long id) {
String name = req.getName();
CheckUtils.throwIf(this.isNameExists(name, id), "修改失败，[{}] 已存在", name);
String code = request.getCode();
String code = req.getCode();
CheckUtils.throwIf(this.isCodeExists(code, id), "修改失败，[{}] 已存在", code);
RoleDO oldRole = super.getById(id);
DataScopeEnum oldDataScope = oldRole.getDataScope();
String oldCode = oldRole.getCode();
if (oldRole.getIsSystem()) {
CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, request.getStatus(), "[{}] 是系统内置角色，不允许禁用",
oldRole.getName());
CheckUtils.throwIfNotEqual(request.getCode(), oldCode, "[{}] 是系统内置角色，不允许修改角色编码", oldRole.getName());
CheckUtils.throwIfNotEqual(request.getDataScope(), oldDataScope, "[{}] 是系统内置角色，不允许修改角色数据权限",
CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, req.getStatus(), "[{}] 是系统内置角色，不允许禁用",
oldRole.getName());
CheckUtils.throwIfNotEqual(req.getCode(), oldCode, "[{}] 是系统内置角色，不允许修改角色编码", oldRole.getName());
CheckUtils.throwIfNotEqual(req.getDataScope(), oldDataScope, "[{}] 是系统内置角色，不允许修改角色数据权限", oldRole.getName());
}
// 更新信息
super.update(request, id);
super.update(req, id);
// 更新关联信息
if (!SysConsts.ADMIN_ROLE_CODE.equals(oldRole.getCode())) {
// 保存角色和菜单关联
boolean isSaveMenuSuccess = roleMenuService.save(request.getMenuIds(), id);
boolean isSaveMenuSuccess = roleMenuService.save(req.getMenuIds(), id);
// 保存角色和部门关联
boolean isSaveDeptSuccess = roleDeptService.save(request.getDeptIds(), id);
boolean isSaveDeptSuccess = roleDeptService.save(req.getDeptIds(), id);
// 如果角色编码、功能权限或数据权限有变更，则清除关联的在线用户（重新登录以获取最新角色权限）
if (ObjectUtil.notEqual(request.getCode(), oldCode)
|| ObjectUtil.notEqual(request.getDataScope(), oldDataScope) || isSaveMenuSuccess
|| isSaveDeptSuccess) {
if (ObjectUtil.notEqual(req.getCode(), oldCode) || ObjectUtil.notEqual(req.getDataScope(), oldDataScope)
|| isSaveMenuSuccess || isSaveDeptSuccess) {
onlineUserService.cleanByRoleId(id);
}
}
@@ -136,12 +134,12 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleVO,
@Override
public void fillDetail(Object detailObj) {
super.fillDetail(detailObj);
if (detailObj instanceof RoleDetailVO) {
RoleDetailVO detailVO = (RoleDetailVO)detailObj;
if (detailObj instanceof RoleDetailResp) {
RoleDetailResp detailVO = (RoleDetailResp)detailObj;
Long roleId = detailVO.getId();
if (SysConsts.ADMIN_ROLE_CODE.equals(detailVO.getCode())) {
List<MenuVO> list = menuService.list(null, null);
List<Long> menuIds = list.stream().map(MenuVO::getId).collect(Collectors.toList());
List<MenuResp> list = menuService.list(null, null);
List<Long> menuIds = list.stream().map(MenuResp::getId).collect(Collectors.toList());
detailVO.setMenuIds(menuIds);
} else {
detailVO.setMenuIds(roleMenuService.listMenuIdByRoleIds(CollUtil.newArrayList(roleId)));
@@ -151,11 +149,11 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleVO,
}
@Override
public List<LabelValueVO<Long>> buildDict(List<RoleVO> list) {
public List<LabelValueResp<Long>> buildDict(List<RoleResp> list) {
if (CollUtil.isEmpty(list)) {
return new ArrayList<>(0);
}
return list.stream().map(r -> new LabelValueVO<>(r.getName(), r.getId())).collect(Collectors.toList());
return list.stream().map(r -> new LabelValueResp<>(r.getName(), r.getId())).collect(Collectors.toList());
}
@Override

56
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
View File

@@ -52,11 +52,11 @@ import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.system.mapper.UserMapper;
import top.charles7c.cnadmin.system.model.entity.UserDO;
import top.charles7c.cnadmin.system.model.query.UserQuery;
import top.charles7c.cnadmin.system.model.request.UserBasicInfoUpdateRequest;
import top.charles7c.cnadmin.system.model.request.UserRequest;
import top.charles7c.cnadmin.system.model.request.UserRoleUpdateRequest;
import top.charles7c.cnadmin.system.model.vo.UserDetailVO;
import top.charles7c.cnadmin.system.model.vo.UserVO;
import top.charles7c.cnadmin.system.model.req.UserBasicInfoUpdateReq;
import top.charles7c.cnadmin.system.model.req.UserReq;
import top.charles7c.cnadmin.system.model.req.UserRoleUpdateReq;
import top.charles7c.cnadmin.system.model.resp.UserDetailResp;
import top.charles7c.cnadmin.system.model.resp.UserResp;
import top.charles7c.cnadmin.system.service.DeptService;
import top.charles7c.cnadmin.system.service.RoleService;
import top.charles7c.cnadmin.system.service.UserRoleService;
@@ -71,7 +71,7 @@ import top.charles7c.cnadmin.system.service.UserService;
@Service
@RequiredArgsConstructor
@CacheConfig(cacheNames = CacheConsts.USER_KEY_PREFIX)
public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO, UserDetailVO, UserQuery, UserRequest>
public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserResp, UserDetailResp, UserQuery, UserReq>
implements UserService, CommonUserService {
private final UserRoleService userRoleService;
@@ -89,34 +89,34 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
@Override
@Transactional(rollbackFor = Exception.class)
public Long add(UserRequest request) {
String username = request.getUsername();
public Long add(UserReq req) {
String username = req.getUsername();
CheckUtils.throwIf(this.isNameExists(username, null), "新增失败，[{}] 已存在", username);
String email = request.getEmail();
String email = req.getEmail();
CheckUtils.throwIf(StrUtil.isNotBlank(email) && this.isEmailExists(email, null), "新增失败，[{}] 已存在", email);
String phone = request.getPhone();
String phone = req.getPhone();
CheckUtils.throwIf(StrUtil.isNotBlank(phone) && this.isPhoneExists(phone, null), "新增失败，[{}] 已存在", phone);
// 新增信息
request.setStatus(DisEnableStatusEnum.ENABLE);
Long userId = super.add(request);
req.setStatus(DisEnableStatusEnum.ENABLE);
Long userId = super.add(req);
baseMapper.lambdaUpdate()
.set(UserDO::getPassword, SecureUtils.md5Salt(SysConsts.DEFAULT_PASSWORD, userId.toString()))
.set(UserDO::getPwdResetTime, LocalDateTime.now()).eq(UserDO::getId, userId).update();
// 保存用户和角色关联
userRoleService.save(request.getRoleIds(), userId);
userRoleService.save(req.getRoleIds(), userId);
return userId;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(UserRequest request, Long id) {
String username = request.getUsername();
public void update(UserReq req, Long id) {
String username = req.getUsername();
CheckUtils.throwIf(this.isNameExists(username, id), "修改失败，[{}] 已存在", username);
String email = request.getEmail();
String email = req.getEmail();
CheckUtils.throwIf(StrUtil.isNotBlank(email) && this.isEmailExists(email, id), "修改失败，[{}] 已存在", email);
String phone = request.getPhone();
String phone = req.getPhone();
CheckUtils.throwIf(StrUtil.isNotBlank(phone) && this.isPhoneExists(phone, id), "修改失败，[{}] 已存在", phone);
DisEnableStatusEnum newStatus = request.getStatus();
DisEnableStatusEnum newStatus = req.getStatus();
CheckUtils.throwIf(
DisEnableStatusEnum.DISABLE.equals(newStatus) && ObjectUtil.equal(id, LoginHelper.getUserId()),
"不允许禁用当前用户");
@@ -125,13 +125,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, newStatus, "[{}] 是系统内置用户，不允许禁用",
oldUser.getNickname());
Collection<Long> disjunctionRoleIds =
CollUtil.disjunction(request.getRoleIds(), userRoleService.listRoleIdByUserId(id));
CollUtil.disjunction(req.getRoleIds(), userRoleService.listRoleIdByUserId(id));
CheckUtils.throwIfNotEmpty(disjunctionRoleIds, "[{}] 是系统内置用户，不允许变更所属角色", oldUser.getNickname());
}
// 更新信息
super.update(request, id);
super.update(req, id);
// 保存用户和角色关联
userRoleService.save(request.getRoleIds(), id);
userRoleService.save(req.getRoleIds(), id);
}
@Override
@@ -152,8 +152,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
@Override
public void fillDetail(Object detailObj) {
super.fillDetail(detailObj);
if (detailObj instanceof UserDetailVO) {
UserDetailVO detailVO = (UserDetailVO)detailObj;
if (detailObj instanceof UserDetailResp) {
UserDetailResp detailVO = (UserDetailResp)detailObj;
detailVO.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detailVO.getDeptId()).getName()));
List<Long> roleIdList = userRoleService.listRoleIdByUserId(detailVO.getId());
detailVO.setRoleIds(roleIdList);
@@ -189,10 +189,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
@Override
@Transactional(rollbackFor = Exception.class)
public void updateBasicInfo(UserBasicInfoUpdateRequest updateRequest, Long id) {
public void updateBasicInfo(UserBasicInfoUpdateReq updateReq, Long id) {
super.getById(id);
baseMapper.lambdaUpdate().set(UserDO::getNickname, updateRequest.getNickname())
.set(UserDO::getGender, updateRequest.getGender()).eq(UserDO::getId, id).update();
baseMapper.lambdaUpdate().set(UserDO::getNickname, updateReq.getNickname())
.set(UserDO::getGender, updateReq.getGender()).eq(UserDO::getId, id).update();
}
@Override
@@ -244,10 +244,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
@Override
@Transactional(rollbackFor = Exception.class)
public void updateRole(UserRoleUpdateRequest updateRequest, Long id) {
public void updateRole(UserRoleUpdateReq updateReq, Long id) {
super.getById(id);
// 保存用户和角色关联
userRoleService.save(updateRequest.getRoleIds(), id);
userRoleService.save(updateReq.getRoleIds(), id);
}
@Override

2
continew-admin-system/src/main/resources/mapper/AnnouncementMapper.xml
View File

@@ -3,7 +3,7 @@
<mapper namespace="top.charles7c.cnadmin.system.mapper.AnnouncementMapper">
<select id="selectDashboardList"
resultType="top.charles7c.cnadmin.system.model.vo.DashboardAnnouncementVO">
resultType="top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp">
SELECT
`id`, `title`, `type`
FROM `sys_announcement`

2
continew-admin-system/src/main/resources/mapper/DictItemMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="top.charles7c.cnadmin.system.mapper.DictItemMapper">
<select id="listByDictCode" resultType="top.charles7c.cnadmin.common.model.vo.LabelValueVO">
<select id="listByDictCode" resultType="top.charles7c.cnadmin.common.model.resp.LabelValueResp">
SELECT t1.`label`, t1.`value`, t1.`color`
FROM `sys_dict_item` AS t1
LEFT JOIN `sys_dict` AS t2 ON t1.`dict_id` = t2.`id`

2
continew-admin-system/src/main/resources/mapper/MessageMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="top.charles7c.cnadmin.system.mapper.MessageMapper">
<select id="selectVoPage" resultType="top.charles7c.cnadmin.system.model.vo.MessageVO">
<select id="selectPageByUserId" resultType="top.charles7c.cnadmin.system.model.resp.MessageResp">
SELECT
t1.*,
t2.`user_id`,