update:添加设备注册验证码接口 (#646)

main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java

@@ -20,6 +20,7 @@ import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.device.dto.DeviceBindDTO;
+import xiaozhi.modules.device.dto.DeviceRegisterDTO;
 import xiaozhi.modules.device.dto.DeviceUnBindDTO;
 import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.service.DeviceService;
@@ -48,6 +49,25 @@ public class DeviceController {
         return new Result<>();
     }
 
+    @PostMapping("/register")
+    @Operation(summary = "注册设备")
+    public Result<String> registerDevice(@RequestBody DeviceRegisterDTO deviceRegisterDTO) {
+        String macAddress = deviceRegisterDTO.getMacAddress();
+        if (StringUtils.isBlank(macAddress)) {
+            return new Result<String>().error(ErrorCode.NOT_NULL, "mac地址不能为空");
+        }
+        // 生成六位验证码
+        String code = String.valueOf(Math.random()).substring(2, 8);
+        String key = RedisKeys.getDeviceCaptchaKey(code);
+        String existsMac = null;
+        do {
+            existsMac = (String) redisUtils.get(key);
+        } while (StringUtils.isNotBlank(existsMac));
+
+        redisUtils.set(key, macAddress);
+        return new Result<String>().ok(code);
+    }
+
     @GetMapping("/bind/{agentId}")
     @Operation(summary = "获取已绑定设备")
     @RequiresPermissions("sys:role:normal")

main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceRegisterDTO.java

@@ -0,0 +1,23 @@
+package xiaozhi.modules.device.dto;
+
+import java.io.Serializable;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 设备注册头信息
+ * 
+ * @author zjy
+ * @since 2025-3-28
+ */
+@Setter
+@Getter
+@Schema(description = "设备注册头信息")
+public class DeviceRegisterDTO implements Serializable {
+
+    @Schema(description = "mac地址")
+    private String macAddress;
+
+}

main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java

@@ -77,6 +77,7 @@ public class ShiroConfig {
         filterMap.put("/user/captcha", "anon");
         filterMap.put("/user/login", "anon");
         filterMap.put("/user/register", "anon");
+        filterMap.put("/device/register", "anon");
         filterMap.put("/**", "oauth2");
         shiroFilter.setFilterChainDefinitionMap(filterMap);
 

main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java

@@ -156,6 +156,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
             AdminPageUserVO adminPageUserVO = new AdminPageUserVO();
             adminPageUserVO.setUserid(user.getId().toString());
             adminPageUserVO.setMobile(user.getUsername());
+            adminPageUserVO.setStatus(user.getStatus());
             // TODO 2. 等设备功能写好，获取对应数据
             adminPageUserVO.setDeviceCount("0");
             return adminPageUserVO;

main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java

@@ -18,6 +18,9 @@ public class AdminPageUserVO {
     @Schema(description = "手机号码")
     private String mobile;
 
+    @Schema(description = "状态")
+    private Integer status;
+
     @Schema(description = "用户id")
     private String userid;
 }