From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java | 58 +++-------------------------------------------------------
1 files changed, 3 insertions(+), 55 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java b/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
index 314d9b4..d0cb203 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
@@ -33,42 +33,9 @@
@ApiModel(description = "浜嬩欢绫诲瀷/浜嬩欢鏉ユ簮")
public static class TypeAndSourceVO {
@ApiModelProperty(value = "浜嬩欢鐨勬�绘暟")
- private Integer all;
+ private Long all;
@ApiModelProperty(value = "浜嬩欢绫诲瀷鐨勬暟閲忋�佸悇鍗犳瘮")
- private List<EnforcementEventsVO.TypeAndSourceVO1> records;
- }
-
- @Data
- @ApiModel(description = "浜嬩欢绫诲瀷/浜嬩欢鏉ユ簮")
- public static class TypeAndSourceVO1 {
- @ApiModelProperty(value = "鍚嶇О")
- private String name;
- @ApiModelProperty(value = "鏁伴噺")
- private Integer count;
- @ApiModelProperty(value = "姣斾緥")
- private BigDecimal ratio;
- }
-
- @Data
- @ApiModel(description = "瑙嗛鎶撴媿楂樺彂鐐逛綅/浜嬩欢鍖哄煙缁熻")
- public static class VideoAndAreaVO {
- @ApiModelProperty(value = "鐐逛綅鍚嶇О")
- private String name;
- @ApiModelProperty(value = "娆℃暟")
- private Integer count;
- @ApiModelProperty(value = "鏁版嵁鍗犳瘮")
- private BigDecimal ratio;
- }
-
- @Data
- @ApiModel(description = "寤惰浜嬩欢")
- public static class DelayVO {
- @ApiModelProperty(value = "浜嬩欢缂栫爜锛堝敮涓�锛�")
- private String code;
- @ApiModelProperty(value = "浜嬩欢鎻忚堪")
- private String description;
- @ApiModelProperty(value = "瓒呮湡鏃堕棿锛堝垎閽燂級")
- private Integer duration;
+ private List<VideoAndAreaVO> records;
}
@Data
@@ -83,25 +50,6 @@
@ApiModelProperty(value = "AI璇嗗埆鐨勪簨浠舵�绘暟")
private Integer identification;
@ApiModelProperty(value = "鍏蜂綋浜嬩欢鐨勬暟鎹俊鎭�")
- private EnforcementEventsVO.EventVO event;
+ private List<EventVO> event;
}
-
- @Data
- @ApiModel(description = "鍏蜂綋浜嬩欢鐨勬暟鎹俊鎭�")
- public static class EventVO {
- @ApiModelProperty(value = "浜嬩欢鎻忚堪")
- private String description;
- @ApiModelProperty(value = "浜嬪彂鍦扮偣")
- private String address;
- @ApiModelProperty(value = "鍙戠敓鏃堕棿")
- private String alarmTime;
- @ApiModelProperty(value = "鍏宠仈鎽勫儚鐐逛綅")
- private String point;
- @ApiModelProperty(value = "鐩戞帶鐢婚潰")
- private String picture;
- @ApiModelProperty(value = "鏉ユ簮")
- private String source;
- }
-
-
}
--
Gitblit v1.8.0