소스 검색

update 删除重复报警和提醒

A17404李放 3 년 전
부모
커밋
78df50b18a

+ 1 - 1
nb-system/src/main/java/com/nb/bus/controller/BusDeviceHistoryController.java

@@ -68,7 +68,7 @@ public class BusDeviceHistoryController extends BaseCrudController<BusDeviceHist
     @PostMapping("/deviceUseDetail")
     @SaCheckPermission("bus:device:useDetail")
     @ApiOperation(value = "设备使用详情",notes = "权限:【bus:device:useDetail】")
-    public R<List<DeviceCountResult>> deviceUseDetail(@RequestAttribute(value = "tenantId",required = false)@ApiParam(hidden = true) String tenantId, @RequestBody @Validated BusDeviceAlarmEntity query){
+    public R<List<DeviceCountResult>> deviceUseDetail(@RequestAttribute(value = "tenantId",required = false)@ApiParam(hidden = true) String tenantId, @RequestBody BusDeviceAlarmEntity query){
         if(!StrUtil.isNullOrUndefined(tenantId)){
             query.setTenantId(tenantId);
         }

+ 1 - 1
nb-system/src/main/java/com/nb/bus/entity/BusDeviceAlarmEntity.java

@@ -36,7 +36,7 @@ import java.util.Date;
 public class BusDeviceAlarmEntity extends TenantGenericEntity<String,String> {
 
     @ApiModelProperty(value = "设备唯一编码",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
-    @NotNull(message = "设备唯一标识不能为空")
+    @NotNull(groups = Insert.class,message = "设备唯一标识不能为空")
     private String deviceId;
 
     @ApiModelProperty(value = "报警时间")