[国标级联] 完善通用通道前端控制处理接口

src/main/java/com/genersoft/iot/vmp/common/enums/ChannelDataType.java

@@ -8,8 +8,7 @@ public enum ChannelDataType {
 
     GB28181(1,"国标28181"),
     STREAM_PUSH(2,"推流设备"),
-    STREAM_PROXY(3,"拉流代理"),
+    STREAM_PROXY(3,"拉流代理");
-    ONVIF(100,"ONVIF");
 
     public final int value;
 

src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelControlService.java

@@ -8,5 +8,9 @@ public interface IGbChannelControlService {
 
 
     void ptz(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback);
+    void fi(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback);
     void preset(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback);
+    void tour(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback);
+    void scan(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback);
+    void auxiliary(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback);
 }

src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelControlServiceImpl.java

@@ -20,4 +20,24 @@ public class GbChannelControlServiceImpl implements IGbChannelControlService {
     public void preset(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback) {
         log.info("[通用通道] 预置位， 通道： {}", channel.getGbId());
     }
+
+    @Override
+    public void fi(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback) {
+        log.info("[通用通道] FI指令， 通道： {}", channel.getGbId());
+    }
+
+    @Override
+    public void tour(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback) {
+
+    }
+
+    @Override
+    public void scan(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback) {
+
+    }
+
+    @Override
+    public void auxiliary(CommonGBChannel channel, FrontEndControlCodeForPTZ frontEndControlCode, ErrorCallback<String> callback) {
+
+    }
 }

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java

@@ -149,7 +149,6 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
                 }
             }));
         }else {
-            if (channel.getDataType() == ChannelDataType.ONVIF.value) { // 这里可以处理其他协议接入的设备
             // 解析云台控制参数
             String cmdString = getText(rootElement, type.getVal());
             IFrontEndControlCode frontEndControlCode = FrontEndCode.decode(cmdString);
@@ -172,6 +171,15 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
                         }
                     }));
                     break;
+                case FI:
+                    channelControlService.fi(channel, (FrontEndControlCodeForPTZ)frontEndControlCode, ((code, msg, data) -> {
+                        try {
+                            responseAck(request, code, msg);
+                        }  catch (InvalidArgumentException | SipException | ParseException exception) {
+                            log.error("[命令发送失败] 云台指令: {}", exception.getMessage());
+                        }
+                    }));
+                    break;
                 case PRESET:
                     channelControlService.preset(channel, (FrontEndControlCodeForPTZ)frontEndControlCode, ((code, msg, data) -> {
                         try {
@@ -181,6 +189,33 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
                         }
                     }));
                     break;
+                case TOUR:
+                    channelControlService.tour(channel, (FrontEndControlCodeForPTZ)frontEndControlCode, ((code, msg, data) -> {
+                        try {
+                            responseAck(request, code, msg);
+                        }  catch (InvalidArgumentException | SipException | ParseException exception) {
+                            log.error("[命令发送失败] 云台指令: {}", exception.getMessage());
+                        }
+                    }));
+                    break;
+                case SCAN:
+                    channelControlService.scan(channel, (FrontEndControlCodeForPTZ)frontEndControlCode, ((code, msg, data) -> {
+                        try {
+                            responseAck(request, code, msg);
+                        }  catch (InvalidArgumentException | SipException | ParseException exception) {
+                            log.error("[命令发送失败] 云台指令: {}", exception.getMessage());
+                        }
+                    }));
+                    break;
+                case AUXILIARY:
+                    channelControlService.auxiliary(channel, (FrontEndControlCodeForPTZ)frontEndControlCode, ((code, msg, data) -> {
+                        try {
+                            responseAck(request, code, msg);
+                        }  catch (InvalidArgumentException | SipException | ParseException exception) {
+                            log.error("[命令发送失败] 云台指令: {}", exception.getMessage());
+                        }
+                    }));
+                    break;
                 default:
                     log.info("[INFO 消息] 设备不支持的控制方式");
                     try {
@@ -189,17 +224,6 @@ public class DeviceControlQueryMessageHandler extends SIPRequestProcessorParent
                         log.error("[命令发送失败] 云台指令: {}", exception.getMessage());
                     }
             }
-
-
-                return;
-            }
-            // 只支持国标的云台控制
-            log.warn("[INFO 消息] 只支持国标的云台控制， 通道ID： {}", channel.getGbId());
-            try {
-                responseAck(request, Response.FORBIDDEN, "");
-            } catch (SipException | InvalidArgumentException | ParseException e) {
-                log.error("[命令发送失败] 错误信息: {}", e.getMessage());
-            }
         }
     }