网关 端口

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/GatewayController.java

@@ -62,6 +62,7 @@ public class GatewayController {
             Terminal terminal = new Terminal();
             terminal.setDeviceCode(deviceCode + i);
             terminal.setGatewayId(gateway.getId());
+            terminal.setBuildId(gateway.getLocationId());
             terminal.setFarmId(gateWayAddParam.getFarmId());
             terminalList.add(terminal);
             List portList = new ArrayList();

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/Terminal.java

@@ -54,6 +54,20 @@ public class Terminal implements TransPojo {
     @TableField("status")
     private Integer status;
 
+    @TableField("build_id")
+    @Trans(type = TransType.SIMPLE, target = BasePigpen.class, fields = "buildName", alias = "build", ref = "buildName")
+    private Integer buildId;
+
+    @TableField(exist = false)
+    private String buildName;
+
+    @TableField("floor_id")
+    @Trans(type = TransType.SIMPLE, target = BasePigpen.class, fields = "buildName", alias = "floor", ref = "floorName")
+    private Integer floorId;
+
+    @TableField(exist = false)
+    private String floorName;
+
     /**
      * 网关ID
      */

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/vo/TerminalUpdateParam.java

@@ -19,6 +19,9 @@ public class TerminalUpdateParam {
     @NotBlank(message = "type不能为空")
     private String type;
 
+    @NotBlank(message = "floorId不能为空")
+    private Integer floorId;
+
     @NotNull(message = "gatewayId不能为空")
     private Integer gatewayId;