Browse Source

账号-用户-群组,底层逻辑重构

jiapu 4 months ago
parent
commit
d397f9e97e
26 changed files with 556 additions and 1162 deletions
  1. 5 6
      code/backend/src/main/java/com/aijiuyi/admin/common/interceptor/TokenInterceptor.java
  2. 8 8
      code/backend/src/main/java/com/aijiuyi/admin/common/service/impl/SysLogServiceImpl.java
  3. 5 5
      code/backend/src/main/java/com/aijiuyi/admin/controller/AdminController.java
  4. 18 70
      code/backend/src/main/java/com/aijiuyi/admin/controller/AppUserController.java
  5. 32 50
      code/backend/src/main/java/com/aijiuyi/admin/controller/AuthController.java
  6. 5 8
      code/backend/src/main/java/com/aijiuyi/admin/controller/dto/UserProfileDTO.java
  7. 58 0
      code/backend/src/main/java/com/aijiuyi/admin/entity/AdminUser.java
  8. 5 31
      code/backend/src/main/java/com/aijiuyi/admin/entity/AppUser.java
  9. 5 8
      code/backend/src/main/java/com/aijiuyi/admin/entity/UserProfile.java
  10. 12 0
      code/backend/src/main/java/com/aijiuyi/admin/mapper/AdminUserMapper.java
  11. 26 6
      code/backend/src/main/java/com/aijiuyi/admin/service/AdminService.java
  12. 7 56
      code/backend/src/main/java/com/aijiuyi/admin/service/AppUserService.java
  13. 144 79
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/AdminServiceImpl.java
  14. 19 72
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/AppDeviceGroupServiceImpl.java
  15. 34 332
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/AppUserServiceImpl.java
  16. 5 5
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/ContentArticleServiceImpl.java
  17. 4 4
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/DeviceServiceImpl.java
  18. 3 3
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/PlanServiceImpl.java
  19. 7 8
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserCategoryServiceImpl.java
  20. 5 8
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserDeviceServiceImpl.java
  21. 49 78
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserProfileServiceImpl.java
  22. 58 0
      code/backend/src/main/resources/db/migration_admin_user.sql
  23. 6 12
      code/backend/src/main/resources/mapper/UserProfileMapper.xml
  24. 4 5
      code/frontend/src/api/auth.js
  25. 7 32
      code/frontend/src/api/user.js
  26. 25 276
      code/frontend/src/views/user/app-user/index.vue

+ 5 - 6
code/backend/src/main/java/com/aijiuyi/admin/common/interceptor/TokenInterceptor.java

@@ -6,9 +6,9 @@ import com.aijiuyi.admin.common.constant.ResultCode;
 import com.aijiuyi.admin.common.context.RequestContext;
 import com.aijiuyi.admin.common.entity.Result;
 import com.aijiuyi.admin.entity.AdminPermission;
-import com.aijiuyi.admin.entity.AppUser;
+import com.aijiuyi.admin.entity.AdminUser;
 import com.aijiuyi.admin.mapper.AdminPermissionMapper;
-import com.aijiuyi.admin.mapper.AppUserMapper;
+import com.aijiuyi.admin.mapper.AdminUserMapper;
 import com.aijiuyi.admin.common.util.LogUtil;
 import com.aijiuyi.admin.common.util.RedisUtil;
 import com.aijiuyi.admin.common.util.TokenUtil;
