aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-06-22 02:57:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改错别字

Browse Source
This commit is contained in:
lin 2026-06-16 16:08:14 +08:00
parent 2f1ec0e33f
commit 1fc8848cf9
10 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/genersoft/iot/vmp/gb28181/controller/ChannelFrontEndController.java
View File

@ -603,15 +603,15 @@ public class ChannelFrontEndController {
@Parameter(name = "channelId", description = "通道ID", required = true) @Parameter(name = "channelId", description = "通道ID", required = true)
@Parameter(name = "length", description = "播放窗口长度像素值", required = true) @Parameter(name = "length", description = "播放窗口长度像素值", required = true)
@Parameter(name = "width", description = "播放窗口宽度像素值", required = true) @Parameter(name = "width", description = "播放窗口宽度像素值", required = true)
@Parameter(name = "midpointX", description = "拉框中心的横轴坐标像素值", required = true) @Parameter(name = "midPointX", description = "拉框中心的横轴坐标像素值", required = true)
@Parameter(name = "midpointY", description = "拉框中心的纵轴坐标像素值", required = true) @Parameter(name = "midPointY", description = "拉框中心的纵轴坐标像素值", required = true)
@Parameter(name = "lengthX", description = "拉框长度像素值", required = true) @Parameter(name = "lengthX", description = "拉框长度像素值", required = true)
@Parameter(name = "lengthY", description = "拉框宽度像素值", required = true) @Parameter(name = "lengthY", description = "拉框宽度像素值", required = true)
@GetMapping("/drag_zoom_in") @GetMapping("/drag_zoom_in")
public DeferredResult<WVPResult<String>> dragZoomIn(Integer channelId, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY){ public DeferredResult<WVPResult<String>> dragZoomIn(Integer channelId, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY){
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("[通用通道]拉框放大 API调用，channelId：{} ，length：{} ，width：{} ，midpointX：{} ，midpointY：{} ，lengthX：{} ，lengthY：{}",channelId, length, width, midpointX, midpointY, lengthX, lengthY); log.debug("[通用通道]拉框放大 API调用，channelId：{} ，length：{} ，width：{} ，midPointX：{} ，midPointY：{} ，lengthX：{} ，lengthY：{}",channelId, length, width, midPointX, midPointY, lengthX, lengthY);
} }
CommonGBChannel channel = channelService.getOne(channelId); CommonGBChannel channel = channelService.getOne(channelId);
@ -621,8 +621,8 @@ public class ChannelFrontEndController {
controlCode.setCode(1); controlCode.setCode(1);
controlCode.setLength(length); controlCode.setLength(length);
controlCode.setWidth(width); controlCode.setWidth(width);
controlCode.setMidPointX(midpointX); controlCode.setMidPointX(midPointX);
controlCode.setMidPointY(midpointY); controlCode.setMidPointY(midPointY);
controlCode.setLengthX(lengthX); controlCode.setLengthX(lengthX);
controlCode.setLengthY(lengthY); controlCode.setLengthY(lengthY);
@ -648,15 +648,15 @@ public class ChannelFrontEndController {
@Parameter(name = "channelId", description = "通道ID", required = true) @Parameter(name = "channelId", description = "通道ID", required = true)
@Parameter(name = "length", description = "播放窗口长度像素值", required = true) @Parameter(name = "length", description = "播放窗口长度像素值", required = true)
@Parameter(name = "width", description = "播放窗口宽度像素值", required = true) @Parameter(name = "width", description = "播放窗口宽度像素值", required = true)
@Parameter(name = "midpointX", description = "拉框中心的横轴坐标像素值", required = true) @Parameter(name = "midPointX", description = "拉框中心的横轴坐标像素值", required = true)
@Parameter(name = "midpointY", description = "拉框中心的纵轴坐标像素值", required = true) @Parameter(name = "midPointY", description = "拉框中心的纵轴坐标像素值", required = true)
@Parameter(name = "lengthX", description = "拉框长度像素值", required = true) @Parameter(name = "lengthX", description = "拉框长度像素值", required = true)
@Parameter(name = "lengthY", description = "拉框宽度像素值", required = true) @Parameter(name = "lengthY", description = "拉框宽度像素值", required = true)
@GetMapping("/drag_zoom_out") @GetMapping("/drag_zoom_out")
public DeferredResult<WVPResult<String>> dragZoomOut(Integer channelId, Integer length, Integer width, Integer midpointX, Integer midpointY, Integer lengthX, Integer lengthY){ public DeferredResult<WVPResult<String>> dragZoomOut(Integer channelId, Integer length, Integer width, Integer midPointX, Integer midPointY, Integer lengthX, Integer lengthY){
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("[通用通道]拉框缩小 API调用，channelId：{} ，length：{} ，width：{} ，midpointX：{} ，midpointY：{} ，lengthX：{} ，lengthY：{}",channelId, length, width, midpointX, midpointY, lengthX, lengthY); log.debug("[通用通道]拉框缩小 API调用，channelId：{} ，length：{} ，width：{} ，midPointX：{} ，midPointY：{} ，lengthX：{} ，lengthY：{}",channelId, length, width, midPointX, midPointY, lengthX, lengthY);
} }
CommonGBChannel channel = channelService.getOne(channelId); CommonGBChannel channel = channelService.getOne(channelId);
@ -666,8 +666,8 @@ public class ChannelFrontEndController {
controlCode.setCode(2); controlCode.setCode(2);
controlCode.setLength(length); controlCode.setLength(length);
controlCode.setWidth(width); controlCode.setWidth(width);
controlCode.setMidPointX(midpointX); controlCode.setMidPointX(midPointX);
controlCode.setMidPointY(midpointY); controlCode.setMidPointY(midPointY);
controlCode.setLengthX(lengthX); controlCode.setLengthX(lengthX);
controlCode.setLengthY(lengthY); controlCode.setLengthY(lengthY);

24
src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceControl.java
View File

@ -165,24 +165,24 @@ public class DeviceControl {
@Parameter(name = "channelId", description = "通道国标编号", required = true) @Parameter(name = "channelId", description = "通道国标编号", required = true)
@Parameter(name = "length", description = "播放窗口长度像素值", required = true) @Parameter(name = "length", description = "播放窗口长度像素值", required = true)
@Parameter(name = "width", description = "播放窗口宽度像素值", required = true) @Parameter(name = "width", description = "播放窗口宽度像素值", required = true)
@Parameter(name = "midpointX", description = "拉框中心的横轴坐标像素值", required = true) @Parameter(name = "midPointX", description = "拉框中心的横轴坐标像素值", required = true)
@Parameter(name = "midpointY", description = "拉框中心的纵轴坐标像素值", required = true) @Parameter(name = "midPointY", description = "拉框中心的纵轴坐标像素值", required = true)
@Parameter(name = "lengthX", description = "拉框长度像素值", required = true) @Parameter(name = "lengthX", description = "拉框长度像素值", required = true)
@Parameter(name = "lengthY", description = "拉框宽度像素值", required = true) @Parameter(name = "lengthY", description = "拉框宽度像素值", required = true)
@GetMapping("drag_zoom/zoom_in") @GetMapping("drag_zoom/zoom_in")
public void dragZoomIn(@RequestParam String deviceId, String channelId, public void dragZoomIn(@RequestParam String deviceId, String channelId,
@RequestParam int length, @RequestParam int length,
@RequestParam int width, @RequestParam int width,
@RequestParam int midpointX, @RequestParam int midPointX,
@RequestParam int midpointY, @RequestParam int midPointY,
@RequestParam int lengthX, @RequestParam int lengthX,
@RequestParam int lengthY) { @RequestParam int lengthY) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug(String.format("设备拉框放大 API调用，deviceId：%s ，channelId：%s ，length：%d ，width：%d ，midpointX：%d ，midpointY：%d ，lengthX：%d ，lengthY：%d",deviceId, channelId, length, width, midpointX, midpointY,lengthX, lengthY)); log.debug(String.format("设备拉框放大 API调用，deviceId：%s ，channelId：%s ，length：%d ，width：%d ，midPointX：%d ，midPointY：%d ，lengthX：%d ，lengthY：%d",deviceId, channelId, length, width, midPointX, midPointY,lengthX, lengthY));
} }
Device device = deviceService.getDeviceByDeviceId(deviceId); Device device = deviceService.getDeviceByDeviceId(deviceId);
Assert.notNull(device, "设备不存在"); Assert.notNull(device, "设备不存在");
deviceService.dragZoomIn(device, channelId, length, width, midpointX, midpointY, lengthX, lengthY); deviceService.dragZoomIn(device, channelId, length, width, midPointX, midPointY, lengthX, lengthY);
} }
@Operation(summary = "拉框缩小", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Operation(summary = "拉框缩小", security = @SecurityRequirement(name = JwtUtils.HEADER))
@ -190,8 +190,8 @@ public class DeviceControl {
@Parameter(name = "channelId", description = "通道国标编号") @Parameter(name = "channelId", description = "通道国标编号")
@Parameter(name = "length", description = "播放窗口长度像素值", required = true) @Parameter(name = "length", description = "播放窗口长度像素值", required = true)
@Parameter(name = "width", description = "播放窗口宽像素值", required = true) @Parameter(name = "width", description = "播放窗口宽像素值", required = true)
@Parameter(name = "midpointX", description = "拉框中心的横轴坐标像素值", required = true) @Parameter(name = "midPointX", description = "拉框中心的横轴坐标像素值", required = true)
@Parameter(name = "midpointY", description = "拉框中心的纵轴坐标像素值", required = true) @Parameter(name = "midPointY", description = "拉框中心的纵轴坐标像素值", required = true)
@Parameter(name = "lengthX", description = "拉框长度像素值", required = true) @Parameter(name = "lengthX", description = "拉框长度像素值", required = true)
@Parameter(name = "lengthY", description = "拉框宽度像素值", required = true) @Parameter(name = "lengthY", description = "拉框宽度像素值", required = true)
@GetMapping("/drag_zoom/zoom_out") @GetMapping("/drag_zoom/zoom_out")
@ -199,16 +199,16 @@ public class DeviceControl {
@RequestParam(required = false) String channelId, @RequestParam(required = false) String channelId,
@RequestParam int length, @RequestParam int length,
@RequestParam int width, @RequestParam int width,
@RequestParam int midpointX, @RequestParam int midPointX,
@RequestParam int midpointY, @RequestParam int midPointY,
@RequestParam int lengthX, @RequestParam int lengthX,
@RequestParam int lengthY){ @RequestParam int lengthY){
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug(String.format("设备拉框缩小 API调用，deviceId：%s ，channelId：%s ，length：%d ，width：%d ，midpointX：%d ，midpointY：%d ，lengthX：%d ，lengthY：%d",deviceId, channelId, length, width, midpointX, midpointY,lengthX, lengthY)); log.debug(String.format("设备拉框缩小 API调用，deviceId：%s ，channelId：%s ，length：%d ，width：%d ，midPointX：%d ，midPointY：%d ，lengthX：%d ，lengthY：%d",deviceId, channelId, length, width, midPointX, midPointY,lengthX, lengthY));
} }
Device device = deviceService.getDeviceByDeviceId(deviceId); Device device = deviceService.getDeviceByDeviceId(deviceId);
Assert.notNull(device, "设备不存在"); Assert.notNull(device, "设备不存在");
deviceService.dragZoomOut(device, channelId, length, width, midpointX, midpointY, lengthX,lengthY); deviceService.dragZoomOut(device, channelId, length, width, midPointX, midPointY, lengthX,lengthY);
} }
} }

