网关 终端

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

@@ -47,6 +47,7 @@ public class TerminalController {
         }
         Terminal terminal = new Terminal();
         terminal.setDeviceCode(terminalAddParam.getDeviceCode());
+        terminal.setDeviceName(terminalAddParam.getDeviceName());
         terminal.setGatewayId(terminalAddParam.getGatewayId());
         terminal.setType(terminalAddParam.getType());
         terminal.setFarmId(terminalAddParam.getFarmId());
@@ -73,7 +74,9 @@ public class TerminalController {
     @PostMapping("/page")
     public Result page(@RequestBody TerminalPageParam terminalPageParam){
         Page<Terminal> page = new Page<>(terminalPageParam.getPageNum(),terminalPageParam.getPageSize());
-        Page<Terminal> terminalPage = terminalService.page(page,new QueryWrapper<Terminal>().lambda().eq(Terminal::getFarmId,terminalPageParam.getFarmId()));
+        Page<Terminal> terminalPage = terminalService.page(page,new QueryWrapper<Terminal>().lambda()
+                .eq(Terminal::getFarmId,terminalPageParam.getFarmId())
+                .eq(ObjectUtil.isNotEmpty(terminalPageParam.getGatewayId()),Terminal::getGatewayId,terminalPageParam.getGatewayId()));
         return new Result(ResultCode.SUCCESS,terminalPage);
     }
 
@@ -87,6 +90,7 @@ public class TerminalController {
         }
         Terminal terminal = terminalService.getById(terminalUpdateParam.getId());
         terminal.setDeviceCode(terminalUpdateParam.getDeviceCode());
+        terminal.setDeviceName(terminalUpdateParam.getDeviceName());
         terminal.setGatewayId(terminalUpdateParam.getGatewayId());
         terminal.setType(terminalUpdateParam.getType());
         terminal.setFarmId(terminalUpdateParam.getFarmId());

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

@@ -31,12 +31,18 @@ public class Terminal implements TransPojo {
     private Integer id;
 
     /**
-     * 终端编号
+     * 编号
      */
     @TableField("device_code")
     private String deviceCode;
 
     /**
+     * 编号
+     */
+    @TableField("device_name")
+    private String deviceName;
+
+    /**
      * 型号
      */
     @TableField("type")

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

@@ -10,6 +10,9 @@ public class TerminalAddParam {
     @NotBlank(message = "deviceCode不能为空")
     private String deviceCode;
 
+    @NotBlank(message = "deviceName不能为空")
+    private String deviceName;
+
     @NotBlank(message = "type不能为空")
     private String type;
 

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

@@ -14,4 +14,8 @@ public class TerminalPageParam {
 
     @NotNull(message = "farmId不能为空")
     private Integer farmId;
+
+    private String deviceCode;
+
+    private String gatewayId;
 }

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

@@ -13,6 +13,9 @@ public class TerminalUpdateParam {
     @NotBlank(message = "deviceCode不能为空")
     private String deviceCode;
 
+    @NotBlank(message = "deviceName不能为空")
+    private String deviceName;
+
     @NotBlank(message = "type不能为空")
     private String type;