From 061749548c0b603774582f823768c23f351a39e1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 五月 2023 11:23:48 +0800
Subject: [PATCH] 修复字段名错误
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 4 ++--
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 6 +++---
src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java | 12 ++++++------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index 5628be9..22b95c2 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -88,12 +88,12 @@
"SELECT " +
"dc.*, " +
"de.name as device_name, " +
- "de.online as device_online " +
+ "de.on_line as device_online " +
"from " +
"wvp_device_channel dc " +
"LEFT JOIN wvp_device de ON dc.device_id = de.device_id " +
"WHERE 1=1" +
- " <if test='device_id != null'> AND dc.device_id = #{deviceId} </if> " +
+ " <if test='deviceId != null'> AND dc.device_id = #{deviceId} </if> " +
" <if test='query != null'> AND (dc.channel_id LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
" <if test='parentChannelId != null'> AND dc.parent_id=#{parentChannelId} </if> " +
" <if test='online == true' > AND dc.status=true</if>" +
@@ -112,7 +112,7 @@
"SELECT " +
"dc.*, " +
"de.name as device_name, " +
- "de.online as device_online " +
+ "de.on_line as device_online " +
"from " +
"wvp_device_channel dc " +
"LEFT JOIN wvp_device de ON dc.device_id = de.device_id " +
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
index ba30175..d8c2093 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
@@ -148,7 +148,7 @@
deviceJOSNChannel.put("ID", deviceChannelExtend.getChannelId());
deviceJOSNChannel.put("DeviceID", deviceChannelExtend.getDeviceId());
deviceJOSNChannel.put("DeviceName", deviceChannelExtend.getDeviceName());
- deviceJOSNChannel.put("DeviceOnline", deviceChannelExtend.getDeviceOnline() == 1);
+ deviceJOSNChannel.put("DeviceOnline", deviceChannelExtend.isDeviceOnline());
deviceJOSNChannel.put("Channel", 0); // TODO 鑷畾涔夊簭鍙�
deviceJOSNChannel.put("Name", deviceChannelExtend.getName());
deviceJOSNChannel.put("Custom", false);
@@ -167,7 +167,7 @@
// 1-IETF RFC3261,
// 2-鍩轰簬鍙ｄ护鐨勫弻鍚戣璇�,
// 3-鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇�
- deviceJOSNChannel.put("Status", deviceChannelExtend.getStatus() == 1 ? "ON":"OFF");
+ deviceJOSNChannel.put("Status", deviceChannelExtend.isStatus() ? "ON":"OFF");
deviceJOSNChannel.put("Longitude", deviceChannelExtend.getLongitude());
deviceJOSNChannel.put("Latitude", deviceChannelExtend.getLatitude());
deviceJOSNChannel.put("PTZType ", deviceChannelExtend.getPTZType()); // 浜戝彴绫诲瀷, 0 - 鏈煡, 1 - 鐞冩満, 2 - 鍗婄悆,
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java
index 972d1a6..5e76cb7 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java
@@ -25,7 +25,7 @@
private String deviceName;
- private int deviceOnline;
+ private boolean deviceOnline;
/**
* 鐢熶骇鍘傚晢
@@ -146,7 +146,7 @@
* <Status>OFF</Status>
* 閬囧埌杩嘚VR涓嬬殑IPC涓嬪彂淇′护鍙互鎺ㄦ祦锛� 浣嗘槸 Status 鍝嶅簲 OFF
*/
- private int status;
+ private boolean status;
/**
* 缁忓害
@@ -417,11 +417,11 @@
this.PTZTypeText = PTZTypeText;
}
- public int getStatus() {
+ public boolean isStatus() {
return status;
}
- public void setStatus(int status) {
+ public void setStatus(boolean status) {
this.status = status;
}
@@ -545,11 +545,11 @@
this.deviceName = deviceName;
}
- public int getDeviceOnline() {
+ public boolean isDeviceOnline() {
return deviceOnline;
}
- public void setDeviceOnline(int deviceOnline) {
+ public void setDeviceOnline(boolean deviceOnline) {
this.deviceOnline = deviceOnline;
}
}
--
Gitblit v1.8.0