4
src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
View File

@ -185,9 +185,9 @@ public interface IDeviceService {
void homePosition(Device device, String channelId, Boolean enabled, Integer resetTime, Integer presetIndex, ErrorCallback<String> callback); void homePosition(Device device, String channelId, Boolean enabled, Integer resetTime, Integer presetIndex, ErrorCallback<String> callback);
void dragZoomIn(Device device, String channelId, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY); void dragZoomIn(Device device, String channelId, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY);
void dragZoomOut(Device device, String channelId, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY); void dragZoomOut(Device device, String channelId, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY);
void deviceStatus(Device device, ErrorCallback<String> callback); void deviceStatus(Device device, ErrorCallback<String> callback);

4
src/main/java/com/genersoft/iot/vmp/gb28181/service/IPTZService.java
View File

@ -18,8 +18,8 @@ public interface IPTZService {
void queryPresetList(CommonGBChannel channel, ErrorCallback<List<Preset>> callback); void queryPresetList(CommonGBChannel channel, ErrorCallback<List<Preset>> callback);
void dragZoomIn(CommonGBChannel channel, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY); void dragZoomIn(CommonGBChannel channel, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY);
void dragZoomOut(CommonGBChannel channel, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY); void dragZoomOut(CommonGBChannel channel, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY);
} }

