Browse Source

1、艾灸椅用户类别获取通过设置类别管理设置
2、用户属性新增省、市、区、详细地址、用户类别字段以及管理
3、设备管理新增省、市、区、详细地址字段以及管理

liyuliangjiazai 6 months ago
parent
commit
4b0bd049b8
33 changed files with 1636 additions and 32 deletions
  1. 2 0
      .gitignore
  2. 36 12
      code/ajyApp/manifest.json
  3. 6 0
      code/ajyApp/pages.json
  4. 13 1
      code/backend/src/main/java/com/aijiuyi/admin/common/constant/ResultCode.java
  5. 114 0
      code/backend/src/main/java/com/aijiuyi/admin/controller/UserCategoryController.java
  6. 9 0
      code/backend/src/main/java/com/aijiuyi/admin/controller/dto/DeviceQueryDTO.java
  7. 12 0
      code/backend/src/main/java/com/aijiuyi/admin/controller/dto/DeviceSaveDTO.java
  8. 22 0
      code/backend/src/main/java/com/aijiuyi/admin/controller/dto/UserCategoryQueryDTO.java
  9. 15 0
      code/backend/src/main/java/com/aijiuyi/admin/controller/dto/UserProfileDTO.java
  10. 12 0
      code/backend/src/main/java/com/aijiuyi/admin/controller/dto/UserProfileQueryDTO.java
  11. 12 0
      code/backend/src/main/java/com/aijiuyi/admin/entity/Device.java
  12. 53 0
      code/backend/src/main/java/com/aijiuyi/admin/entity/UserCategory.java
  13. 15 0
      code/backend/src/main/java/com/aijiuyi/admin/entity/UserProfile.java
  14. 12 0
      code/backend/src/main/java/com/aijiuyi/admin/mapper/UserCategoryMapper.java
  15. 59 0
      code/backend/src/main/java/com/aijiuyi/admin/service/UserCategoryService.java
  16. 4 0
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/DeviceServiceImpl.java
  17. 167 0
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserCategoryServiceImpl.java
  18. 39 0
      code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserProfileServiceImpl.java
  19. 13 0
      code/backend/src/main/resources/mapper/DeviceMapper.xml
  20. 17 0
      code/backend/src/main/resources/mapper/UserProfileMapper.xml
  21. 33 0
      code/backend/src/main/resources/sql/init.sql
  22. 29 0
      code/backend/src/main/resources/sql/migration_user_category.sql
  23. 23 0
      code/backend/src/main/resources/sql/migration_user_profile_address.sql
  24. 16 0
      code/frontend/package-lock.json
  25. 1 0
      code/frontend/package.json
  26. 3 0
      code/frontend/src/api/index.js
  27. 62 0
      code/frontend/src/api/userCategory.js
  28. 6 0
      code/frontend/src/router/index.js
  29. 1 0
      code/frontend/src/views/admin/index.vue
  30. 175 7
      code/frontend/src/views/device/index.vue
  31. 356 0
      code/frontend/src/views/system/user-category/index.vue
  32. 45 9
      code/frontend/src/views/user/app-user/index.vue
  33. 254 3
      code/frontend/src/views/user/profile/index.vue

+ 2 - 0
.gitignore

@@ -23,3 +23,5 @@ Thumbs.db
 
 # AGENTS.md - 本地AI agent指南,不提交
 AGENTS.md
+code/app/
+code/ajyApp/

+ 36 - 12
code/ajyApp/manifest.json

