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 11:26:54 +08:00
parent cd293bc116
commit 2f1ec0e33f
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ public class DeviceControl {
@RequestParam int lengthX,
@RequestParam int lengthY) {
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);
Assert.notNull(device, "设备不存在");
@ -192,8 +192,8 @@ public class DeviceControl {
@Parameter(name = "width", description = "播放窗口宽像素值", required = true)
@Parameter(name = "midpointX", description = "拉框中心的横轴坐标像素值", required = true)
@Parameter(name = "midpointY", description = "拉框中心的纵轴坐标像素值", required = true)
@Parameter(name = "lengthx", description = "拉框长度像素值", required = true)
@Parameter(name = "lengthy", description = "拉框宽度像素值", required = true)
@Parameter(name = "lengthX", description = "拉框长度像素值", required = true)
@Parameter(name = "lengthY", description = "拉框宽度像素值", required = true)
@GetMapping("/drag_zoom/zoom_out")
public void dragZoomOut(@RequestParam String deviceId,
@RequestParam(required = false) String channelId,
@ -201,14 +201,14 @@ public class DeviceControl {
@RequestParam int width,
@RequestParam int midpointX,
@RequestParam int midpointY,
@RequestParam int lengthx,
@RequestParam int lengthy){
@RequestParam int lengthX,
@RequestParam int lengthY){
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);
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 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);

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

@ -1300,9 +1300,9 @@ public class DeviceServiceImpl implements IDeviceService {
}
@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())) {
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;
}
@ -1312,8 +1312,8 @@ public class DeviceServiceImpl implements IDeviceService {
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("<LengthX>" + lengthX+ "</LengthX>\r\n");
cmdXml.append("<LengthY>" + lengthY+ "</LengthY>\r\n");
cmdXml.append("</DragZoomOut>\r\n");
try {
sipCommander.dragZoomCmd(device, channelId, cmdXml.toString());

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);
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);

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

@ -320,8 +320,8 @@ public class RedisRpcDeviceController extends RpcController {
Integer width = paramJson.getInteger("width");
Integer midpointX = paramJson.getInteger("midpointX");
Integer midpointY = paramJson.getInteger("midpointY");
Integer lengthx = paramJson.getInteger("lengthx");
Integer lengthy = paramJson.getInteger("lengthy");
Integer lengthX = paramJson.getInteger("lengthX");
Integer lengthY = paramJson.getInteger("lengthY");
Device device = deviceService.getDeviceByDeviceId(deviceId);
@ -332,7 +332,7 @@ public class RedisRpcDeviceController extends RpcController {
return response;
}
try {
deviceService.dragZoomIn(device, channelId, length, width, midpointX, midpointY, lengthx, lengthy);
deviceService.dragZoomIn(device, channelId, length, width, midpointX, midpointY, lengthX, lengthY);
}catch (ControllerException e) {
response.setStatusCode(e.getCode());
response.setBody(WVPResult.fail(ErrorCode.ERROR100.getCode(), e.getMsg()));
@ -352,8 +352,8 @@ public class RedisRpcDeviceController extends RpcController {
Integer width = paramJson.getInteger("width");
Integer midpointX = paramJson.getInteger("midpointX");
Integer midpointY = paramJson.getInteger("midpointY");
Integer lengthx = paramJson.getInteger("lengthx");
Integer lengthy = paramJson.getInteger("lengthy");
Integer lengthX = paramJson.getInteger("lengthX");
Integer lengthY = paramJson.getInteger("lengthY");
Device device = deviceService.getDeviceByDeviceId(deviceId);
@ -364,7 +364,7 @@ public class RedisRpcDeviceController extends RpcController {
return response;
}
try {
deviceService.dragZoomOut(device, channelId, length, width, midpointX, midpointY, lengthx, lengthy);
deviceService.dragZoomOut(device, channelId, length, width, midpointX, midpointY, lengthX, lengthY);
}catch (ControllerException e) {
response.setStatusCode(e.getCode());
response.setBody(WVPResult.fail(ErrorCode.ERROR100.getCode(), e.getMsg()));

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

@ -434,7 +434,7 @@ public class RedisRpcServiceImpl implements IRedisRpcService {
@Override
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.put("device", device.getDeviceId());
jsonObject.put("channelId", channelId);
@ -442,15 +442,15 @@ public class RedisRpcServiceImpl implements IRedisRpcService {
jsonObject.put("width", width);
jsonObject.put("midpointX", midpointX);
jsonObject.put("midpointY", midpointY);
jsonObject.put("lengthx", lengthx);
jsonObject.put("lengthy", lengthy);
jsonObject.put("lengthX", lengthX);
jsonObject.put("lengthY", lengthY);
RedisRpcRequest request = buildRequest("device/dragZoomIn", jsonObject);
request.setToId(serverId);
redisRpcConfig.request(request, 50, TimeUnit.MILLISECONDS);
}
@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.put("device", device.getDeviceId());
jsonObject.put("channelId", channelId);
@ -458,8 +458,8 @@ public class RedisRpcServiceImpl implements IRedisRpcService {
jsonObject.put("width", width);
jsonObject.put("midpointX", midpointX);
jsonObject.put("midpointY", midpointY);
jsonObject.put("lengthx", lengthx);
jsonObject.put("lengthy", lengthy);
jsonObject.put("lengthX", lengthX);
jsonObject.put("lengthY", lengthY);
RedisRpcRequest request = buildRequest("device/dragZoomOut", jsonObject);
request.setToId(serverId);
redisRpcConfig.request(request, 50, TimeUnit.MILLISECONDS);