16
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
View File

@ -1276,9 +1276,9 @@ public class DeviceServiceImpl implements IDeviceService {
} }
@Override @Override
public void dragZoomIn(Device device, String channelId, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY) { public void dragZoomIn(Device device, String channelId, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY) {
if (!userSetting.getServerId().equals(device.getServerId())) { if (!userSetting.getServerId().equals(device.getServerId())) {
redisRpcService.dragZoomIn(device.getServerId(), device, channelId, length, width, midpointX, midpointY, lengthX, lengthY); redisRpcService.dragZoomIn(device.getServerId(), device, channelId, length, width, midPointX, midPointY, lengthX, lengthY);
return; return;
} }
@ -1286,8 +1286,8 @@ public class DeviceServiceImpl implements IDeviceService {
cmdXml.append("<DragZoomIn>\r\n"); cmdXml.append("<DragZoomIn>\r\n");
cmdXml.append("<Length>" + length+ "</Length>\r\n"); cmdXml.append("<Length>" + length+ "</Length>\r\n");
cmdXml.append("<Width>" + width+ "</Width>\r\n"); cmdXml.append("<Width>" + width+ "</Width>\r\n");
cmdXml.append("<MidPointX>" + midpointX+ "</MidPointX>\r\n"); cmdXml.append("<MidPointX>" + midPointX+ "</MidPointX>\r\n");
cmdXml.append("<MidPointY>" + midpointY+ "</MidPointY>\r\n"); cmdXml.append("<MidPointY>" + midPointY+ "</MidPointY>\r\n");
cmdXml.append("<LengthX>" + lengthX+ "</LengthX>\r\n"); cmdXml.append("<LengthX>" + lengthX+ "</LengthX>\r\n");
cmdXml.append("<LengthY>" + lengthY+ "</LengthY>\r\n"); cmdXml.append("<LengthY>" + lengthY+ "</LengthY>\r\n");
cmdXml.append("</DragZoomIn>\r\n"); cmdXml.append("</DragZoomIn>\r\n");
@ -1300,9 +1300,9 @@ public class DeviceServiceImpl implements IDeviceService {
} }
@Override @Override
public void dragZoomOut(Device device, String channelId, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY) { public void dragZoomOut(Device device, String channelId, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY) {
if (!userSetting.getServerId().equals(device.getServerId())) { if (!userSetting.getServerId().equals(device.getServerId())) {
redisRpcService.dragZoomOut(device.getServerId(), device, channelId, length, width, midpointX, midpointY, lengthX, lengthY); redisRpcService.dragZoomOut(device.getServerId(), device, channelId, length, width, midPointX, midPointY, lengthX, lengthY);
return; return;
} }
@ -1310,8 +1310,8 @@ public class DeviceServiceImpl implements IDeviceService {
cmdXml.append("<DragZoomOut>\r\n"); cmdXml.append("<DragZoomOut>\r\n");
cmdXml.append("<Length>" + length+ "</Length>\r\n"); cmdXml.append("<Length>" + length+ "</Length>\r\n");
cmdXml.append("<Width>" + width+ "</Width>\r\n"); cmdXml.append("<Width>" + width+ "</Width>\r\n");
cmdXml.append("<MidPointX>" + midpointX+ "</MidPointX>\r\n"); cmdXml.append("<MidPointX>" + midPointX+ "</MidPointX>\r\n");
cmdXml.append("<MidPointY>" + midpointY+ "</MidPointY>\r\n"); cmdXml.append("<MidPointY>" + midPointY+ "</MidPointY>\r\n");
cmdXml.append("<LengthX>" + lengthX+ "</LengthX>\r\n"); cmdXml.append("<LengthX>" + lengthX+ "</LengthX>\r\n");
cmdXml.append("<LengthY>" + lengthY+ "</LengthY>\r\n"); cmdXml.append("<LengthY>" + lengthY+ "</LengthY>\r\n");
cmdXml.append("</DragZoomOut>\r\n"); cmdXml.append("</DragZoomOut>\r\n");

8
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PTZServiceImpl.java
View File

@ -92,7 +92,7 @@ public class PTZServiceImpl implements IPTZService {
} }
@Override @Override
public void dragZoomIn(CommonGBChannel channel, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY) { public void dragZoomIn(CommonGBChannel channel, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY) {
if (channel.getDataType() != ChannelDataType.GB28181) { if (channel.getDataType() != ChannelDataType.GB28181) {
log.warn("[INFO 消息] 只有国标通道的支持云台控制， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 只有国标通道的支持云台控制， 通道ID： {}", channel.getGbId());
throw new ControllerException(ErrorCode.ERROR100.getCode(), "不支持"); throw new ControllerException(ErrorCode.ERROR100.getCode(), "不支持");
@ -102,11 +102,11 @@ public class PTZServiceImpl implements IPTZService {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到设备ID"); throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到设备ID");
} }
DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId()); DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId());
deviceService.dragZoomIn(device, deviceChannel.getDeviceId(), length, width, midpointX, midpointY, lengthX, lengthY); deviceService.dragZoomIn(device, deviceChannel.getDeviceId(), length, width, midPointX, midPointY, lengthX, lengthY);
} }
@Override @Override
public void dragZoomOut(CommonGBChannel channel, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY) { public void dragZoomOut(CommonGBChannel channel, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY) {
if (channel.getDataType() != ChannelDataType.GB28181) { if (channel.getDataType() != ChannelDataType.GB28181) {
log.warn("[INFO 消息] 只有国标通道的支持云台控制， 通道ID： {}", channel.getGbId()); log.warn("[INFO 消息] 只有国标通道的支持云台控制， 通道ID： {}", channel.getGbId());
throw new ControllerException(ErrorCode.ERROR100.getCode(), "不支持"); throw new ControllerException(ErrorCode.ERROR100.getCode(), "不支持");
@ -116,7 +116,7 @@ public class PTZServiceImpl implements IPTZService {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到设备ID"); throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到设备ID");
} }
DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId()); DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId());
deviceService.dragZoomOut(device, deviceChannel.getDeviceId(), length, width, midpointX, midpointY, lengthX, lengthY); deviceService.dragZoomOut(device, deviceChannel.getDeviceId(), length, width, midPointX, midPointY, lengthX, lengthY);
} }
@Override @Override

