XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整ptzType字段名称

Browse Source
This commit is contained in:
648540858
2024-03-18 17:41:49 +08:00
parent bfafe45b26
commit 97dc926b28
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
View File

@@ -142,13 +142,13 @@ public class DeviceChannel {
* 云台类型
*/
@Schema(description = "云台类型")
private int PTZType;
private int ptzType;
/**
* 云台类型描述字符串
*/
@Schema(description = "云台类型描述字符串")
private String PTZTypeText;
private String ptzTypeText;
/**
* 创建时间
@@ -266,23 +266,23 @@ public class DeviceChannel {
this.deviceId = deviceId;
}
public void setPTZType(int PTZType) {
this.PTZType = PTZType;
switch (PTZType) {
public void setPtzType(int ptzType) {
this.ptzType = ptzType;
switch (ptzType) {
case 0:
this.PTZTypeText = "未知";
this.ptzTypeText = "未知";
break;
case 1:
this.PTZTypeText = "球机";
this.ptzTypeText = "球机";
break;
case 2:
this.PTZTypeText = "半球";
this.ptzTypeText = "半球";
break;
case 3:
this.PTZTypeText = "固定枪机";
this.ptzTypeText = "固定枪机";
break;
case 4:
this.PTZTypeText = "遥控枪机";
this.ptzTypeText = "遥控枪机";
break;
}
}
@@ -448,15 +448,15 @@ public class DeviceChannel {
}
public int getPTZType() {
return PTZType;
return ptzType;
}
public String getPTZTypeText() {
return PTZTypeText;
return ptzTypeText;
}
public void setPTZTypeText(String PTZTypeText) {
this.PTZTypeText = PTZTypeText;
this.ptzTypeText = PTZTypeText;
}
public boolean isStatus() {

4
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
View File

@@ -568,14 +568,14 @@ public class XmlUtil {
String ptzTypeFromInfo = XmlUtil.getText(info, "PTZType");
if(!ObjectUtils.isEmpty(ptzTypeFromInfo)){
try {
deviceChannel.setPTZType(Integer.parseInt(ptzTypeFromInfo));
deviceChannel.setPtzType(Integer.parseInt(ptzTypeFromInfo));
}catch (NumberFormatException e){
logger.warn("[xml解析] 从通道数据info中获取PTZType失败： {}", ptzTypeFromInfo);
}
}
} else {
try {
deviceChannel.setPTZType(Integer.parseInt(ptzType));
deviceChannel.setPtzType(Integer.parseInt(ptzType));
}catch (NumberFormatException e){
logger.warn("[xml解析] 从通道数据中获取PTZType失败： {}", ptzType);
}