区域位置

server-service/src/main/java/com/makeit/dto/platform/space/PlatRegionSettingDTO.java

+package com.makeit.dto.platform.space;
+
+import com.makeit.common.dto.BaseIdDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author：lzy
+ * @Date：2023/9/8 14:51
+ * @Describe：
+ */
+@Data
+@ApiModel("PlatRegionSettingDTO")
+public class PlatRegionSettingDTO extends BaseIdDTO {
+
+    @ApiModelProperty("安装方式 数据字典：device.install 0-顶装 1-侧装")
+    private String installType;
+
+    @ApiModelProperty("设备朝向 数据字典：device.toward 0-上 1-下 2-左 3-右")
+    private String toward;
+
+    @ApiModelProperty("区域名称")
+    private String regionName;
+
+    @ApiModelProperty("区域定位")
+    private String regionRange;
+
+    @ApiModelProperty("房间门定位")
+    private String roomRange;
+
+    @ApiModelProperty("设备ID")
+    private String equipmentId;
+
+    @ApiModelProperty("房间ID")
+    private String roomId;
+}

server-service/src/main/java/com/makeit/dto/platform/space/PlatRoomQueryDTO.java

@@ -15,4 +15,7 @@ public class PlatRoomQueryDTO {
 
 
     @ApiModelProperty("房间名称")
     @ApiModelProperty("房间名称")
     private String name;
     private String name;
+
+    @ApiModelProperty("空间ID")
+    private  String spaceId;
 }
 }

server-service/src/main/java/com/makeit/entity/platform/space/PlatRegionSetting.java

@@ -16,12 +16,15 @@ import lombok.EqualsAndHashCode;
 @ApiModel(value = "RegionSetting对象", description = "区域设置")
 @ApiModel(value = "RegionSetting对象", description = "区域设置")
 public class PlatRegionSetting extends BaseBusEntity {
 public class PlatRegionSetting extends BaseBusEntity {
 
 
-    @ApiModelProperty("区域设置Id")
-    private String regionSettingId;
-
+    /**
+     * 数据字典：device.install
+     */
     @ApiModelProperty("安装方式 0-顶装 1-侧装")
     @ApiModelProperty("安装方式 0-顶装 1-侧装")
     private String installType;
     private String installType;
 
 
+    /**
+     * 数据字典：device.toward
+     */
     @ApiModelProperty("设备朝向 0-上 1-下 2-左 3-右")
     @ApiModelProperty("设备朝向 0-上 1-下 2-左 3-右")
     private String toward;
     private String toward;
 
 
@@ -36,4 +39,7 @@ public class PlatRegionSetting extends BaseBusEntity {
 
 
     @ApiModelProperty("设备ID")
     @ApiModelProperty("设备ID")
     private String equipmentId;
     private String equipmentId;
+
+    @ApiModelProperty("房间ID")
+    private String roomId;
 }
 }

server-service/src/main/java/com/makeit/enums/platform/device/PlatDeviceEnum.java

@@ -32,4 +32,33 @@ public class PlatDeviceEnum {
         }
         }
     }
     }
 
 
+    public enum InstallEnum implements BaseEnum {
+        CROWN("device.install.crown"), SIDE("device.install.side");
+
+        private String code;
+
+        InstallEnum(String code) {
+            this.code = code;
+        }
+
+        public String getValue() {
+            return SysDictUtil.getValue(code);
+        }
+    }
+
+    public enum TowardEnum implements BaseEnum {
+        UP("device.toward.up"), DOWN("device.toward.down"),
+        LEFT("device.toward.left"),RIGHT("device.toward.right");
+
+        private String code;
+
+        TowardEnum(String code) {
+            this.code = code;
+        }
+
+        public String getValue() {
+            return SysDictUtil.getValue(code);
+        }
+    }
+
 }
 }

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomServiceImpl.java

@@ -118,6 +118,7 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
         Page<PlatRoom> p = PageUtil.toMpPage(page);
         Page<PlatRoom> p = PageUtil.toMpPage(page);
         LambdaQueryWrapper<PlatRoom> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatRoom> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtil.isNotEmpty(dto.getName()), PlatRoom::getName, dto.getName());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getName()), PlatRoom::getName, dto.getName());
+        queryWrapper.eq(StringUtil.isNotEmpty(dto.getSpaceId()),PlatRoom::getSpaceId,dto.getSpaceId());
         Page<PlatRoom> pages = page(p, queryWrapper);
         Page<PlatRoom> pages = page(p, queryWrapper);
         return PageUtil.toPageVO(pages.getRecords(), pages);
         return PageUtil.toPageVO(pages.getRecords(), pages);
     }
     }