4
src/main/java/com/genersoft/iot/vmp/service/redisMsg/IRedisRpcService.java
View File

@ -69,9 +69,9 @@ public interface IRedisRpcService {
WVPResult<String> homePosition(String serverId, Device device, String channelId, Boolean enabled, Integer resetTime, Integer presetIndex); WVPResult<String> homePosition(String serverId, Device device, String channelId, Boolean enabled, Integer resetTime, Integer presetIndex);
void dragZoomIn(String serverId, Device device, String channelId, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY); void dragZoomIn(String serverId, Device device, String channelId, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY);
void dragZoomOut(String serverId, Device device, String channelId, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY); void dragZoomOut(String serverId, Device device, String channelId, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY);
WVPResult<String> deviceStatus(String serverId, Device device); WVPResult<String> deviceStatus(String serverId, Device device);

12
src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcDeviceController.java
View File

@ -318,8 +318,8 @@ public class RedisRpcDeviceController extends RpcController {
String channelId = paramJson.getString("channelId"); String channelId = paramJson.getString("channelId");
Integer length = paramJson.getInteger("length"); Integer length = paramJson.getInteger("length");
Integer width = paramJson.getInteger("width"); Integer width = paramJson.getInteger("width");
Integer midpointX = paramJson.getInteger("midpointX"); Integer midPointX = paramJson.getInteger("midPointX");
Integer midpointY = paramJson.getInteger("midpointY"); Integer midPointY = paramJson.getInteger("midPointY");
Integer lengthX = paramJson.getInteger("lengthX"); Integer lengthX = paramJson.getInteger("lengthX");
Integer lengthY = paramJson.getInteger("lengthY"); Integer lengthY = paramJson.getInteger("lengthY");
@ -332,7 +332,7 @@ public class RedisRpcDeviceController extends RpcController {
return response; return response;
} }
try { try {
deviceService.dragZoomIn(device, channelId, length, width, midpointX, midpointY, lengthX, lengthY); deviceService.dragZoomIn(device, channelId, length, width, midPointX, midPointY, lengthX, lengthY);
}catch (ControllerException e) { }catch (ControllerException e) {
response.setStatusCode(e.getCode()); response.setStatusCode(e.getCode());
response.setBody(WVPResult.fail(ErrorCode.ERROR100.getCode(), e.getMsg())); response.setBody(WVPResult.fail(ErrorCode.ERROR100.getCode(), e.getMsg()));
@ -350,8 +350,8 @@ public class RedisRpcDeviceController extends RpcController {
String channelId = paramJson.getString("channelId"); String channelId = paramJson.getString("channelId");
Integer length = paramJson.getInteger("length"); Integer length = paramJson.getInteger("length");
Integer width = paramJson.getInteger("width"); Integer width = paramJson.getInteger("width");
Integer midpointX = paramJson.getInteger("midpointX"); Integer midPointX = paramJson.getInteger("midPointX");
Integer midpointY = paramJson.getInteger("midpointY"); Integer midPointY = paramJson.getInteger("midPointY");
Integer lengthX = paramJson.getInteger("lengthX"); Integer lengthX = paramJson.getInteger("lengthX");
Integer lengthY = paramJson.getInteger("lengthY"); Integer lengthY = paramJson.getInteger("lengthY");
@ -364,7 +364,7 @@ public class RedisRpcDeviceController extends RpcController {
return response; return response;
} }
try { try {
deviceService.dragZoomOut(device, channelId, length, width, midpointX, midpointY, lengthX, lengthY); deviceService.dragZoomOut(device, channelId, length, width, midPointX, midPointY, lengthX, lengthY);
}catch (ControllerException e) { }catch (ControllerException e) {
response.setStatusCode(e.getCode()); response.setStatusCode(e.getCode());
response.setBody(WVPResult.fail(ErrorCode.ERROR100.getCode(), e.getMsg())); response.setBody(WVPResult.fail(ErrorCode.ERROR100.getCode(), e.getMsg()));

14
src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcServiceImpl.java
View File

@ -433,15 +433,15 @@ public class RedisRpcServiceImpl implements IRedisRpcService {
} }
@Override @Override
public void dragZoomIn(String serverId, Device device, String channelId, int length, int width, int midpointX, public void dragZoomIn(String serverId, Device device, String channelId, int length, int width, int midPointX,
int midpointY, int lengthX, int lengthY) { int midPointY, int lengthX, int lengthY) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("device", device.getDeviceId()); jsonObject.put("device", device.getDeviceId());
jsonObject.put("channelId", channelId); jsonObject.put("channelId", channelId);
jsonObject.put("length", length); jsonObject.put("length", length);
jsonObject.put("width", width); jsonObject.put("width", width);
jsonObject.put("midpointX", midpointX); jsonObject.put("midPointX", midPointX);
jsonObject.put("midpointY", midpointY); jsonObject.put("midPointY", midPointY);
jsonObject.put("lengthX", lengthX); jsonObject.put("lengthX", lengthX);
jsonObject.put("lengthY", lengthY); jsonObject.put("lengthY", lengthY);
RedisRpcRequest request = buildRequest("device/dragZoomIn", jsonObject); RedisRpcRequest request = buildRequest("device/dragZoomIn", jsonObject);
@ -450,14 +450,14 @@ public class RedisRpcServiceImpl implements IRedisRpcService {
} }
@Override @Override
public void dragZoomOut(String serverId, Device device, String channelId, int length, int width, int midpointX, int midpointY, int lengthX, int lengthY) { public void dragZoomOut(String serverId, Device device, String channelId, int length, int width, int midPointX, int midPointY, int lengthX, int lengthY) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("device", device.getDeviceId()); jsonObject.put("device", device.getDeviceId());
jsonObject.put("channelId", channelId); jsonObject.put("channelId", channelId);
jsonObject.put("length", length); jsonObject.put("length", length);
jsonObject.put("width", width); jsonObject.put("width", width);
jsonObject.put("midpointX", midpointX); jsonObject.put("midPointX", midPointX);
jsonObject.put("midpointY", midpointY); jsonObject.put("midPointY", midPointY);
jsonObject.put("lengthX", lengthX); jsonObject.put("lengthX", lengthX);
jsonObject.put("lengthY", lengthY); jsonObject.put("lengthY", lengthY);
RedisRpcRequest request = buildRequest("device/dragZoomOut", jsonObject); RedisRpcRequest request = buildRequest("device/dragZoomOut", jsonObject);

4
web/src/mixins/dragZoom.js
View File

@ -185,8 +185,8 @@ export default {
const params = { const params = {
length: Math.round(this.dragVideoRect.width), length: Math.round(this.dragVideoRect.width),
width: Math.round(this.dragVideoRect.height), width: Math.round(this.dragVideoRect.height),
midpointX: Math.round(sx + rectW / 2), midPointX: Math.round(sx + rectW / 2),
midpointY: Math.round(sy + rectH / 2), midPointY: Math.round(sy + rectH / 2),
lengthX: Math.round(rectW), lengthX: Math.round(rectW),
lengthY: Math.round(rectH) lengthY: Math.round(rectH)
} }