XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[集群] 增加远程重启/录像控制/布防（或撤防）/重置报警， 增加关闭推流接口

Browse Source
This commit is contained in:
lin
2025-02-08 17:29:31 +08:00
parent 8ca982485c
commit 71390a7b51
9 changed files with 271 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,4 +43,10 @@ public interface IRedisRpcService {
String deviceBasicConfig(String serverId, Device device, String channelId, String name, String expiration, String heartBeatInterval, String heartBeatCount);
String deviceConfigQuery(String serverId, Device device, String channelId, String configType);
void teleboot(String serverId, Device device);
String recordControl(String serverId, Device device, String channelId, String recordCmdStr);
WVPResult<String> guard(String serverId, Device device, String guardCmdStr);
}

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

@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.service.redisMsg.control;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.redis.RedisRpcConfig;
import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcMessage;
import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcRequest;
@@ -165,6 +166,110 @@ public class RedisRpcDeviceController extends RpcController {
return response;
}
@RedisRpcMapping("teleboot")
public RedisRpcResponse teleboot(RedisRpcRequest request) {
String deviceId = request.getParam().toString();
Device device = deviceService.getDeviceByDeviceId(deviceId);
RedisRpcResponse response = request.getResponse();
if (device == null || !userSetting.getServerId().equals(device.getServerId())) {
response.setStatusCode(ErrorCode.ERROR400.getCode());
response.setBody("param error");
return response;
}
try {
deviceService.teleboot(device);
}catch (ControllerException e) {
response.setStatusCode(e.getCode());
response.setBody(e.getMsg());
return response;
}
response.setStatusCode(ErrorCode.SUCCESS.getCode());
response.setBody(ErrorCode.SUCCESS.getMsg());
return response;
}
@RedisRpcMapping("record")
public RedisRpcResponse record(RedisRpcRequest request) {
JSONObject paramJson = JSONObject.parseObject(request.getParam().toString());
String deviceId = paramJson.getString("deviceId");
String channelId = paramJson.getString("channelId");
String recordCmdStr = paramJson.getString("recordCmdStr");
Device device = deviceService.getDeviceByDeviceId(deviceId);
RedisRpcResponse response = request.getResponse();
if (device == null || !userSetting.getServerId().equals(device.getServerId())) {
response.setStatusCode(ErrorCode.ERROR400.getCode());
response.setBody("param error");
return response;
}
try {
DeferredResult<String> deferredResult = deviceService.record(device, channelId, recordCmdStr);
deferredResult.onCompletion(() ->{
String resultStr = (String)deferredResult.getResult();
response.setStatusCode(ErrorCode.SUCCESS.getCode());
response.setBody(resultStr);
// 手动发送结果
sendResponse(response);
});
deferredResult.onTimeout(() -> {
log.warn("设备录像控制操作超时, 设备未返回应答指令");
JSONObject json = new JSONObject();
json.put("DeviceID", device.getDeviceId());
json.put("Status", "Timeout");
json.put("Description", "设备录像控制操作超时, 设备未返回应答指令");
response.setStatusCode(ErrorCode.SUCCESS.getCode());
response.setBody(json);
// 手动发送结果
sendResponse(response);
});
}catch (ControllerException e) {
response.setStatusCode(e.getCode());
response.setBody(e.getMsg());
sendResponse(response);
}
return null;
}
@RedisRpcMapping("guard")
public RedisRpcResponse guard(RedisRpcRequest request) {
JSONObject paramJson = JSONObject.parseObject(request.getParam().toString());
String deviceId = paramJson.getString("deviceId");
String guardCmdStr = paramJson.getString("guardCmdStr");
Device device = deviceService.getDeviceByDeviceId(deviceId);
RedisRpcResponse response = request.getResponse();
if (device == null || !userSetting.getServerId().equals(device.getServerId())) {
response.setStatusCode(ErrorCode.ERROR400.getCode());
response.setBody("param error");
return response;
}
try {
DeferredResult<WVPResult<String>> deferredResult = deviceService.guard(device, guardCmdStr);
deferredResult.onCompletion(() ->{
response.setStatusCode(ErrorCode.SUCCESS.getCode());
response.setBody(deferredResult.getResult());
// 手动发送结果
sendResponse(response);
});
deferredResult.onTimeout(() -> {
log.warn("设备录像控制操作超时, 设备未返回应答指令");
response.setStatusCode(ErrorCode.SUCCESS.getCode());
response.setBody(WVPResult.fail(ErrorCode.ERROR100.getCode(), "操作超时, 设备未应答"));
// 手动发送结果
sendResponse(response);
});
}catch (ControllerException e) {
response.setStatusCode(e.getCode());
response.setBody(e.getMsg());
sendResponse(response);
}
return null;
}
}

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.redis.RedisRpcConfig;
import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcRequest;
import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcResponse;
@@ -292,4 +293,37 @@ public class RedisRpcServiceImpl implements IRedisRpcService {
RedisRpcResponse response = redisRpcConfig.request(request, 50, TimeUnit.MILLISECONDS);
return response.getBody().toString();
}
@Override
public void teleboot(String serverId, Device device) {
RedisRpcRequest request = buildRequest("device/teleboot", device.getDeviceId());
request.setToId(serverId);
RedisRpcResponse response = redisRpcConfig.request(request, 50, TimeUnit.MILLISECONDS);
if (response.getStatusCode() != ErrorCode.SUCCESS.getCode()) {
throw new ControllerException(response.getStatusCode(), response.getBody().toString());
}
}
@Override
public String recordControl(String serverId, Device device, String channelId, String recordCmdStr) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("device", device.getDeviceId());
jsonObject.put("channelId", channelId);
jsonObject.put("recordCmdStr", recordCmdStr);
RedisRpcRequest request = buildRequest("device/record", jsonObject);
request.setToId(serverId);
RedisRpcResponse response = redisRpcConfig.request(request, 50, TimeUnit.MILLISECONDS);
return response.getBody().toString();
}
@Override
public WVPResult<String> guard(String serverId, Device device, String guardCmdStr) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("device", device.getDeviceId());
jsonObject.put("guardCmdStr", guardCmdStr);
RedisRpcRequest request = buildRequest("device/guard", jsonObject);
request.setToId(serverId);
RedisRpcResponse response = redisRpcConfig.request(request, 50, TimeUnit.MILLISECONDS);
return JSON.parseObject(response.getBody().toString(), WVPResult.class);
}
}