From 07f618d91f7d8e314b9b06f030ed0a0eea7b1286 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 22 Jul 2026 11:18:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(SensorDevice):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=BC=A0=E6=84=9F=E5=99=A8=E8=AE=BE=E5=A4=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=AA=8C=E8=AF=81=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zcloud/web/SensorDeviceController.java | 2 +- .../src/main/java/com/zcloud/dto/SensorDeviceScreenQry.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/web/SensorDeviceController.java b/web-adapter/src/main/java/com/zcloud/web/SensorDeviceController.java index c204f98..28bacb4 100644 --- a/web-adapter/src/main/java/com/zcloud/web/SensorDeviceController.java +++ b/web-adapter/src/main/java/com/zcloud/web/SensorDeviceController.java @@ -91,7 +91,7 @@ public class SensorDeviceController { @ApiOperation("可视化大屏-传感器设备查询") @PostMapping("/screenList") - public PageResponse screenList(@Validated @RequestBody SensorDeviceScreenQry qry) { + public PageResponse screenList(@RequestBody SensorDeviceScreenQry qry) { return sensorDeviceService.screenList(qry); } } diff --git a/web-client/src/main/java/com/zcloud/dto/SensorDeviceScreenQry.java b/web-client/src/main/java/com/zcloud/dto/SensorDeviceScreenQry.java index 91b77e7..ee047ba 100644 --- a/web-client/src/main/java/com/zcloud/dto/SensorDeviceScreenQry.java +++ b/web-client/src/main/java/com/zcloud/dto/SensorDeviceScreenQry.java @@ -21,8 +21,5 @@ public class SensorDeviceScreenQry extends PageQuery { @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") private Integer portArea; - @AssertTrue(message = "企业id和港区至少传一个") - public boolean isCorpinfoIdOrPortAreaPresent() { - return corpinfoId != null || portArea != null; - } + }