From a2d1723244ce9440ec1d27a77eb289485ea1fa20 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sun, 11 Jun 2023 17:05:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E5=8C=85=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/sys/api/SysUserServiceApi.java | 4 +- .../kernel/sys/api/pojo/SimpleUserDTO.java | 57 ++++++ .../roses/kernel/sys/api/pojo/SysUserDTO.java | 164 ------------------ .../org/factory/OrgApproverFactory.java | 4 +- 4 files changed, 61 insertions(+), 168 deletions(-) create mode 100644 kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/SimpleUserDTO.java delete mode 100644 kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/SysUserDTO.java diff --git a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java index 83af87f6e..b3bb09889 100644 --- a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java +++ b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java @@ -24,7 +24,7 @@ */ package cn.stylefeng.roses.kernel.sys.api; -import cn.stylefeng.roses.kernel.sys.api.pojo.SysUserDTO; +import cn.stylefeng.roses.kernel.sys.api.pojo.SimpleUserDTO; /** * 基础核心业务Api @@ -41,6 +41,6 @@ public interface SysUserServiceApi { * @author majianguo * @since 2021/1/9 19:00 */ - SysUserDTO getUserInfoByUserId(Long userId); + SimpleUserDTO getUserInfoByUserId(Long userId); } diff --git a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/SimpleUserDTO.java b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/SimpleUserDTO.java new file mode 100644 index 000000000..5cdbf9281 --- /dev/null +++ b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/SimpleUserDTO.java @@ -0,0 +1,57 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点，可申请商业授权 + */ +package cn.stylefeng.roses.kernel.sys.api.pojo; + +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import lombok.Data; + +/** + * 用户信息的简单包装 + * + * @author fengshuonan + * @since 2023/6/11 17:05 + */ +@Data +public class SimpleUserDTO { + + /** + * 主键 + */ + @ChineseDescription("主键") + private Long userId; + + /** + * 姓名 + */ + @ChineseDescription("姓名") + private String realName; + + /** + * 头像地址 + */ + @ChineseDescription("头像地址") + private String avatarUrl; + +} diff --git a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/SysUserDTO.java b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/SysUserDTO.java deleted file mode 100644 index adff90f21..000000000 --- a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/SysUserDTO.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.sys.api.pojo; - -import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * 系统用户结果 - * - * @author fengshuonan - * @since 2020/4/2 9:19 - */ -@Data -public class SysUserDTO { - - /** - * 主键 - */ - @ChineseDescription("主键") - private Long userId; - - /** - * 账号 - */ - @ChineseDescription("账号") - private String account; - - /** - * 昵称 - */ - @ChineseDescription("昵称") - private String nickName; - - /** - * 姓名 - */ - @ChineseDescription("姓名") - private String realName; - - /** - * 头像 - */ - @ChineseDescription("头像") - private Long avatar; - - /** - * 生日 - */ - @ChineseDescription("生日") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date birthday; - - /** - * 性别（M-男，F-女） - */ - @ChineseDescription("性别（M-男，F-女）") - private String sex; - - /** - * 邮箱 - */ - @ChineseDescription("邮箱") - private String email; - - /** - * 手机 - */ - @ChineseDescription("手机") - private String phone; - - /** - * 密码 - */ - @ChineseDescription("密码") - private String password; - - /** - * 电话 - */ - @ChineseDescription("电话") - private String tel; - - /** - * 用户所属机构 - */ - @ChineseDescription("用户所属机构") - private Long orgId; - - /** - * 用户所属机构名称 - */ - @ChineseDescription("用户所属机构名称") - private String orgName; - - /** - * 用户所属机构的职务 - */ - @ChineseDescription("用户所属机构的职务") - private Long positionId; - - /** - * 职务名称 - */ - @ChineseDescription("职务名称") - private String positionName; - - /** - * 状态 - */ - @ChineseDescription("状态") - private Integer statusFlag; - - /** - * 用户角色id - */ - @ChineseDescription("用户角色id") - private List grantRoleIdList; - - /** - * 是否是超级管理员，超级管理员可以拥有所有权限（Y-是，N-否） - */ - @ChineseDescription("是否是超级管理员，超级管理员可以拥有所有权限（Y-是，N-否）") - private String superAdminFlag; - - /** - * 是否密码重试次数过多，当密码重试次数超过5次这个状态就会激活 - */ - @ChineseDescription("是否密码重试次数过多") - private Boolean loginErrorCountFlag = false; - - /** - * 头像地址 - */ - @ChineseDescription("头像地址") - private String avatarUrl; - -} diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/factory/OrgApproverFactory.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/factory/OrgApproverFactory.java index f709d28ff..9b96e7209 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/factory/OrgApproverFactory.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/factory/OrgApproverFactory.java @@ -3,7 +3,7 @@ package cn.stylefeng.roses.kernel.sys.modular.org.factory; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.spring.SpringUtil; import cn.stylefeng.roses.kernel.sys.api.SysUserServiceApi; -import cn.stylefeng.roses.kernel.sys.api.pojo.SysUserDTO; +import cn.stylefeng.roses.kernel.sys.api.pojo.SimpleUserDTO; import cn.stylefeng.roses.kernel.sys.modular.org.entity.HrOrgApprover; import cn.stylefeng.roses.kernel.sys.modular.org.pojo.response.ApproverBindUserItem; @@ -41,7 +41,7 @@ public class OrgApproverFactory { // 获取用户详情信息 SysUserServiceApi sysUserServiceApi = SpringUtil.getBean(SysUserServiceApi.class); - SysUserDTO sysUserDTO = sysUserServiceApi.getUserInfoByUserId(userId); + SimpleUserDTO sysUserDTO = sysUserServiceApi.getUserInfoByUserId(userId); bindUserItem.setName(sysUserDTO.getRealName()); bindUserItem.setAvatarUrl(sysUserDTO.getAvatarUrl());