Merge pull request #580 from xinnan-tech/manager-api-newdevice

修改了设备模块的绑定设备接口的逻辑

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

@@ -14,45 +14,45 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import xiaozhi.common.constant.Constant;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
 import xiaozhi.common.exception.ErrorCode;
-import xiaozhi.common.page.PageData;
 import xiaozhi.common.redis.RedisKeys;
 import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.user.UserDetail;
-import xiaozhi.common.utils.JsonUtils;
 import xiaozhi.common.utils.Result;
-import xiaozhi.modules.device.dto.DeviceHeaderDTO;
+import xiaozhi.modules.device.dto.DeviceBindDTO;
 import xiaozhi.modules.device.dto.DeviceUnBindDTO;
 import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.security.user.SecurityUser;
 
+import java.util.List;
+
 @Tag(name = "设备管理")
 @AllArgsConstructor
 @RestController
 @RequestMapping("/device")
 public class DeviceController {
     private final DeviceService deviceService;
+
     private final RedisUtils redisUtils;
 
     @PostMapping("/bind/{deviceCode}")
     @Operation(summary = "绑定设备")
     @RequiresPermissions("sys:role:normal")
-    public Result<DeviceEntity> bindDevice(@PathVariable String deviceCode) {
-        UserDetail user = SecurityUser.getUser();
-
-        String deviceHeaders = (String) redisUtils.get(RedisKeys.getDeviceCaptchaKey(deviceCode));
-        if (StringUtils.isBlank(deviceHeaders)) {
-            return new Result<DeviceEntity>().error(ErrorCode.DEVICE_CAPTCHA_ERROR);
+    public Result<Void> bindDevice(@PathVariable String agentId,@RequestBody String code) {
+        String macAddress = (String) redisUtils.get(RedisKeys.getDeviceCaptchaKey(code));
+        if (StringUtils.isBlank(macAddress)) {
+            return new Result<Void>().error(ErrorCode.DEVICE_CAPTCHA_ERROR);
         }
-        DeviceHeaderDTO deviceHeader = JsonUtils.parseObject(deviceHeaders.getBytes(), DeviceHeaderDTO.class);
-        DeviceEntity device = deviceService.bindDevice(user.getId(), deviceHeader);
-        return new Result<DeviceEntity>().ok(device);
+        Long user = SecurityUser.getUser().getId();
+        DeviceBindDTO deviceBindDTO = new DeviceBindDTO(macAddress,user,agentId);
+        deviceService.bindDevice(deviceBindDTO);
+        return new Result<>();
     }
 
     @GetMapping("/bind")
@@ -73,16 +73,5 @@ public class DeviceController {
         return new Result<Void>();
     }
 
-    @GetMapping("/all")
-    @Operation(summary = "设备列表（管理员）")
-    @RequiresPermissions("sys:role:superAdmin")
-    @Parameters({
-            @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
-            @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
-    })
-    public Result<PageData<DeviceEntity>> adminDeviceList(
-            @Parameter(hidden = true) @RequestParam Map<String, Object> params) {
-        PageData<DeviceEntity> page = deviceService.adminDeviceList(params);
-        return new Result<PageData<DeviceEntity>>().ok(page);
-    }
+
 }

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

@@ -0,0 +1,26 @@
+package xiaozhi.modules.device.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * 设备绑定的DTO
+ * @author zjy
+ * @since 2025-3-28
+ */
+@Data
+@AllArgsConstructor
+@Schema(description = "设备连接头信息")
+public class DeviceBindDTO {
+
+    @Schema(description = "mac地址")
+    private String macAddress;
+
+    @Schema(description = "所属用户id")
+    private Long userId;
+
+    @Schema(description = "智能体id")
+    private String agentId;
+
+}

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

@@ -1,19 +0,0 @@
-package xiaozhi.modules.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Data
-@Schema(description = "设备连接头信息")
-public class DeviceHeaderDTO {
-
-    @Schema(description = "设备ID")
-    private String deviceId;
-
-    @Schema(description = "协议版本号")
-    private Long protocolVersion;
-
-    @Schema(description = "认证信息")
-    private String authorization;
-
-}

main/manager-api/src/main/java/xiaozhi/modules/device/entity/DeviceEntity.java

@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import xiaozhi.common.entity.BaseEntity;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @TableName("ai_device")
 @Schema(description = "设备信息")
-public class DeviceEntity {
-    @Schema(description = "设备ID")
-    private String id;
-
+public class DeviceEntity extends BaseEntity {
     @Schema(description = "关联用户ID")
     private Long userId;
 
@@ -41,12 +41,6 @@ public class DeviceEntity {
     @Schema(description = "排序")
     private Integer sort;
 
-    @Schema(description = "创建者")
-    private Long creator;
-
-    @Schema(description = "创建时间")
-    private Date createDate;
-
     @Schema(description = "更新者")
     private Long updater;
 

main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java

@@ -167,32 +167,28 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
 
         return response;
     }
-
+  
     @Override
-    public DeviceEntity bindDevice(Long userId, DeviceHeaderDTO deviceHeader) {
-        DeviceEntity device = new DeviceEntity();
-        device.setUserId(userId);
-        device.setMacAddress(deviceHeader.getDeviceId());
-        device.setCreateDate(new Date());
-        deviceDao.insert(device);
-        return device;
+    public void bindDevice(DeviceBindDTO dto) {
+        DeviceEntity deviceEntity = ConvertUtils.sourceToTarget(dto, DeviceEntity.class);
+        baseDao.insert(deviceEntity);
     }
 
     @Override
     public List<DeviceEntity> getUserDevices(Long userId) {
         QueryWrapper<DeviceEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("user_id", userId);
-        return deviceDao.selectList(wrapper);
+        return baseDao.selectList(wrapper);
     }
 
     @Override
     public void unbindDevice(Long userId, Long deviceId) {
-        deviceDao.deleteById(deviceId);
+        baseDao.deleteById(deviceId);
     }
 
     @Override
     public PageData<DeviceEntity> adminDeviceList(Map<String, Object> params) {
-        IPage<DeviceEntity> page = deviceDao.selectPage(
+        IPage<DeviceEntity> page = baseDao.selectPage(
                 getPage(params, "sort", true),
                 new QueryWrapper<>());
         return new PageData<>(page.getRecords(), page.getTotal());