Browse Source
Merge branch 'master' of http://120.76.47.59:3000/liu_li/yxk_StoreroomSystem into master
Merge branch 'master' of http://120.76.47.59:3000/liu_li/yxk_StoreroomSystem into master
# Conflicts: # storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.javamaster
16 changed files with 309 additions and 70 deletions
-
106common/src/main/java/com/storeroom/utils/DateUtils.java
-
22storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java
-
9storeroom/src/main/java/com/storeroom/modules/device/domain/AlarmDeseCaBinetLog.java
-
4storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceCamerBind.java
-
5storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java
-
14storeroom/src/main/java/com/storeroom/modules/device/repository/DeviceCamerBindRepository.java
-
13storeroom/src/main/java/com/storeroom/modules/device/service/DeviceCamerBindService.java
-
5storeroom/src/main/java/com/storeroom/modules/device/service/VideoMonitoringService.java
-
21storeroom/src/main/java/com/storeroom/modules/device/service/dto/CameraInfoDto.java
-
49storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceCamerBindImpl.java
-
12storeroom/src/main/java/com/storeroom/modules/device/service/impl/VideoMonitoringImpl.java
-
1storeroom/src/main/java/com/storeroom/modules/storeroom3d/config/common/NVSSDK.java
-
64storeroom/src/main/java/com/storeroom/modules/storeroom3d/config/common/VideoClient.java
-
4storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/VideosTestController.java
-
39storeroom/src/test/java/test.java
-
11storeroom/src/test/java/videoTest.java
@ -1,5 +1,24 @@ |
|||
package com.storeroom.modules.device.service.dto; |
|||
|
|||
public class CameraInfoDto { |
|||
|
|||
import com.storeroom.base.BaseDTO; |
|||
import lombok.Getter; |
|||
import lombok.Setter; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
@Getter |
|||
@Setter |
|||
public class CameraInfoDto extends BaseDTO implements Serializable { |
|||
|
|||
private String id; |
|||
|
|||
private String deviceCamerBindId; |
|||
|
|||
private String description; |
|||
|
|||
private String event; |
|||
|
|||
private String downloadLink; |
|||
|
|||
} |
Write
Preview
Loading…
Cancel
Save
Reference in new issue