Newspaper 1 year ago
parent
commit
35bb7dec6d

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

@@ -53,7 +53,9 @@ public class GatewayController {
     @PostMapping("/page")
     public Result page(@RequestBody GateWayPageParam gateWayPageParam){
         Page<Gateway> page = new Page<>(gateWayPageParam.getPageNum(),gateWayPageParam.getPageSize());
-        Page<Gateway> gatewayPage = gatewayService.page(page,new QueryWrapper<Gateway>().lambda().eq(Gateway::getFarmId,gateWayPageParam.getFarmId()));
+        Page<Gateway> gatewayPage = gatewayService.page(page,new QueryWrapper<Gateway>().lambda()
+                .eq(Gateway::getFarmId,gateWayPageParam.getFarmId())
+                .like(ObjectUtil.isNotEmpty(gateWayPageParam.getDeviceCode()),Gateway::getDeviceCode,gateWayPageParam.getDeviceCode()));
         return new Result(ResultCode.SUCCESS,gatewayPage);
     }
 

+ 2 - 0
huimv-env-admin/src/main/java/com/huimv/env/admin/entity/vo/GateWayPageParam.java

@@ -15,4 +15,6 @@ public class GateWayPageParam {
 
     @NotNull(message = "farmId不能为空")
     private Integer farmId;
+
+    private String deviceCode;
 }