feat: 设备分组功能

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java

@@ -211,6 +211,12 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceI
                                                int page, int size) {
         JPAQuery<TbDeviceInfo> query = jpaQueryFactory.selectFrom(tbDeviceInfo);
 
+        // 根据groupId, 如果groupId存在，则关联查询TbDeviceGroupMapping, 根据groupId,查询对应的devices
+        if (StringUtils.isNotBlank(groupId)) {
+            query.join(tbDeviceGroupMapping).on(tbDeviceGroupMapping.deviceId.eq(tbDeviceInfo.deviceId));
+            query.where(tbDeviceGroupMapping.groupId.eq(groupId));
+        }
+
         if (StringUtils.isNotBlank(uid)) {
             query.where(tbDeviceInfo.uid.eq(uid));
         }

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/devicegroup/DeviceGroupBo.java

@@ -19,6 +19,10 @@ public class DeviceGroupBo extends BaseDto {
 
     private static final long serialVersionUID = -1L;
 
+    @ApiModelProperty(value = "分组id")
+    @NotNull(message = "分组id不能为空")
+    private String id;
+
     @ApiModelProperty(value = "创建时间")
     @NotNull(message = "创建时间不能为空")
     private Long createAt;

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/deviceinfo/DeviceInfoVo.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Map;
 
 
 @ApiModel(value = "DeviceInfoVo")
@@ -75,4 +76,7 @@ public class DeviceInfoVo implements Serializable {
     @ApiModelProperty(value = "所属产品信息")
     private Product product;
 
+    @ApiModelProperty(value = "所属分组")
+    private Map<String, DeviceInfo.Group> group;
+
 }