@@ -2,8 +2,8 @@
     "name" : "ajyApp",
     "appid" : "__UNI__A3304B5",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -44,18 +44,42 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {
-                "push" : {
-                    "unipush" : {
-                        "version" : "2",
-                        "offline" : true,
-                        "hms" : {},
-                        "oppo" : {},
-                        "vivo" : {},
-                        "mi" : {},
-                        "honor" : {}
+                "push" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             }

+ 6 - 0
code/ajyApp/pages.json

@@ -1,5 +1,11 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+	{
+		"path": "pages/ble-demo/ble-demo",
+		"style": {
+			"navigationBarTitleText": "ble-demo"
+		}
+	},
 		{
 			"path": "pages/index/index",
 			"style": {

+ 13 - 1
code/backend/src/main/java/com/aijiuyi/admin/common/constant/ResultCode.java

@@ -131,7 +131,19 @@ public enum ResultCode {
     /** 文件大小超限 */
     FILE_SIZE_EXCEEDED(1952, "文件大小超过限制"),
     /** 文件上传失败 */
-    FILE_UPLOAD_FAILED(1953, "文件上传失败");
+    FILE_UPLOAD_FAILED(1953, "文件上传失败"),
+
+    // ======================== 用户类别相关 1970-1989 ========================
+    /** 用户类别不存在 */
+    USER_CATEGORY_NOT_FOUND(1970, "用户类别不存在"),
+    /** 用户类别编码已存在 */
+    USER_CATEGORY_CODE_EXISTS(1971, "用户类别编码已存在"),
+    /** 用户类别名称已存在 */
+    USER_CATEGORY_NAME_EXISTS(1972, "用户类别名称已存在"),
+    /** 内置用户类别不可删除 */
+    USER_CATEGORY_BUILTIN_FORBIDDEN(1973, "内置用户类别不可删除或修改编码"),
+    /** 用户类别已被使用 */
+    USER_CATEGORY_IN_USE(1974, "用户类别已被用户使用,不可删除");
 
     // ======================== 其他业务错误码在此区间之后继续添加 ========================
 

+ 114 - 0
code/backend/src/main/java/com/aijiuyi/admin/controller/UserCategoryController.java

@@ -0,0 +1,114 @@
+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.UserCategoryQueryDTO;
+import com.aijiuyi.admin.entity.UserCategory;
+import com.aijiuyi.admin.service.UserCategoryService;
+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
+ * 提供用户类别(用户类型字典)的增删改查接口
+ * 内置类别(普通用户/专家/管理员)不可删除或修改 code
+ */
+@RestController
+@RequestMapping("/user/category")
+public class UserCategoryController {
+
+    @Autowired
+    private UserCategoryService userCategoryService;
+
+    /**
+     * 分页查询用户类别
+     *
+     * @param queryDTO 查询条件
+     * @return 分页结果
+     */
+    @GetMapping("/page")
+    @Log(value = "查询用户类别列表", module = "用户类别管理", operationType = OperationType.QUERY)
+    public Result<IPage<UserCategory>> page(UserCategoryQueryDTO queryDTO) {
+        return Result.success(userCategoryService.pageList(queryDTO));
+    }
+
+    /**
+     * 查询所有启用的用户类别(前端下拉选择使用)
+     *
+     * @return 启用的用户类别列表
+     */
+    @GetMapping("/list")
+    @Log(value = "获取用户类别下拉列表", module = "用户类别管理", operationType = OperationType.QUERY)
+    public Result<List<UserCategory>> list() {
+        return Result.success(userCategoryService.listEnabled());
+    }
+
+    /**
+     * 查询用户类别详情
+     *
+     * @param id 类别ID
+     * @return 类别详情
+     */
+    @GetMapping("/{id}")
+    @Log(value = "查询用户类别详情", module = "用户类别管理", operationType = OperationType.QUERY)
+    public Result<UserCategory> getById(@PathVariable Long id) {
+        return Result.success(userCategoryService.getById(id));
+    }
+
+    /**
+     * 新增用户类别
+     *
+     * @param category 类别信息
+     * @return 操作结果
+     */
+    @PostMapping
+    @Log(value = "新增用户类别", module = "用户类别管理", operationType = OperationType.INSERT)
+    public Result<Void> add(@RequestBody UserCategory category) {
+        userCategoryService.addCategory(category);
+        return Result.success();
+    }
+
+    /**
+     * 修改用户类别
+     *
+     * @param category 类别信息
+     * @return 操作结果
+     */
+    @PutMapping
+    @Log(value = "修改用户类别", module = "用户类别管理", operationType = OperationType.UPDATE)
+    public Result<Void> update(@RequestBody UserCategory category) {
+        userCategoryService.updateCategory(category);
+        return Result.success();
+    }
+
+    /**
+     * 删除用户类别(内置类别和已被使用的类别不可删除)
+     *
+     * @param id 类别ID
+     * @return 操作结果
+     */
+    @DeleteMapping("/{id}")
+    @Log(value = "删除用户类别", module = "用户类别管理", operationType = OperationType.DELETE)
+    public Result<Void> delete(@PathVariable Long id) {
+        userCategoryService.deleteCategory(id);
+        return Result.success();
+    }
+
+    /**
+     * 修改用户类别状态(启用/停用)
+     *
+     * @param id     类别ID
+     * @param status 目标状态:1=启用,0=停用
+     * @return 操作结果
+     */
+    @PutMapping("/{id}/status")
+    @Log(value = "修改用户类别状态", module = "用户类别管理", operationType = OperationType.UPDATE)
+    public Result<Void> updateStatus(@PathVariable Long id, @RequestParam Integer status) {
+        userCategoryService.updateStatus(id, status);
+        return Result.success();
+    }
+}

+ 9 - 0
code/backend/src/main/java/com/aijiuyi/admin/controller/dto/DeviceQueryDTO.java

@@ -23,6 +23,15 @@ public class DeviceQueryDTO {
     /** 固件版本(精确匹配,null=全部) */
     private String firmwareVersion;
 
+    /** 省级行政区划编码(精确匹配) */
+    private String provinceCode;
+
+    /** 市级行政区划编码(精确匹配) */
+    private String cityCode;
+
+    /** 区/县级行政区划编码(精确匹配) */
+    private String districtCode;
+
     /** 当前页码(从1开始) */
     private Integer pageNum = 1;
 

+ 12 - 0
code/backend/src/main/java/com/aijiuyi/admin/controller/dto/DeviceSaveDTO.java

@@ -31,6 +31,18 @@ public class DeviceSaveDTO {
     /** 备注(选填,最长200字符) */
     private String remark;
 
+    /** 省级行政区划编码(选填) */
+    private String provinceCode;
+
+    /** 市级行政区划编码(选填) */
+    private String cityCode;
+
+    /** 区/县级行政区划编码(选填) */
+    private String districtCode;
+
+    /** 详细地址(选填,最长200字符) */
+    private String address;
+
     /**
      * 绑定用户ID列表(user_profile.id,选填)
      * 新增:绑定初始用户;编辑:与当前绑定用户做差集合并(null 表示不变更绑定关系,空列表表示清空所有绑定)

+ 22 - 0
code/backend/src/main/java/com/aijiuyi/admin/controller/dto/UserCategoryQueryDTO.java

@@ -0,0 +1,22 @@
+package com.aijiuyi.admin.controller.dto;
+
+import lombok.Data;
+
+/**
+ * 用户类别分页查询参数 DTO
+ */
+@Data
+public class UserCategoryQueryDTO {
+
+    /** 关键字(名称/备注模糊查询) */
+    private String keyword;
+
+    /** 状态:1=启用,0=停用 */
+    private Integer status;
+
+    /** 当前页码,默认第1页 */
+    private Integer pageNum = 1;
+
+    /** 每页条数,默认10条 */
+    private Integer pageSize = 10;
+}

+ 15 - 0
code/backend/src/main/java/com/aijiuyi/admin/controller/dto/UserProfileDTO.java

@@ -38,6 +38,21 @@ public class UserProfileDTO {
     @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
     private String phone;
 
+    /** 用户类型:1=普通用户,2=专家,3=管理员(选填,缺省按普通用户) */
+    private Integer userType;
+
+    /** 省级行政区划编码(GB/T 2260) */
+    private String provinceCode;
+
+    /** 市级行政区划编码 */
+    private String cityCode;
+
+    /** 区/县级行政区划编码 */
+    private String districtCode;
+
+    /** 详细地址 */
+    private String address;
+
     /** 肩宽(cm,必填) */
     @NotNull(message = "肩宽不能为空")
     private BigDecimal shoulderWidth;

+ 12 - 0
code/backend/src/main/java/com/aijiuyi/admin/controller/dto/UserProfileQueryDTO.java

@@ -17,6 +17,18 @@ public class UserProfileQueryDTO {
     /** 性别:1=男,2=女,不传则查全部 */
     private Integer gender;
 
+    /** 用户类型:1=普通用户,2=专家,3=管理员,不传则查全部 */
+    private Integer userType;
+
+    /** 省级行政区划编码(选填,可独立查询) */
+    private String provinceCode;
+
+    /** 市级行政区划编码(选填,可独立查询) */
+    private String cityCode;
+
+    /** 区/县级行政区划编码(选填,可独立查询) */
+    private String districtCode;
+
     /** 注册时间开始(格式:yyyy-MM-dd HH:mm:ss) */
     private String startTime;
 

+ 12 - 0
code/backend/src/main/java/com/aijiuyi/admin/entity/Device.java

@@ -39,6 +39,18 @@ public class Device {
     /** 最后在线时间 */
     private LocalDateTime lastOnlineTime;
 
+    /** 省级行政区划编码(GB/T 2260) */
+    private String provinceCode;
+
+    /** 市级行政区划编码 */
+    private String cityCode;
+
+    /** 区/县级行政区划编码 */
+    private String districtCode;
+
+    /** 详细地址 */
+    private String address;
+
     /** 备注 */
     private String remark;
 

+ 53 - 0
code/backend/src/main/java/com/aijiuyi/admin/entity/UserCategory.java

@@ -0,0 +1,53 @@
+package com.aijiuyi.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 用户类别实体(用户类型字典)
+ * 对应数据库 user_category 表
+ * code 字段与 app_user.user_type / user_profile.user_type 关联
+ */
+@Data
+@TableName("user_category")
+public class UserCategory {
+
+    /** 主键ID */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 类别编码(与 user_type 字段对应,唯一) */
+    private Integer code;
+
+    /** 类别名称 */
+    private String name;
+
+    /** 备注说明 */
+    private String remark;
+
+    /** 前端标签颜色:primary/success/warning/danger/info */
+    private String tagType;
+
+    /** 排序(升序) */
+    private Integer sort;
+
+    /** 是否内置:1=内置(不可删除/改code),0=自定义 */
+    private Integer builtin;
+
+    /** 状态:1=启用,0=停用 */
+    private Integer status;
+
+    /** 逻辑删除:0=未删除,1=已删除 */
+    @TableLogic
+    private Integer deleted;
+
+    /** 创建时间(自动填充) */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /** 更新时间(自动填充) */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+}

+ 15 - 0
code/backend/src/main/java/com/aijiuyi/admin/entity/UserProfile.java

@@ -33,6 +33,21 @@ public class UserProfile {
     /** 手机号(11位,唯一) */
     private String phone;
 
+    /** 用户类型:1=普通用户,2=专家,3=管理员 */
+    private Integer userType;
+
+    /** 省级行政区划编码(GB/T 2260) */
+    private String provinceCode;
+
+    /** 市级行政区划编码 */
+    private String cityCode;
+
+    /** 区/县级行政区划编码 */
+    private String districtCode;
+
+    /** 详细地址 */
+    private String address;
+
     /** 肩宽(cm) */
     private BigDecimal shoulderWidth;
 

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

@@ -0,0 +1,12 @@
+package com.aijiuyi.admin.mapper;
+
+import com.aijiuyi.admin.entity.UserCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户类别 Mapper 接口
+ */
+@Mapper
+public interface UserCategoryMapper extends BaseMapper<UserCategory> {
+}

+ 59 - 0
code/backend/src/main/java/com/aijiuyi/admin/service/UserCategoryService.java

@@ -0,0 +1,59 @@
+package com.aijiuyi.admin.service;
+
+import com.aijiuyi.admin.controller.dto.UserCategoryQueryDTO;
+import com.aijiuyi.admin.entity.UserCategory;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 用户类别 Service 接口
+ */
+public interface UserCategoryService extends IService<UserCategory> {
+
+    /**
+     * 分页查询用户类别
+     *
+     * @param queryDTO 查询条件
+     * @return 分页结果
+     */
+    IPage<UserCategory> pageList(UserCategoryQueryDTO queryDTO);
+
+    /**
+     * 查询所有启用的用户类别(用于前端下拉选择)
+     *
+     * @return 启用的用户类别列表(按 sort 升序)
+     */
+    List<UserCategory> listEnabled();
+
+    /**
+     * 新增用户类别
+     *
+     * @param category 类别信息
+     */
+    void addCategory(UserCategory category);
+
+    /**
+     * 修改用户类别
+     *
+     * @param category 类别信息
+     */
+    void updateCategory(UserCategory category);
+
+    /**
+     * 删除用户类别(逻辑删除)
+     * 内置类别和已被用户使用的类别不可删除
+     *
+     * @param id 类别ID
+     */
+    void deleteCategory(Long id);
+
+    /**
+     * 修改用户类别状态(启用/停用)
+     *
+     * @param id     类别ID
+     * @param status 目标状态:1=启用,0=停用
+     */
+    void updateStatus(Long id, Integer status);
+}

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

@@ -303,6 +303,10 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         device.setDeviceModel(dto.getDeviceModel());
         device.setSerialNo(dto.getSerialNo());
         device.setFirmwareVersion(dto.getFirmwareVersion());
+        device.setProvinceCode(dto.getProvinceCode());
+        device.setCityCode(dto.getCityCode());
+        device.setDistrictCode(dto.getDistrictCode());
+        device.setAddress(dto.getAddress());
         device.setRemark(dto.getRemark());
         device.setOnlineStatus(0);
         return device;

+ 167 - 0
code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserCategoryServiceImpl.java

@@ -0,0 +1,167 @@
+package com.aijiuyi.admin.service.impl;
+
+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.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.UserCategoryService;
+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.StringUtils;
+
+import java.util.List;
+
+/**
+ * 用户类别 Service 实现类
+ */
+@Service
+public class UserCategoryServiceImpl extends ServiceImpl<UserCategoryMapper, UserCategory>
+        implements UserCategoryService {
+
+    @Autowired
+    private AppUserMapper appUserMapper;
+
+    @Autowired
+    private UserProfileMapper userProfileMapper;
+
+    @Override
+    public IPage<UserCategory> pageList(UserCategoryQueryDTO queryDTO) {
+        Page<UserCategory> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());
+        LambdaQueryWrapper<UserCategory> wrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.hasText(queryDTO.getKeyword())) {
+            String kw = queryDTO.getKeyword();
+            wrapper.and(w -> w.like(UserCategory::getName, kw).or().like(UserCategory::getRemark, kw));
+        }
+        wrapper.eq(queryDTO.getStatus() != null, UserCategory::getStatus, queryDTO.getStatus())
+               .orderByAsc(UserCategory::getSort)
+               .orderByAsc(UserCategory::getCode);
+        return page(page, wrapper);
+    }
+
+    @Override
+    public List<UserCategory> listEnabled() {
+        return list(new LambdaQueryWrapper<UserCategory>()
+                .eq(UserCategory::getStatus, 1)
+                .orderByAsc(UserCategory::getSort)
+                .orderByAsc(UserCategory::getCode));
+    }
+
+    @Override
+    public void addCategory(UserCategory category) {
+        if (category.getCode() == null) {
+            throw new BusinessException(ResultCode.PARAM_ERROR);
+        }
+        if (!StringUtils.hasText(category.getName())) {
+            throw new BusinessException(ResultCode.PARAM_ERROR);
+        }
+        // 编码唯一性
+        long codeCount = lambdaQuery().eq(UserCategory::getCode, category.getCode()).count();
+        if (codeCount > 0) {
+            throw new BusinessException(ResultCode.USER_CATEGORY_CODE_EXISTS);
+        }
+        // 名称唯一性
+        long nameCount = lambdaQuery().eq(UserCategory::getName, category.getName()).count();
+        if (nameCount > 0) {
+            throw new BusinessException(ResultCode.USER_CATEGORY_NAME_EXISTS);
+        }
+        // 自定义类别强制 builtin=0
+        category.setBuiltin(0);
+        if (category.getStatus() == null) {
+            category.setStatus(1);
+        }
+        if (category.getSort() == null) {
+            category.setSort(0);
+        }
+        if (!StringUtils.hasText(category.getTagType())) {
+            category.setTagType("primary");
+        }
+        save(category);
+        LogUtil.info(UserCategoryServiceImpl.class, "新增用户类别 code=[{}] name=[{}]",
+                category.getCode(), category.getName());
+    }
+
+    @Override
+    public void updateCategory(UserCategory category) {
+        if (category.getId() == null) {
+            throw new BusinessException(ResultCode.PARAM_ERROR);
+        }
+        UserCategory exist = getById(category.getId());
+        if (exist == null) {
+            throw new BusinessException(ResultCode.USER_CATEGORY_NOT_FOUND);
+        }
+        // 内置类别不允许修改 code
+        if (Integer.valueOf(1).equals(exist.getBuiltin())
+                && category.getCode() != null
+                && !category.getCode().equals(exist.getCode())) {
+            throw new BusinessException(ResultCode.USER_CATEGORY_BUILTIN_FORBIDDEN);
+        }
+        // 编码唯一性(排除自身)
+        if (category.getCode() != null && !category.getCode().equals(exist.getCode())) {
+            long codeCount = lambdaQuery()
+                    .eq(UserCategory::getCode, category.getCode())
+                    .ne(UserCategory::getId, category.getId())
+                    .count();
+            if (codeCount > 0) {
+                throw new BusinessException(ResultCode.USER_CATEGORY_CODE_EXISTS);
+            }
+        }
+        // 名称唯一性(排除自身)
+        if (StringUtils.hasText(category.getName()) && !category.getName().equals(exist.getName())) {
+            long nameCount = lambdaQuery()
+                    .eq(UserCategory::getName, category.getName())
+                    .ne(UserCategory::getId, category.getId())
+                    .count();
+            if (nameCount > 0) {
+                throw new BusinessException(ResultCode.USER_CATEGORY_NAME_EXISTS);
+            }
+        }
+        // 内置标识不可篡改
+        category.setBuiltin(exist.getBuiltin());
+        updateById(category);
+        LogUtil.info(UserCategoryServiceImpl.class, "修改用户类别[{}]", category.getId());
+    }
+
+    @Override
+    public void deleteCategory(Long id) {
+        UserCategory exist = getById(id);
+        if (exist == null) {
+            throw new BusinessException(ResultCode.USER_CATEGORY_NOT_FOUND);
+        }
+        if (Integer.valueOf(1).equals(exist.getBuiltin())) {
+            throw new BusinessException(ResultCode.USER_CATEGORY_BUILTIN_FORBIDDEN);
+        }
+        // 是否仍被使用
+        long appUserCount = appUserMapper.selectCount(
+                new LambdaQueryWrapper<AppUser>().eq(AppUser::getUserType, exist.getCode()));
+        long profileCount = userProfileMapper.selectCount(
+                new LambdaQueryWrapper<UserProfile>().eq(UserProfile::getUserType, exist.getCode()));
+        if (appUserCount > 0 || profileCount > 0) {
+            throw new BusinessException(ResultCode.USER_CATEGORY_IN_USE);
+        }
+        removeById(id);
+        LogUtil.info(UserCategoryServiceImpl.class, "删除用户类别[{}] code=[{}]", id, exist.getCode());
+    }
+
+    @Override
+    public void updateStatus(Long id, Integer status) {
+        UserCategory exist = getById(id);
+        if (exist == null) {
+            throw new BusinessException(ResultCode.USER_CATEGORY_NOT_FOUND);
+        }
+        UserCategory update = new UserCategory();
+        update.setId(id);
+        update.setStatus(status);
+        updateById(update);
+        LogUtil.info(UserCategoryServiceImpl.class, "修改用户类别[{}]状态为[{}]", id, status);
+    }
+}

+ 39 - 0
code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserProfileServiceImpl.java

@@ -5,7 +5,9 @@ import com.aijiuyi.admin.common.exception.BusinessException;
 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.UserProfile;
+import com.aijiuyi.admin.mapper.AppUserMapper;
 import com.aijiuyi.admin.mapper.UserProfileMapper;
 import com.aijiuyi.admin.service.UserAcupointService;
 import com.aijiuyi.admin.service.UserProfileService;
@@ -31,6 +33,9 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
     @Autowired
     private UserAcupointService userAcupointService;
 
+    @Autowired
+    private AppUserMapper appUserMapper;
+
     @Override
     public IPage<UserProfile> pageList(UserProfileQueryDTO queryDTO) {
         Page<UserProfile> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());
@@ -47,6 +52,8 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         save(profile);
         LogUtil.info(UserProfileServiceImpl.class, "新增子用户[{}],手机号[{}]", dto.getName(), dto.getPhone());
 
+        syncAppUserType(dto.getPhone(), dto.getUserType());
+
         regenerateUserAcupoints(profile.getId(), "新增");
     }
 
@@ -69,6 +76,10 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         updateById(profile);
         LogUtil.info(UserProfileServiceImpl.class, "修改子用户[{}]", dto.getId());
 
+        // 优先以传入手机号同步;未传入时回退到已存记录的手机号
+        String syncPhone = StringUtils.hasText(dto.getPhone()) ? dto.getPhone() : exist.getPhone();
+        syncAppUserType(syncPhone, dto.getUserType());
+
         regenerateUserAcupoints(dto.getId(), "修改");
     }
 
@@ -176,6 +187,29 @@ 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);
+    }
+
     private UserProfile buildProfileFromDto(UserProfileDTO dto) {
         UserProfile profile = new UserProfile();
         profile.setUserId(dto.getUserId());
@@ -183,6 +217,11 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         profile.setGender(dto.getGender());
         profile.setAge(dto.getAge());
         profile.setPhone(dto.getPhone());
+        profile.setUserType(dto.getUserType());
+        profile.setProvinceCode(dto.getProvinceCode());
+        profile.setCityCode(dto.getCityCode());
+        profile.setDistrictCode(dto.getDistrictCode());
+        profile.setAddress(dto.getAddress());
         profile.setShoulderWidth(dto.getShoulderWidth());
         profile.setBodyHeight(dto.getBodyHeight());
         profile.setSpineLength(dto.getSpineLength());

+ 13 - 0
code/backend/src/main/resources/mapper/DeviceMapper.xml

@@ -18,6 +18,10 @@
             d.firmware_version,
             d.online_status,
             d.last_online_time,
+            d.province_code,
+            d.city_code,
+            d.district_code,
+            d.address,
             d.remark,
             d.deleted,
             d.create_time,
@@ -43,6 +47,15 @@
         <if test="q.firmwareVersion != null and q.firmwareVersion != ''">
             AND d.firmware_version = #{q.firmwareVersion}
         </if>
+        <if test="q.provinceCode != null and q.provinceCode != ''">
+            AND d.province_code = #{q.provinceCode}
+        </if>
+        <if test="q.cityCode != null and q.cityCode != ''">
+            AND d.city_code = #{q.cityCode}
+        </if>
+        <if test="q.districtCode != null and q.districtCode != ''">
+            AND d.district_code = #{q.districtCode}
+        </if>
         <if test="q.boundUserName != null and q.boundUserName != ''">
             AND d.device_code IN (
                 SELECT ud2.device_code FROM user_device ud2

+ 17 - 0
code/backend/src/main/resources/mapper/UserProfileMapper.xml

@@ -15,6 +15,11 @@
             up.gender,
             up.age,
             up.phone,
+            up.user_type,
+            up.province_code,
+            up.city_code,
+            up.district_code,
+            up.address,
             up.shoulder_width,
             up.body_height,
             up.spine_length,
@@ -38,6 +43,18 @@
         <if test="q.gender != null">
             AND up.gender = #{q.gender}
         </if>
+        <if test="q.userType != null">
+            AND up.user_type = #{q.userType}
+        </if>
+        <if test="q.provinceCode != null and q.provinceCode != ''">
+            AND up.province_code = #{q.provinceCode}
+        </if>
+        <if test="q.cityCode != null and q.cityCode != ''">
+            AND up.city_code = #{q.cityCode}
+        </if>
+        <if test="q.districtCode != null and q.districtCode != ''">
+            AND up.district_code = #{q.districtCode}
+        </if>
         <if test="q.startTime != null and q.startTime != ''">
             AND up.create_time &gt;= #{q.startTime}
         </if>

+ 33 - 0
code/backend/src/main/resources/sql/init.sql

@@ -56,6 +56,34 @@ CREATE TABLE IF NOT EXISTS `app_user` (
 INSERT INTO `app_user` (`username`, `password`, `nickname`, `user_type`, `status`, `deleted`, `create_time`, `update_time`)
 VALUES ('admin', MD5('admin123'), '超级管理员', 3, 1, 0, NOW(), NOW());
 
+-- ----------------------------
+-- 用户类别表(用户类型字典,code 与 app_user.user_type / user_profile.user_type 关联)
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `user_category` (
+    `id`          BIGINT       NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `code`        INT          NOT NULL COMMENT '类别编码(与 user_type 字段对应,唯一)',
+    `name`        VARCHAR(50)  NOT NULL COMMENT '类别名称',
+    `remark`      VARCHAR(255)          COMMENT '备注说明',
+    `tag_type`    VARCHAR(20)  DEFAULT 'primary' COMMENT '前端标签颜色:primary/success/warning/danger/info',
+    `sort`        INT          NOT NULL DEFAULT 0 COMMENT '排序(升序)',
+    `builtin`     TINYINT      NOT NULL DEFAULT 0 COMMENT '是否内置:1=内置(不可删除/改code),0=自定义',
+    `status`      TINYINT      NOT NULL DEFAULT 1 COMMENT '状态:1=启用,0=停用',
+    `deleted`     TINYINT      NOT NULL DEFAULT 0 COMMENT '逻辑删除:0=未删除,1=已删除',
+    `create_time` DATETIME              COMMENT '创建时间',
+    `update_time` DATETIME              COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_code` (`code`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COMMENT = '用户类别表';
+
+-- 初始化内置用户类别(与原 userType 取值保持一致)
+INSERT INTO `user_category` (`code`, `name`, `remark`, `tag_type`, `sort`, `builtin`, `status`, `deleted`, `create_time`, `update_time`)
+VALUES
+    (1, '普通用户', '默认用户类别', 'primary', 1, 1, 1, 0, NOW(), NOW()),
+    (2, '专家',     '可创作方案的专家用户', 'warning', 2, 1, 1, 0, NOW(), NOW()),
+    (3, '管理员',   '后台管理员(仅 code=3 可登录后台)', 'danger', 3, 1, 1, 0, NOW(), NOW());
+
 -- ----------------------------
 -- 子用户信息表(属于某个应用用户)
 -- ----------------------------
@@ -66,6 +94,11 @@ CREATE TABLE IF NOT EXISTS `user_profile` (
     `gender`            TINYINT               COMMENT '性别:1=男,2=女',
     `age`               INT                   COMMENT '年龄',
     `phone`             VARCHAR(20)           COMMENT '手机号(唯一)',
+    `user_type`         TINYINT      NOT NULL DEFAULT 1 COMMENT '用户类型:1=普通用户,2=专家,3=管理员',
+    `province_code`     VARCHAR(12)           COMMENT '省级行政区划编码(GB/T 2260)',
+    `city_code`         VARCHAR(12)           COMMENT '市级行政区划编码',
+    `district_code`     VARCHAR(12)           COMMENT '区/县级行政区划编码',
+    `address`           VARCHAR(255)          COMMENT '详细地址',
     `shoulder_width`    DECIMAL(5,1)          COMMENT '肩宽(cm)',
     `body_height`       DECIMAL(5,1)          COMMENT '身长/坐高(cm)',
     `spine_length`      DECIMAL(5,1)          COMMENT '脊柱长度C7-S4(cm,范围30-60)',

+ 29 - 0
code/backend/src/main/resources/sql/migration_user_category.sql

@@ -0,0 +1,29 @@
+-- =====================================================
+-- 迁移脚本:新增 user_category 用户类别表(用户类型字典)
+-- 适用:已部署数据库(首次部署使用 init.sql 即可,无需执行此脚本)
+-- =====================================================
+
+CREATE TABLE IF NOT EXISTS `user_category` (
+    `id`          BIGINT       NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `code`        INT          NOT NULL COMMENT '类别编码(与 user_type 字段对应,唯一)',
+    `name`        VARCHAR(50)  NOT NULL COMMENT '类别名称',
+    `remark`      VARCHAR(255)          COMMENT '备注说明',
+    `tag_type`    VARCHAR(20)  DEFAULT 'primary' COMMENT '前端标签颜色:primary/success/warning/danger/info',
+    `sort`        INT          NOT NULL DEFAULT 0 COMMENT '排序(升序)',
+    `builtin`     TINYINT      NOT NULL DEFAULT 0 COMMENT '是否内置:1=内置(不可删除/改code),0=自定义',
+    `status`      TINYINT      NOT NULL DEFAULT 1 COMMENT '状态:1=启用,0=停用',
+    `deleted`     TINYINT      NOT NULL DEFAULT 0 COMMENT '逻辑删除:0=未删除,1=已删除',
+    `create_time` DATETIME              COMMENT '创建时间',
+    `update_time` DATETIME              COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_code` (`code`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COMMENT = '用户类别表';
+
+-- 初始化内置用户类别(与原 userType 取值保持一致)
+INSERT INTO `user_category` (`code`, `name`, `remark`, `tag_type`, `sort`, `builtin`, `status`, `deleted`, `create_time`, `update_time`)
+VALUES
+    (1, '普通用户', '默认用户类别', 'primary', 1, 1, 1, 0, NOW(), NOW()),
+    (2, '专家',     '可创作方案的专家用户', 'warning', 2, 1, 1, 0, NOW(), NOW()),
+    (3, '管理员',   '后台管理员(仅 code=3 可登录后台)', 'danger', 3, 1, 1, 0, NOW(), NOW());

+ 23 - 0
code/backend/src/main/resources/sql/migration_user_profile_address.sql

@@ -0,0 +1,23 @@
+-- =====================================================
+-- 迁移脚本:user_profile 新增 用户类型 / 省市区行政区划编码 / 详细地址
+-- 适用:已部署数据库(首次部署使用 init.sql 即可,无需执行此脚本)
+-- 执行后将自动同步 user_profile.user_type 与 app_user.user_type(按手机号匹配)
+-- =====================================================
+
+ALTER TABLE `user_profile`
+    ADD COLUMN `user_type`     TINYINT     NOT NULL DEFAULT 1 COMMENT '用户类型:1=普通用户,2=专家,3=管理员' AFTER `phone`,
+    ADD COLUMN `province_code` VARCHAR(12) NULL COMMENT '省级行政区划编码(GB/T 2260)' AFTER `user_type`,
+    ADD COLUMN `city_code`     VARCHAR(12) NULL COMMENT '市级行政区划编码' AFTER `province_code`,
+    ADD COLUMN `district_code` VARCHAR(12) NULL COMMENT '区/县级行政区划编码' AFTER `city_code`,
+    ADD COLUMN `address`       VARCHAR(255) NULL COMMENT '详细地址' AFTER `district_code`;
+
+-- 用 app_user 已有用户类型回填 user_profile(按手机号匹配)
+UPDATE `user_profile` up
+JOIN `app_user` au ON au.phone = up.phone AND au.deleted = 0
+SET up.user_type = au.user_type
+WHERE up.deleted = 0;
+ALTER TABLE device
+    ADD COLUMN province_code VARCHAR(20) DEFAULT '' COMMENT '省级行政区划编码',
+  ADD COLUMN city_code     VARCHAR(20) DEFAULT '' COMMENT '市级行政区划编码',
+  ADD COLUMN district_code VARCHAR(20) DEFAULT '' COMMENT '区/县级行政区划编码',
+  ADD COLUMN address       VARCHAR(200) DEFAULT '' COMMENT '详细地址';

+ 16 - 0
code/frontend/package-lock.json

@@ -12,6 +12,7 @@
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^5.1.12",
         "axios": "^1.14.0",
+        "element-china-area-data": "^6.1.0",
         "element-plus": "^2.13.6",
         "pinia": "^3.0.4",
         "sass": "^1.99.0",
@@ -1273,6 +1274,12 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/china-division": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/china-division/-/china-division-2.7.0.tgz",
+      "integrity": "sha512-4uUPAT+1WfqDh5jytq7omdCmHNk3j+k76zEG/2IqaGcYB90c2SwcixttcypdsZ3T/9tN1TTpBDoeZn+Yw/qBEA==",
+      "license": "MIT"
+    },
     "node_modules/chokidar": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
@@ -1409,6 +1416,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/element-china-area-data": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/element-china-area-data/-/element-china-area-data-6.1.0.tgz",
+      "integrity": "sha512-IkpcjwQv2A/2AxFiSoaISZ+oMw1rZCPUSOg5sOCwT5jKc96TaawmKZeY81xfxXsO0QbKxU5LLc6AirhG52hUmg==",
+      "license": "MIT",
+      "dependencies": {
+        "china-division": "^2.7.0"
+      }
+    },
     "node_modules/element-plus": {
       "version": "2.13.6",
       "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.13.6.tgz",

+ 1 - 0
code/frontend/package.json

@@ -13,6 +13,7 @@
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.14.0",
+    "element-china-area-data": "^6.1.0",
     "element-plus": "^2.13.6",
     "pinia": "^3.0.4",
     "sass": "^1.99.0",

+ 3 - 0
code/frontend/src/api/index.js

@@ -34,3 +34,6 @@ export * as simulationApi from './simulation'
 
 // 内容管理模块
 export * as contentApi from './content'
+
+// 用户类别管理模块
+export * as userCategoryApi from './userCategory'

+ 62 - 0
code/frontend/src/api/userCategory.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+/**
+ * 用户类别管理模块 API
+ * 对应后端 UserCategoryController
+ */
+
+/**
+ * 分页查询用户类别
+ * @param {Object} params 查询参数:keyword/status/pageNum/pageSize
+ */
+export function getUserCategoryPage(params) {
+  return request.get('/user/category/page', { params })
+}
+
+/**
+ * 查询所有启用的用户类别(前端下拉用,无需鉴权依赖于路由配置)
+ */
+export function getUserCategoryList() {
+  return request.get('/user/category/list')
+}
+
+/**
+ * 查询用户类别详情
+ * @param {number} id 类别ID
+ */
+export function getUserCategoryById(id) {
+  return request.get(`/user/category/${id}`)
+}
+
+/**
+ * 新增用户类别
+ * @param {Object} data 类别信息:code/name/remark/tagType/sort/status
+ */
+export function addUserCategory(data) {
+  return request.post('/user/category', data)
+}
+
+/**
+ * 修改用户类别
+ * @param {Object} data 类别信息:id/code/name/remark/tagType/sort/status
+ */
+export function updateUserCategory(data) {
+  return request.put('/user/category', data)
+}
+
+/**
+ * 删除用户类别
+ * @param {number} id 类别ID
+ */
+export function deleteUserCategory(id) {
+  return request.delete(`/user/category/${id}`)
+}
+
+/**
+ * 修改用户类别状态
+ * @param {number} id     类别ID
+ * @param {number} status 目标状态:1=启用,0=停用
+ */
+export function updateUserCategoryStatus(id, status) {
+  return request.put(`/user/category/${id}/status`, null, { params: { status } })
+}

+ 6 - 0
code/frontend/src/router/index.js

@@ -106,6 +106,12 @@ const routes = [
             component: () => import('@/views/admin/index.vue'),
             meta: { requiresAuth: true, title: '管理员', icon: 'Avatar' }
           },
+          {
+            path: 'user-category',
+            name: 'UserCategory',
+            component: () => import('@/views/system/user-category/index.vue'),
+            meta: { requiresAuth: true, title: '用户类别', icon: 'Collection' }
+          },
           {
             path: 'log',
             name: 'Log',

+ 1 - 0
code/frontend/src/views/admin/index.vue

@@ -222,6 +222,7 @@ const allMenuRoutes = [
   { path: '/plan', title: '方案管理' },
   { path: '/simulation', title: '方案模拟测试' },
   { path: '/admin', title: '管理员管理' },
+  { path: '/system/user-category', title: '用户类别' },
   { path: '/log', title: '日志管理' },
 ]
 

+ 175 - 7
code/frontend/src/views/device/index.vue

@@ -25,6 +25,38 @@
             <el-option label="v1.0.0" value="v1.0.0" />
           </el-select>
         </el-form-item>
+        <el-form-item label="省">
+          <el-select-v2
+            v-model="query.provinceCode"
+            :options="provinceList"
+            placeholder="全部"
+            clearable
+            filterable
+            style="width:160px"
+            @change="onQueryProvinceChange"
+          />
+        </el-form-item>
+        <el-form-item label="市">
+          <el-select-v2
+            v-model="query.cityCode"
+            :options="queryCityList"
+            placeholder="全部"
+            clearable
+            filterable
+            style="width:200px"
+            @change="onQueryCityChange"
+          />
+        </el-form-item>
+        <el-form-item label="区/县">
+          <el-select-v2
+            v-model="query.districtCode"
+            :options="queryDistrictList"
+            placeholder="全部"
+            clearable
+            filterable
+            style="width:240px"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
           <el-button :icon="Refresh" @click="handleReset">重置</el-button>
@@ -87,6 +119,9 @@
         <el-table-column prop="firmwareVersion" label="固件版本" width="95">
           <template #default="{ row }">{{ row.firmwareVersion || '-' }}</template>
         </el-table-column>
+        <el-table-column label="所在地区" min-width="160">
+          <template #default="{ row }">{{ formatRegion(row) }}</template>
+        </el-table-column>
         <el-table-column prop="lastOnlineTime" label="最后在线时间" width="140">
           <template #default="{ row }">{{ row.lastOnlineTime || '-' }}</template>
         </el-table-column>
@@ -189,6 +224,26 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="所在地区">
+          <el-cascader
+            v-model="deviceForm.regionCodes"
+            :options="regionOptions"
+            :props="regionCascaderProps"
+            placeholder="请选择省/市/区"
+            clearable
+            filterable
+            style="width:100%"
+            :disabled="formMode === 'view'"
+          />
+        </el-form-item>
+        <el-form-item label="详细地址">
+          <el-input
+            v-model="deviceForm.address"
+            placeholder="请输入详细地址(选填)"
+            maxlength="200"
+            :disabled="formMode === 'view'"
+          />
+        </el-form-item>
         <el-form-item label="备注">
           <el-input
             v-model="deviceForm.remark"
@@ -215,10 +270,11 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, computed } from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Plus, Delete } from '@element-plus/icons-vue'
+import { regionData, codeToText } from 'element-china-area-data'
 import ExcelImport from '@/components/ExcelImport.vue'
 import ExcelExport from '@/components/ExcelExport.vue'
 import {
@@ -249,9 +305,103 @@ const query = reactive({
   deviceName: '',
   boundUserName: '',
   onlineStatus: null,
-  firmwareVersion: ''
+  firmwareVersion: '',
+  provinceCode: '',
+  cityCode: '',
+  districtCode: ''
 })
 
+// ======================== 省市区数据 ========================
+const regionOptions = regionData
+const regionCascaderProps = { value: 'value', label: 'label', children: 'children' }
+
+// 查询区域:省列表
+const provinceList = computed(() => regionData.map(p => ({ value: p.value, label: p.label })))
+
+// 预计算"全国所有市"与"全国所有区"(模块级常量,仅计算一次)
+const ALL_CITIES = []
+const ALL_DISTRICTS = []
+regionData.forEach(p => {
+  ;(p.children || []).forEach(c => {
+    ALL_CITIES.push({ value: c.value, label: `${p.label} / ${c.label}` })
+    ;(c.children || []).forEach(d => {
+      ALL_DISTRICTS.push({ value: d.value, label: `${p.label} / ${c.label} / ${d.label}` })
+    })
+  })
+})
+
+/** 市列表:选了省则返回该省市;未选省则返回全国所有市 */
+const queryCityList = computed(() => {
+  if (query.provinceCode) {
+    const prov = regionData.find(p => p.value === query.provinceCode)
+    return (prov?.children || []).map(c => ({ value: c.value, label: c.label }))
+  }
+  return ALL_CITIES
+})
+
+/** 区/县列表:选了市则返回该市下区;只选省返回该省下区;都未选返回全国区 */
+const queryDistrictList = computed(() => {
+  if (query.cityCode) {
+    for (const p of regionData) {
+      const city = (p.children || []).find(c => c.value === query.cityCode)
+      if (city) {
+        return (city.children || []).map(d => ({ value: d.value, label: d.label }))
+      }
+    }
+    return []
+  }
+  if (query.provinceCode) {
+    const prov = regionData.find(p => p.value === query.provinceCode)
+    const all = []
+    ;(prov?.children || []).forEach(c => {
+      (c.children || []).forEach(d => {
+        all.push({ value: d.value, label: `${c.label} / ${d.label}` })
+      })
+    })
+    return all
+  }
+  return ALL_DISTRICTS
+})
+
+/** 选了省:如果已选的市/区不属于该省则清空 */
+function onQueryProvinceChange(val) {
+  if (!val) return
+  const prov = regionData.find(p => p.value === val)
+  const cities = prov?.children || []
+  if (query.cityCode && !cities.find(c => c.value === query.cityCode)) {
+    query.cityCode = ''
+    query.districtCode = ''
+  } else if (query.districtCode) {
+    const city = cities.find(c => c.value === query.cityCode)
+    if (city && !(city.children || []).find(d => d.value === query.districtCode)) {
+      query.districtCode = ''
+    }
+  }
+}
+
+/** 选了市:如果已选的区不属于该市则清空 */
+function onQueryCityChange(val) {
+  if (!val) return
+  for (const p of regionData) {
+    const city = (p.children || []).find(c => c.value === val)
+    if (city) {
+      if (query.districtCode && !(city.children || []).find(d => d.value === query.districtCode)) {
+        query.districtCode = ''
+      }
+      return
+    }
+  }
+}
+
+/** 根据行政区划编码还原为 "省/市/区" 文本 */
+function formatRegion(row) {
+  const parts = [row.provinceCode, row.cityCode, row.districtCode]
+    .filter(c => !!c)
+    .map(c => codeToText[c] || '')
+    .filter(t => !!t)
+  return parts.length > 0 ? parts.join(' / ') : '-'
+}
+
 /**
  * 设备列表只展示最新绑定的前 3 个用户,更多用户用省略号提示。
  * boundUserNames 由后端按绑定时间倒序拼接。
@@ -278,6 +428,7 @@ const exportHeaders = [
   { label: '设备编号', prop: 'deviceCode' },
   { label: '设备名称', prop: 'deviceName' },
   { label: '设备型号', prop: 'deviceModel' },
+  { label: '所在地区', prop: 'regionText' },
   { label: '绑定用户数', prop: 'boundUserCount' },
   { label: '绑定用户', prop: 'boundUserNames' },
   { label: '在线状态', prop: 'onlineStatusLabel' },
@@ -297,10 +448,11 @@ async function loadData() {
       pageSize: pageSize.value
     })
     const records = res.data?.records || []
-    // 为导出添加状态标签字段
+    // 为导出添加状态标签字段和地区文本
     tableData.value = records.map(r => ({
       ...r,
-      onlineStatusLabel: r.onlineStatus === 1 ? '在线' : '离线'
+      onlineStatusLabel: r.onlineStatus === 1 ? '在线' : '离线',
+      regionText: formatRegion(r)
     }))
     total.value = res.data?.total || 0
   } finally {
@@ -325,7 +477,10 @@ function handleReset() {
     deviceName: '',
     boundUserName: '',
     onlineStatus: null,
-    firmwareVersion: ''
+    firmwareVersion: '',
+    provinceCode: '',
+    cityCode: '',
+    districtCode: ''
   })
   pageNum.value = 1
   loadData()
@@ -352,6 +507,8 @@ const deviceForm = reactive({
   serialNo: '',
   firmwareVersion: '',
   userIds: [],
+  regionCodes: [],
+  address: '',
   remark: ''
 })
 
@@ -403,6 +560,8 @@ async function handleAdd() {
     serialNo: '',
     firmwareVersion: '',
     userIds: [],
+    regionCodes: [],
+    address: '',
     remark: ''
   })
   // 预加载用户选项
@@ -422,7 +581,9 @@ async function handleView(row) {
   userOptions.value = boundUsers.map(u => ({ id: u.userId, name: u.userName, phone: u.phone }))
   Object.assign(deviceForm, {
     ...row,
-    userIds: boundUsers.map(u => u.userId)
+    userIds: boundUsers.map(u => u.userId),
+    regionCodes: [row.provinceCode, row.cityCode, row.districtCode].filter(Boolean),
+    address: row.address || ''
   })
   formDialogVisible.value = true
 }
@@ -452,7 +613,9 @@ async function handleEdit(row) {
     serialNo: row.serialNo || '',
     firmwareVersion: row.firmwareVersion || '',
     remark: row.remark || '',
-    userIds: boundUsers.map(u => u.userId)
+    userIds: boundUsers.map(u => u.userId),
+    regionCodes: [row.provinceCode, row.cityCode, row.districtCode].filter(Boolean),
+    address: row.address || ''
   })
   formDialogVisible.value = true
 }
@@ -464,6 +627,7 @@ async function submitForm() {
   await deviceFormRef.value.validate()
   submitLoading.value = true
   try {
+    const codes = deviceForm.regionCodes || []
     const payload = {
       id: deviceForm.id,
       deviceCode: deviceForm.deviceCode,
@@ -471,6 +635,10 @@ async function submitForm() {
       deviceModel: deviceForm.deviceModel,
       serialNo: deviceForm.serialNo,
       firmwareVersion: deviceForm.firmwareVersion,
+      provinceCode: codes[0] || '',
+      cityCode: codes[1] || '',
+      districtCode: codes[2] || '',
+      address: deviceForm.address || undefined,
       remark: deviceForm.remark || undefined,
       userIds: deviceForm.userIds.length > 0 ? deviceForm.userIds : undefined
     }

+ 356 - 0
code/frontend/src/views/system/user-category/index.vue

@@ -0,0 +1,356 @@
+<template>
+  <div class="page-container">
+    <!-- 搜索栏 -->
+    <el-card class="search-card" shadow="never">
+      <el-form :model="query" inline>
+        <el-form-item label="关键字">
+          <el-input
+            v-model="query.keyword"
+            placeholder="名称/备注"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleSearch"
+          />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="query.status" placeholder="全部" clearable style="width: 100px">
+            <el-option label="启用" :value="1" />
+            <el-option label="停用" :value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
+          <el-button :icon="Refresh" @click="handleReset">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <!-- 表格卡片 -->
+    <el-card class="table-card" shadow="never">
+      <div class="toolbar">
+        <el-button type="primary" :icon="Plus" @click="handleAdd">新增类别</el-button>
+        <el-alert
+          title="内置类别(普通用户/专家/管理员)的编码不可修改、不可删除;类别一旦被用户使用也不可删除。"
+          type="info"
+          :closable="false"
+          show-icon
+          style="margin-left: 16px; flex: 1"
+        />
+      </div>
+
+      <el-table v-loading="loading" :data="tableData" border stripe>
+        <el-table-column label="序号" type="index" width="60" align="center" />
+        <el-table-column label="编码" prop="code" width="80" align="center" />
+        <el-table-column label="类别名称" min-width="140">
+          <template #default="{ row }">
+            <el-tag :type="row.tagType || 'primary'" size="small">{{ row.name }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark" min-width="220" show-overflow-tooltip />
+        <el-table-column label="标签颜色" prop="tagType" width="120" align="center" />
+        <el-table-column label="排序" prop="sort" width="80" align="center" />
+        <el-table-column label="是否内置" prop="builtin" width="100" align="center">
+          <template #default="{ row }">
+            <el-tag :type="row.builtin === 1 ? 'warning' : 'info'" size="small">
+              {{ row.builtin === 1 ? '内置' : '自定义' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" prop="status" width="90" align="center">
+          <template #default="{ row }">
+            <el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">
+              {{ row.status === 1 ? '启用' : '停用' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="170" align="center" />
+        <el-table-column label="操作" width="220" align="center" fixed="right">
+          <template #default="{ row }">
+            <el-button type="primary" link size="small" @click="handleEdit(row)">编辑</el-button>
+            <el-button
+              :type="row.status === 1 ? 'warning' : 'success'"
+              link
+              size="small"
+              @click="handleToggleStatus(row)"
+            >
+              {{ row.status === 1 ? '停用' : '启用' }}
+            </el-button>
+            <el-button
+              type="danger"
+              link
+              size="small"
+              :disabled="row.builtin === 1"
+              @click="handleDelete(row)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="pagination">
+        <el-pagination
+          v-model:current-page="query.pageNum"
+          v-model:page-size="query.pageSize"
+          :page-sizes="[10, 20, 50]"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          background
+          @size-change="loadData"
+          @current-change="loadData"
+        />
+      </div>
+    </el-card>
+
+    <!-- 新增/编辑对话框 -->
+    <el-dialog
+      v-model="formVisible"
+      :title="formMode === 'add' ? '新增用户类别' : '编辑用户类别'"
+      width="520px"
+      :close-on-click-modal="false"
+      @close="handleFormClose"
+    >
+      <el-form ref="formRef" :model="formData" :rules="formRules" label-width="90px">
+        <el-form-item label="编码" prop="code">
+          <el-input-number
+            v-model="formData.code"
+            :min="1"
+            :max="9999"
+            :step="1"
+            :disabled="formMode === 'edit' && formData.builtin === 1"
+            placeholder="整数,唯一"
+            style="width: 100%"
+          />
+          <div class="form-tip">
+            内置编码:1=普通用户,2=专家,3=管理员;自定义编码建议从 4 开始
+          </div>
+        </el-form-item>
+        <el-form-item label="类别名称" prop="name">
+          <el-input v-model="formData.name" placeholder="最长50字符" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="formData.remark"
+            type="textarea"
+            :rows="2"
+            placeholder="备注说明"
+            maxlength="255"
+            show-word-limit
+          />
+        </el-form-item>
+        <el-form-item label="标签颜色" prop="tagType">
+          <el-select v-model="formData.tagType" style="width: 100%">
+            <el-option label="主要(蓝)" value="primary" />
+            <el-option label="成功(绿)" value="success" />
+            <el-option label="警告(橙)" value="warning" />
+            <el-option label="危险(红)" value="danger" />
+            <el-option label="信息(灰)" value="info" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="formData.sort" :min="0" :max="9999" style="width: 100%" />
+        </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="formVisible = false">取消</el-button>
+        <el-button type="primary" :loading="submitLoading" @click="handleSubmit">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Search, Refresh, Plus } from '@element-plus/icons-vue'
+import { userCategoryApi } from '@/api'
+
+// ======================== 列表 ========================
+const loading = ref(false)
+const tableData = ref([])
+const total = ref(0)
+
+const query = reactive({
+  keyword: '',
+  status: null,
+  pageNum: 1,
+  pageSize: 10
+})
+
+async function loadData() {
+  loading.value = true
+  try {
+    const res = await userCategoryApi.getUserCategoryPage({
+      keyword: query.keyword || undefined,
+      status: query.status ?? undefined,
+      pageNum: query.pageNum,
+      pageSize: query.pageSize
+    })
+    tableData.value = res.data.records || []
+    total.value = res.data.total || 0
+  } finally {
+    loading.value = false
+  }
+}
+
+function handleSearch() {
+  query.pageNum = 1
+  loadData()
+}
+
+function handleReset() {
+  query.keyword = ''
+  query.status = null
+  query.pageNum = 1
+  loadData()
+}
+
+// ======================== 新增/编辑 ========================
+const formVisible = ref(false)
+const formMode = ref('add')
+const submitLoading = ref(false)
+const formRef = ref()
+
+const formData = reactive({
+  id: null,
+  code: null,
+  name: '',
+  remark: '',
+  tagType: 'primary',
+  sort: 0,
+  status: 1,
+  builtin: 0
+})
+
+const formRules = {
+  code: [{ required: true, message: '请输入类别编码', trigger: 'blur' }],
+  name: [
+    { required: true, message: '请输入类别名称', trigger: 'blur' },
+    { max: 50, message: '名称最长50字符', trigger: 'blur' }
+  ],
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }]
+}
+
+function resetForm() {
+  Object.assign(formData, {
+    id: null,
+    code: null,
+    name: '',
+    remark: '',
+    tagType: 'primary',
+    sort: 0,
+    status: 1,
+    builtin: 0
+  })
+}
+
+function handleAdd() {
+  formMode.value = 'add'
+  resetForm()
+  formVisible.value = true
+}
+
+function handleEdit(row) {
+  formMode.value = 'edit'
+  Object.assign(formData, {
+    id: row.id,
+    code: row.code,
+    name: row.name,
+    remark: row.remark || '',
+    tagType: row.tagType || 'primary',
+    sort: row.sort ?? 0,
+    status: row.status,
+    builtin: row.builtin
+  })
+  formVisible.value = true
+}
+
+function handleFormClose() {
+  formRef.value?.resetFields()
+}
+
+async function handleSubmit() {
+  await formRef.value?.validate()
+  submitLoading.value = true
+  try {
+    if (formMode.value === 'add') {
+      await userCategoryApi.addUserCategory({ ...formData })
+      ElMessage.success('新增类别成功')
+    } else {
+      await userCategoryApi.updateUserCategory({ ...formData })
+      ElMessage.success('修改成功')
+    }
+    formVisible.value = false
+    loadData()
+  } finally {
+    submitLoading.value = false
+  }
+}
+
+// ======================== 状态切换 ========================
+async function handleToggleStatus(row) {
+  const newStatus = row.status === 1 ? 0 : 1
+  const label = newStatus === 1 ? '启用' : '停用'
+  await ElMessageBox.confirm(`确认${label}类别【${row.name}】吗?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+  await userCategoryApi.updateUserCategoryStatus(row.id, newStatus)
+  ElMessage.success(`${label}成功`)
+  loadData()
+}
+
+// ======================== 删除 ========================
+async function handleDelete(row) {
+  await ElMessageBox.confirm(`确认删除类别【${row.name}】吗?此操作不可恢复`, '警告', {
+    confirmButtonText: '确认删除',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+  await userCategoryApi.deleteUserCategory(row.id)
+  ElMessage.success('删除成功')
+  loadData()
+}
+
+onMounted(() => {
+  loadData()
+})
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.search-card :deep(.el-card__body) {
+  padding-bottom: 0;
+}
+
+.toolbar {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16px;
+}
+
+.pagination {
+  margin-top: 16px;
+  display: flex;
+  justify-content: flex-end;
+}
+
+.form-tip {
+  font-size: 12px;
+  color: #909399;
+  line-height: 1.5;
+  margin-top: 4px;
+}
+</style>

+ 45 - 9
code/frontend/src/views/user/app-user/index.vue

@@ -11,9 +11,12 @@
         </el-form-item>
         <el-form-item label="用户类型">
           <el-select v-model="queryForm.userType" placeholder="全部" clearable style="width:120px">
-            <el-option label="普通用户" :value="1" />
-            <el-option label="专家" :value="2" />
-            <el-option label="管理员" :value="3" />
+            <el-option
+              v-for="item in userCategoryOptions"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="状态">
@@ -45,10 +48,10 @@
         <el-table-column prop="userType" label="用户类型" width="100" align="center">
           <template #default="{ row }">
             <el-tag
-              :type="row.userType === 2 ? 'warning' : row.userType === 3 ? 'danger' : 'primary'"
+              :type="userTypeTagType(row.userType)"
               size="small"
             >
-              {{ row.userType === 2 ? '专家' : row.userType === 3 ? '管理员' : '普通用户' }}
+              {{ userTypeText(row.userType) }}
             </el-tag>
           </template>
         </el-table-column>
@@ -108,9 +111,12 @@
         </el-form-item>
         <el-form-item label="用户类型" prop="userType">
           <el-select v-model="formData.userType" placeholder="请选择" style="width:100%">
-            <el-option label="普通用户" :value="1" />
-            <el-option label="专家" :value="2" />
-            <el-option label="管理员" :value="3" />
+            <el-option
+              v-for="item in userCategoryOptions"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="状态" prop="status">
@@ -140,9 +146,27 @@ import {
   deleteAppUser,
   updateAppUserStatus
 } from '@/api/user'
+import { getUserCategoryList } from '@/api/userCategory'
 
 const router = useRouter()
 
+/** 用户类别选项(从后台 user_category 动态加载) */
+const userCategoryOptions = ref([])
+
+/** 用户类型文本 */
+function userTypeText(type) {
+  if (type == null) return '-'
+  const item = userCategoryOptions.value.find(c => c.code === type)
+  return item ? item.name : '-'
+}
+
+/** 用户类型标签颜色 */
+function userTypeTagType(type) {
+  if (type == null) return 'info'
+  const item = userCategoryOptions.value.find(c => c.code === type)
+  return item?.tagType || 'primary'
+}
+
 // 查询表单
 const queryForm = reactive({
   phone: '',
@@ -259,7 +283,19 @@ async function handleDelete(row) {
   loadData()
 }
 
-onMounted(loadData)
+async function loadUserCategories() {
+  try {
+    const res = await getUserCategoryList()
+    userCategoryOptions.value = res.data || []
+  } catch (e) {
+    userCategoryOptions.value = []
+  }
+}
+
+onMounted(() => {
+  loadUserCategories()
+  loadData()
+})
 </script>
 
 <style lang="scss" scoped>

+ 254 - 3
code/frontend/src/views/user/profile/index.vue

@@ -15,6 +15,48 @@
             <el-option label="女" :value="2" />
           </el-select>
         </el-form-item>
+        <el-form-item label="用户类型">
+          <el-select v-model="queryForm.userType" placeholder="全部" clearable style="width:120px">
+            <el-option
+              v-for="item in userCategoryOptions"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="省">
+          <el-select-v2
+            v-model="queryForm.provinceCode"
+            :options="provinceList"
+            placeholder="全部"
+            clearable
+            filterable
+            style="width:160px"
+            @change="onQueryProvinceChange"
+          />
+        </el-form-item>
+        <el-form-item label="市">
+          <el-select-v2
+            v-model="queryForm.cityCode"
+            :options="queryCityList"
+            placeholder="全部"
+            clearable
+            filterable
+            style="width:200px"
+            @change="onQueryCityChange"
+          />
+        </el-form-item>
+        <el-form-item label="区/县">
+          <el-select-v2
+            v-model="queryForm.districtCode"
+            :options="queryDistrictList"
+            placeholder="全部"
+            clearable
+            filterable
+            style="width:240px"
+          />
+        </el-form-item>
         <el-form-item label="注册时间">
           <el-date-picker
             v-model="queryForm.dateRange"
@@ -86,6 +128,26 @@
           <template #default="{ row }">{{ row.age != null ? row.age + '岁' : '-' }}</template>
         </el-table-column>
         <el-table-column prop="phone" label="手机号" width="130" />
+        <el-table-column prop="userType" label="用户类型" width="95" align="center">
+          <template #default="{ row }">
+            <el-tag :type="userTypeTagType(row.userType)" size="small" v-if="row.userType">
+              {{ userTypeText(row.userType) }}
+            </el-tag>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="所在地区" min-width="180">
+          <template #default="{ row }">
+            <span v-if="row.provinceCode">{{ formatRegion(row) }}</span>
+            <span v-else class="text-gray">-</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="详细地址" min-width="160" show-overflow-tooltip>
+          <template #default="{ row }">
+            <span v-if="row.address">{{ row.address }}</span>
+            <span v-else class="text-gray">-</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="deviceCodes" label="设备编号" min-width="140">
           <template #default="{ row }">
             <span v-if="row.deviceCodes">{{ row.deviceCodes }}</span>
@@ -168,6 +230,36 @@
               <el-input v-model="formData.phone" placeholder="请输入手机号" maxlength="11" :disabled="!!formData.id" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户类型" prop="userType">
+              <el-select v-model="formData.userType" placeholder="请选择用户类型" style="width:100%">
+                <el-option
+                  v-for="item in userCategoryOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所在地区" prop="regionCodes">
+              <el-cascader
+                v-model="formData.regionCodes"
+                :options="regionOptions"
+                :props="regionCascaderProps"
+                placeholder="请选择省/市/区"
+                clearable
+                filterable
+                style="width:100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="详细地址" prop="address">
+              <el-input v-model="formData.address" placeholder="请输入详细地址" maxlength="200" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="肩宽(cm)" prop="shoulderWidth">
               <el-input-number v-model="formData.shoulderWidth" :min="0" :precision="1" style="width:100%" />
@@ -257,6 +349,7 @@ import { ref, reactive, onMounted, computed, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
 import { Search, Refresh, Plus, Delete } from '@element-plus/icons-vue'
+import { regionData, codeToText } from 'element-china-area-data'
 import ExcelExport from '@/components/ExcelExport.vue'
 import ExcelImport from '@/components/ExcelImport.vue'
 import {
@@ -268,6 +361,7 @@ import {
   batchImportProfile,
   generateUserAcupoint
 } from '@/api/user'
+import { getUserCategoryList } from '@/api/userCategory'
 
 const router = useRouter()
 
@@ -276,6 +370,10 @@ const queryForm = reactive({
   keyword: '',
   deviceCode: '',
   gender: null,
+  userType: null,
+  provinceCode: '',
+  cityCode: '',
+  districtCode: '',
   dateRange: null,
   acupointStatus: null,
   pageNum: 1,
@@ -294,6 +392,9 @@ const exportHeaders = [
   { label: '性别', prop: 'genderText' },
   { label: '年龄', prop: 'age' },
   { label: '手机号', prop: 'phone' },
+  { label: '用户类型', prop: 'userTypeLabel' },
+  { label: '所在地区', prop: 'regionText' },
+  { label: '详细地址', prop: 'address' },
   { label: '设备编号', prop: 'deviceCodes' },
   { label: '肩宽(cm)', prop: 'shoulderWidth' },
   { label: '身长(cm)', prop: 'bodyHeight' },
@@ -304,6 +405,119 @@ const exportHeaders = [
   { label: '注册时间', prop: 'createTime' }
 ]
 
+// 中国三级行政区划数据(省/市/区)
+const regionOptions = regionData
+const regionCascaderProps = { value: 'value', label: 'label', children: 'children' }
+
+// 查询区域:省列表、联动的市/区列表
+const provinceList = computed(() => regionData.map(p => ({ value: p.value, label: p.label })))
+
+// 预计算“全国所有市”与“全国所有区”(模块级常量,仅计算一次),
+// 避免清空上级时 computed 重复重建上千条数组导致卡顿
+const ALL_CITIES = []
+const ALL_DISTRICTS = []
+regionData.forEach(p => {
+  ;(p.children || []).forEach(c => {
+    ALL_CITIES.push({ value: c.value, label: `${p.label} / ${c.label}` })
+    ;(c.children || []).forEach(d => {
+      ALL_DISTRICTS.push({ value: d.value, label: `${p.label} / ${c.label} / ${d.label}` })
+    })
+  })
+})
+
+/** 市列表:选了省则返回该省市;未选省则返回全国所有市(加上省名以便识别) */
+const queryCityList = computed(() => {
+  if (queryForm.provinceCode) {
+    const prov = regionData.find(p => p.value === queryForm.provinceCode)
+    return (prov?.children || []).map(c => ({ value: c.value, label: c.label }))
+  }
+  return ALL_CITIES
+})
+
+/** 区/县列表:选了市则返回该市下区;只选省返回该省下区;都未选返回全国区(带上上级以便识别) */
+const queryDistrictList = computed(() => {
+  if (queryForm.cityCode) {
+    for (const p of regionData) {
+      const city = (p.children || []).find(c => c.value === queryForm.cityCode)
+      if (city) {
+        return (city.children || []).map(d => ({ value: d.value, label: d.label }))
+      }
+    }
+    return []
+  }
+  if (queryForm.provinceCode) {
+    const prov = regionData.find(p => p.value === queryForm.provinceCode)
+    const all = []
+    ;(prov?.children || []).forEach(c => {
+      (c.children || []).forEach(d => {
+        all.push({ value: d.value, label: `${c.label} / ${d.label}` })
+      })
+    })
+    return all
+  }
+  return ALL_DISTRICTS
+})
+
+/** 选了省:如果已选的市/区不属于该省则清空 */
+function onQueryProvinceChange(val) {
+  if (!val) {
+    return
+  }
+  const prov = regionData.find(p => p.value === val)
+  const cities = prov?.children || []
+  if (queryForm.cityCode && !cities.find(c => c.value === queryForm.cityCode)) {
+    queryForm.cityCode = ''
+    queryForm.districtCode = ''
+  } else if (queryForm.districtCode) {
+    const city = cities.find(c => c.value === queryForm.cityCode)
+    if (city && !(city.children || []).find(d => d.value === queryForm.districtCode)) {
+      queryForm.districtCode = ''
+    }
+  }
+}
+
+/** 选了市:如果已选的区不属于该市则清空 */
+function onQueryCityChange(val) {
+  if (!val) {
+    return
+  }
+  for (const p of regionData) {
+    const city = (p.children || []).find(c => c.value === val)
+    if (city) {
+      if (queryForm.districtCode && !(city.children || []).find(d => d.value === queryForm.districtCode)) {
+        queryForm.districtCode = ''
+      }
+      return
+    }
+  }
+}
+
+/** 用户类别选项(从后台 user_category 动态加载) */
+const userCategoryOptions = ref([])
+
+/** 用户类型文本(优先从动态加载的类别表查) */
+function userTypeText(type) {
+  if (type == null) return '-'
+  const item = userCategoryOptions.value.find(c => c.code === type)
+  return item ? item.name : '-'
+}
+
+/** 用户类型标签颜色(优先使用后台配置的 tagType) */
+function userTypeTagType(type) {
+  if (type == null) return 'info'
+  const item = userCategoryOptions.value.find(c => c.code === type)
+  return item?.tagType || 'primary'
+}
+
+/** 根据行政区划编码还原为 “省/市/区” 文本 */
+function formatRegion(row) {
+  const parts = [row.provinceCode, row.cityCode, row.districtCode]
+    .filter(c => !!c)
+    .map(c => codeToText[c] || '')
+    .filter(t => !!t)
+  return parts.join(' / ')
+}
+
 async function loadData() {
   loading.value = true
   try {
@@ -311,6 +525,10 @@ async function loadData() {
       keyword: queryForm.keyword || undefined,
       deviceCode: queryForm.deviceCode || undefined,
       gender: queryForm.gender,
+      userType: queryForm.userType,
+      provinceCode: queryForm.provinceCode || undefined,
+      cityCode: queryForm.cityCode || undefined,
+      districtCode: queryForm.districtCode || undefined,
       startTime: queryForm.dateRange?.[0] || undefined,
       endTime: queryForm.dateRange?.[1] || undefined,
       acupointStatus: queryForm.acupointStatus,
@@ -322,6 +540,8 @@ async function loadData() {
     const records = (res.data?.records || []).map(r => ({
       ...r,
       genderText: r.gender === 1 ? '男' : r.gender === 2 ? '女' : '-',
+      userTypeLabel: userTypeText(r.userType),
+      regionText: formatRegion(r),
       acupointText: r.acupointTableId ? '已生成' : '未生成'
     }))
     tableData.value = records
@@ -340,6 +560,10 @@ function handleReset() {
   queryForm.keyword = ''
   queryForm.deviceCode = ''
   queryForm.gender = null
+  queryForm.userType = null
+  queryForm.provinceCode = ''
+  queryForm.cityCode = ''
+  queryForm.districtCode = ''
   queryForm.dateRange = null
   queryForm.acupointStatus = null
   queryForm.pageNum = 1
@@ -362,6 +586,9 @@ const formData = reactive({
   gender: null,
   age: null,
   phone: '',
+  userType: 1,
+  regionCodes: [],
+  address: '',
   shoulderWidth: null,
   bodyHeight: null,
   spineLength: null,
@@ -446,6 +673,7 @@ const formRules = {
 function handleAdd() {
   Object.assign(formData, {
     id: null, name: '', gender: null, age: null, phone: '',
+    userType: 1, regionCodes: [], address: '',
     shoulderWidth: null, bodyHeight: null, spineLength: null, height: null, weight: null,
     fingerWidth1: null, fingerWidth15: null, fingerWidth3: null
   })
@@ -460,6 +688,9 @@ function handleEdit(row) {
     gender: row.gender,
     age: row.age,
     phone: row.phone,
+    userType: row.userType ?? 1,
+    regionCodes: [row.provinceCode, row.cityCode, row.districtCode].filter(c => !!c),
+    address: row.address || '',
     shoulderWidth: row.shoulderWidth,
     bodyHeight: row.bodyHeight,
     spineLength: row.spineLength,
@@ -484,10 +715,18 @@ async function handleSubmit() {
   await formRef.value.validate()
   submitLoading.value = true
   try {
+    const codes = formData.regionCodes || []
+    const payload = {
+      ...formData,
+      provinceCode: codes[0] || null,
+      cityCode: codes[1] || null,
+      districtCode: codes[2] || null
+    }
+    delete payload.regionCodes
     if (formData.id) {
-      await updateProfile({ ...formData })
+      await updateProfile(payload)
     } else {
-      await addProfile({ ...formData })
+      await addProfile(payload)
     }
     ElMessage.success('操作成功')
     dialogVisible.value = false
@@ -557,7 +796,19 @@ async function handleGenerateAcupoint() {
   }
 }
 
-onMounted(loadData)
+async function loadUserCategories() {
+  try {
+    const res = await getUserCategoryList()
+    userCategoryOptions.value = res.data || []
+  } catch (e) {
+    userCategoryOptions.value = []
+  }
+}
+
+onMounted(() => {
+  loadUserCategories()
+  loadData()
+})
 </script>
 
 <style lang="scss" scoped>