From 97dc926b282575de59ba1e97c567c9b890936927 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 18 三月 2024 17:41:49 +0800
Subject: [PATCH] 调整ptzType字段名称
---
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java | 4 ++--
web_src/src/components/channelList.vue | 10 +++++-----
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 26 +++++++++++++-------------
3 files changed, 20 insertions(+), 20 deletions(-)
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 d58abcb..43a5d48 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
@@ -142,13 +142,13 @@
* 浜戝彴绫诲瀷
*/
@Schema(description = "浜戝彴绫诲瀷")
- private int PTZType;
+ private int ptzType;
/**
* 浜戝彴绫诲瀷鎻忚堪瀛楃涓�
*/
@Schema(description = "浜戝彴绫诲瀷鎻忚堪瀛楃涓�")
- private String PTZTypeText;
+ private String ptzTypeText;
/**
* 鍒涘缓鏃堕棿
@@ -266,23 +266,23 @@
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 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() {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
index 9de1ef2..70702bb 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -568,14 +568,14 @@
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涓幏鍙朠TZType澶辫触锛� {}", ptzTypeFromInfo);
}
}
} else {
try {
- deviceChannel.setPTZType(Integer.parseInt(ptzType));
+ deviceChannel.setPtzType(Integer.parseInt(ptzType));
}catch (NumberFormatException e){
logger.warn("[xml瑙ｆ瀽] 浠庨�氶亾鏁版嵁涓幏鍙朠TZType澶辫触锛� {}", ptzType);
}
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 24f4946..a62805b 100755
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -100,9 +100,9 @@
<span v-show="!scope.row.edit">{{ scope.row.location }}</span>
</template>
</el-table-column>
- <el-table-column prop="ptztype" label="浜戝彴绫诲瀷" min-width="100">
+ <el-table-column prop="ptzType" label="浜戝彴绫诲瀷" min-width="100">
<template v-slot:default="scope">
- <el-select v-show="scope.row.edit" v-model="scope.row.ptztype"
+ <el-select v-show="scope.row.edit" v-model="scope.row.ptzType"
placeholder="浜戝彴绫诲瀷" filterable>
<el-option
v-for="(value, key) in ptzTypes"
@@ -111,7 +111,7 @@
:value="key"
/>
</el-select>
- <div v-show="!scope.row.edit">{{ scope.row.ptztypeText }}</div>
+ <div v-show="!scope.row.edit">{{ scope.row.ptzTypeText }}</div>
</template>
</el-table-column>
<el-table-column label="寮�鍚煶棰�" min-width="100">
@@ -312,7 +312,7 @@
that.total = res.data.data.total;
that.deviceChannelList = res.data.data.list;
that.deviceChannelList.forEach(e => {
- e.ptztype = e.ptztype + "";
+ e.ptzType = e.ptzType + "";
that.$set(e, "edit", false);
that.$set(e, "location", "");
if (e.longitude && e.latitude) {
@@ -460,7 +460,7 @@
this.total = res.data.data.total;
this.deviceChannelList = res.data.data.list;
this.deviceChannelList.forEach(e => {
- e.ptztype = e.ptztype + "";
+ e.ptzType = e.ptzType + "";
this.$set(e, "edit", false);
this.$set(e, "location", "");
if (e.longitude && e.latitude) {
--
Gitblit v1.8.0