From cc61ed4a074dbf4ef2218618b05270514f045e4a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 16 十月 2020 14:57:10 +0800
Subject: [PATCH] 去除lombok框架
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 97 +++++
src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/DeviceChannel.java | 193 +++++++++++
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java | 74 ++++
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 231 ++++++++++++++
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Host.java | 28 +
src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java | 15
src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java | 178 +++++++++++
web_src/src/components/videoList.vue | 23 +
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java | 65 +++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 6
pom.xml | 6
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java | 33 ++
12 files changed, 917 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index f619cef..0b5fec8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,12 +156,6 @@
<artifactId>okhttp</artifactId>
<version>4.9.0</version>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.12</version>
- </dependency>
-
</dependencies>
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index b87ffac..de52ac6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -1,11 +1,9 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import lombok.Data;
import java.util.List;
import java.util.Map;
-@Data
public class Device {
/**
@@ -40,6 +38,14 @@
private String transport;
/**
+ * 鏁版嵁娴佷紶杈撴ā寮�
+ * UDP:udp浼犺緭
+ * TCP-ACTIVE锛歵cp涓诲姩妯″紡
+ * TCP-PASSIVE锛歵cp琚姩妯″紡
+ */
+ private String streamMode;
+
+ /**
* wan鍦板潃
*/
private Host host;
@@ -58,4 +64,91 @@
private List<String> channelList;
+ public String getDeviceId() {
+ return deviceId;
+ }
+
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getManufacturer() {
+ return manufacturer;
+ }
+
+ public void setManufacturer(String manufacturer) {
+ this.manufacturer = manufacturer;
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ public String getFirmware() {
+ return firmware;
+ }
+
+ public void setFirmware(String firmware) {
+ this.firmware = firmware;
+ }
+
+ public String getTransport() {
+ return transport;
+ }
+
+ public void setTransport(String transport) {
+ this.transport = transport;
+ }
+
+ public String getStreamMode() {
+ return streamMode;
+ }
+
+ public void setStreamMode(String streamMode) {
+ this.streamMode = streamMode;
+ }
+
+ public Host getHost() {
+ return host;
+ }
+
+ public void setHost(Host host) {
+ this.host = host;
+ }
+
+ public int getOnline() {
+ return online;
+ }
+
+ public void setOnline(int online) {
+ this.online = online;
+ }
+
+ public int getChannelCount() {
+ return channelCount;
+ }
+
+ public void setChannelCount(int channelCount) {
+ this.channelCount = channelCount;
+ }
+
+ public List<String> getChannelList() {
+ return channelList;
+ }
+
+ public void setChannelList(List<String> channelList) {
+ this.channelList = channelList;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
index 6512d37..d91a1c7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
@@ -1,8 +1,6 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import lombok.Data;
-@Data
public class DeviceAlarm {
/**
@@ -47,4 +45,67 @@
private String alarmType;
+ public String getDeviceId() {
+ return deviceId;
+ }
+
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public String getAlarmPriorit() {
+ return alarmPriorit;
+ }
+
+ public void setAlarmPriorit(String alarmPriorit) {
+ this.alarmPriorit = alarmPriorit;
+ }
+
+ public String getAlarmMethod() {
+ return alarmMethod;
+ }
+
+ public void setAlarmMethod(String alarmMethod) {
+ this.alarmMethod = alarmMethod;
+ }
+
+ public String getAlarmTime() {
+ return alarmTime;
+ }
+
+ public void setAlarmTime(String alarmTime) {
+ this.alarmTime = alarmTime;
+ }
+
+ public String getAlarmDescription() {
+ return alarmDescription;
+ }
+
+ public void setAlarmDescription(String alarmDescription) {
+ this.alarmDescription = alarmDescription;
+ }
+
+ public double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(double longitude) {
+ this.longitude = longitude;
+ }
+
+ public double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(double latitude) {
+ this.latitude = latitude;
+ }
+
+ public String getAlarmType() {
+ return alarmType;
+ }
+
+ public void setAlarmType(String alarmType) {
+ this.alarmType = alarmType;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index ad1dbab..810feab 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -1,8 +1,5 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import lombok.Data;
-
-@Data
public class DeviceChannel {
/**
@@ -177,4 +174,232 @@
break;
}
}
+
+ public String getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(String channelId) {
+ this.channelId = channelId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getManufacture() {
+ return manufacture;
+ }
+
+ public void setManufacture(String manufacture) {
+ this.manufacture = manufacture;
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ public String getOwner() {
+ return owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+ public String getCivilCode() {
+ return civilCode;
+ }
+
+ public void setCivilCode(String civilCode) {
+ this.civilCode = civilCode;
+ }
+
+ public String getBlock() {
+ return block;
+ }
+
+ public void setBlock(String block) {
+ this.block = block;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public int getParental() {
+ return parental;
+ }
+
+ public void setParental(int parental) {
+ this.parental = parental;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public int getSafetyWay() {
+ return safetyWay;
+ }
+
+ public void setSafetyWay(int safetyWay) {
+ this.safetyWay = safetyWay;
+ }
+
+ public int getRegisterWay() {
+ return registerWay;
+ }
+
+ public void setRegisterWay(int registerWay) {
+ this.registerWay = registerWay;
+ }
+
+ public String getCertNum() {
+ return certNum;
+ }
+
+ public void setCertNum(String certNum) {
+ this.certNum = certNum;
+ }
+
+ public int getCertifiable() {
+ return certifiable;
+ }
+
+ public void setCertifiable(int certifiable) {
+ this.certifiable = certifiable;
+ }
+
+ public int getErrCode() {
+ return errCode;
+ }
+
+ public void setErrCode(int errCode) {
+ this.errCode = errCode;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getSecrecy() {
+ return secrecy;
+ }
+
+ public void setSecrecy(String secrecy) {
+ this.secrecy = secrecy;
+ }
+
+ public String getIpAddress() {
+ return ipAddress;
+ }
+
+ public void setIpAddress(String ipAddress) {
+ this.ipAddress = ipAddress;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public int getPTZType() {
+ return PTZType;
+ }
+
+ public String getPTZTypeText() {
+ return PTZTypeText;
+ }
+
+ public void setPTZTypeText(String PTZTypeText) {
+ this.PTZTypeText = PTZTypeText;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(double longitude) {
+ this.longitude = longitude;
+ }
+
+ public double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(double latitude) {
+ this.latitude = latitude;
+ }
+
+ public int getSubCount() {
+ return subCount;
+ }
+
+ public void setSubCount(int subCount) {
+ this.subCount = subCount;
+ }
+
+ public String getSsrc() {
+ return ssrc;
+ }
+
+ public void setSsrc(String ssrc) {
+ this.ssrc = ssrc;
+ }
+
+ public boolean isHasAudio() {
+ return hasAudio;
+ }
+
+ public void setHasAudio(boolean hasAudio) {
+ this.hasAudio = hasAudio;
+ }
+
+ public boolean isPlay() {
+ return play;
+ }
+
+ public void setPlay(boolean play) {
+ this.play = play;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Host.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Host.java
index d8499b1..1b14560 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Host.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Host.java
@@ -1,15 +1,35 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import lombok.Data;
-@Data
+
public class Host {
private String ip;
private int port;
private String address;
-
-
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java
index 9b2fb05..7c3ebf6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java
@@ -9,7 +9,6 @@
* @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓嬪崍2:05:56
*/
-@Data
public class RecordInfo {
private String deviceId;
@@ -20,4 +19,36 @@
private List<RecordItem> recordList;
+
+ public String getDeviceId() {
+ return deviceId;
+ }
+
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getSumNum() {
+ return sumNum;
+ }
+
+ public void setSumNum(int sumNum) {
+ this.sumNum = sumNum;
+ }
+
+ public List<RecordItem> getRecordList() {
+ return recordList;
+ }
+
+ public void setRecordList(List<RecordItem> recordList) {
+ this.recordList = recordList;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java
index 7d3eec5..20605b1 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java
@@ -1,14 +1,11 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import lombok.Data;
/**
* @Description:璁惧褰曞儚bean
* @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓嬪崍2:06:54
*/
-
-@Data
public class RecordItem {
private String deviceId;
@@ -29,4 +26,75 @@
private String recorderId;
+ public String getDeviceId() {
+ return deviceId;
+ }
+
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getFilePath() {
+ return filePath;
+ }
+
+ public void setFilePath(String filePath) {
+ this.filePath = filePath;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public int getSecrecy() {
+ return secrecy;
+ }
+
+ public void setSecrecy(int secrecy) {
+ this.secrecy = secrecy;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getRecorderId() {
+ return recorderId;
+ }
+
+ public void setRecorderId(String recorderId) {
+ this.recorderId = recorderId;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
index 73f2dc5..9768243 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -37,6 +37,7 @@
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import org.springframework.util.StringUtils;
/**
* @Description:MESSAGE璇锋眰澶勭悊鍣�
@@ -125,6 +126,9 @@
device.setManufacturer(XmlUtil.getText(rootElement,"Manufacturer"));
device.setModel(XmlUtil.getText(rootElement,"Model"));
device.setFirmware(XmlUtil.getText(rootElement,"Firmware"));
+ if (StringUtils.isEmpty(device.getStreamMode())){
+ device.setStreamMode("UDP");
+ }
storager.updateDevice(device);
RequestMessage msg = new RequestMessage();
@@ -202,8 +206,6 @@
deviceChannel.setHasAudio(false); // 榛樿鍚湁闊抽涓篺alse
storager.updateChannel(device.getDeviceId(), deviceChannel);
}
- // 鏇存柊
- storager.updateDevice(device);
RequestMessage msg = new RequestMessage();
msg.setDeviceId(deviceId);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
index 1b4689a..bd5564e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
@@ -66,7 +66,7 @@
* @param count 姣忛〉鏉℃暟
* @return 閫氶亾鍒楄〃
*/
- @GetMapping("devices/{deviceId}/channels")
+ @GetMapping("/devices/{deviceId}/channels")
public ResponseEntity<PageResult> channels(@PathVariable String deviceId,
int page, int count,
@RequestParam(required = false) String query,
@@ -123,7 +123,7 @@
* @param count 姣忛〉鏉℃暟
* @return 瀛愰�氶亾鍒楄〃
*/
- @GetMapping("subChannels/{deviceId}/{channelId}/channels")
+ @GetMapping("/subChannels/{deviceId}/{channelId}/channels")
public ResponseEntity<PageResult> subChannels(@PathVariable String deviceId,
@PathVariable String channelId,
int page,
@@ -145,9 +145,18 @@
return new ResponseEntity<>(pageResult,HttpStatus.OK);
}
- @PostMapping("channel/update/{deviceId}")
+ @PostMapping("/channel/update/{deviceId}")
public ResponseEntity<PageResult> updateChannel(@PathVariable String deviceId,DeviceChannel channel){
storager.updateChannel(deviceId, channel);
return new ResponseEntity<>(null,HttpStatus.OK);
}
+
+ @GetMapping("/devices/{deviceId}/transport/{transport}")
+ @PostMapping("/devices/{deviceId}/transport/{transport}")
+ public ResponseEntity<PageResult> updateTransport(@PathVariable String deviceId, @PathVariable String transport){
+ Device device = storager.queryVideoDevice(deviceId);
+ device.setTransport(transport);
+ storager.updateDevice(device);
+ return new ResponseEntity<>(null,HttpStatus.OK);
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java
index 0f3614d..e47f796 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/Device.java
@@ -12,14 +12,12 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* @Description:瑙嗛璁惧淇℃伅
* @author: songww
* @date: 2020骞�5鏈�8鏃� 涓嬪崍2:05:56
*/
-@Data
@ApiModel(value = "瑙嗛璁惧淇℃伅", description = "瑙嗛璁惧淇℃伅")
@Table(name="VMP_VIDEODEVICES")
public class Device {
@@ -224,4 +222,180 @@
@Transient
private List<DeviceChannel> channelList;
+
+ public String getDeviceId() {
+ return deviceId;
+ }
+
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public String getDeviceName() {
+ return deviceName;
+ }
+
+ public void setDeviceName(String deviceName) {
+ this.deviceName = deviceName;
+ }
+
+ public String getManufacturer() {
+ return manufacturer;
+ }
+
+ public void setManufacturer(String manufacturer) {
+ this.manufacturer = manufacturer;
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ public String getFirmware() {
+ return firmware;
+ }
+
+ public void setFirmware(String firmware) {
+ this.firmware = firmware;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public String getTransport() {
+ return transport;
+ }
+
+ public void setTransport(String transport) {
+ this.transport = transport;
+ }
+
+ public String getStreamMode() {
+ return streamMode;
+ }
+
+ public void setStreamMode(String streamMode) {
+ this.streamMode = streamMode;
+ }
+
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public Integer getPort() {
+ return port;
+ }
+
+ public void setPort(Integer port) {
+ this.port = port;
+ }
+
+ public String getOnline() {
+ return online;
+ }
+
+ public void setOnline(String online) {
+ this.online = online;
+ }
+
+ public Integer getChannelSum() {
+ return channelSum;
+ }
+
+ public void setChannelSum(Integer channelSum) {
+ this.channelSum = channelSum;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getRegisterTime() {
+ return registerTime;
+ }
+
+ public void setRegisterTime(String registerTime) {
+ this.registerTime = registerTime;
+ }
+
+ public String getHeartbeatTime() {
+ return heartbeatTime;
+ }
+
+ public void setHeartbeatTime(String heartbeatTime) {
+ this.heartbeatTime = heartbeatTime;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdatePerson() {
+ return updatePerson;
+ }
+
+ public void setUpdatePerson(String updatePerson) {
+ this.updatePerson = updatePerson;
+ }
+
+ public String getSyncTime() {
+ return syncTime;
+ }
+
+ public void setSyncTime(String syncTime) {
+ this.syncTime = syncTime;
+ }
+
+ public String getSyncPerson() {
+ return syncPerson;
+ }
+
+ public void setSyncPerson(String syncPerson) {
+ this.syncPerson = syncPerson;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public List<DeviceChannel> getChannelList() {
+ return channelList;
+ }
+
+ public void setChannelList(List<DeviceChannel> channelList) {
+ this.channelList = channelList;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/DeviceChannel.java
index 36941ed..bedd075 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/entity/DeviceChannel.java
@@ -6,14 +6,12 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* @Description:璁惧閫氶亾淇℃伅
* @author: songww
* @date: 2020骞�5鏈�20鏃� 涓嬪崍9:00:46
*/
-@Data
@ApiModel(value = "璁惧閫氶亾淇℃伅", description = "璁惧閫氶亾淇℃伅")
@Table(name="VMP_VIDEOCHANNELS")
public class DeviceChannel {
@@ -193,4 +191,195 @@
@Column(name="LATITUDE")
private double latitude;
+ public String getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(String channelId) {
+ this.channelId = channelId;
+ }
+
+ public String getDeviceId() {
+ return deviceId;
+ }
+
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public String getChannelName() {
+ return channelName;
+ }
+
+ public void setChannelName(String channelName) {
+ this.channelName = channelName;
+ }
+
+ public String getManufacture() {
+ return manufacture;
+ }
+
+ public void setManufacture(String manufacture) {
+ this.manufacture = manufacture;
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ public String getOwner() {
+ return owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+ public String getCivilCode() {
+ return civilCode;
+ }
+
+ public void setCivilCode(String civilCode) {
+ this.civilCode = civilCode;
+ }
+
+ public String getBlock() {
+ return block;
+ }
+
+ public void setBlock(String block) {
+ this.block = block;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public String getParental() {
+ return parental;
+ }
+
+ public void setParental(String parental) {
+ this.parental = parental;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getSafetyWay() {
+ return safetyWay;
+ }
+
+ public void setSafetyWay(String safetyWay) {
+ this.safetyWay = safetyWay;
+ }
+
+ public String getRegisterWay() {
+ return registerWay;
+ }
+
+ public void setRegisterWay(String registerWay) {
+ this.registerWay = registerWay;
+ }
+
+ public String getCertNum() {
+ return certNum;
+ }
+
+ public void setCertNum(String certNum) {
+ this.certNum = certNum;
+ }
+
+ public String getCertValid() {
+ return certValid;
+ }
+
+ public void setCertValid(String certValid) {
+ this.certValid = certValid;
+ }
+
+ public String getCertErrCode() {
+ return certErrCode;
+ }
+
+ public void setCertErrCode(String certErrCode) {
+ this.certErrCode = certErrCode;
+ }
+
+ public String getCertEndTime() {
+ return certEndTime;
+ }
+
+ public void setCertEndTime(String certEndTime) {
+ this.certEndTime = certEndTime;
+ }
+
+ public String getSecrecy() {
+ return secrecy;
+ }
+
+ public void setSecrecy(String secrecy) {
+ this.secrecy = secrecy;
+ }
+
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public Integer getPort() {
+ return port;
+ }
+
+ public void setPort(Integer port) {
+ this.port = port;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getOnline() {
+ return online;
+ }
+
+ public void setOnline(String online) {
+ this.online = online;
+ }
+
+ public double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(double longitude) {
+ this.longitude = longitude;
+ }
+
+ public double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(double latitude) {
+ this.latitude = latitude;
+ }
}
diff --git a/web_src/src/components/videoList.vue b/web_src/src/components/videoList.vue
index efbb489..1ae78be 100644
--- a/web_src/src/components/videoList.vue
+++ b/web_src/src/components/videoList.vue
@@ -29,7 +29,14 @@
</el-table-column>
<el-table-column prop="model" label="鍥轰欢鐗堟湰" align="center">
</el-table-column>
- <el-table-column prop="transport" label="閫氳鏂瑰紡" align="center">
+ <el-table-column label="閫氳鏂瑰紡" align="center">
+ <template slot-scope="scope">
+ <el-select @change="transportChange(scope.row)" v-model="scope.row.streamMode" placeholder="璇烽�夋嫨">
+ <el-option key="UDP" label="UDP" value="UDP"></el-option>
+ <el-option key="TCP-ACTIVE" label="TCP涓诲姩妯″紡" value="TCP-ACTIVE"></el-option>
+ <el-option key="TCP-PASSIVE" label="TCP琚姩妯″紡" :disabled="true" value="TCP-PASSIVE"></el-option>
+ </el-select>
+ </template>
</el-table-column>
<el-table-column prop="channelCount" label="閫氶亾鏁�" align="center">
</el-table-column>
@@ -180,7 +187,19 @@
that.$refs.devicePlayer.play(ssrc,deviceId,channelId);
}).catch(function(e) {
});
- }
+ },
+ transportChange: function (row) {
+ console.log(`淇敼浼犺緭鏂瑰紡涓� ${row.transport}锛�${row.deviceId} `);
+ let that = this;
+ this.$axios({
+ method: 'get',
+ url: '/api/devices/' + row.deviceId + '/transport/' + row.transport
+ }).then(function(res) {
+ let ssrc = res.data.ssrc;
+ that.$refs.devicePlayer.play(ssrc,deviceId,channelId);
+ }).catch(function(e) {
+ });
+ }
}
};
--
Gitblit v1.8.0