@@ -44,7 +44,6 @@ import java.util.UUID;
 @Component
 public class TokenInterceptor implements HandlerInterceptor {
 
-    private static final int ADMIN_USER_TYPE = 3;
     private static final int SUPER_ADMIN_ROLE = 1;
 
     /** Token 在请求头中的 key */
@@ -79,7 +78,7 @@ public class TokenInterceptor implements HandlerInterceptor {
     private AuthProperties authProperties;
 
     @Autowired
-    private AppUserMapper appUserMapper;
+    private AdminUserMapper adminUserMapper;
 
     @Autowired
     private AdminPermissionMapper adminPermissionMapper;
@@ -206,8 +205,8 @@ public class TokenInterceptor implements HandlerInterceptor {
             return true;
         }
 
-        AppUser admin = appUserMapper.selectById(userId);
-        if (admin == null || !Integer.valueOf(ADMIN_USER_TYPE).equals(admin.getUserType())) {
+        AdminUser admin = adminUserMapper.selectById(userId);
+        if (admin == null) {
             writeErrorResponse(response, ResultCode.FORBIDDEN);
             return false;
         }

+ 8 - 8
code/backend/src/main/java/com/aijiuyi/admin/common/service/impl/SysLogServiceImpl.java

@@ -4,8 +4,8 @@ import com.aijiuyi.admin.common.entity.SysLog;
 import com.aijiuyi.admin.common.service.SysLogService;
 import com.aijiuyi.admin.common.util.LogUtil;
 import com.aijiuyi.admin.controller.dto.SysLogQueryDTO;
-import com.aijiuyi.admin.entity.AppUser;
-import com.aijiuyi.admin.mapper.AppUserMapper;
+import com.aijiuyi.admin.entity.AdminUser;
+import com.aijiuyi.admin.mapper.AdminUserMapper;
 import com.aijiuyi.admin.mapper.SysLogMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ public class SysLogServiceImpl implements SysLogService {
     private SysLogMapper sysLogMapper;
 
     @Autowired
-    private AppUserMapper appUserMapper;
+    private AdminUserMapper adminUserMapper;
 
     /**
      * 异步保存操作日志
@@ -80,13 +80,13 @@ public class SysLogServiceImpl implements SysLogService {
      */
     @Override
     public List<Map<String, Object>> getSysUserOptions() {
-        List<AppUser> users = appUserMapper.selectList(
-                new LambdaQueryWrapper<AppUser>()
-                        .select(AppUser::getId, AppUser::getUsername, AppUser::getNickname)
-                        .orderByAsc(AppUser::getId)
+        List<AdminUser> users = adminUserMapper.selectList(
+                new LambdaQueryWrapper<AdminUser>()
+                        .select(AdminUser::getId, AdminUser::getUsername, AdminUser::getNickname)
+                        .orderByAsc(AdminUser::getId)
         );
         List<Map<String, Object>> options = new ArrayList<>();
-        for (AppUser user : users) {
+        for (AdminUser user : users) {
             Map<String, Object> option = new HashMap<>();
             option.put("id", user.getId());
             // 优先展示昵称,无昵称则展示用户名

+ 5 - 5
code/backend/src/main/java/com/aijiuyi/admin/controller/AdminController.java

@@ -4,7 +4,7 @@ import com.aijiuyi.admin.common.annotation.Log;
 import com.aijiuyi.admin.common.entity.Result;
 import com.aijiuyi.admin.common.enums.OperationType;
 import com.aijiuyi.admin.controller.dto.AdminQueryDTO;
-import com.aijiuyi.admin.entity.AppUser;
+import com.aijiuyi.admin.entity.AdminUser;
 import com.aijiuyi.admin.service.AdminService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ public class AdminController {
      */
     @GetMapping("/page")
     @Log(value = "查询管理员列表", module = "管理员管理", operationType = OperationType.QUERY)
-    public Result<IPage<AppUser>> page(AdminQueryDTO queryDTO) {
+    public Result<IPage<AdminUser>> page(AdminQueryDTO queryDTO) {
         return Result.success(adminService.pageList(queryDTO));
     }
 
@@ -45,7 +45,7 @@ public class AdminController {
      */
     @GetMapping("/{id}")
     @Log(value = "查询管理员详情", module = "管理员管理", operationType = OperationType.QUERY)
-    public Result<AppUser> getById(@PathVariable Long id) {
+    public Result<AdminUser> getById(@PathVariable Long id) {
         return Result.success(adminService.getById(id));
     }
 
@@ -57,7 +57,7 @@ public class AdminController {
      */
     @PostMapping
     @Log(value = "新增管理员", module = "管理员管理", operationType = OperationType.INSERT)
-    public Result<Void> add(@RequestBody AppUser admin) {
+    public Result<Void> add(@RequestBody AdminUser admin) {
         adminService.addAdmin(admin);
         return Result.success();
     }
@@ -70,7 +70,7 @@ public class AdminController {
      */
     @PutMapping
     @Log(value = "修改管理员信息", module = "管理员管理", operationType = OperationType.UPDATE)
-    public Result<Void> update(@RequestBody AppUser admin) {
+    public Result<Void> update(@RequestBody AdminUser admin) {
         adminService.updateAdmin(admin);
         return Result.success();
     }

+ 18 - 70
code/backend/src/main/java/com/aijiuyi/admin/controller/AppUserController.java

@@ -3,19 +3,18 @@ package com.aijiuyi.admin.controller;
 import com.aijiuyi.admin.common.annotation.Log;
 import com.aijiuyi.admin.common.entity.Result;
 import com.aijiuyi.admin.common.enums.OperationType;
-import com.aijiuyi.admin.controller.dto.AppUserQueryDTO;
 import com.aijiuyi.admin.entity.AppUser;
 import com.aijiuyi.admin.service.AppUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 /**
- * 应用用户管理 Controller(管理员后台)
- * 提供应用用户的增删改查和状态管理接口
+ * APP用户账号 Controller(管理员后台)
+ * 提供APP用户账号的查询和状态管理接口
+ * 用户档案管理已迁移到 UserProfileController
  */
 @RestController
 @RequestMapping("/user/app")
@@ -25,98 +24,47 @@ public class AppUserController {
     private AppUserService appUserService;
 
     /**
-     * 获取应用用户选项列表(用于方案创作人选择框)
-     * 返回所有启用状态的用户,前端根据 userType 区分角色
+     * 获取APP用户账号列表(用于下拉选择等场景)
+     * 返回所有启用状态的APP用户账号
      *
-     * @param userType 可选过滤:1=用户,2=专家,3=管理员;null=全部
-     * @return 用户列表(id + nickname + username + userType)
+     * @return 用户列表(id + phone + nickname)
      */
     @GetMapping("/list")
-    @Log(value = "获取用户选项列表", module = "用户管理", operationType = OperationType.QUERY)
-    public Result<List<AppUser>> list(@RequestParam(required = false) Integer userType) {
+    @Log(value = "获取APP用户列表", module = "用户管理", operationType = OperationType.QUERY)
+    public Result<List<AppUser>> list() {
         LambdaQueryWrapper<AppUser> wrapper = new LambdaQueryWrapper<AppUser>()
                 .eq(AppUser::getStatus, 1)
-                .eq(userType != null, AppUser::getUserType, userType)
-                .select(AppUser::getId, AppUser::getNickname, AppUser::getUsername, AppUser::getUserType)
-                .orderByAsc(AppUser::getUserType)
-                .orderByAsc(AppUser::getId);
+                .select(AppUser::getId, AppUser::getPhone, AppUser::getNickname, AppUser::getAppId)
+                .orderByDesc(AppUser::getCreateTime);
         return Result.success(appUserService.list(wrapper));
     }
 
     /**
-     * 分页查询应用用户列表
-     *
-     * @param queryDTO 查询条件
-     * @return 分页结果
-     */
-    @GetMapping("/page")
-    @Log(value = "查询应用用户列表", module = "用户管理", operationType = OperationType.QUERY)
-    public Result<IPage<AppUser>> page(AppUserQueryDTO queryDTO) {
-        return Result.success(appUserService.pageList(queryDTO));
-    }
-
-    /**
-     * 查询应用用户详情
+     * 查询APP用户账号详情
      *
      * @param id 用户ID
      * @return 用户详情
      */
     @GetMapping("/{id}")
-    @Log(value = "查询应用用户详情", module = "用户管理", operationType = OperationType.QUERY)
+    @Log(value = "查询APP用户详情", module = "用户管理", operationType = OperationType.QUERY)
     public Result<AppUser> getById(@PathVariable Long id) {
         return Result.success(appUserService.getById(id));
     }
 
     /**
-     * 新增应用用户
-     *
-     * @param appUser 用户信息
-     * @return 操作结果
-     */
-    @PostMapping
-    @Log(value = "新增应用用户", module = "用户管理", operationType = OperationType.INSERT)
-    public Result<Void> add(@RequestBody AppUser appUser) {
-        appUserService.addUser(appUser);
-        return Result.success();
-    }
-
-    /**
-     * 修改应用用户
-     *
-     * @param appUser 用户信息
-     * @return 操作结果
-     */
-    @PutMapping
-    @Log(value = "修改应用用户", module = "用户管理", operationType = OperationType.UPDATE)
-    public Result<Void> update(@RequestBody AppUser appUser) {
-        appUserService.updateUser(appUser);
-        return Result.success();
-    }
-
-    /**
-     * 删除应用用户(逻辑删除)
-     *
-     * @param id 用户ID
-     * @return 操作结果
-     */
-    @DeleteMapping("/{id}")
-    @Log(value = "删除应用用户", module = "用户管理", operationType = OperationType.DELETE)
-    public Result<Void> delete(@PathVariable Long id) {
-        appUserService.deleteUser(id);
-        return Result.success();
-    }
-
-    /**
-     * 修改应用用户状态(禁用/启用)
+     * 修改APP用户状态(禁用/启用)
      *
      * @param id     用户ID
      * @param status 目标状态:1=启用,0=禁用
      * @return 操作结果
      */
     @PutMapping("/{id}/status")
-    @Log(value = "修改应用用户状态", module = "用户管理", operationType = OperationType.UPDATE)
+    @Log(value = "修改APP用户状态", module = "用户管理", operationType = OperationType.UPDATE)
     public Result<Void> updateStatus(@PathVariable Long id, @RequestParam Integer status) {
-        appUserService.updateStatus(id, status);
+        AppUser update = new AppUser();
+        update.setId(id);
+        update.setStatus(status);
+        appUserService.updateById(update);
         return Result.success();
     }
 }

+ 32 - 50
code/backend/src/main/java/com/aijiuyi/admin/controller/AuthController.java

@@ -5,10 +5,9 @@ import com.aijiuyi.admin.common.annotation.NoAuth;
 import com.aijiuyi.admin.common.context.RequestContext;
 import com.aijiuyi.admin.common.entity.Result;
 import com.aijiuyi.admin.common.enums.OperationType;
-import com.aijiuyi.admin.entity.AppUser;
+import com.aijiuyi.admin.entity.AdminUser;
 import com.aijiuyi.admin.controller.dto.LoginDTO;
 import com.aijiuyi.admin.service.AdminService;
-import com.aijiuyi.admin.service.AppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,82 +20,73 @@ import org.springframework.util.StringUtils;
 
 /**
  * 认证管理 Controller
- * 提供登录、退出、获取当前用户信息接口
- * 统一使用应用用户表(app_user)进行身份验证
+ * 提供管理员登录、退出、获取当前用户信息接口
+ * 使用独立的 admin_user 表进行身份验证
  */
 @RestController
 @RequestMapping("/auth")
 public class AuthController {
 
-    @Autowired
-    private AppUserService appUserService;
-
     @Autowired
     private AdminService adminService;
 
     /**
-     * 用户登录接口
+     * 管理员登录接口
      * 免鉴权(使用 @NoAuth 注解跳过 Token 验证)
-     * 仅 userType=3(管理员)账号可登录后台
      *
      * @param loginDTO 登录参数(用户名、密码)
      * @return 包含 token 和用户信息的 Result
      */
     @PostMapping("/login")
     @NoAuth
-    @Log(value = "用户登录", module = "认证管理", operationType = OperationType.OTHER)
+    @Log(value = "管理员登录", module = "认证管理", operationType = OperationType.OTHER)
     public Result<Map<String, Object>> login(@RequestBody @Valid LoginDTO loginDTO) {
-        return appUserService.login(loginDTO);
+        return adminService.login(loginDTO);
     }
 
     /**
-     * 用户退出登录
+     * 管理员退出登录
      * 删除 Redis 中的 Token,使当前 Token 立即失效
      *
      * @param request HTTP 请求(用于获取 Authorization 头中的 Token)
      * @return 操作结果
      */
     @PostMapping("/logout")
-    @Log(value = "用户退出", module = "认证管理", operationType = OperationType.OTHER)
+    @Log(value = "管理员退出", module = "认证管理", operationType = OperationType.OTHER)
     public Result<Void> logout(HttpServletRequest request) {
         String token = request.getHeader("Authorization");
-        appUserService.logout(token);
+        adminService.logout(token);
         return Result.success();
     }
 
     /**
-     * 获取当前登录用户信息(含权限路由列表)
+     * 获取当前登录管理员信息(含权限路由列表)
      *
-     * @return 应用用户信息 + permissions 权限路由列表
+     * @return 管理员信息 + permissions 权限路由列表
      */
     @GetMapping("/info")
     @Log(value = "获取当前用户信息", module = "认证管理", operationType = OperationType.QUERY)
     public Result<Map<String, Object>> getUserInfo() {
-        // 从 ThreadLocal 获取当前用户ID(由 TokenInterceptor 解析 Token 后设置)
         Long userId = RequestContext.getUserId();
-        AppUser user = appUserService.getById(userId);
-        if (user != null) {
-            user.setPassword(null);
-        }
+        AdminUser admin = adminService.getById(userId);
         // 查询权限路由列表(超级管理员返回 null,前端视为全部权限)
         String permissions = adminService.getPermissions(userId);
         Map<String, Object> data = new HashMap<>(8);
-        data.put("userId", user != null ? user.getId() : null);
-        data.put("username", user != null ? user.getUsername() : null);
-        data.put("nickname", user != null ? user.getNickname() : null);
-        data.put("avatar", user != null ? user.getAvatar() : null);
-        data.put("phone", user != null ? user.getPhone() : null);
-        data.put("address", user != null ? user.getAddress() : null);
-        data.put("userType", user != null ? user.getUserType() : null);
-        data.put("adminRole", user != null ? user.getAdminRole() : null);
+        data.put("userId", admin != null ? admin.getId() : null);
+        data.put("username", admin != null ? admin.getUsername() : null);
+        data.put("nickname", admin != null ? admin.getNickname() : null);
+        data.put("avatar", admin != null ? admin.getAvatar() : null);
+        data.put("phone", admin != null ? admin.getPhone() : null);
+        data.put("userType", 3);
+        data.put("adminRole", admin != null ? admin.getAdminRole() : null);
         data.put("permissions", permissions);
         return Result.success(data);
     }
 
     /**
-     * 更新当前管理员个人信息(昵称、手机、地址、头像、密码)
+     * 更新当前管理员个人信息(昵称、手机、头像、密码)
      *
-     * @param payload 请求体(nickname/phone/address/avatar/password/oldPassword)
+     * @param payload 请求体(nickname/phone/avatar/password/oldPassword)
      * @return 操作结果
      */
     @PutMapping("/profile")
@@ -104,8 +94,8 @@ public class AuthController {
     public Result<Void> updateProfile(@RequestBody Map<String, String> payload,
                                       HttpServletRequest request) {
         Long userId = RequestContext.getUserId();
-        AppUser user = appUserService.getById(userId);
-        if (user == null) {
+        AdminUser admin = adminService.getById(userId);
+        if (admin == null) {
             return Result.error("用户不存在");
         }
 
@@ -117,51 +107,43 @@ public class AuthController {
                 return Result.error("请输入旧密码");
             }
             String oldPasswordMd5 = DigestUtils.md5DigestAsHex(oldPassword.getBytes());
-            if (!oldPasswordMd5.equals(user.getPassword())) {
+            if (!oldPasswordMd5.equals(admin.getPassword())) {
                 return Result.error("旧密码不正确");
             }
         }
 
         // 如果修改了手机号,校验唯一性
         String newPhone = payload.get("phone");
-        if (StringUtils.hasText(newPhone) && !newPhone.equals(user.getPhone())) {
-            long phoneCount = appUserService.lambdaQuery()
-                    .eq(AppUser::getPhone, newPhone)
-                    .ne(AppUser::getId, userId)
+        if (StringUtils.hasText(newPhone) && !newPhone.equals(admin.getPhone())) {
+            long phoneCount = adminService.lambdaQuery()
+                    .eq(AdminUser::getPhone, newPhone)
+                    .ne(AdminUser::getId, userId)
                     .count();
             if (phoneCount > 0) {
                 return Result.error("该手机号已注册,请更换手机号");
             }
         }
 
-        AppUser update = new AppUser();
+        AdminUser update = new AdminUser();
         update.setId(userId);
-        // 更新昵称
         if (payload.containsKey("nickname")) {
             update.setNickname(payload.get("nickname"));
         }
-        // 更新手机号
         if (payload.containsKey("phone")) {
             update.setPhone(payload.get("phone"));
         }
-        // 更新地址
-        if (payload.containsKey("address")) {
-            update.setAddress(payload.get("address"));
-        }
-        // 更新头像
         if (payload.containsKey("avatar")) {
             update.setAvatar(payload.get("avatar"));
         }
-        // 更新密码
         if (StringUtils.hasText(newPassword)) {
             update.setPassword(DigestUtils.md5DigestAsHex(newPassword.getBytes()));
         }
-        appUserService.updateById(update);
+        adminService.updateById(update);
 
-        // 修改密码后,从 Redis 删除当前 Token,使其立即失效,强制重新登录
+        // 修改密码后,使当前 Token 失效,强制重新登录
         if (StringUtils.hasText(newPassword)) {
             String token = request.getHeader("Authorization");
-            appUserService.logout(token);
+            adminService.logout(token);
         }
 
         return Result.success();

+ 5 - 8
code/backend/src/main/java/com/aijiuyi/admin/controller/dto/UserProfileDTO.java

@@ -10,16 +10,16 @@ import javax.validation.constraints.Pattern;
 import java.math.BigDecimal;
 
 /**
- * 子用户新增/修改请求 DTO
+ * 用户档案新增/修改请求 DTO
  */
 @Data
 public class UserProfileDTO {
 
-    /** 子用户ID(修改时必填,新增时不填) */
+    /** 用户档案ID(修改时必填,新增时不填) */
     private Long id;
 
-    /** 所属应用用户ID(新增时必填) */
-    private Long userId;
+    /** 关联APP用户ID(内部使用,不由前端传入) */
+    private Long appUserId;
 
     /** 姓名(必填) */
     @NotBlank(message = "姓名不能为空")
@@ -38,10 +38,7 @@ public class UserProfileDTO {
     @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
     private String phone;
 
-    /** 用户类型:保留兼容,用户列表统一按 1=用户 处理 */
-    private Integer userType;
-
-    /** 用户分类ID(仅 userType=1 用户有效,关联 app_user_category.id) */
+    /** 用户分类ID(关联 app_user_category.id) */
     private Long userCategoryId;
 
     /** 省级行政区划编码(GB/T 2260) */

+ 58 - 0
code/backend/src/main/java/com/aijiuyi/admin/entity/AdminUser.java

@@ -0,0 +1,58 @@
+package com.aijiuyi.admin.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 后台管理员实体
+ * 对应数据库 admin_user 表
+ * 与 APP 用户完全隔离,仅用于后台管理系统登录和权限管理
+ */
+@Data
+@TableName("admin_user")
+public class AdminUser {
+
+    /** 主键ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 用户名(唯一,登录用) */
+    private String username;
+
+    /** 密码(MD5加密存储,不序列化到响应) */
+    @JSONField(serialize = false)
+    private String password;
+
+    /** 昵称 */
+    private String nickname;
+
+    /** 手机号 */
+    private String phone;
+
+    /** 头像URL */
+    private String avatar;
+
+    /** 管理员角色:1=超级管理员,2=设备管理员,3=圣手管理 */
+    private Integer adminRole;
+
+    /** 状态:1=正常,0=禁用 */
+    private Integer status;
+
+    /** 最后登录时间 */
+    private LocalDateTime lastLoginTime;
+
+    /** 逻辑删除:0=未删除,1=已删除 */
+    @TableLogic
+    private Integer deleted;
+
+    /** 创建时间(自动填充) */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /** 更新时间(自动填充) */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+}

+ 5 - 31
code/backend/src/main/java/com/aijiuyi/admin/entity/AppUser.java

@@ -1,15 +1,14 @@
 package com.aijiuyi.admin.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
 /**
- * 应用用户实体(统一用户表,通过 userType 区分角色)
+ * APP登录账号实体
  * 对应数据库 app_user 表
- * userType: 1=用户,2=专家,3=管理员
+ * 仅存储APP端手机号登录账号信息,与管理员完全隔离
  */
 @Data
 @TableName("app_user")
@@ -19,13 +18,6 @@ public class AppUser {
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
-    /** 用户名(唯一,用于后台管理员登录) */
-    private String username;
-
-    /** 密码(MD5加密存储,后台账号使用;不序列化到响应) */
-    @JSONField(serialize = false)
-    private String password;
-
     /** 手机号(唯一,用于App端登录) */
     private String phone;
 
@@ -35,39 +27,21 @@ public class AppUser {
     /** 头像URL */
     private String avatar;
 
-    /** 地址 */
-    private String address;
-
     /** 用户AppId(展示用唯一标识,如 AJY00000001) */
     private String appId;
 
-    /**
-     * 用户类型(角色):1=用户,2=专家,3=管理员
-     */
-    private Integer userType;
-
-    /**
-     * 用户分类ID(仅 userType=1 用户有效,关联 app_user_category.id)
-     */
-    private Long userCategoryId;
-
-    /**
-     * 管理员角色:1=超级管理员,2=设备管理员,3=圣手管理(仅 userType=3 时有效)
-     */
-    private Integer adminRole;
-
     /** 状态:1=正常,0=禁用 */
     private Integer status;
 
-    /** 最后登录时间 */
-    private LocalDateTime lastLoginTime;
-
     /**
      * 登录方式:1=手机号验证码,2=微信,3=苹果
      * 记录用户最近一次登录所用的方式
      */
     private Integer loginType;
 
+    /** 最后登录时间 */
+    private LocalDateTime lastLoginTime;
+
     /** 微信 OpenID(同一应用内唯一,微信登录时记录,预留字段) */
     private String wechatOpenId;
 

+ 5 - 8
code/backend/src/main/java/com/aijiuyi/admin/entity/UserProfile.java

@@ -7,8 +7,9 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
- * 子用户信息实体
+ * 用户档案实体
  * 对应数据库 user_profile 表
+ * 作为后台用户列表的数据源,存储用户体型数据和基本信息
  */
 @Data
 @TableName("user_profile")
@@ -18,8 +19,8 @@ public class UserProfile {
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
-    /** 所属应用用户ID(关联 app_user.id) */
-    private Long userId;
+    /** 关联APP登录账号ID(app_user.id),NULL表示该用户不可登录APP */
+    private Long appUserId;
 
     /** 姓名 */
     private String name;
@@ -33,11 +34,7 @@ public class UserProfile {
     /** 手机号(11位,唯一) */
     private String phone;
 
-    /** 用户类型:1=用户,2=专家,3=管理员 */
-    private Integer userType;
-
-    /** 用户分类ID(非数据库字段,查询时从 app_user 关联填充) */
-    @TableField(exist = false)
+    /** 用户分类ID(关联 app_user_category.id) */
     private Long userCategoryId;
 
     /** 用户分类名称(非数据库字段,查询时从 app_user_category 关联填充) */

+ 12 - 0
code/backend/src/main/java/com/aijiuyi/admin/mapper/AdminUserMapper.java

@@ -0,0 +1,12 @@
+package com.aijiuyi.admin.mapper;
+
+import com.aijiuyi.admin.entity.AdminUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 后台管理员 Mapper
+ */
+@Mapper
+public interface AdminUserMapper extends BaseMapper<AdminUser> {
+}

+ 26 - 6
code/backend/src/main/java/com/aijiuyi/admin/service/AdminService.java

@@ -1,18 +1,38 @@
 package com.aijiuyi.admin.service;
 
+import com.aijiuyi.admin.common.entity.Result;
 import com.aijiuyi.admin.controller.dto.AdminQueryDTO;
-import com.aijiuyi.admin.entity.AppUser;
+import com.aijiuyi.admin.controller.dto.LoginDTO;
+import com.aijiuyi.admin.entity.AdminUser;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 管理员管理 Service 接口
- * 对 app_user 表中 userType=3 的管理员进行管理,
+ * 操作独立的 admin_user 表,与 APP 用户完全隔离
  * 同时提供管理员权限配置的查询与更新
  */
-public interface AdminService extends IService<AppUser> {
+public interface AdminService extends IService<AdminUser> {
+
+    /**
+     * 管理员登录
+     * 通过用户名+密码登录,返回 Token 和用户信息
+     *
+     * @param loginDTO 登录参数(用户名、密码)
+     * @return 包含 token 和用户基本信息的 Result
+     */
+    Result<Map<String, Object>> login(LoginDTO loginDTO);
+
+    /**
+     * 退出登录
+     * 从 Redis 中删除 Token,使 Token 立即失效
+     *
+     * @param token 当前用户的 Token
+     */
+    void logout(String token);
 
     /**
      * 分页查询管理员列表
@@ -20,7 +40,7 @@ public interface AdminService extends IService<AppUser> {
      * @param queryDTO 查询参数
      * @return 分页结果
      */
-    IPage<AppUser> pageList(AdminQueryDTO queryDTO);
+    IPage<AdminUser> pageList(AdminQueryDTO queryDTO);
 
     /**
      * 新增管理员
@@ -28,7 +48,7 @@ public interface AdminService extends IService<AppUser> {
      *
      * @param admin 管理员信息
      */
-    void addAdmin(AppUser admin);
+    void addAdmin(AdminUser admin);
 
     /**
      * 修改管理员信息
@@ -36,7 +56,7 @@ public interface AdminService extends IService<AppUser> {
      *
      * @param admin 管理员信息(需携带 id)
      */
-    void updateAdmin(AppUser admin);
+    void updateAdmin(AdminUser admin);
 
     /**
      * 删除管理员(逻辑删除)

+ 7 - 56
code/backend/src/main/java/com/aijiuyi/admin/service/AppUserService.java

@@ -2,37 +2,17 @@ package com.aijiuyi.admin.service;
 
 import com.aijiuyi.admin.common.entity.Result;
 import com.aijiuyi.admin.controller.dto.AppLoginDTO;
-import com.aijiuyi.admin.controller.dto.AppUserQueryDTO;
-import com.aijiuyi.admin.controller.dto.LoginDTO;
 import com.aijiuyi.admin.entity.AppUser;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Map;
 
 /**
- * 应用用户 Service
- * 统一用户中心:用户、专家、管理员均使用此表,通过 userType 区分
+ * APP用户账号 Service
+ * 仅处理APP端手机号登录账号相关逻辑
  */
 public interface AppUserService extends IService<AppUser> {
 
-    /**
-     * 管理员登录
-     * 通过用户名+密码登录,返回 Token 和用户信息
-     *
-     * @param loginDTO 登录参数(用户名、密码)
-     * @return 包含 token 和用户基本信息的 Result
-     */
-    Result<Map<String, Object>> login(LoginDTO loginDTO);
-
-    /**
-     * 退出登录
-     * 从 Redis 中删除 Token,使 Token 立即失效
-     *
-     * @param token 当前用户的 Token(从请求头中获取)
-     */
-    void logout(String token);
-
     /**
      * App 端发送短信验证码
      * 60 秒内同一手机号不重复发送,验证码 5 分钟有效
@@ -43,7 +23,7 @@ public interface AppUserService extends IService<AppUser> {
 
     /**
      * App 端手机号验证码登录
-     * 手机号未注册时自动注册为用户(userType=1)
+     * 手机号未注册时自动注册
      * Token 永久有效(除非后台主动踢下线)
      *
      * @param loginDTO 手机号+验证码
@@ -52,39 +32,10 @@ public interface AppUserService extends IService<AppUser> {
     Result<Map<String, Object>> appLogin(AppLoginDTO loginDTO);
 
     /**
-     * 分页查询应用用户列表
-     *
-     * @param queryDTO 查询条件
-     * @return 分页结果
-     */
-    IPage<AppUser> pageList(AppUserQueryDTO queryDTO);
-
-    /**
-     * 修改用户状态(禁用/启用)
-     *
-     * @param id     用户ID
-     * @param status 目标状态:1=启用,0=禁用
-     */
-    void updateStatus(Long id, Integer status);
-
-    /**
-     * 新增应用用户
-     *
-     * @param appUser 用户信息
-     */
-    void addUser(AppUser appUser);
-
-    /**
-     * 修改应用用户
-     *
-     * @param appUser 用户信息
-     */
-    void updateUser(AppUser appUser);
-
-    /**
-     * 删除应用用户(逻辑删除)
+     * APP用户退出登录
+     * 从 Redis 中删除 Token,使 Token 立即失效
      *
-     * @param id 用户ID
+     * @param token 当前用户的 Token(从请求头中获取)
      */
-    void deleteUser(Long id);
+    void logout(String token);
 }

+ 144 - 79
code/backend/src/main/java/com/aijiuyi/admin/service/impl/AdminServiceImpl.java

@@ -2,13 +2,18 @@ package com.aijiuyi.admin.service.impl;
 
 import com.aijiuyi.admin.common.constant.ResultCode;
 import com.aijiuyi.admin.common.context.RequestContext;
+import com.aijiuyi.admin.common.entity.Result;
 import com.aijiuyi.admin.common.exception.BusinessException;
+import com.aijiuyi.admin.common.interceptor.TokenInterceptor;
 import com.aijiuyi.admin.common.util.LogUtil;
+import com.aijiuyi.admin.common.util.RedisUtil;
+import com.aijiuyi.admin.common.util.TokenUtil;
 import com.aijiuyi.admin.controller.dto.AdminQueryDTO;
+import com.aijiuyi.admin.controller.dto.LoginDTO;
 import com.aijiuyi.admin.entity.AdminPermission;
-import com.aijiuyi.admin.entity.AppUser;
+import com.aijiuyi.admin.entity.AdminUser;
 import com.aijiuyi.admin.mapper.AdminPermissionMapper;
-import com.aijiuyi.admin.mapper.AppUserMapper;
+import com.aijiuyi.admin.mapper.AdminUserMapper;
 import com.aijiuyi.admin.service.AdminService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -24,19 +29,28 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
  * 管理员管理 Service 实现类
- * 操作 app_user 表中 userType=3 的管理员记录
+ * 操作独立的 admin_user 表,与 APP 用户完全隔离
  * 同时维护 admin_permission 表中的路由权限配置
  */
 @Service
-public class AdminServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements AdminService {
+public class AdminServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser> implements AdminService {
 
     private static final String PHONE_PATTERN = "^1[3-9]\\d{9}$";
+
+    /** Token 在 Redis 中的 key 前缀 */
+    private static final String TOKEN_REDIS_PREFIX = TokenInterceptor.REDIS_TOKEN_KEY_PREFIX;
+
+    /** Token 在 Redis 中的过期时间:3年(秒) */
+    private static final long TOKEN_EXPIRE_SECONDS = 3L * 365 * 24 * 60 * 60;
+
     private static final Set<String> ASSIGNABLE_ROUTE_PATHS = Collections.unmodifiableSet(new LinkedHashSet<>(Arrays.asList(
             "/dashboard",
             "/user/profile",
@@ -55,54 +69,135 @@ public class AdminServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implem
     @Autowired
     private AdminPermissionMapper adminPermissionMapper;
 
+    @Autowired
+    private RedisUtil redisUtil;
+
+    /**
+     * 管理员登录
+     * 通过用户名+密码校验身份,生成 JWT Token 并存入 Redis
+     */
+    @Override
+    public Result<Map<String, Object>> login(LoginDTO loginDTO) {
+        LogUtil.info(AdminServiceImpl.class, "管理员[{}]尝试登录", loginDTO.getUsername());
+
+        // 根据用户名查询管理员
+        AdminUser admin = lambdaQuery()
+                .eq(AdminUser::getUsername, loginDTO.getUsername())
+                .one();
+
+        if (admin == null) {
+            LogUtil.warn(AdminServiceImpl.class, "管理员[{}]不存在", loginDTO.getUsername());
+            throw new BusinessException(ResultCode.USER_NOT_FOUND);
+        }
+
+        // 验证密码(前端传明文,后端 MD5 加密后比对)
+        String md5Password = DigestUtils.md5DigestAsHex(loginDTO.getPassword().getBytes());
+        if (!md5Password.equals(admin.getPassword())) {
+            LogUtil.warn(AdminServiceImpl.class, "管理员[{}]密码错误", loginDTO.getUsername());
+            throw new BusinessException(ResultCode.USER_PASSWORD_ERROR);
+        }
+
+        // 验证状态
+        if (admin.getStatus() != null && admin.getStatus() == 0) {
+            LogUtil.warn(AdminServiceImpl.class, "管理员[{}]已被禁用", loginDTO.getUsername());
+            throw new BusinessException(ResultCode.USER_DISABLED);
+        }
+
+        // 生成 JWT Token(userType 固定为 3 代表管理员)
+        String token = TokenUtil.generateToken(admin.getId(), admin.getUsername(), 3);
+
+        // 将 Token 存入 Redis,3年过期
+        redisUtil.set(TOKEN_REDIS_PREFIX + token, admin.getId(), TOKEN_EXPIRE_SECONDS);
+
+        // 更新最后登录时间
+        AdminUser updateLogin = new AdminUser();
+        updateLogin.setId(admin.getId());
+        updateLogin.setLastLoginTime(LocalDateTime.now());
+        updateById(updateLogin);
+
+        // 登录成功后将用户信息写入 RequestContext
+        RequestContext.setUserId(admin.getId());
+        RequestContext.setUserName(admin.getUsername());
+        RequestContext.setUserType(3);
+
+        LogUtil.info(AdminServiceImpl.class, "管理员[{}]登录成功", admin.getUsername());
+
+        // 查询权限路由(超级管理员返回 null,代表全部权限)
+        String routePaths = null;
+        if (!Integer.valueOf(1).equals(admin.getAdminRole())) {
+            AdminPermission permission = adminPermissionMapper.selectOne(
+                    new LambdaQueryWrapper<AdminPermission>()
+                            .eq(AdminPermission::getAdminId, admin.getId())
+            );
+            routePaths = permission != null ? permission.getRoutePaths() : "[]";
+        }
+
+        // 组装返回数据
+        Map<String, Object> resultData = new HashMap<>(8);
+        resultData.put("token", token);
+        resultData.put("userId", admin.getId());
+        resultData.put("username", admin.getUsername());
+        resultData.put("nickname", admin.getNickname());
+        resultData.put("avatar", admin.getAvatar());
+        resultData.put("userType", 3);
+        resultData.put("adminRole", admin.getAdminRole());
+        resultData.put("permissions", routePaths);
+
+        return Result.success(resultData);
+    }
+
     /**
-     * 分页查询管理员列表(仅 userType=3)
-     *
-     * @param queryDTO 查询条件
-     * @return 分页结果
+     * 退出登录
      */
     @Override
-    public IPage<AppUser> pageList(AdminQueryDTO queryDTO) {
-        Page<AppUser> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());
-        LambdaQueryWrapper<AppUser> wrapper = new LambdaQueryWrapper<AppUser>()
-                .eq(AppUser::getUserType, 3)
-                .eq(queryDTO.getAdminRole() != null, AppUser::getAdminRole, queryDTO.getAdminRole())
-                .eq(queryDTO.getStatus() != null, AppUser::getStatus, queryDTO.getStatus())
-                .orderByAsc(AppUser::getId);
+    public void logout(String token) {
+        if (StringUtils.hasText(token)) {
+            if (token.startsWith("Bearer ")) {
+                token = token.substring(7);
+            }
+            redisUtil.del(TOKEN_REDIS_PREFIX + token);
+            LogUtil.info(AdminServiceImpl.class, "管理员退出登录,Token 已失效");
+        }
+    }
+
+    /**
+     * 分页查询管理员列表
+     */
+    @Override
+    public IPage<AdminUser> pageList(AdminQueryDTO queryDTO) {
+        Page<AdminUser> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());
+        LambdaQueryWrapper<AdminUser> wrapper = new LambdaQueryWrapper<AdminUser>()
+                .eq(queryDTO.getAdminRole() != null, AdminUser::getAdminRole, queryDTO.getAdminRole())
+                .eq(queryDTO.getStatus() != null, AdminUser::getStatus, queryDTO.getStatus())
+                .orderByAsc(AdminUser::getId);
         // 用户名/姓名 OR 模糊查询
         boolean hasKeyword = StringUtils.hasText(queryDTO.getUsername()) || StringUtils.hasText(queryDTO.getNickname());
         if (hasKeyword) {
             String kw = StringUtils.hasText(queryDTO.getUsername()) ? queryDTO.getUsername() : queryDTO.getNickname();
-            wrapper.and(w -> w.like(AppUser::getUsername, kw).or().like(AppUser::getNickname, kw));
+            wrapper.and(w -> w.like(AdminUser::getUsername, kw).or().like(AdminUser::getNickname, kw));
         }
         return page(page, wrapper);
     }
 
     /**
      * 新增管理员
-     * 校验用户名唯一性,对密码进行 MD5 加密,userType 强制设为 3
-     *
-     * @param admin 管理员信息
      */
     @Override
-    public void addAdmin(AppUser admin) {
+    public void addAdmin(AdminUser admin) {
         normalizePhone(admin);
-        // 校验用户名唯一性
         if (!StringUtils.hasText(admin.getUsername())) {
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
-        long usernameCount = lambdaQuery().eq(AppUser::getUsername, admin.getUsername()).count();
+        long usernameCount = lambdaQuery().eq(AdminUser::getUsername, admin.getUsername()).count();
         if (usernameCount > 0) {
             throw new BusinessException(ResultCode.USERNAME_EXISTS);
         }
         if (StringUtils.hasText(admin.getPhone())) {
-            long phoneCount = lambdaQuery().eq(AppUser::getPhone, admin.getPhone()).count();
+            long phoneCount = lambdaQuery().eq(AdminUser::getPhone, admin.getPhone()).count();
             if (phoneCount > 0) {
                 throw new BusinessException(ResultCode.PHONE_EXISTS);
             }
         }
-        // 强制 userType=3(管理员)
-        admin.setUserType(3);
         // 密码加密
         if (StringUtils.hasText(admin.getPassword())) {
             admin.setPassword(DigestUtils.md5DigestAsHex(admin.getPassword().getBytes()));
@@ -113,27 +208,24 @@ public class AdminServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implem
 
     /**
      * 修改管理员信息
-     * 若传入密码则重新加密,否则保留原密码;不允许修改 userType
-     *
-     * @param admin 管理员信息(需携带 id)
      */
     @Override
-    public void updateAdmin(AppUser admin) {
-        AppUser exist = getById(admin.getId());
-        if (exist == null || !Integer.valueOf(3).equals(exist.getUserType())) {
+    public void updateAdmin(AdminUser admin) {
+        AdminUser exist = getById(admin.getId());
+        if (exist == null) {
             throw new BusinessException(ResultCode.ADMIN_NOT_FOUND);
         }
         boolean clearPhone = normalizePhone(admin);
         // 若修改了用户名,校验唯一性
         if (StringUtils.hasText(admin.getUsername()) && !admin.getUsername().equals(exist.getUsername())) {
-            long count = lambdaQuery().eq(AppUser::getUsername, admin.getUsername()).count();
+            long count = lambdaQuery().eq(AdminUser::getUsername, admin.getUsername()).count();
             if (count > 0) {
                 throw new BusinessException(ResultCode.USERNAME_EXISTS);
             }
         }
-        // 若修改了手机号,校验格式与唯一性;传空字符串表示清空手机号
+        // 若修改了手机号,校验唯一性
         if (StringUtils.hasText(admin.getPhone()) && !admin.getPhone().equals(exist.getPhone())) {
-            long count = lambdaQuery().eq(AppUser::getPhone, admin.getPhone()).count();
+            long count = lambdaQuery().eq(AdminUser::getPhone, admin.getPhone()).count();
             if (count > 0) {
                 throw new BusinessException(ResultCode.PHONE_EXISTS);
             }
@@ -144,22 +236,17 @@ public class AdminServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implem
         } else {
             admin.setPassword(null);
         }
-        // 强制 userType 不变
-        admin.setUserType(null);
         updateById(admin);
         if (clearPhone) {
-            lambdaUpdate().eq(AppUser::getId, admin.getId()).set(AppUser::getPhone, null).update();
+            lambdaUpdate().eq(AdminUser::getId, admin.getId()).set(AdminUser::getPhone, null).update();
         }
         LogUtil.info(AdminServiceImpl.class, "修改管理员[{}]", admin.getId());
     }
 
     /**
      * 手机号为选填项:有值时按中国大陆手机号校验,无值时规范为 null。
-     *
-     * @param admin 管理员实体
-     * @return true 表示本次请求显式清空手机号
      */
-    private boolean normalizePhone(AppUser admin) {
+    private boolean normalizePhone(AdminUser admin) {
         if (admin.getPhone() == null) {
             return false;
         }
@@ -177,14 +264,11 @@ public class AdminServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implem
 
     /**
      * 删除管理员(逻辑删除)
-     * adminRole=1 超级管理员不可删除
-     *
-     * @param id 管理员ID
      */
     @Override
     public void deleteAdmin(Long id) {
-        AppUser admin = getById(id);
-        if (admin == null || !Integer.valueOf(3).equals(admin.getUserType())) {
+        AdminUser admin = getById(id);
+        if (admin == null) {
             throw new BusinessException(ResultCode.ADMIN_NOT_FOUND);
         }
         if (Integer.valueOf(1).equals(admin.getAdminRole())) {
@@ -196,20 +280,16 @@ public class AdminServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implem
 
     /**
      * 批量删除管理员(逻辑删除)
-     * 超级管理员(adminRole=1)不可被批量删除
-     *
-     * @param ids 管理员ID列表
      */
     @Override
     public void batchDeleteAdmin(List<Long> ids) {
         if (ids == null || ids.isEmpty()) {
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
-        List<AppUser> admins = lambdaQuery()
-                .in(AppUser::getId, ids)
-                .eq(AppUser::getUserType, 3)
+        List<AdminUser> admins = lambdaQuery()
+                .in(AdminUser::getId, ids)
                 .list();
-        for (AppUser admin : admins) {
+        for (AdminUser admin : admins) {
             if (Integer.valueOf(1).equals(admin.getAdminRole())) {
                 throw new BusinessException(ResultCode.ADMIN_CANNOT_DELETE);
             }
@@ -222,34 +302,28 @@ public class AdminServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implem
 
     private void logicDeleteAdminsAndReleaseUniqueFields(List<Long> ids) {
         lambdaUpdate()
-                .in(AppUser::getId, ids)
-                .eq(AppUser::getUserType, 3)
-                .set(AppUser::getUsername, null)
-                .set(AppUser::getPhone, null)
-                .set(AppUser::getDeleted, 1)
-                .set(AppUser::getUpdateTime, LocalDateTime.now())
+                .in(AdminUser::getId, ids)
+                .set(AdminUser::getUsername, null)
+                .set(AdminUser::getPhone, null)
+                .set(AdminUser::getDeleted, 1)
+                .set(AdminUser::getUpdateTime, LocalDateTime.now())
                 .update();
     }
 
     /**
      * 修改管理员状态(禁用/启用)
-     * 不允许禁用当前登录账号自身
-     *
-     * @param id     管理员ID
-     * @param status 目标状态:1=启用,0=禁用
      */
     @Override
     public void updateStatus(Long id, Integer status) {
-        // 不允许禁用自身
         Long currentUserId = RequestContext.getUserId();
         if (Integer.valueOf(0).equals(status) && id.equals(currentUserId)) {
             throw new BusinessException(ResultCode.ADMIN_CANNOT_DISABLE_SELF);
         }
-        AppUser admin = getById(id);
-        if (admin == null || !Integer.valueOf(3).equals(admin.getUserType())) {
+        AdminUser admin = getById(id);
+        if (admin == null) {
             throw new BusinessException(ResultCode.ADMIN_NOT_FOUND);
         }
-        AppUser update = new AppUser();
+        AdminUser update = new AdminUser();
         update.setId(id);
         update.setStatus(status);
         updateById(update);
@@ -258,17 +332,13 @@ public class AdminServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implem
 
     /**
      * 查询管理员权限路由列表
-     *
-     * @param adminId 管理员ID
-     * @return 路由路径 JSON 数组字符串;超级管理员返回 null
      */
     @Override
     public String getPermissions(Long adminId) {
-        AppUser admin = getById(adminId);
+        AdminUser admin = getById(adminId);
         if (admin == null) {
             throw new BusinessException(ResultCode.ADMIN_NOT_FOUND);
         }
-        // 超级管理员返回 null,前端视为全部权限
         if (Integer.valueOf(1).equals(admin.getAdminRole())) {
             return null;
         }
@@ -281,18 +351,13 @@ public class AdminServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implem
 
     /**
      * 更新管理员权限路由列表
-     * 超级管理员(adminRole=1)调用时直接忽略,不修改
-     *
-     * @param adminId    管理员ID
-     * @param routePaths 路由路径 JSON 数组字符串
      */
     @Override
     public void updatePermissions(Long adminId, String routePaths) {
-        AppUser admin = getById(adminId);
-        if (admin == null || !Integer.valueOf(3).equals(admin.getUserType())) {
+        AdminUser admin = getById(adminId);
+        if (admin == null) {
             throw new BusinessException(ResultCode.ADMIN_NOT_FOUND);
         }
-        // 超级管理员不设置权限
         if (Integer.valueOf(1).equals(admin.getAdminRole())) {
             return;
         }

+ 19 - 72
code/backend/src/main/java/com/aijiuyi/admin/service/impl/AppDeviceGroupServiceImpl.java

@@ -10,14 +10,12 @@ import com.aijiuyi.admin.entity.AppUser;
 import com.aijiuyi.admin.entity.Device;
 import com.aijiuyi.admin.entity.DeviceGroup;
 import com.aijiuyi.admin.entity.DeviceGroupMember;
-import com.aijiuyi.admin.entity.UserCategory;
 import com.aijiuyi.admin.entity.UserDevice;
 import com.aijiuyi.admin.entity.UserProfile;
 import com.aijiuyi.admin.mapper.AppUserMapper;
 import com.aijiuyi.admin.mapper.DeviceGroupMapper;
 import com.aijiuyi.admin.mapper.DeviceGroupMemberMapper;
 import com.aijiuyi.admin.mapper.DeviceMapper;
-import com.aijiuyi.admin.mapper.UserCategoryMapper;
 import com.aijiuyi.admin.mapper.UserDeviceMapper;
 import com.aijiuyi.admin.mapper.UserProfileMapper;
 import com.aijiuyi.admin.service.AppDeviceGroupService;
@@ -48,7 +46,6 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
 
     private static final int DEVICE_TYPE_FAMILY = 1;
     private static final int DEVICE_TYPE_PUBLIC = 2;
-    private static final int NORMAL_USER_TYPE = 1;
     private static final int STATUS_ENABLED = 1;
     private static final String PHONE_PATTERN = "^1[3-9]\\d{9}$";
 
@@ -70,9 +67,6 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
     @Autowired
     private UserDeviceMapper userDeviceMapper;
 
-    @Autowired
-    private UserCategoryMapper userCategoryMapper;
-
     @Autowired
     private UserAcupointService userAcupointService;
 
@@ -136,7 +130,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
         }
 
         List<UserProfile> profiles = userProfileMapper.selectList(
-                new LambdaQueryWrapper<UserProfile>().eq(UserProfile::getUserId, appUserId)
+                new LambdaQueryWrapper<UserProfile>().eq(UserProfile::getAppUserId, appUserId)
         );
         if (!CollectionUtils.isEmpty(profiles)) {
             List<Long> profileIds = profiles.stream().map(UserProfile::getId).collect(Collectors.toList());
@@ -187,7 +181,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
         UserProfile selectedProfile = dto.getProfileId() != null
                 ? requireProfile(dto.getProfileId())
                 : ensureAccountProfile(requireAppUser(appUserId));
-        if (!Objects.equals(selectedProfile.getUserId(), appUserId)) {
+        if (!Objects.equals(selectedProfile.getAppUserId(), appUserId)) {
             throw new BusinessException(ResultCode.FORBIDDEN.getCode(), "公共设备只能选择当前账号档案");
         }
         if (!hasActiveUserDevice(selectedProfile.getId(), device.getDeviceCode())) {
@@ -223,7 +217,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
         String phone = normalizePhone(dto.getPhone());
         checkGroupPhoneAvailable(group.getId(), phone, null);
 
-        AppUser linkedAccount = ensureAccountForPhone(phone, dto.getName(), dto.getUserCategoryId());
+        AppUser linkedAccount = ensureAccountForPhone(phone, dto.getName());
         checkGroupAppUserAvailable(group.getId(), linkedAccount == null ? null : linkedAccount.getId(), null);
 
         UserProfile profile = resolveProfileForNewMember(dto, phone, linkedAccount);
@@ -248,7 +242,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
 
         String phone = normalizePhone(dto.getPhone());
         checkGroupPhoneAvailable(group.getId(), phone, profileId);
-        AppUser linkedAccount = ensureAccountForPhone(phone, dto.getName(), dto.getUserCategoryId());
+        AppUser linkedAccount = ensureAccountForPhone(phone, dto.getName());
         Long linkedAppUserId = linkedAccount == null ? null : linkedAccount.getId();
         checkGroupAppUserAvailable(group.getId(), linkedAppUserId, profileId);
 
@@ -321,7 +315,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
             }
         } else if (isPublicDevice(device)) {
             List<UserProfile> profiles = userProfileMapper.selectList(
-                    new LambdaQueryWrapper<UserProfile>().eq(UserProfile::getUserId, appUserId)
+                    new LambdaQueryWrapper<UserProfile>().eq(UserProfile::getAppUserId, appUserId)
             );
             if (CollectionUtils.isEmpty(profiles)) {
                 throw new BusinessException(ResultCode.FORBIDDEN.getCode(), "无权访问该设备");
@@ -470,7 +464,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
     private UserProfile ensureAccountProfile(AppUser appUser) {
         UserProfile profile = userProfileMapper.selectOne(
                 new LambdaQueryWrapper<UserProfile>()
-                        .eq(UserProfile::getUserId, appUser.getId())
+                        .eq(UserProfile::getAppUserId, appUser.getId())
                         .orderByAsc(UserProfile::getCreateTime)
                         .last("LIMIT 1")
         );
@@ -483,31 +477,29 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
             profile = userProfileMapper.selectOne(
                     new LambdaQueryWrapper<UserProfile>()
                             .eq(UserProfile::getPhone, phone)
-                            .and(w -> w.isNull(UserProfile::getUserId).or().eq(UserProfile::getUserId, appUser.getId()))
+                            .and(w -> w.isNull(UserProfile::getAppUserId).or().eq(UserProfile::getAppUserId, appUser.getId()))
                             .orderByAsc(UserProfile::getCreateTime)
                             .last("LIMIT 1")
             );
             if (profile != null) {
                 UserProfile update = new UserProfile();
                 update.setId(profile.getId());
-                update.setUserId(appUser.getId());
+                update.setAppUserId(appUser.getId());
                 userProfileMapper.updateById(update);
-                profile.setUserId(appUser.getId());
+                profile.setAppUserId(appUser.getId());
                 return profile;
             }
         }
 
         profile = new UserProfile();
-        profile.setUserId(appUser.getId());
+        profile.setAppUserId(appUser.getId());
         profile.setPhone(phone);
         profile.setName(resolveProfileName(appUser.getNickname(), phone, appUser.getId()));
-        profile.setUserType(NORMAL_USER_TYPE);
-        profile.setAddress(appUser.getAddress());
         userProfileMapper.insert(profile);
         return profile;
     }
 
-    private AppUser ensureAccountForPhone(String phone, String name, Long userCategoryId) {
+    private AppUser ensureAccountForPhone(String phone, String name) {
         if (phone == null) {
             return null;
         }
@@ -521,16 +513,14 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
             if (Integer.valueOf(0).equals(user.getStatus())) {
                 throw new BusinessException(ResultCode.APP_USER_DISABLED);
             }
-            syncUserCategory(user, userCategoryId);
             return user;
         }
 
         user = new AppUser();
         user.setPhone(phone);
         user.setNickname(resolveProfileName(name, phone, null));
-        user.setUserType(NORMAL_USER_TYPE);
-        user.setUserCategoryId(userCategoryId != null ? validateUserCategory(userCategoryId) : getDefaultUserCategoryId());
         user.setStatus(STATUS_ENABLED);
+        user.setLoginType(1);
         appUserMapper.insert(user);
         AppUser update = new AppUser();
         update.setId(user.getId());
@@ -540,56 +530,14 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
         return user;
     }
 
-    private void syncUserCategory(AppUser user, Long userCategoryId) {
-        if (userCategoryId == null || !Integer.valueOf(NORMAL_USER_TYPE).equals(user.getUserType())) {
-            return;
-        }
-        Long validCategoryId = validateUserCategory(userCategoryId);
-        if (validCategoryId.equals(user.getUserCategoryId())) {
-            return;
-        }
-        AppUser update = new AppUser();
-        update.setId(user.getId());
-        update.setUserCategoryId(validCategoryId);
-        appUserMapper.updateById(update);
-        user.setUserCategoryId(validCategoryId);
-    }
-
-    private Long validateUserCategory(Long userCategoryId) {
-        if (userCategoryId == null) {
-            return null;
-        }
-        long count = userCategoryMapper.selectCount(new LambdaQueryWrapper<UserCategory>()
-                .eq(UserCategory::getId, userCategoryId)
-                .eq(UserCategory::getUserType, NORMAL_USER_TYPE));
-        if (count <= 0) {
-            throw new BusinessException(ResultCode.USER_CATEGORY_NOT_FOUND);
-        }
-        return userCategoryId;
-    }
-
-    private Long getDefaultUserCategoryId() {
-        UserCategory category = userCategoryMapper.selectOne(new LambdaQueryWrapper<UserCategory>()
-                .eq(UserCategory::getUserType, NORMAL_USER_TYPE)
-                .eq(UserCategory::getName, "普通用户")
-                .last("LIMIT 1"));
-        if (category == null) {
-            category = userCategoryMapper.selectOne(new LambdaQueryWrapper<UserCategory>()
-                    .eq(UserCategory::getUserType, NORMAL_USER_TYPE)
-                    .orderByAsc(UserCategory::getId)
-                    .last("LIMIT 1"));
-        }
-        return category != null ? category.getId() : null;
-    }
-
     private UserProfile buildProfileFromGroupDto(AppGroupMemberDTO dto, String phone, Long appUserId) {
         UserProfile profile = new UserProfile();
-        profile.setUserId(appUserId);
+        profile.setAppUserId(appUserId);
         profile.setName(dto.getName().trim());
         profile.setGender(dto.getGender());
         profile.setAge(dto.getAge());
         profile.setPhone(phone);
-        profile.setUserType(NORMAL_USER_TYPE);
+        profile.setUserCategoryId(dto.getUserCategoryId());
         profile.setProvinceCode(trimToNull(dto.getProvinceCode()));
         profile.setCityCode(trimToNull(dto.getCityCode()));
         profile.setDistrictCode(trimToNull(dto.getDistrictCode()));
@@ -615,7 +563,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
 
         UserProfile profile = userProfileMapper.selectOne(
                 new LambdaQueryWrapper<UserProfile>()
-                        .eq(UserProfile::getUserId, linkedAccount.getId())
+                        .eq(UserProfile::getAppUserId, linkedAccount.getId())
                         .orderByAsc(UserProfile::getCreateTime)
                         .last("LIMIT 1")
         );
@@ -623,7 +571,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
             profile = userProfileMapper.selectOne(
                     new LambdaQueryWrapper<UserProfile>()
                             .eq(UserProfile::getPhone, phone)
-                            .isNull(UserProfile::getUserId)
+                            .isNull(UserProfile::getAppUserId)
                             .orderByAsc(UserProfile::getCreateTime)
                             .last("LIMIT 1")
             );
@@ -641,7 +589,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
     private void updateProfileFromGroupDto(Long profileId, AppGroupMemberDTO dto, String phone, Long appUserId) {
         LambdaUpdateWrapper<UserProfile> wrapper = new LambdaUpdateWrapper<UserProfile>()
                 .eq(UserProfile::getId, profileId)
-                .set(UserProfile::getUserId, appUserId)
+                .set(UserProfile::getAppUserId, appUserId)
                 .set(UserProfile::getName, dto.getName().trim())
                 .set(UserProfile::getGender, dto.getGender())
                 .set(UserProfile::getAge, dto.getAge())
@@ -926,12 +874,11 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
         }
         data.put("profileId", profile.getId());
         data.put("id", profile.getId());
-        data.put("appUserId", profile.getUserId());
+        data.put("appUserId", profile.getAppUserId());
         data.put("name", profile.getName());
         data.put("gender", profile.getGender());
         data.put("age", profile.getAge());
         data.put("phone", profile.getPhone());
-        data.put("userType", profile.getUserType());
         data.put("provinceCode", profile.getProvinceCode());
         data.put("cityCode", profile.getCityCode());
         data.put("districtCode", profile.getDistrictCode());
@@ -958,7 +905,7 @@ public class AppDeviceGroupServiceImpl implements AppDeviceGroupService {
         data.put("accountPhone", appUser.getPhone());
         data.put("phone", profile.getPhone());
         data.put("appId", appUser.getAppId());
-        data.put("userCategoryId", appUser.getUserCategoryId());
+        data.put("userCategoryId", profile.getUserCategoryId());
         return data;
     }
 

+ 34 - 332
code/backend/src/main/java/com/aijiuyi/admin/service/impl/AppUserServiceImpl.java

@@ -10,22 +10,12 @@ import com.aijiuyi.admin.common.util.RedisUtil;
 import com.aijiuyi.admin.common.util.SmsUtil;
 import com.aijiuyi.admin.common.util.TokenUtil;
 import com.aijiuyi.admin.controller.dto.AppLoginDTO;
-import com.aijiuyi.admin.controller.dto.AppUserQueryDTO;
-import com.aijiuyi.admin.controller.dto.LoginDTO;
-import com.aijiuyi.admin.entity.AdminPermission;
 import com.aijiuyi.admin.entity.AppUser;
-import com.aijiuyi.admin.entity.UserCategory;
-import com.aijiuyi.admin.mapper.AdminPermissionMapper;
 import com.aijiuyi.admin.mapper.AppUserMapper;
-import com.aijiuyi.admin.mapper.UserCategoryMapper;
 import com.aijiuyi.admin.service.AppUserService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.DigestUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
@@ -33,14 +23,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 应用用户 Service 实现类
- * 统一用户中心:用户、专家、管理员均使用此表
+ * APP用户账号 Service 实现类
+ * 仅处理APP端手机号登录、短信验证码等逻辑
  */
 @Service
 public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements AppUserService {
 
-    private static final int NORMAL_USER_TYPE = 1;
-
     /** Token 在 Redis 中的 key 前缀 */
     private static final String TOKEN_REDIS_PREFIX = TokenInterceptor.REDIS_TOKEN_KEY_PREFIX;
 
@@ -65,10 +53,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
     /** 短信发送限流:60秒内不重复发送 */
     private static final long SMS_LIMIT_SECONDS = 60L;
 
-    /**
-     * 短信模板 Code(阿里云短信控制台配置的模板)
-     * TODO: 替换为实际申请的验证码模板 Code
-     */
+    /** 短信模板 Code */
     private static final String SMS_TEMPLATE_CODE = "SMS_316430242";
 
     /** 开发调试用万能验证码(仅 dev/test 环境生效) */
@@ -80,297 +65,8 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
     @Autowired
     private RedisUtil redisUtil;
 
-    @Autowired
-    private AdminPermissionMapper adminPermissionMapper;
-
-    @Autowired
-    private UserCategoryMapper userCategoryMapper;
-
-    /**
-     * 管理员登录
-     * 通过用户名+密码校验身份,生成 JWT Token 并存入 Redis
-     *
-     * @param loginDTO 登录参数
-     * @return 包含 token 和用户基本信息的 Result
-     */
-    @Override
-    public Result<Map<String, Object>> login(LoginDTO loginDTO) {
-        LogUtil.info(AppUserServiceImpl.class, "用户[{}]尝试登录", loginDTO.getUsername());
-
-        // 根据用户名查询用户(仅管理员可通过用户名登录)
-        AppUser user = lambdaQuery()
-                .eq(AppUser::getUsername, loginDTO.getUsername())
-                .one();
-
-        // 用户不存在
-        if (user == null) {
-            LogUtil.warn(AppUserServiceImpl.class, "用户[{}]不存在", loginDTO.getUsername());
-            throw new BusinessException(ResultCode.USER_NOT_FOUND);
-        }
-
-        // 验证密码(前端传明文,后端 MD5 加密后比对)
-        String md5Password = DigestUtils.md5DigestAsHex(loginDTO.getPassword().getBytes());
-        if (!md5Password.equals(user.getPassword())) {
-            LogUtil.warn(AppUserServiceImpl.class, "用户[{}]密码错误", loginDTO.getUsername());
-            throw new BusinessException(ResultCode.USER_PASSWORD_ERROR);
-        }
-
-        // 验证用户状态
-        if (user.getStatus() != null && user.getStatus() == 0) {
-            LogUtil.warn(AppUserServiceImpl.class, "用户[{}]已被禁用", loginDTO.getUsername());
-            throw new BusinessException(ResultCode.USER_DISABLED);
-        }
-
-        // 验证角色(仅 userType=3=管理员 可登录后台)
-        if (user.getUserType() == null || user.getUserType() != 3) {
-            LogUtil.warn(AppUserServiceImpl.class, "用户[{}]无后台登录权限", loginDTO.getUsername());
-            throw new BusinessException(ResultCode.FORBIDDEN);
-        }
-
-        // 生成 JWT Token(携带 userType)
-        String token = TokenUtil.generateToken(user.getId(), user.getUsername(), user.getUserType());
-
-        // 将 Token 存入 Redis,3年过期
-        redisUtil.set(TOKEN_REDIS_PREFIX + token, user.getId(), TOKEN_EXPIRE_SECONDS);
-
-        // 更新最后登录时间
-        AppUser updateLogin = new AppUser();
-        updateLogin.setId(user.getId());
-        updateLogin.setLastLoginTime(LocalDateTime.now());
-        updateById(updateLogin);
-
-        // 登录成功后将用户信息写入 RequestContext,供 LogAspect 正确记录操作人
-        RequestContext.setUserId(user.getId());
-        RequestContext.setUserName(user.getUsername());
-        RequestContext.setUserType(user.getUserType());
-
-        LogUtil.info(AppUserServiceImpl.class, "用户[{}]登录成功", user.getUsername());
-
-        // 查询权限路由(超级管理员返回 null,代表全部权限)
-        String routePaths = null;
-        if (!Integer.valueOf(1).equals(user.getAdminRole())) {
-            AdminPermission permission = adminPermissionMapper.selectOne(
-                    new LambdaQueryWrapper<AdminPermission>()
-                            .eq(AdminPermission::getAdminId, user.getId())
-            );
-            routePaths = permission != null ? permission.getRoutePaths() : "[]";
-        }
-
-        // 组装返回数据
-        Map<String, Object> resultData = new HashMap<>(8);
-        resultData.put("token", token);
-        resultData.put("userId", user.getId());
-        resultData.put("username", user.getUsername());
-        resultData.put("nickname", user.getNickname());
-        resultData.put("avatar", user.getAvatar());
-        resultData.put("userType", user.getUserType());
-        resultData.put("adminRole", user.getAdminRole());
-        resultData.put("permissions", routePaths);
-
-        return Result.success(resultData);
-    }
-
-    /**
-     * 退出登录
-     * 从 Redis 中删除 Token,使 Token 立即失效
-     *
-     * @param token 当前用户的 Token
-     */
-    @Override
-    public void logout(String token) {
-        if (StringUtils.hasText(token)) {
-            // 去掉 Bearer 前缀
-            if (token.startsWith("Bearer ")) {
-                token = token.substring(7);
-            }
-            // 从 Redis 删除 Token
-            redisUtil.del(TOKEN_REDIS_PREFIX + token);
-            LogUtil.info(AppUserServiceImpl.class, "用户退出登录,Token 已失效");
-        }
-    }
-
-    /**
-     * 分页查询应用用户列表
-     *
-     * @param queryDTO 查询条件
-     * @return 分页结果
-     */
-    @Override
-    public IPage<AppUser> pageList(AppUserQueryDTO queryDTO) {
-        Page<AppUser> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());
-        LambdaQueryWrapper<AppUser> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(StringUtils.hasText(queryDTO.getPhone()), AppUser::getPhone, queryDTO.getPhone())
-                .like(StringUtils.hasText(queryDTO.getNickname()), AppUser::getNickname, queryDTO.getNickname())
-                .eq(queryDTO.getStatus() != null, AppUser::getStatus, queryDTO.getStatus());
-        if (queryDTO.getUserCategoryId() != null) {
-            wrapper.eq(AppUser::getUserType, NORMAL_USER_TYPE)
-                    .eq(AppUser::getUserCategoryId, queryDTO.getUserCategoryId());
-        } else {
-            wrapper.eq(queryDTO.getUserType() != null, AppUser::getUserType, queryDTO.getUserType());
-        }
-        wrapper.orderByDesc(AppUser::getCreateTime);
-        return page(page, wrapper);
-    }
-
-    /**
-     * 修改用户状态(禁用/启用)
-     *
-     * @param id     用户ID
-     * @param status 目标状态:1=启用,0=禁用
-     */
-    @Override
-    public void updateStatus(Long id, Integer status) {
-        AppUser user = getById(id);
-        if (user == null) {
-            throw new BusinessException(ResultCode.APP_USER_NOT_FOUND);
-        }
-        AppUser update = new AppUser();
-        update.setId(id);
-        update.setStatus(status);
-        updateById(update);
-        LogUtil.info(AppUserServiceImpl.class, "应用用户[{}]状态修改为[{}]", id, status);
-    }
-
-    /**
-     * 新增应用用户
-     * 若为管理员(userType=3)则校验用户名唯一性并对密码做 MD5 加密
-     *
-     * @param appUser 用户信息
-     */
-    @Override
-    public void addUser(AppUser appUser) {
-        normalizeUserCategory(appUser.getUserType(), appUser);
-        // 手机号唯一性校验(手机号不为空时校验)
-        if (StringUtils.hasText(appUser.getPhone())) {
-            long phoneCount = lambdaQuery().eq(AppUser::getPhone, appUser.getPhone()).count();
-            if (phoneCount > 0) {
-                throw new BusinessException(ResultCode.PHONE_EXISTS);
-            }
-        }
-        // 管理员需校验用户名唯一性,并对密码加密
-        if (Integer.valueOf(3).equals(appUser.getUserType())) {
-            if (StringUtils.hasText(appUser.getUsername())) {
-                long usernameCount = lambdaQuery().eq(AppUser::getUsername, appUser.getUsername()).count();
-                if (usernameCount > 0) {
-                    throw new BusinessException(ResultCode.USERNAME_EXISTS);
-                }
-            }
-            // 密码 MD5 加密
-            if (StringUtils.hasText(appUser.getPassword())) {
-                appUser.setPassword(DigestUtils.md5DigestAsHex(appUser.getPassword().getBytes()));
-            }
-        }
-        save(appUser);
-        LogUtil.info(AppUserServiceImpl.class, "新增应用用户,手机号[{}],类型[{}]", appUser.getPhone(), appUser.getUserType());
-    }
-
-    /**
-     * 修改应用用户
-     *
-     * @param appUser 用户信息
-     */
-    @Override
-    public void updateUser(AppUser appUser) {
-        AppUser exist = getById(appUser.getId());
-        if (exist == null) {
-            throw new BusinessException(ResultCode.APP_USER_NOT_FOUND);
-        }
-        Integer targetUserType = appUser.getUserType() != null ? appUser.getUserType() : exist.getUserType();
-        normalizeUserCategory(targetUserType, appUser);
-        boolean shouldClearUserCategory = !Integer.valueOf(NORMAL_USER_TYPE).equals(targetUserType);
-        // 如果修改了手机号,校验唯一性
-        if (StringUtils.hasText(appUser.getPhone()) && !appUser.getPhone().equals(exist.getPhone())) {
-            long count = lambdaQuery().eq(AppUser::getPhone, appUser.getPhone()).count();
-            if (count > 0) {
-                throw new BusinessException(ResultCode.PHONE_EXISTS);
-            }
-        }
-        // 如果修改了用户名,校验唯一性
-        if (StringUtils.hasText(appUser.getUsername()) && !appUser.getUsername().equals(exist.getUsername())) {
-            long count = lambdaQuery().eq(AppUser::getUsername, appUser.getUsername()).count();
-            if (count > 0) {
-                throw new BusinessException(ResultCode.USERNAME_EXISTS);
-            }
-        }
-        // 如果修改了密码,重新加密
-        if (StringUtils.hasText(appUser.getPassword())) {
-            appUser.setPassword(DigestUtils.md5DigestAsHex(appUser.getPassword().getBytes()));
-        } else {
-            // 不修改密码字段
-            appUser.setPassword(null);
-        }
-        updateById(appUser);
-        if (shouldClearUserCategory) {
-            lambdaUpdate()
-                    .set(AppUser::getUserCategoryId, null)
-                    .eq(AppUser::getId, appUser.getId())
-                    .update();
-        }
-        LogUtil.info(AppUserServiceImpl.class, "修改应用用户[{}]", appUser.getId());
-    }
-
-    private void normalizeUserCategory(Integer userType, AppUser appUser) {
-        if (Integer.valueOf(NORMAL_USER_TYPE).equals(userType)) {
-            if (appUser.getUserCategoryId() == null) {
-                appUser.setUserCategoryId(getDefaultUserCategoryId());
-            } else {
-                validateUserCategory(appUser.getUserCategoryId());
-            }
-            return;
-        }
-        appUser.setUserCategoryId(null);
-    }
-
-    private Long getDefaultUserCategoryId() {
-        UserCategory category = userCategoryMapper.selectOne(new LambdaQueryWrapper<UserCategory>()
-                .eq(UserCategory::getUserType, NORMAL_USER_TYPE)
-                .eq(UserCategory::getName, "普通用户")
-                .last("LIMIT 1"));
-        if (category == null) {
-            category = userCategoryMapper.selectOne(new LambdaQueryWrapper<UserCategory>()
-                    .eq(UserCategory::getUserType, NORMAL_USER_TYPE)
-                    .orderByAsc(UserCategory::getId)
-                    .last("LIMIT 1"));
-        }
-        return category != null ? category.getId() : null;
-    }
-
-    private void validateUserCategory(Long userCategoryId) {
-        if (userCategoryId == null) {
-            return;
-        }
-        long count = userCategoryMapper.selectCount(new LambdaQueryWrapper<UserCategory>()
-                .eq(UserCategory::getId, userCategoryId)
-                .eq(UserCategory::getUserType, NORMAL_USER_TYPE));
-        if (count <= 0) {
-            throw new BusinessException(ResultCode.USER_CATEGORY_NOT_FOUND);
-        }
-    }
-
-    /**
-     * 删除应用用户(逻辑删除)
-     *
-     * @param id 用户ID
-     */
-    @Override
-    public void deleteUser(Long id) {
-        AppUser user = getById(id);
-        if (user == null) {
-            throw new BusinessException(ResultCode.APP_USER_NOT_FOUND);
-        }
-        removeById(id);
-        LogUtil.info(AppUserServiceImpl.class, "删除应用用户[{}]", id);
-    }
-
     /**
      * App 端发送短信验证码
-     * 处理逻辑:
-     * 1. 检60秒限流(同一手机号内不重复发送)
-     * 2. 生成6位随机验证码
-     * 3. 调用阿里云短信发送
-     * 4. 将验证码存入 Redis,有效期 5 分钟
-     *
-     * @param phone 手机号
      */
     @Override
     public void sendSmsCode(String phone) {
@@ -380,13 +76,13 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
             LogUtil.info(AppUserServiceImpl.class, "[开发模式] 跳过真实短信发送, phone={}, code={}", phone, DEV_BYPASS_CODE);
             return;
         }
-    
+
         // 检60秒内是否已发送(限流)
         String limitKey = SMS_LIMIT_PREFIX + phone;
         if (redisUtil.hasKey(limitKey)) {
             throw new BusinessException(ResultCode.SMS_SEND_TOO_FREQUENT);
         }
-    
+
         // 检查每日发送次数是否已达上限
         String dailyKey = SMS_DAILY_COUNT_PREFIX + phone;
         Object dailyCount = redisUtil.get(dailyKey);
@@ -394,8 +90,8 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         if (count >= SMS_DAILY_MAX_COUNT) {
             throw new BusinessException(ResultCode.SMS_DAILY_LIMIT);
         }
-    
-        // 生或6位随机验证码
+
+        // 生成6位随机验证码
         String code = String.format("%06d", (int) (Math.random() * 1000000));
 
         // 发送短信
@@ -408,13 +104,12 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
 
         // 存入 Redis(5 分钟有效)
         redisUtil.set(SMS_CODE_PREFIX + phone, code, SMS_CODE_EXPIRE_SECONDS);
-        // 设置60秒限流(设置在发送成功后)
+        // 设置60秒限流
         redisUtil.set(limitKey, "1", SMS_LIMIT_SECONDS);
-        // 累加每日发送次数(过期时间到当天结束)
+        // 累加每日发送次数
         if (redisUtil.hasKey(dailyKey)) {
             redisUtil.set(dailyKey, String.valueOf(count + 1), redisUtil.getExpire(dailyKey));
         } else {
-            // 计算到当天23:59:59的剩余秒数
             long secondsUntilMidnight = java.time.Duration.between(
                     java.time.LocalDateTime.now(),
                     java.time.LocalDate.now().plusDays(1).atStartOfDay()
@@ -434,15 +129,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
 
     /**
      * App 端手机号验证码登录
-     * 处理逻辑:
-     * 1. 校验验证码(是否存在、是否正确)
-     * 2. 验证成功后删除 Redis 中的验证码(一次性)
-     * 3. 查询用户,不存在则自动注册
-     * 4. 生成 JWT Token 并存入 Redis(3 年有效)
-     * 5. 更新最后登录时间
-     *
-     * @param loginDTO 手机号+验证码
-     * @return 包含 token 和用户信息的 Result
      */
     @Override
     public Result<Map<String, Object>> appLogin(AppLoginDTO loginDTO) {
@@ -472,12 +158,10 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
             user = new AppUser();
             user.setPhone(phone);
             user.setNickname("用户" + phone.substring(7));
-            user.setUserType(1);
-            user.setUserCategoryId(getDefaultUserCategoryId());
             user.setStatus(1);
             user.setLoginType(1);
             save(user);
-            // 注册成功后生成 AppId(前缀AJY + 8位用户ID)
+            // 注册成功后生成 AppId
             user.setAppId("AJY" + String.format("%08d", user.getId()));
             updateById(user);
             LogUtil.info(AppUserServiceImpl.class, "App 新用户自动注册: phone={}, appId={}", phone, user.getAppId());
@@ -486,10 +170,16 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
             if (user.getStatus() != null && user.getStatus() == 0) {
                 throw new BusinessException(ResultCode.APP_USER_DISABLED);
             }
+            // 兼容历史数据:已有用户若未生成 app_id,登录时自动补生成
+            if (!StringUtils.hasText(user.getAppId())) {
+                user.setAppId("AJY" + String.format("%08d", user.getId()));
+                updateById(user);
+                LogUtil.info(AppUserServiceImpl.class, "App 登录时补生成 AppId: phone={}, appId={}", phone, user.getAppId());
+            }
         }
 
-        // 生成 JWT Token(username 字段存手机号)
-        String token = TokenUtil.generateToken(user.getId(), phone, user.getUserType());
+        // 生成 JWT Token(userType=1 表示APP用户)
+        String token = TokenUtil.generateToken(user.getId(), phone, 1);
 
         // Token 存入 Redis(3 年有效)
         redisUtil.set(TOKEN_REDIS_PREFIX + token, user.getId(), TOKEN_EXPIRE_SECONDS);
@@ -501,10 +191,10 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         updateLogin.setLoginType(1);
         updateById(updateLogin);
 
-        // 写入请求上下文(供 LogAspect 正确记录操作人)
+        // 写入请求上下文
         RequestContext.setUserId(user.getId());
         RequestContext.setUserName(phone);
-        RequestContext.setUserType(user.getUserType());
+        RequestContext.setUserType(1);
 
         LogUtil.info(AppUserServiceImpl.class, "App 用户[{}]登录成功", phone);
 
@@ -515,9 +205,21 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         resultData.put("nickname", user.getNickname());
         resultData.put("avatar", user.getAvatar());
         resultData.put("appId", user.getAppId());
-        resultData.put("userType", user.getUserType());
-        resultData.put("userCategoryId", user.getUserCategoryId());
 
         return Result.success(resultData);
     }
+
+    /**
+     * APP用户退出登录
+     */
+    @Override
+    public void logout(String token) {
+        if (StringUtils.hasText(token)) {
+            if (token.startsWith("Bearer ")) {
+                token = token.substring(7);
+            }
+            redisUtil.del(TOKEN_REDIS_PREFIX + token);
+            LogUtil.info(AppUserServiceImpl.class, "APP用户退出登录,Token 已失效");
+        }
+    }
 }

+ 5 - 5
code/backend/src/main/java/com/aijiuyi/admin/service/impl/ContentArticleServiceImpl.java

@@ -6,10 +6,10 @@ import com.aijiuyi.admin.common.exception.BusinessException;
 import com.aijiuyi.admin.common.util.LogUtil;
 import com.aijiuyi.admin.controller.dto.ArticleRejectDTO;
 import com.aijiuyi.admin.controller.dto.ContentArticleQueryDTO;
-import com.aijiuyi.admin.entity.AppUser;
+import com.aijiuyi.admin.entity.AdminUser;
 import com.aijiuyi.admin.entity.ContentArticle;
 import com.aijiuyi.admin.mapper.ContentArticleMapper;
-import com.aijiuyi.admin.service.AppUserService;
+import com.aijiuyi.admin.service.AdminService;
 import com.aijiuyi.admin.service.ContentArticleService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,7 +39,7 @@ public class ContentArticleServiceImpl extends ServiceImpl<ContentArticleMapper,
     public static final String STATUS_OFFLINE = "OFFLINE";
 
     @Autowired
-    private AppUserService appUserService;
+    private AdminService adminService;
 
     /**
      * 分页查询文章列表
@@ -279,7 +279,7 @@ public class ContentArticleServiceImpl extends ServiceImpl<ContentArticleMapper,
         if (userId == null) {
             return false;
         }
-        AppUser user = appUserService.getById(userId);
-        return user != null && user.getAdminRole() != null && user.getAdminRole() == 1;
+        AdminUser admin = adminService.getById(userId);
+        return admin != null && admin.getAdminRole() != null && admin.getAdminRole() == 1;
     }
 }

+ 4 - 4
code/backend/src/main/java/com/aijiuyi/admin/service/impl/DeviceServiceImpl.java

@@ -457,14 +457,14 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
             DeviceGroupMember member = new DeviceGroupMember();
             member.setGroupId(group.getId());
             member.setProfileId(profileId);
-            member.setAppUserId(profile.getUserId());
+            member.setAppUserId(profile.getAppUserId());
             member.setStatus(STATUS_ENABLED);
             member.setJoinTime(LocalDateTime.now());
             deviceGroupMemberMapper.insert(member);
         } else {
             LambdaUpdateWrapper<DeviceGroupMember> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(DeviceGroupMember::getId, current.getId())
-                    .set(DeviceGroupMember::getAppUserId, profile.getUserId())
+                    .set(DeviceGroupMember::getAppUserId, profile.getAppUserId())
                     .set(DeviceGroupMember::getStatus, STATUS_ENABLED)
                     .set(DeviceGroupMember::getJoinTime, LocalDateTime.now());
             deviceGroupMemberMapper.update(null, wrapper);
@@ -633,11 +633,11 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
                 }
             }
         }
-        if (profile.getUserId() != null) {
+        if (profile.getAppUserId() != null) {
             long count = deviceGroupMemberMapper.selectCount(
                     new LambdaQueryWrapper<DeviceGroupMember>()
                             .eq(DeviceGroupMember::getGroupId, groupId)
-                            .eq(DeviceGroupMember::getAppUserId, profile.getUserId())
+                            .eq(DeviceGroupMember::getAppUserId, profile.getAppUserId())
                             .ne(DeviceGroupMember::getProfileId, excludeProfileId)
                             .eq(DeviceGroupMember::getStatus, STATUS_ENABLED)
             );

+ 3 - 3
code/backend/src/main/java/com/aijiuyi/admin/service/impl/PlanServiceImpl.java

@@ -198,14 +198,14 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         if (StringUtils.hasText(currentUser.getNickname())) {
             return currentUser.getNickname();
         }
-        if (StringUtils.hasText(currentUser.getUsername())) {
-            return currentUser.getUsername();
+        if (StringUtils.hasText(currentUser.getPhone())) {
+            return currentUser.getPhone();
         }
         return "ADMIN";
     }
 
     private Integer resolvePlanAuthorType(AppUser currentUser) {
-        Integer userType = currentUser != null ? currentUser.getUserType() : RequestContext.getUserType();
+        Integer userType = RequestContext.getUserType();
         if (Integer.valueOf(1).equals(userType)) {
             return 2;
         }

+ 7 - 8
code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserCategoryServiceImpl.java

@@ -4,10 +4,10 @@ import com.aijiuyi.admin.common.constant.ResultCode;
 import com.aijiuyi.admin.common.exception.BusinessException;
 import com.aijiuyi.admin.common.util.LogUtil;
 import com.aijiuyi.admin.controller.dto.UserCategoryQueryDTO;
-import com.aijiuyi.admin.entity.AppUser;
 import com.aijiuyi.admin.entity.UserCategory;
-import com.aijiuyi.admin.mapper.AppUserMapper;
+import com.aijiuyi.admin.entity.UserProfile;
 import com.aijiuyi.admin.mapper.UserCategoryMapper;
+import com.aijiuyi.admin.mapper.UserProfileMapper;
 import com.aijiuyi.admin.service.UserCategoryService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ public class UserCategoryServiceImpl extends ServiceImpl<UserCategoryMapper, Use
     private static final int NORMAL_USER_TYPE = 1;
 
     @Autowired
-    private AppUserMapper appUserMapper;
+    private UserProfileMapper userProfileMapper;
 
     @Override
     public IPage<UserCategory> pageList(UserCategoryQueryDTO queryDTO) {
@@ -115,11 +115,10 @@ public class UserCategoryServiceImpl extends ServiceImpl<UserCategoryMapper, Use
         if (exist == null) {
             throw new BusinessException(ResultCode.USER_CATEGORY_NOT_FOUND);
         }
-        long appUserCount = appUserMapper.selectCount(
-                new LambdaQueryWrapper<AppUser>()
-                        .eq(AppUser::getUserType, NORMAL_USER_TYPE)
-                        .eq(AppUser::getUserCategoryId, id));
-        if (appUserCount > 0) {
+        long profileCount = userProfileMapper.selectCount(
+                new LambdaQueryWrapper<UserProfile>()
+                        .eq(UserProfile::getUserCategoryId, id));
+        if (profileCount > 0) {
             throw new BusinessException(ResultCode.USER_CATEGORY_IN_USE);
         }
         removeById(id);

+ 5 - 8
code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserDeviceServiceImpl.java

@@ -36,7 +36,6 @@ import java.util.List;
 @Service
 public class UserDeviceServiceImpl extends ServiceImpl<UserDeviceMapper, UserDevice> implements UserDeviceService {
 
-    private static final int NORMAL_USER_TYPE = 1;
     private static final int DEVICE_TYPE_FAMILY = 1;
     private static final int DEVICE_TYPE_PUBLIC = 2;
     private static final int STATUS_ENABLED = 1;
@@ -276,7 +275,7 @@ public class UserDeviceServiceImpl extends ServiceImpl<UserDeviceMapper, UserDev
     private UserProfile ensureAccountProfile(AppUser appUser) {
         UserProfile profile = userProfileMapper.selectOne(
                 new LambdaQueryWrapper<UserProfile>()
-                        .eq(UserProfile::getUserId, appUser.getId())
+                        .eq(UserProfile::getAppUserId, appUser.getId())
                         .orderByAsc(UserProfile::getCreateTime)
                         .last("LIMIT 1")
         );
@@ -289,26 +288,24 @@ public class UserDeviceServiceImpl extends ServiceImpl<UserDeviceMapper, UserDev
             profile = userProfileMapper.selectOne(
                     new LambdaQueryWrapper<UserProfile>()
                             .eq(UserProfile::getPhone, phone)
-                            .and(w -> w.isNull(UserProfile::getUserId).or().eq(UserProfile::getUserId, appUser.getId()))
+                            .and(w -> w.isNull(UserProfile::getAppUserId).or().eq(UserProfile::getAppUserId, appUser.getId()))
                             .orderByAsc(UserProfile::getCreateTime)
                             .last("LIMIT 1")
             );
             if (profile != null) {
                 UserProfile update = new UserProfile();
                 update.setId(profile.getId());
-                update.setUserId(appUser.getId());
+                update.setAppUserId(appUser.getId());
                 userProfileMapper.updateById(update);
-                profile.setUserId(appUser.getId());
+                profile.setAppUserId(appUser.getId());
                 return profile;
             }
         }
 
         profile = new UserProfile();
-        profile.setUserId(appUser.getId());
+        profile.setAppUserId(appUser.getId());
         profile.setPhone(phone);
         profile.setName(resolveProfileName(appUser.getNickname(), phone, appUser.getId()));
-        profile.setUserType(NORMAL_USER_TYPE);
-        profile.setAddress(appUser.getAddress());
         userProfileMapper.insert(profile);
         return profile;
     }

+ 49 - 78
code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserProfileServiceImpl.java

@@ -6,10 +6,8 @@ import com.aijiuyi.admin.common.util.LogUtil;
 import com.aijiuyi.admin.controller.dto.UserProfileDTO;
 import com.aijiuyi.admin.controller.dto.UserProfileQueryDTO;
 import com.aijiuyi.admin.entity.AppUser;
-import com.aijiuyi.admin.entity.UserCategory;
 import com.aijiuyi.admin.entity.UserProfile;
 import com.aijiuyi.admin.mapper.AppUserMapper;
-import com.aijiuyi.admin.mapper.UserCategoryMapper;
 import com.aijiuyi.admin.mapper.UserProfileMapper;
 import com.aijiuyi.admin.service.UserAcupointService;
 import com.aijiuyi.admin.service.UserProfileService;
@@ -27,22 +25,17 @@ import java.math.BigDecimal;
 import java.util.List;
 
 /**
- * 子用户信息 Service 实现类
+ * 用户档案 Service 实现类
  */
 @Service
 public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserProfile> implements UserProfileService {
 
-    private static final int NORMAL_USER_TYPE = 1;
-
     @Autowired
     private UserAcupointService userAcupointService;
 
     @Autowired
     private AppUserMapper appUserMapper;
 
-    @Autowired
-    private UserCategoryMapper userCategoryMapper;
-
     @Override
     public IPage<UserProfile> pageList(UserProfileQueryDTO queryDTO) {
         Page<UserProfile> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());
@@ -52,15 +45,19 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addProfile(UserProfileDTO dto) {
+        if (!StringUtils.hasText(dto.getPhone())) {
+            throw new BusinessException("手机号不能为空");
+        }
         checkPhoneUnique(dto.getPhone(), null);
         validateFingerWidths(dto);
 
+        // 根据手机号自动创建或关联 app_user 账号
+        Long appUserId = ensureAppUserForPhone(dto.getPhone());
+
         UserProfile profile = buildProfileFromDto(dto);
+        profile.setAppUserId(appUserId);
         save(profile);
-        LogUtil.info(UserProfileServiceImpl.class, "新增子用户[{}],手机号[{}]", dto.getName(), dto.getPhone());
-
-        syncAppUserType(dto.getPhone(), NORMAL_USER_TYPE);
-        syncAppUserCategory(dto.getPhone(), dto.getUserCategoryId());
+        LogUtil.info(UserProfileServiceImpl.class, "新增用户档案[{}],手机号[{}],关联app_user[{}]", dto.getName(), dto.getPhone(), appUserId);
 
         regenerateUserAcupoints(profile.getId(), "新增");
     }
@@ -75,19 +72,21 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
 
         if (StringUtils.hasText(dto.getPhone()) && !dto.getPhone().equals(exist.getPhone())) {
             checkPhoneUnique(dto.getPhone(), dto.getId());
+            // 手机号变更,重新关联 app_user
+            Long appUserId = ensureAppUserForPhone(dto.getPhone());
+            dto.setAppUserId(appUserId);
         }
 
         validateFingerWidths(dto);
 
         UserProfile profile = buildProfileFromDto(dto);
         profile.setId(dto.getId());
+        // 如果手机号未变更,保留原有 appUserId
+        if (profile.getAppUserId() == null) {
+            profile.setAppUserId(exist.getAppUserId());
+        }
         updateById(profile);
-        LogUtil.info(UserProfileServiceImpl.class, "修改子用户[{}]", dto.getId());
-
-        // 优先以传入手机号同步;未传入时回退到已存记录的手机号
-        String syncPhone = StringUtils.hasText(dto.getPhone()) ? dto.getPhone() : exist.getPhone();
-        syncAppUserType(syncPhone, NORMAL_USER_TYPE);
-        syncAppUserCategory(syncPhone, dto.getUserCategoryId());
+        LogUtil.info(UserProfileServiceImpl.class, "修改用户档案[{}]", dto.getId());
 
         regenerateUserAcupoints(dto.getId(), "修改");
     }
@@ -99,7 +98,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
             throw new BusinessException(ResultCode.PROFILE_NOT_FOUND);
         }
         removeById(id);
-        LogUtil.info(UserProfileServiceImpl.class, "删除子用户[{}]", id);
+        LogUtil.info(UserProfileServiceImpl.class, "删除用户档案[{}]", id);
     }
 
     @Override
@@ -108,7 +107,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
         removeByIds(ids);
-        LogUtil.info(UserProfileServiceImpl.class, "批量删除子用户,共[{}]条", ids.size());
+        LogUtil.info(UserProfileServiceImpl.class, "批量删除用户档案,共[{}]条", ids.size());
     }
 
     @Override
@@ -134,7 +133,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
             save(profile);
         }
 
-        LogUtil.info(UserProfileServiceImpl.class, "批量导入子用户,共[{}]条", list.size());
+        LogUtil.info(UserProfileServiceImpl.class, "批量导入用户档案,共[{}]条", list.size());
     }
 
     /**
@@ -182,6 +181,33 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         }
     }
 
+    /**
+     * 根据手机号查找或创建 app_user 账号,返回 app_user.id。
+     * 后台新增用户时手机号必填,自动为其创建 APP 登录账号。
+     */
+    private Long ensureAppUserForPhone(String phone) {
+        if (!StringUtils.hasText(phone)) {
+            return null;
+        }
+        AppUser existing = appUserMapper.selectOne(
+                new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, phone));
+        if (existing != null) {
+            return existing.getId();
+        }
+        // 自动创建APP账号
+        AppUser newUser = new AppUser();
+        newUser.setPhone(phone);
+        newUser.setNickname(phone.substring(0, 3) + "****" + phone.substring(7));
+        newUser.setStatus(1);
+        newUser.setLoginType(1);
+        appUserMapper.insert(newUser);
+        // 生成展示用 AppId(格式 AJY00000001)
+        newUser.setAppId("AJY" + String.format("%08d", newUser.getId()));
+        appUserMapper.updateById(newUser);
+        LogUtil.info(UserProfileServiceImpl.class, "自动创建 app_user 账号,手机号[{}],id[{}],appId[{}]", phone, newUser.getId(), newUser.getAppId());
+        return newUser.getId();
+    }
+
     private void regenerateUserAcupoints(Long profileId, String action) {
         try {
             userAcupointService.generateForUser(profileId);
@@ -196,68 +222,13 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         }
     }
 
-    /**
-     * 同步用户类型到 app_user:若 user_profile.phone 与 app_user.phone 一致,同步修改其 userType。
-     */
-    private void syncAppUserType(String phone, Integer userType) {
-        if (!StringUtils.hasText(phone) || userType == null) {
-            return;
-        }
-        AppUser appUser = appUserMapper.selectOne(
-                new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, phone));
-        if (appUser == null) {
-            return;
-        }
-        if (userType.equals(appUser.getUserType())) {
-            return;
-        }
-        AppUser update = new AppUser();
-        update.setId(appUser.getId());
-        update.setUserType(userType);
-        appUserMapper.updateById(update);
-        LogUtil.info(UserProfileServiceImpl.class,
-                "同步 app_user[{}] 用户类型为[{}](手机号[{}])", appUser.getId(), userType, phone);
-    }
-
-    /**
-     * 同步用户分类到 app_user:用户列表只维护身份为“用户”的档案,分类存储在 app_user.user_category_id。
-     */
-    private void syncAppUserCategory(String phone, Long userCategoryId) {
-        if (!StringUtils.hasText(phone) || userCategoryId == null) {
-            return;
-        }
-        long categoryCount = userCategoryMapper.selectCount(
-                new LambdaQueryWrapper<UserCategory>()
-                        .eq(UserCategory::getId, userCategoryId)
-                        .eq(UserCategory::getUserType, NORMAL_USER_TYPE));
-        if (categoryCount <= 0) {
-            throw new BusinessException(ResultCode.USER_CATEGORY_NOT_FOUND);
-        }
-
-        AppUser appUser = appUserMapper.selectOne(
-                new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, phone));
-        if (appUser == null || !Integer.valueOf(NORMAL_USER_TYPE).equals(appUser.getUserType())) {
-            return;
-        }
-        if (userCategoryId.equals(appUser.getUserCategoryId())) {
-            return;
-        }
-        AppUser update = new AppUser();
-        update.setId(appUser.getId());
-        update.setUserCategoryId(userCategoryId);
-        appUserMapper.updateById(update);
-        LogUtil.info(UserProfileServiceImpl.class,
-                "同步 app_user[{}] 用户分类为[{}](手机号[{}])", appUser.getId(), userCategoryId, phone);
-    }
-
     private UserProfile buildProfileFromDto(UserProfileDTO dto) {
         UserProfile profile = new UserProfile();
-        profile.setUserId(dto.getUserId());
         profile.setName(dto.getName());
         profile.setGender(dto.getGender());
         profile.setAge(dto.getAge());
         profile.setPhone(dto.getPhone());
-        profile.setUserType(NORMAL_USER_TYPE);
+        profile.setUserCategoryId(dto.getUserCategoryId());
         profile.setProvinceCode(dto.getProvinceCode());
         profile.setCityCode(dto.getCityCode());
         profile.setDistrictCode(dto.getDistrictCode());
@@ -286,4 +257,4 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         wrapper.orderByAsc(UserProfile::getName).last("LIMIT 200");
         return list(wrapper);
     }
-}
+}

+ 58 - 0
code/backend/src/main/resources/db/migration_admin_user.sql

@@ -0,0 +1,58 @@
+-- ============================================================
+-- 用户表结构重构迁移脚本
+-- 目的:将管理员与APP用户隔离,明确表职责边界
+-- ============================================================
+
+-- 1. 创建 admin_user 表(管理员独立表)
+CREATE TABLE IF NOT EXISTS `admin_user` (
+  `id` bigint NOT NULL,
+  `username` varchar(50) NOT NULL COMMENT '用户名(唯一,登录用)',
+  `password` varchar(255) NOT NULL COMMENT '密码(MD5加密)',
+  `nickname` varchar(50) DEFAULT NULL COMMENT '昵称',
+  `phone` varchar(20) DEFAULT NULL COMMENT '手机号',
+  `avatar` varchar(500) DEFAULT NULL COMMENT '头像URL',
+  `admin_role` int DEFAULT NULL COMMENT '角色:1=超管,2=设备管理,3=圣手管理',
+  `status` int DEFAULT 1 COMMENT '状态:1=正常,0=禁用',
+  `last_login_time` datetime DEFAULT NULL COMMENT '最后登录时间',
+  `deleted` int DEFAULT 0 COMMENT '逻辑删除:0=未删除,1=已删除',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_username` (`username`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='后台管理员表';
+
+-- 2. 从 app_user 迁移管理员数据到 admin_user
+INSERT INTO `admin_user` (`id`, `username`, `password`, `nickname`, `phone`, `avatar`, `admin_role`, `status`, `last_login_time`, `deleted`, `create_time`, `update_time`)
+SELECT `id`, `username`, `password`, `nickname`, `phone`, `avatar`, `admin_role`, `status`, `last_login_time`, `deleted`, `create_time`, `update_time`
+FROM `app_user`
+WHERE `user_type` = 3 AND `username` IS NOT NULL;
+
+-- 3. 迁移 admin_permission 数据(admin_id 对应关系保持不变,因为主键ID一致)
+
+-- 4. 修改 user_profile 表
+-- 4a. 将 user_id 重命名为 app_user_id
+ALTER TABLE `user_profile` CHANGE COLUMN `user_id` `app_user_id` bigint DEFAULT NULL COMMENT '关联APP账号ID(app_user.id),NULL表示不可登录APP';
+
+-- 4b. 添加 user_category_id 字段(从 app_user 表迁移过来)
+ALTER TABLE `user_profile` ADD COLUMN `user_category_id` bigint DEFAULT NULL COMMENT '用户分类ID' AFTER `phone`;
+
+-- 4c. 同步已有数据的 user_category_id(从关联的 app_user 中获取)
+UPDATE `user_profile` up
+INNER JOIN `app_user` au ON au.id = up.app_user_id AND au.deleted = 0
+SET up.user_category_id = au.user_category_id
+WHERE au.user_category_id IS NOT NULL;
+
+-- 4d. 删除 user_type 字段(不再需要区分角色)
+ALTER TABLE `user_profile` DROP COLUMN `user_type`;
+
+-- 5. 修改 app_user 表(删除管理员相关字段)
+-- 5a. 先删除管理员数据(已迁移到 admin_user)
+DELETE FROM `app_user` WHERE `user_type` = 3;
+
+-- 5b. 删除不需要的字段
+ALTER TABLE `app_user` DROP COLUMN `username`;
+ALTER TABLE `app_user` DROP COLUMN `password`;
+ALTER TABLE `app_user` DROP COLUMN `user_type`;
+ALTER TABLE `app_user` DROP COLUMN `user_category_id`;
+ALTER TABLE `app_user` DROP COLUMN `admin_role`;
+ALTER TABLE `app_user` DROP COLUMN `address`;

+ 6 - 12
code/backend/src/main/resources/mapper/UserProfileMapper.xml

@@ -3,20 +3,20 @@
 <mapper namespace="com.aijiuyi.admin.mapper.UserProfileMapper">
 
     <!--
-        分页查询用户列表,LEFT JOIN user_device 获取绑定设备编号
-        该列表固定展示身份为“用户”的数据,并关联 app_user_category 获取用户分类
+        分页查询用户档案列表,LEFT JOIN user_device 获取绑定设备编号
+        user_category_id 现在直接存储在 user_profile 表中,关联 app_user_category 获取分类名称
         device_codes: GROUP_CONCAT 逗号拼接已绑定设备编号
         设备编号过滤使用子查询,避免 LEFT JOIN 过滤导致无设备用户丢失
     -->
     <select id="pageWithDevices" resultType="com.aijiuyi.admin.entity.UserProfile">
         SELECT
             up.id,
-            up.user_id,
+            up.app_user_id,
             up.name,
             up.gender,
             up.age,
             up.phone,
-            up.user_type,
+            up.user_category_id,
             up.province_code,
             up.city_code,
             up.district_code,
@@ -33,18 +33,12 @@
             up.deleted,
             up.create_time,
             up.update_time,
-            MAX(COALESCE(au_id.user_category_id, au_phone.user_category_id)) AS user_category_id,
             MAX(uc.name) AS user_category_name,
             GROUP_CONCAT(ud.device_code ORDER BY ud.id SEPARATOR ',') AS device_codes
         FROM user_profile up
         LEFT JOIN user_device ud ON ud.user_id = up.id AND ud.status = 1
-        LEFT JOIN app_user au_id ON au_id.id = up.user_id AND au_id.deleted = 0
-        LEFT JOIN app_user au_phone ON au_id.id IS NULL AND au_phone.phone = up.phone AND au_phone.deleted = 0
-        LEFT JOIN app_user_category uc
-            ON uc.id = COALESCE(au_id.user_category_id, au_phone.user_category_id)
-            AND uc.deleted = 0
+        LEFT JOIN app_user_category uc ON uc.id = up.user_category_id AND uc.deleted = 0
         WHERE up.deleted = 0
-          AND up.user_type = 1
         <if test="q.keyword != null and q.keyword != ''">
             AND (up.name LIKE CONCAT('%', #{q.keyword}, '%')
               OR up.phone LIKE CONCAT('%', #{q.keyword}, '%'))
@@ -53,7 +47,7 @@
             AND up.gender = #{q.gender}
         </if>
         <if test="q.userCategoryId != null">
-            AND COALESCE(au_id.user_category_id, au_phone.user_category_id) = #{q.userCategoryId}
+            AND up.user_category_id = #{q.userCategoryId}
         </if>
         <if test="q.provinceCode != null and q.provinceCode != ''">
             AND up.province_code = #{q.provinceCode}

+ 4 - 5
code/frontend/src/api/auth.js

@@ -55,10 +55,9 @@ export function uploadImage(file) {
 }
 
 /**
- * 获取应用用户列表(用于方案创作人选择框)
- * @param {number} [userType] 可选过滤:1=用户,2=专家,3=管理员;不传则返回全部
- * @returns {Promise} 用户列表(id + nickname + username + userType)
+ * 获取APP用户列表(用于方案创作人选择框等场景)
+ * @returns {Promise} 用户列表(id + phone + nickname + appId)
  */
-export function getAppUserList(userType) {
-  return request.get('/user/app/list', { params: userType != null ? { userType } : {} })
+export function getAppUserList() {
+  return request.get('/user/app/list')
 }

+ 7 - 32
code/frontend/src/api/user.js

@@ -139,18 +139,17 @@ export function deleteDevice(id) {
   return request.delete(`/user/device/${id}`)
 }
 
-// ======================== 应用用户(保留,备用)========================
+// ======================== APP账号管理 ========================
 
 /**
- * 分页查询应用用户列表
- * @param {Object} params 查询参数
+ * 获取APP账号列表(全部启用的账号,用于下拉选择)
  */
-export function getAppUserPage(params) {
-  return request.get('/user/app/page', { params })
+export function getAppUserList() {
+  return request.get('/user/app/list')
 }
 
 /**
- * 查询应用用户详情
+ * 查询APP账号详情
  * @param {string} id 用户ID
  */
 export function getAppUserById(id) {
@@ -158,33 +157,9 @@ export function getAppUserById(id) {
 }
 
 /**
- * 新增应用用户
- * @param {Object} data 用户信息
- */
-export function addAppUser(data) {
-  return request.post('/user/app', data)
-}
-
-/**
- * 修改应用用户
- * @param {Object} data 用户信息
- */
-export function updateAppUser(data) {
-  return request.put('/user/app', data)
-}
-
-/**
- * 删除应用用户
- * @param {string} id 用户ID
- */
-export function deleteAppUser(id) {
-  return request.delete(`/user/app/${id}`)
-}
-
-/**
- * 修改应用用户状态
+ * 修改APP用户状态
  * @param {string} id     用户ID
- * @param {string} status 目标状态:1=启用,0=禁用
+ * @param {number} status 目标状态:1=启用,0=禁用
  */
 export function updateAppUserStatus(id, status) {
   return request.put(`/user/app/${id}/status`, null, { params: { status } })

+ 25 - 276
code/frontend/src/views/user/app-user/index.vue

@@ -6,35 +6,6 @@
         <el-form-item label="手机号">
           <el-input v-model="queryForm.phone" placeholder="请输入手机号" clearable style="width:180px" />
         </el-form-item>
-        <el-form-item label="昵称">
-          <el-input v-model="queryForm.nickname" placeholder="请输入昵称" clearable style="width:180px" />
-        </el-form-item>
-        <el-form-item label="用户身份">
-          <el-select v-model="queryForm.userType" placeholder="全部" clearable style="width:120px">
-            <el-option
-              v-for="item in userTypeOptions"
-              :key="item.code"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="用户分类">
-          <el-select
-            v-model="queryForm.userCategoryId"
-            placeholder="全部"
-            clearable
-            :disabled="queryForm.userType && queryForm.userType !== 1"
-            style="width:140px"
-          >
-            <el-option
-              v-for="item in userCategoryOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="queryForm.status" placeholder="全部" clearable style="width:100px">
             <el-option label="正常" :value="1" />
@@ -52,31 +23,15 @@
     <el-card class="table-card">
       <template #header>
         <div class="card-header">
-          <span class="title">账号管理列表</span>
-          <el-button type="primary" :icon="Plus" @click="handleAdd">新增用户</el-button>
+          <span class="title">APP账号管理</span>
         </div>
       </template>
 
       <el-table :data="tableData" v-loading="loading" border stripe>
         <el-table-column type="index" label="#" width="55" align="center" />
-        <el-table-column prop="phone" label="手机号" width="130" />
+        <el-table-column prop="phone" label="手机号" width="140" />
         <el-table-column prop="nickname" label="昵称" />
-        <el-table-column prop="userType" label="用户身份" width="100" align="center">
-          <template #default="{ row }">
-            <el-tag
-              :type="userTypeTagType(row.userType)"
-              size="small"
-            >
-              {{ userTypeText(row.userType) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="userCategoryId" label="用户分类" width="120" align="center">
-          <template #default="{ row }">
-            <span v-if="row.userType === 1">{{ userCategoryText(row.userCategoryId) }}</span>
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="appId" label="APP ID" width="150" />
         <el-table-column prop="status" label="状态" width="80" align="center">
           <template #default="{ row }">
             <el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">
@@ -84,12 +39,10 @@
             </el-tag>
           </template>
         </el-table-column>
-         <el-table-column prop="s" label="绑定设备" width="170" />
-          <el-table-column prop="s" label="子用户" width="170" />
+        <el-table-column prop="lastLoginTime" label="最后登录" width="170" :formatter="dateTimeFormatter" />
         <el-table-column prop="createTime" label="注册时间" width="170" :formatter="dateTimeFormatter" />
-        <el-table-column label="操作" width="240" align="center" fixed="right">
+        <el-table-column label="操作" width="120" align="center" fixed="right">
           <template #default="{ row }">
-            <el-button size="small" type="primary" link @click="handleEdit(row)">编辑</el-button>
             <el-button
               size="small"
               :type="row.status === 1 ? 'warning' : 'success'"
@@ -98,170 +51,50 @@
             >
               {{ row.status === 1 ? '禁用' : '启用' }}
             </el-button>
-            <!-- <el-button size="small" type="info" link @click="handleViewProfiles(row)">子用户</el-button> -->
-            <el-button size="small" type="danger" link @click="handleDelete(row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <!-- 分页 -->
-      <el-pagination
-        v-model:current-page="queryForm.pageNum"
-        v-model:page-size="queryForm.pageSize"
-        :page-sizes="[10, 20, 50]"
-        :total="total"
-        :hide-on-single-page="false"
-        layout="total, sizes, prev, pager, next, jumper"
-        background
-        class="pagination"
-        @size-change="loadData"
-        @current-change="loadData"
-      />
+      <!-- 展示总数 -->
+      <div class="pagination" v-if="total > 0">
+        <span>共 {{ total }} 条记录</span>
+      </div>
     </el-card>
-
-    <!-- 新增/编辑弹窗 -->
-    <el-dialog
-      v-model="dialogVisible"
-      :title="dialogTitle"
-      width="500px"
-      destroy-on-close
-      :close-on-click-modal="false"
-    >
-      <el-form :model="formData" :rules="formRules" ref="formRef" label-width="90px">
-        <el-form-item label="手机号" prop="phone">
-          <el-input v-model="formData.phone" placeholder="请输入手机号" :disabled="!!formData.id" />
-        </el-form-item>
-        <el-form-item label="昵称" prop="nickname">
-          <el-input v-model="formData.nickname" placeholder="请输入昵称" />
-        </el-form-item>
-        <el-form-item label="用户身份" prop="userType">
-          <el-select v-model="formData.userType" placeholder="请选择" style="width:100%">
-            <el-option
-              v-for="item in userTypeOptions"
-              :key="item.code"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="formData.userType === 1" label="用户分类" prop="userCategoryId">
-          <el-select v-model="formData.userCategoryId" placeholder="请选择用户分类" clearable style="width:100%">
-            <el-option
-              v-for="item in userCategoryOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="formData.status">
-            <el-radio :label="1">正常</el-radio>
-            <el-radio :label="0">禁用</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" :loading="submitLoading" @click="handleSubmit">确定</el-button>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, watch } from 'vue'
-import { useRouter } from 'vue-router'
+import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { Search, Refresh, Plus } from '@element-plus/icons-vue'
-import {
-  getAppUserPage,
-  addAppUser,
-  updateAppUser,
-  deleteAppUser,
-  updateAppUserStatus
-} from '@/api/user'
-import { getUserCategoryList } from '@/api/userCategory'
+import { Search, Refresh } from '@element-plus/icons-vue'
+import { getAppUserList, updateAppUserStatus } from '@/api/user'
 import { dateTimeFormatter } from '@/utils/date'
-import { parsePageData } from '@/utils/pagination'
-
-const router = useRouter()
-
-/** 用户身份固定选项(app_user.user_type 主分类) */
-const userTypeOptions = [
-  { code: 1, name: '用户', tagType: 'primary' },
-  { code: 2, name: '专家', tagType: 'warning' },
-  { code: 3, name: '管理员', tagType: 'danger' }
-]
-
-/** 用户分类选项(用户 user_type=1 的分类) */
-const userCategoryOptions = ref([])
-
-/** 用户身份文本 */
-function userTypeText(type) {
-  if (type == null) return '-'
-  const item = userTypeOptions.find(c => c.code === type)
-  return item ? item.name : '-'
-}
-
-/** 用户身份标签颜色 */
-function userTypeTagType(type) {
-  if (type == null) return 'info'
-  const item = userTypeOptions.find(c => c.code === type)
-  return item?.tagType || 'primary'
-}
-
-function userCategoryText(categoryId) {
-  if (!categoryId) return '-'
-  const item = userCategoryOptions.value.find(c => c.id === categoryId)
-  return item ? item.name : '-'
-}
 
 // 查询表单
 const queryForm = reactive({
   phone: '',
-  nickname: '',
-  userType: null,
-  userCategoryId: null,
-  status: null,
-  pageNum: 1,
-  pageSize: 10
+  status: null
 })
 
 const tableData = ref([])
 const total = ref(0)
 const loading = ref(false)
 
-// 弹窗
-const dialogVisible = ref(false)
-const dialogTitle = ref('')
-const submitLoading = ref(false)
-const formRef = ref(null)
-const formData = reactive({
-  id: null,
-  phone: '',
-  nickname: '',
-  userType: 1,
-  userCategoryId: null,
-  status: 1
-})
-
-const formRules = {
-  phone: [
-    { required: true, message: '请输入手机号', trigger: 'blur' },
-    { pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }
-  ],
-  userType: [{ required: true, message: '请选择用户身份', trigger: 'change' }]
-}
-
 // 加载数据
 async function loadData() {
   loading.value = true
   try {
-    const res = await getAppUserPage(queryForm)
-    const { records, total: pageTotal } = parsePageData(res.data)
-    tableData.value = records
-    total.value = pageTotal
+    const res = await getAppUserList()
+    let list = res.data || []
+    // 前端过滤
+    if (queryForm.phone) {
+      list = list.filter(item => item.phone && item.phone.includes(queryForm.phone))
+    }
+    if (queryForm.status !== null && queryForm.status !== undefined && queryForm.status !== '') {
+      list = list.filter(item => item.status === queryForm.status)
+    }
+    tableData.value = list
+    total.value = list.length
   } finally {
     loading.value = false
   }
@@ -274,105 +107,21 @@ function handleSearch() {
 
 function handleReset() {
   queryForm.phone = ''
-  queryForm.nickname = ''
-  queryForm.userType = null
-  queryForm.userCategoryId = null
   queryForm.status = null
-  queryForm.pageNum = 1
   loadData()
 }
 
-// 新增
-function handleAdd() {
-  Object.assign(formData, { id: null, phone: '', nickname: '', userType: 1, userCategoryId: null, status: 1 })
-  dialogTitle.value = '新增账号'
-  dialogVisible.value = true
-}
-
-// 编辑
-function handleEdit(row) {
-  Object.assign(formData, {
-    id: row.id,
-    phone: row.phone,
-    nickname: row.nickname,
-    userType: row.userType,
-    userCategoryId: row.userCategoryId || null,
-    status: row.status
-  })
-  dialogTitle.value = '编辑账号'
-  dialogVisible.value = true
-}
-
-// 提交
-async function handleSubmit() {
-  await formRef.value.validate()
-  submitLoading.value = true
-  try {
-    if (formData.id) {
-      await updateAppUser({ ...formData })
-    } else {
-      await addAppUser({ ...formData })
-    }
-    ElMessage.success('操作成功')
-    dialogVisible.value = false
-    loadData()
-  } finally {
-    submitLoading.value = false
-  }
-}
-
 // 禁用/启用
 async function handleToggleStatus(row) {
   const newStatus = row.status === 1 ? 0 : 1
   const action = newStatus === 0 ? '禁用' : '启用'
-  await ElMessageBox.confirm(`确认${action}该用户吗?`, '提示', { type: 'warning' })
+  await ElMessageBox.confirm(`确认${action}该账号吗?`, '提示', { type: 'warning' })
   await updateAppUserStatus(row.id, newStatus)
   ElMessage.success(`已${action}`)
   loadData()
 }
 
-// 查看子用户
-function handleViewProfiles(row) {
-  router.push({ path: '/user/profile', query: { userId: row.id } })
-}
-
-// 删除
-async function handleDelete(row) {
-  await ElMessageBox.confirm('确认删除该用户吗?删除后不可恢复!', '提示', { type: 'warning' })
-  await deleteAppUser(row.id)
-  ElMessage.success('删除成功')
-  loadData()
-}
-
-async function loadUserCategories() {
-  try {
-    const res = await getUserCategoryList()
-    userCategoryOptions.value = res.data || []
-  } catch (e) {
-    userCategoryOptions.value = []
-  }
-}
-
-watch(
-  () => formData.userType,
-  userType => {
-    if (userType !== 1) {
-      formData.userCategoryId = null
-    }
-  }
-)
-
-watch(
-  () => queryForm.userType,
-  userType => {
-    if (userType && userType !== 1) {
-      queryForm.userCategoryId = null
-    }
-  }
-)
-
 onMounted(() => {
-  loadUserCategories()
   loadData()
 })
 </script>