From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java | 120 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 91 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
index f784d3e..286c8d5 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
@@ -1,18 +1,25 @@
package com.genersoft.iot.vmp.web.gb28181;
-import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
/**
* API鍏煎锛氳澶囨帶鍒�
*/
-@CrossOrigin
+
@RestController
@RequestMapping(value = "/api/v1/control")
public class ApiControlController {
@@ -23,7 +30,7 @@
private SIPCommander cmder;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
/**
* 璁惧鎺у埗 - 浜戝彴鎺у埗
@@ -35,59 +42,114 @@
* @return
*/
@RequestMapping(value = "/ptz")
- private JSONObject list(String serial,String command,
+ private void list(String serial,String command,
@RequestParam(required = false)Integer channel,
@RequestParam(required = false)String code,
@RequestParam(required = false)Integer speed){
if (logger.isDebugEnabled()) {
- logger.debug(String.format("妯℃嫙鎺ュ彛> 璁惧浜戝彴鎺у埗 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宑ommand锛�%d 锛宻peed锛�%d ",
- serial, code, command, speed));
+ logger.debug("妯℃嫙鎺ュ彛> 璁惧浜戝彴鎺у埗 API璋冪敤锛宒eviceId锛歿} 锛宑hannelId锛歿} 锛宑ommand锛歿} 锛宻peed锛歿} ",
+ serial, code, command, speed);
}
+ if (channel == null) {channel = 0;}
+ if (speed == null) {speed = 0;}
Device device = storager.queryVideoDevice(serial);
- int leftRight = 0;
- int upDown = 0;
- int inOut = 0;
- switch (command) {
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "device[ " + serial + " ]鏈壘鍒�");
+ }
+ int cmdCode = 0;
+ switch (command){
case "left":
- leftRight = 1;
+ cmdCode = 2;
break;
case "right":
- leftRight = 2;
+ cmdCode = 1;
break;
case "up":
- upDown = 1;
+ cmdCode = 8;
break;
case "down":
- upDown = 2;
+ cmdCode = 4;
break;
case "upleft":
- upDown = 1;
- leftRight = 1;
+ cmdCode = 10;
+ break;
case "upright":
- upDown = 1;
- leftRight = 2;
+ cmdCode = 9;
break;
case "downleft":
- upDown = 2;
- leftRight = 1;
+ cmdCode = 6;
break;
case "downright":
- upDown = 2;
- leftRight = 2;
+ cmdCode = 5;
break;
case "zoomin":
- inOut = 2;
+ cmdCode = 16;
break;
case "zoomout":
- inOut = 1;
+ cmdCode = 32;
break;
case "stop":
+ cmdCode = 0;
break;
-
+ default:
+ break;
}
// 榛樿鍊� 50
- cmder.ptzCmd(device, code, leftRight, upDown, inOut, speed==0 ? 129 : speed, 50);
- return null;
+ try {
+ cmder.frontEndCmd(device, code, cmdCode, speed, speed, speed);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 浜戝彴鎺у埗: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 璁惧鎺у埗 - 棰勭疆浣嶆帶鍒�
+ * @param serial 璁惧缂栧彿
+ * @param code 閫氶亾缂栧彿,閫氳繃 /api/v1/device/channellist 鑾峰彇鐨� ChannelList.ID, 璇ュ弬鏁板拰 channel 浜岄�変竴浼犻�掑嵆鍙�
+ * @param channel 閫氶亾搴忓彿, 榛樿鍊�: 1
+ * @param command 鎺у埗鎸囦护 鍏佽鍊�: set, goto, remove
+ * @param preset 棰勭疆浣嶇紪鍙�(1~255)
+ * @param name 棰勭疆浣嶅悕绉�, command=set 鏃舵湁鏁�
+ * @return
+ */
+ @RequestMapping(value = "/preset")
+ private void list(String serial,String command,
+ @RequestParam(required = false)Integer channel,
+ @RequestParam(required = false)String code,
+ @RequestParam(required = false)String name,
+ @RequestParam(required = false)Integer preset){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("妯℃嫙鎺ュ彛> 棰勭疆浣嶆帶鍒� API璋冪敤锛宒eviceId锛歿} 锛宑hannelId锛歿} 锛宑ommand锛歿} 锛宯ame锛歿} 锛宲reset锛歿} ",
+ serial, code, command, name, preset);
+ }
+
+ if (channel == null) {channel = 0;}
+ Device device = storager.queryVideoDevice(serial);
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "device[ " + serial + " ]鏈壘鍒�");
+ }
+ int cmdCode = 0;
+ switch (command){
+ case "set":
+ cmdCode = 129;
+ break;
+ case "goto":
+ cmdCode = 130;
+ break;
+ case "remove":
+ cmdCode = 131;
+ break;
+ default:
+ break;
+ }
+ try {
+ cmder.frontEndCmd(device, code, cmdCode, 0, preset, 0);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 棰勭疆浣嶆帶鍒�: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
}
}
--
Gitblit v1.8.0