From 29d69267f9747f268a967a039f685da7e85da3a8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 一月 2022 10:16:58 +0800
Subject: [PATCH] 优化通道选择页面样式和优化拉框放大与缩小的接口路径
---
/dev/null | 138 ---------------------------
web_src/src/components/dialog/chooseChannel.vue | 3
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java | 99 +++++++++++++++++++
web_src/src/components/dialog/importChannel.vue | 2
web_src/src/components/dialog/chooseChannelForGb.vue | 2
5 files changed, 103 insertions(+), 141 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
index 20aa957..183561a 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
@@ -296,4 +296,103 @@
resultHolder.put(key, uuid, result);
return result;
}
+
+ /**
+ * 鎷夋鏀惧ぇ
+ * @param deviceId 璁惧id
+ * @param channelId 閫氶亾id
+ * @param length 鎾斁绐楀彛闀垮害鍍忕礌鍊�
+ * @param width 鎾斁绐楀彛瀹藉害鍍忕礌鍊�
+ * @param midpointx 鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��
+ * @param midpointy 鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��
+ * @param lengthx 鎷夋闀垮害鍍忕礌鍊�
+ * @param lengthy 鎷夋瀹藉害鍍忕礌鍊�
+ * @return
+ */
+ @ApiOperation("鎷夋鏀惧ぇ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "length", value = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "width", value = "鎾斁绐楀彛瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "midpointx", value = "鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "midpointy", value = "鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "lengthx", value = "鎷夋闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "lengthy", value = "鎷夋瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
+ })
+ @GetMapping("drag_zoom/zoom_in")
+ public ResponseEntity<String> dragZoomIn(@RequestParam String deviceId,
+ @RequestParam(required = false) String channelId,
+ @RequestParam int length,
+ @RequestParam int width,
+ @RequestParam int midpointx,
+ @RequestParam int midpointy,
+ @RequestParam int lengthx,
+ @RequestParam int lengthy){
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("璁惧鎷夋鏀惧ぇ API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宭ength锛�%d 锛寃idth锛�%d 锛宮idpointx锛�%d 锛宮idpointy锛�%d 锛宭engthx锛�%d 锛宭engthy锛�%d",deviceId, channelId, length, width, midpointx, midpointy,lengthx, lengthy));
+ }
+ Device device = storager.queryVideoDevice(deviceId);
+ StringBuffer cmdXml = new StringBuffer(200);
+ cmdXml.append("<DragZoomIn>\r\n");
+ cmdXml.append("<Length>" + length+ "</Length>\r\n");
+ cmdXml.append("<Width>" + width+ "</Width>\r\n");
+ cmdXml.append("<MidPointX>" + midpointx+ "</MidPointX>\r\n");
+ cmdXml.append("<MidPointY>" + midpointy+ "</MidPointY>\r\n");
+ cmdXml.append("<LengthX>" + lengthx+ "</LengthX>\r\n");
+ cmdXml.append("<LengthY>" + lengthy+ "</LengthY>\r\n");
+ cmdXml.append("</DragZoomIn>\r\n");
+ cmder.dragZoomCmd(device, channelId, cmdXml.toString());
+ return new ResponseEntity<String>("success", HttpStatus.OK);
+ }
+
+ /**
+ * 鎷夋缂╁皬
+ * @param deviceId 璁惧id
+ * @param channelId 閫氶亾id
+ * @param length 鎾斁绐楀彛闀垮害鍍忕礌鍊�
+ * @param width 鎾斁绐楀彛瀹藉害鍍忕礌鍊�
+ * @param midpointx 鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��
+ * @param midpointy 鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��
+ * @param lengthx 鎷夋闀垮害鍍忕礌鍊�
+ * @param lengthy 鎷夋瀹藉害鍍忕礌鍊�
+ * @return
+ */
+ @ApiOperation("鎷夋缂╁皬")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "length", value = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "width", value = "鎾斁绐楀彛瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "midpointx", value = "鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "midpointy", value = "鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "lengthx", value = "鎷夋闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "lengthy", value = "鎷夋瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
+ })
+ @GetMapping("/drag_zoom/zoom_out")
+ public ResponseEntity<String> dragZoomOut(@RequestParam String deviceId,
+ @RequestParam(required = false) String channelId,
+ @RequestParam int length,
+ @RequestParam int width,
+ @RequestParam int midpointx,
+ @RequestParam int midpointy,
+ @RequestParam int lengthx,
+ @RequestParam int lengthy){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("璁惧鎷夋缂╁皬 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宭ength锛�%d 锛寃idth锛�%d 锛宮idpointx锛�%d 锛宮idpointy锛�%d 锛宭engthx锛�%d 锛宭engthy锛�%d",deviceId, channelId, length, width, midpointx, midpointy,lengthx, lengthy));
+ }
+ Device device = storager.queryVideoDevice(deviceId);
+ StringBuffer cmdXml = new StringBuffer(200);
+ cmdXml.append("<DragZoomOut>\r\n");
+ cmdXml.append("<Length>" + length+ "</Length>\r\n");
+ cmdXml.append("<Width>" + width+ "</Width>\r\n");
+ cmdXml.append("<MidPointX>" + midpointx+ "</MidPointX>\r\n");
+ cmdXml.append("<MidPointY>" + midpointy+ "</MidPointY>\r\n");
+ cmdXml.append("<LengthX>" + lengthx+ "</LengthX>\r\n");
+ cmdXml.append("<LengthY>" + lengthy+ "</LengthY>\r\n");
+ cmdXml.append("</DragZoomOut>\r\n");
+ cmder.dragZoomCmd(device, channelId, cmdXml.toString());
+ return new ResponseEntity<String>("success",HttpStatus.OK);
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/dragZoom/DragZoomControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/dragZoom/DragZoomControl.java
deleted file mode 100644
index fb1970e..0000000
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/dragZoom/DragZoomControl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.genersoft.iot.vmp.vmanager.gb28181.dragZoom;
-
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author szy
- * @date 21:55 2022/1/15
- */
-@Api(tags = "鎷夋鎺у埗")
-@CrossOrigin
-@RestController
-@RequestMapping("/api/dragZoom")
-public class DragZoomControl {
-
- private final static Logger logger = LoggerFactory.getLogger(DragZoomControl.class);
-
- @Autowired
- private SIPCommander cmder;
-
- @Autowired
- private IVideoManagerStorager storager;
-
- @Autowired
- private DeferredResultHolder resultHolder;
-
- /**
- * 鎷夋鏀惧ぇ
- * @param deviceId 璁惧id
- * @param channelId 閫氶亾id
- * @param length 鎾斁绐楀彛闀垮害鍍忕礌鍊�
- * @param width 鎾斁绐楀彛瀹藉害鍍忕礌鍊�
- * @param midpointx 鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��
- * @param midpointy 鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��
- * @param lengthx 鎷夋闀垮害鍍忕礌鍊�
- * @param lengthy 鎷夋瀹藉害鍍忕礌鍊�
- * @return
- */
- @ApiOperation("鎷夋鏀惧ぇ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "length", value = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "width", value = "鎾斁绐楀彛瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "midpointx", value = "鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "midpointy", value = "鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "lengthx", value = "鎷夋闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "lengthy", value = "鎷夋瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
- })
- @GetMapping("/dragzoomin")
- public ResponseEntity<String> dragZoomIn(@RequestParam String deviceId,
- @RequestParam(required = false) String channelId,
- @RequestParam int length,
- @RequestParam int width,
- @RequestParam int midpointx,
- @RequestParam int midpointy,
- @RequestParam int lengthx,
- @RequestParam int lengthy){
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧鎷夋鏀惧ぇ API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宭ength锛�%d 锛寃idth锛�%d 锛宮idpointx锛�%d 锛宮idpointy锛�%d 锛宭engthx锛�%d 锛宭engthy锛�%d",deviceId, channelId, length, width, midpointx, midpointy,lengthx, lengthy));
- }
- Device device = storager.queryVideoDevice(deviceId);
- StringBuffer cmdXml = new StringBuffer(200);
- cmdXml.append("<DragZoomIn>\r\n");
- cmdXml.append("<Length>" + length+ "</Length>\r\n");
- cmdXml.append("<Width>" + width+ "</Width>\r\n");
- cmdXml.append("<MidPointX>" + midpointx+ "</MidPointX>\r\n");
- cmdXml.append("<MidPointY>" + midpointy+ "</MidPointY>\r\n");
- cmdXml.append("<LengthX>" + lengthx+ "</LengthX>\r\n");
- cmdXml.append("<LengthY>" + lengthy+ "</LengthY>\r\n");
- cmdXml.append("</DragZoomIn>\r\n");
- cmder.dragZoomCmd(device, channelId, cmdXml.toString());
- return new ResponseEntity<String>("success", HttpStatus.OK);
- }
-
- /**
- * 鎷夋缂╁皬
- * @param deviceId 璁惧id
- * @param channelId 閫氶亾id
- * @param length 鎾斁绐楀彛闀垮害鍍忕礌鍊�
- * @param width 鎾斁绐楀彛瀹藉害鍍忕礌鍊�
- * @param midpointx 鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��
- * @param midpointy 鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��
- * @param lengthx 鎷夋闀垮害鍍忕礌鍊�
- * @param lengthy 鎷夋瀹藉害鍍忕礌鍊�
- * @return
- */
- @ApiOperation("鎷夋缂╁皬")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "length", value = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "width", value = "鎾斁绐楀彛瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "midpointx", value = "鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "midpointy", value = "鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "lengthx", value = "鎷夋闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "lengthy", value = "鎷夋瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class),
- })
- @GetMapping("/dragzoomout")
- public ResponseEntity<String> dragZoomOut(@RequestParam String deviceId,
- @RequestParam(required = false) String channelId,
- @RequestParam int length,
- @RequestParam int width,
- @RequestParam int midpointx,
- @RequestParam int midpointy,
- @RequestParam int lengthx,
- @RequestParam int lengthy){
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧鎷夋缂╁皬 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宭ength锛�%d 锛寃idth锛�%d 锛宮idpointx锛�%d 锛宮idpointy锛�%d 锛宭engthx锛�%d 锛宭engthy锛�%d",deviceId, channelId, length, width, midpointx, midpointy,lengthx, lengthy));
- }
- Device device = storager.queryVideoDevice(deviceId);
- StringBuffer cmdXml = new StringBuffer(200);
- cmdXml.append("<DragZoomOut>\r\n");
- cmdXml.append("<Length>" + length+ "</Length>\r\n");
- cmdXml.append("<Width>" + width+ "</Width>\r\n");
- cmdXml.append("<MidPointX>" + midpointx+ "</MidPointX>\r\n");
- cmdXml.append("<MidPointY>" + midpointy+ "</MidPointY>\r\n");
- cmdXml.append("<LengthX>" + lengthx+ "</LengthX>\r\n");
- cmdXml.append("<LengthY>" + lengthy+ "</LengthY>\r\n");
- cmdXml.append("</DragZoomOut>\r\n");
- cmder.dragZoomCmd(device, channelId, cmdXml.toString());
- return new ResponseEntity<String>("success",HttpStatus.OK);
- }
-
-}
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index cc810c9..5544b38 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -70,7 +70,8 @@
platformName: "",
defaultCatalogId: "",
showDialog: false,
- chooseData: {}
+ chooseData: {},
+ winHeight: window.innerHeight - 250,
};
},
diff --git a/web_src/src/components/dialog/chooseChannelForGb.vue b/web_src/src/components/dialog/chooseChannelForGb.vue
index b8a7a0c..742b3de 100644
--- a/web_src/src/components/dialog/chooseChannelForGb.vue
+++ b/web_src/src/components/dialog/chooseChannelForGb.vue
@@ -75,7 +75,7 @@
count: 10,
total: 0,
eventEnanle: false,
- winHeight: window.innerHeight - 350,
+ winHeight: window.innerHeight - 400,
};
},
diff --git a/web_src/src/components/dialog/importChannel.vue b/web_src/src/components/dialog/importChannel.vue
index efd0893..ac5ce05 100644
--- a/web_src/src/components/dialog/importChannel.vue
+++ b/web_src/src/components/dialog/importChannel.vue
@@ -38,7 +38,7 @@
showDialog: false,
isLoging: false,
isEdit: false,
- uploadUrl: "debug/api/push/upload",
+ uploadUrl: process.env.NODE_ENV === 'development'?`debug/api/push/upload`:`api/push/upload`,
};
},
methods: {
--
Gitblit v1.8.0