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; - } + }