diff --git a/yudao-module-farm/pom.xml b/yudao-module-farm/pom.xml index 80d2e0c1..f0136113 100644 --- a/yudao-module-farm/pom.xml +++ b/yudao-module-farm/pom.xml @@ -133,28 +133,21 @@ org.springframework spring-websocket - - cn.iocoder.boot - yudao-module-system - 2025.08-SNAPSHOT - compile - - - - - - - - - - + + + + + + + + - - - - + + + + diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/personnelmanagement/SystemUserDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/personnelmanagement/SystemUserDO.java new file mode 100644 index 00000000..9d0f1106 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/personnelmanagement/SystemUserDO.java @@ -0,0 +1,94 @@ +package cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement; + +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import lombok.*; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; + +import java.time.LocalDateTime; +import java.util.Set; + +/** + * 管理后台的用户 DO + * + * @author 芋道源码 + */ +@TableName(value = "system_users", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字,所以使用 system_users +@KeySequence("system_users_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SystemUserDO extends TenantBaseDO { + + /** + * 用户ID + */ + @TableId + private Long id; + /** + * 用户账号 + */ + private String username; + /** + * 加密后的密码 + *

+ * 因为目前使用 {@link BCryptPasswordEncoder} 加密器,所以无需自己处理 salt 盐 + */ + private String password; + /** + * 用户昵称 + */ + private String nickname; + /** + * 备注 + */ + private String remark; + /** + * 部门 ID + */ + private Long deptId; + /** + * 岗位编号数组 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + private Set postIds; + /** + * 用户邮箱 + */ + private String email; + /** + * 手机号码 + */ + private String mobile; + /** + * 用户性别 + *

+ */ + private Integer sex; + /** + * 用户头像 + */ + private String avatar; + /** + * 帐号状态 + *

+ * 枚举 {@link CommonStatusEnum} + */ + private Integer status; + /** + * 最后登录IP + */ + private String loginIp; + /** + * 最后登录时间 + */ + private LocalDateTime loginDate; + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java new file mode 100644 index 00000000..5db92c6f --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java @@ -0,0 +1,7 @@ +package cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement; + +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.SystemUserDO; + +public interface SystemUserMapper extends BaseMapperX { +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java index bc4caf30..2dacab1f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java @@ -9,9 +9,9 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.SystemUserDO; import cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement.PersonnelManagementMapper; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; +import cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement.SystemUserMapper; import jakarta.annotation.Resource; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -34,7 +34,7 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic @Resource private PersonnelManagementMapper personnelManagementMapper; @Resource - private AdminUserMapper userMapper; + private SystemUserMapper userMapper; @Resource private PasswordEncoder passwordEncoder; @@ -49,7 +49,7 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic // 处理图片集合转换 handleImageConversion(personnelManagement, createReqVO); - AdminUserDO adminUserDO = new AdminUserDO(); + SystemUserDO adminUserDO = new SystemUserDO(); adminUserDO.setUsername(personnelManagement.getPhone()); adminUserDO.setNickname(personnelManagement.getName()); adminUserDO.setMobile(personnelManagement.getPhone()); diff --git a/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml b/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml new file mode 100644 index 00000000..6aceb4ca --- /dev/null +++ b/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/PersonnelManagementDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/PersonnelDO.java similarity index 96% rename from yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/PersonnelManagementDO.java rename to yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/PersonnelDO.java index eae66364..0a81d9da 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/PersonnelManagementDO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/PersonnelDO.java @@ -19,7 +19,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class PersonnelManagementDO extends BaseDO { +public class PersonnelDO extends BaseDO { /** * 人员id diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelMapper.java index 64449fc5..e593e51c 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelMapper.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/PersonnelMapper.java @@ -1,10 +1,10 @@ package cn.iocoder.yudao.module.system.dal.mysql.user; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.system.dal.dataobject.user.PersonnelManagementDO; +import cn.iocoder.yudao.module.system.dal.dataobject.user.PersonnelDO; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface PersonnelMapper extends BaseMapperX { +public interface PersonnelMapper extends BaseMapperX { } diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index 66e61edd..638d3f6b 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -23,7 +23,7 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqV import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.PersonnelManagementDO; +import cn.iocoder.yudao.module.system.dal.dataobject.user.PersonnelDO; import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper; import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; import cn.iocoder.yudao.module.system.dal.mysql.user.PersonnelMapper; @@ -116,7 +116,7 @@ public class AdminUserServiceImpl implements AdminUserService { // 3. 记录操作日志上下文 LogRecordContext.putVariable("user", user); - PersonnelManagementDO userDo = new PersonnelManagementDO(); + PersonnelDO userDo = new PersonnelDO(); userDo.setName(user.getNickname()); userDo.setPhone(user.getMobile()); userDo.setDepartment(user.getDeptId().toString());