Merge pull request #23 from lunasaw/dev_1.1.4

Dev 1.1.4
lunasaw · Dec 25, 2023 · e1ff28b · e1ff28b
2 parents b68724a + 02cada7
commit e1ff28b
Show file tree

Hide file tree

Showing 146 changed files with 1,518 additions and 603 deletions.
diff --git a/gb28181-client/pom.xml b/gb28181-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.lunasaw</groupId>
         <artifactId>sip-proxy</artifactId>
-        <version>1.1.3</version>
+        <version>1.1.4</version>
     </parent>
 
     <version>${gb28181-proxy.version}</version>
@@ -27,6 +27,11 @@
             <groupId>io.github.lunasaw</groupId>
             <artifactId>sip-common</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.github.lunasaw</groupId>
+            <artifactId>gb28181-common</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...lient/src/main/java/io/github/lunasaw/gbproxy/client/config/SipProxyClientAutoConfig.java b/...lient/src/main/java/io/github/lunasaw/gbproxy/client/config/SipProxyClientAutoConfig.java
@@ -2,7 +2,6 @@
 
 import java.util.Map;
 
-import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageClientHandlerAbstract;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
@@ -11,7 +10,9 @@
 import org.springframework.stereotype.Component;
 
 import io.github.lunasaw.gbproxy.client.transmit.request.message.ClientMessageRequestProcessor;
-import io.github.lunasaw.sip.common.transmit.event.message.MessageHandler;
+import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageClientHandlerAbstract;
+import io.github.lunasaw.gbproxy.client.transmit.request.subscribe.ClientSubscribeRequestProcessor;
+import io.github.lunasaw.gbproxy.client.transmit.request.subscribe.SubscribeClientHandlerAbstract;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -29,6 +30,10 @@ public class SipProxyClientAutoConfig implements InitializingBean, ApplicationCo
     public void afterPropertiesSet() {
         Map<String, MessageClientHandlerAbstract> clientMessageHandlerMap = applicationContext.getBeansOfType(MessageClientHandlerAbstract.class);
         clientMessageHandlerMap.forEach((k, v) -> ClientMessageRequestProcessor.addHandler(v));
+
+        Map<String, SubscribeClientHandlerAbstract> clientSubscribeHandlerMap =
+            applicationContext.getBeansOfType(SubscribeClientHandlerAbstract.class);
+        clientSubscribeHandlerMap.forEach((k, v) -> ClientSubscribeRequestProcessor.addHandler(v));
     }
 
     @Override

diff --git a/...81-client/src/main/java/io/github/lunasaw/gbproxy/client/entity/InviteResponseEntity.java b/...81-client/src/main/java/io/github/lunasaw/gbproxy/client/entity/InviteResponseEntity.java
@@ -1,6 +1,6 @@
 package io.github.lunasaw.gbproxy.client.entity;
 
-import io.github.lunasaw.sip.common.enums.InviteSessionNameEnum;
+import io.github.lunasaw.gb28181.common.entity.enums.InviteSessionNameEnum;
 import lombok.Getter;
 import lombok.Setter;
 

diff --git a/...src/main/java/io/github/lunasaw/gbproxy/client/eventbus/event/subscribe/CatalogEvent.java b/...src/main/java/io/github/lunasaw/gbproxy/client/eventbus/event/subscribe/CatalogEvent.java
@@ -0,0 +1,50 @@
+package io.github.lunasaw.gbproxy.client.eventbus.event.subscribe;
+
+import org.springframework.context.ApplicationEvent;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CatalogEvent extends ApplicationEvent {
+    public CatalogEvent(Object source) {
+        super(source);
+    }
+
+    /**
+     * 上线
+     */
+    public static final String ON         = "ON";
+
+    /**
+     * 离线
+     */
+    public static final String OFF        = "OFF";
+
+    /**
+     * 视频丢失
+     */
+    public static final String VIDEO_LOST = "VIDEO_LOST";
+
+    /**
+     * 故障
+     */
+    public static final String DEFECT     = "DEFECT";
+
+    /**
+     * 增加
+     */
+    public static final String ADD        = "ADD";
+
+    /**
+     * 删除
+     */
+    public static final String DEL        = "DEL";
+
+    /**
+     * 更新
+     */
+    public static final String UPDATE     = "UPDATE";
+
+}
diff --git a/...181-client/src/main/java/io/github/lunasaw/gbproxy/client/transmit/cmd/ClientSendCmd.java b/...181-client/src/main/java/io/github/lunasaw/gbproxy/client/transmit/cmd/ClientSendCmd.java
@@ -5,12 +5,12 @@
 import com.luna.common.check.Assert;
 import com.luna.common.text.RandomStrUtil;
 
-import io.github.lunasaw.sip.common.entity.DeviceAlarm;
+import io.github.lunasaw.gb28181.common.entity.DeviceAlarm;
 import io.github.lunasaw.sip.common.entity.FromDevice;
 import io.github.lunasaw.sip.common.entity.ToDevice;
-import io.github.lunasaw.sip.common.entity.notify.*;
-import io.github.lunasaw.sip.common.entity.response.*;
-import io.github.lunasaw.sip.common.enums.CmdTypeEnum;
+import io.github.lunasaw.gb28181.common.entity.notify.*;
+import io.github.lunasaw.gb28181.common.entity.response.*;
+import io.github.lunasaw.gb28181.common.entity.enums.CmdTypeEnum;
 import io.github.lunasaw.sip.common.subscribe.SubscribeInfo;
 import io.github.lunasaw.sip.common.transmit.SipSender;
 import io.github.lunasaw.sip.common.transmit.event.Event;
@@ -29,7 +29,7 @@ public class ClientSendCmd {
      * @return
      */
     public static String deviceAlarmNotify(FromDevice fromDevice, ToDevice toDevice, DeviceAlarmNotify deviceAlarmNotify) {
-        return SipSender.doMessageRequest(fromDevice, toDevice, deviceAlarmNotify);
+        return SipSender.doMessageRequest(fromDevice, toDevice, deviceAlarmNotify.toString());
     }
 
     /**
@@ -45,7 +45,7 @@ public static String deviceAlarmNotify(FromDevice fromDevice, ToDevice toDevice,
 
         deviceAlarmNotify.setAlarm(deviceAlarm);
 
-        return SipSender.doMessageRequest(fromDevice, toDevice, deviceAlarmNotify);
+        return SipSender.doMessageRequest(fromDevice, toDevice, deviceAlarmNotify.toString());
     }
 
     /**
@@ -70,7 +70,7 @@ public static String deviceKeepLiveNotify(FromDevice fromDevice, ToDevice toDevi
 
         deviceKeepLiveNotify.setStatus(status);
 
-        return SipSender.doMessageRequest(fromDevice, toDevice, deviceKeepLiveNotify, errorEvent, okEvent);
+        return SipSender.doMessageRequest(fromDevice, toDevice, deviceKeepLiveNotify.toString(), errorEvent, okEvent);
     }
 
     /**
@@ -82,7 +82,7 @@ public static String deviceKeepLiveNotify(FromDevice fromDevice, ToDevice toDevi
      * @return
      */
     public static String deviceChannelCatalogResponse(FromDevice fromDevice, ToDevice toDevice, DeviceResponse deviceResponse) {
-        return SipSender.doMessageRequest(fromDevice, toDevice, deviceResponse);
+        return SipSender.doMessageRequest(fromDevice, toDevice, deviceResponse.toString());
     }
 
     public static String deviceChannelCatalogResponse(FromDevice fromDevice, ToDevice toDevice, List<DeviceItem> deviceItems, String sn) {
@@ -120,7 +120,7 @@ public static String deviceInfoResponse(FromDevice fromDevice, ToDevice toDevice
 
         deviceInfo.setCmdType(CmdTypeEnum.DEVICE_INFO.getType());
         deviceInfo.setSn(RandomStrUtil.getValidationCode());
-        return SipSender.doMessageRequest(fromDevice, toDevice, deviceInfo);
+        return SipSender.doMessageRequest(fromDevice, toDevice, deviceInfo.toString());
     }
 
     /**
@@ -138,7 +138,7 @@ public static String deviceStatusResponse(FromDevice fromDevice, ToDevice toDevi
 
         deviceStatus.setOnline(online);
 
-        return SipSender.doMessageRequest(fromDevice, toDevice, deviceStatus);
+        return SipSender.doMessageRequest(fromDevice, toDevice, deviceStatus.toString());
     }
 
     /**
@@ -154,7 +154,7 @@ public static String MobilePositionNotify(FromDevice fromDevice, ToDevice toDevi
         mobilePositionNotify.setCmdType(CmdTypeEnum.DEVICE_INFO.getType());
         mobilePositionNotify.setSn(RandomStrUtil.getValidationCode());
         mobilePositionNotify.setDeviceId(fromDevice.getUserId());
-        return SipSender.doNotifyRequest(fromDevice, toDevice, mobilePositionNotify, subscribeInfo);
+        return SipSender.doNotifyRequest(fromDevice, toDevice, mobilePositionNotify.toString(), subscribeInfo);
     }
 
     /**
@@ -173,7 +173,7 @@ public static String deviceChannelUpdateCatlog(FromDevice fromDevice, ToDevice t
         deviceUpdateNotify.setSumNum(deviceItems.size());
         deviceUpdateNotify.setDeviceItemList(deviceItems);
 
-        return SipSender.doNotifyRequest(fromDevice, toDevice, deviceUpdateNotify, subscribeInfo);
+        return SipSender.doNotifyRequest(fromDevice, toDevice, deviceUpdateNotify.toString(), subscribeInfo);
     }
 
     /**
@@ -192,7 +192,7 @@ public static String deviceOtherUpdateCatlog(FromDevice fromDevice, ToDevice toD
         deviceUpdateNotify.setSumNum(deviceItems.size());
         deviceUpdateNotify.setDeviceItemList(deviceItems);
 
-        return SipSender.doNotifyRequest(fromDevice, toDevice, deviceUpdateNotify, subscribeInfo);
+        return SipSender.doNotifyRequest(fromDevice, toDevice, deviceUpdateNotify.toString(), subscribeInfo);
     }
 
     /**
@@ -205,7 +205,7 @@ public static String deviceOtherUpdateCatlog(FromDevice fromDevice, ToDevice toD
      */
     public static String deviceRecordResponse(FromDevice fromDevice, ToDevice toDevice, DeviceRecord deviceRecord) {
 
-        return SipSender.doMessageRequest(fromDevice, toDevice, deviceRecord);
+        return SipSender.doMessageRequest(fromDevice, toDevice, deviceRecord.toString());
     }
 
     /**
@@ -235,7 +235,7 @@ public static String deviceRecordResponse(FromDevice fromDevice, ToDevice toDevi
      * @return
      */
     public static String deviceConfigResponse(FromDevice fromDevice, ToDevice toDevice, DeviceConfigResponse deviceConfigResponse) {
-        return SipSender.doMessageRequest(fromDevice, toDevice, deviceConfigResponse);
+        return SipSender.doMessageRequest(fromDevice, toDevice, deviceConfigResponse.toString());
     }
 
     public static String deviceConfigResponse(FromDevice fromDevice, ToDevice toDevice, DeviceConfigResponse.BasicParam basicParam) {
@@ -262,7 +262,7 @@ public static String deviceMediaStatusNotify(FromDevice fromDevice, ToDevice toD
 
         mediaStatusNotify.setNotifyType(notifyType);
 
-        return SipSender.doMessageRequest(fromDevice, toDevice, mediaStatusNotify);
+        return SipSender.doMessageRequest(fromDevice, toDevice, mediaStatusNotify.toString());
     }
 
     /**
@@ -307,6 +307,10 @@ public static String deviceRegister(FromDevice fromDevice, ToDevice toDevice, In
         return SipSender.doRegisterRequest(fromDevice, toDevice, expires);
     }
 
+    public static String deviceRegister(FromDevice fromDevice, ToDevice toDevice, Integer expires, Event event) {
+        return SipSender.doRegisterRequest(fromDevice, toDevice, expires, event);
+    }
+
     /**
      * 设备注销
      *

diff --git a/.../java/io/github/lunasaw/gbproxy/client/transmit/request/invite/InviteProcessorClient.java b/.../java/io/github/lunasaw/gbproxy/client/transmit/request/invite/InviteProcessorClient.java
@@ -5,7 +5,7 @@
 import io.github.lunasaw.gbproxy.client.entity.InviteResponseEntity;
 import io.github.lunasaw.sip.common.entity.GbSessionDescription;
 import io.github.lunasaw.sip.common.entity.SdpSessionDescription;
-import io.github.lunasaw.sip.common.enums.InviteSessionNameEnum;
+import io.github.lunasaw.gb28181.common.entity.enums.InviteSessionNameEnum;
 import io.github.lunasaw.sip.common.service.SipUserGenerate;
 import lombok.SneakyThrows;
 import org.apache.commons.collections4.CollectionUtils;

diff --git a/...java/io/github/lunasaw/gbproxy/client/transmit/request/invite/InviteRequestProcessor.java b/...java/io/github/lunasaw/gbproxy/client/transmit/request/invite/InviteRequestProcessor.java
@@ -5,14 +5,16 @@
 import javax.sip.header.ContentTypeHeader;
 import javax.sip.message.Response;
 
+import org.springframework.stereotype.Component;
+
 import gov.nist.javax.sip.message.SIPRequest;
-import io.github.lunasaw.sip.common.entity.*;
+import io.github.lunasaw.sip.common.entity.GbSessionDescription;
+import io.github.lunasaw.sip.common.entity.Device;
+import io.github.lunasaw.sip.common.entity.FromDevice;
 import io.github.lunasaw.sip.common.enums.ContentTypeEnum;
 import io.github.lunasaw.sip.common.transmit.ResponseCmd;
-import io.github.lunasaw.sip.common.utils.SipUtils;
-import org.springframework.stereotype.Component;
-
 import io.github.lunasaw.sip.common.transmit.event.request.SipRequestProcessorAbstract;
+import io.github.lunasaw.sip.common.utils.SipUtils;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...github/lunasaw/gbproxy/client/transmit/request/message/ClientMessageRequestProcessor.java b/...github/lunasaw/gbproxy/client/transmit/request/message/ClientMessageRequestProcessor.java
@@ -2,7 +2,7 @@
 
 import gov.nist.javax.sip.message.SIPRequest;
 import io.github.lunasaw.sip.common.entity.FromDevice;
-import io.github.lunasaw.sip.common.transmit.event.request.SipMessageRequestProcessorAbstract;
+import io.github.lunasaw.sip.common.transmit.event.message.SipMessageRequestProcessorAbstract;
 import io.github.lunasaw.sip.common.utils.SipUtils;
 import lombok.Getter;
 import lombok.Setter;

diff --git a/.../github/lunasaw/gbproxy/client/transmit/request/message/MessageClientHandlerAbstract.java b/.../github/lunasaw/gbproxy/client/transmit/request/message/MessageClientHandlerAbstract.java
@@ -1,10 +1,11 @@
 package io.github.lunasaw.gbproxy.client.transmit.request.message;
 
 import gov.nist.javax.sip.message.SIPRequest;
-import io.github.lunasaw.sip.common.entity.base.DeviceSession;
+import io.github.lunasaw.gb28181.common.entity.base.DeviceSession;
 import io.github.lunasaw.sip.common.transmit.event.message.MessageHandlerAbstract;
 import io.github.lunasaw.sip.common.utils.SipUtils;
 import lombok.Data;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -20,7 +21,7 @@ public abstract class MessageClientHandlerAbstract extends MessageHandlerAbstrac
     @Resource
     public MessageProcessorClient messageProcessorClient;
 
-    public MessageClientHandlerAbstract(MessageProcessorClient messageProcessorClient) {
+    public MessageClientHandlerAbstract(@Lazy MessageProcessorClient messageProcessorClient) {
         this.messageProcessorClient = messageProcessorClient;
     }
 

diff --git a/...ava/io/github/lunasaw/gbproxy/client/transmit/request/message/MessageProcessorClient.java b/...ava/io/github/lunasaw/gbproxy/client/transmit/request/message/MessageProcessorClient.java
@@ -1,16 +1,15 @@
 package io.github.lunasaw.gbproxy.client.transmit.request.message;
 
+import io.github.lunasaw.gb28181.common.entity.response.*;
 import io.github.lunasaw.gbproxy.client.transmit.request.message.handler.notify.BroadcastNotifyMessageHandler;
 import io.github.lunasaw.gbproxy.client.transmit.request.message.handler.query.CatalogQueryMessageClientHandler;
 import io.github.lunasaw.gbproxy.client.transmit.request.message.handler.query.DeviceInfoQueryMessageClientHandler;
 import io.github.lunasaw.gbproxy.client.transmit.request.message.handler.query.DeviceStatusQueryMessageClientHandler;
-import io.github.lunasaw.sip.common.entity.control.DeviceControlBase;
-import io.github.lunasaw.sip.common.entity.notify.DeviceAlarmNotify;
-import io.github.lunasaw.sip.common.entity.notify.DeviceBroadcastNotify;
-import io.github.lunasaw.sip.common.entity.query.DeviceAlarmQuery;
-import io.github.lunasaw.sip.common.entity.query.DeviceConfigDownload;
-import io.github.lunasaw.sip.common.entity.query.DeviceRecordQuery;
-import io.github.lunasaw.sip.common.entity.response.*;
+import io.github.lunasaw.gb28181.common.entity.notify.DeviceAlarmNotify;
+import io.github.lunasaw.gb28181.common.entity.notify.DeviceBroadcastNotify;
+import io.github.lunasaw.gb28181.common.entity.query.DeviceAlarmQuery;
+import io.github.lunasaw.gb28181.common.entity.query.DeviceConfigDownload;
+import io.github.lunasaw.gb28181.common.entity.query.DeviceRecordQuery;
 import io.github.lunasaw.sip.common.service.SipUserGenerate;
 
 /**

diff --git a/.../gbproxy/client/transmit/request/message/handler/control/DeviceControlMessageHandler.java b/.../gbproxy/client/transmit/request/message/handler/control/DeviceControlMessageHandler.java
@@ -2,9 +2,7 @@
 
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageClientHandlerAbstract;
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageProcessorClient;
-import io.github.lunasaw.sip.common.entity.FromDevice;
-import io.github.lunasaw.sip.common.entity.base.DeviceSession;
-import io.github.lunasaw.sip.common.enums.DeviceControlType;
+import io.github.lunasaw.gb28181.common.entity.enums.DeviceControlType;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...gbproxy/client/transmit/request/message/handler/notify/BroadcastNotifyMessageHandler.java b/...gbproxy/client/transmit/request/message/handler/notify/BroadcastNotifyMessageHandler.java
@@ -3,8 +3,8 @@
 import javax.sip.RequestEvent;
 
 import io.github.lunasaw.sip.common.entity.FromDevice;
-import io.github.lunasaw.sip.common.entity.base.DeviceSession;
-import io.github.lunasaw.sip.common.entity.notify.DeviceBroadcastNotify;
+import io.github.lunasaw.gb28181.common.entity.base.DeviceSession;
+import io.github.lunasaw.gb28181.common.entity.notify.DeviceBroadcastNotify;
 import org.springframework.stereotype.Component;
 
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageClientHandlerAbstract;
@@ -43,6 +43,9 @@ public void handForEvt(RequestEvent event) {
 
         // 设备查询
         FromDevice fromDevice = (FromDevice) messageProcessorClient.getFromDevice();
+        if (fromDevice == null || !fromDevice.getUserId().equals(userId)) {
+            throw new RuntimeException("查询设备失败");
+        }
 
         DeviceBroadcastNotify broadcastNotify = parseXml(DeviceBroadcastNotify.class);
 

diff --git a/...gbproxy/client/transmit/request/message/handler/query/AlarmQueryMessageClientHandler.java b/...gbproxy/client/transmit/request/message/handler/query/AlarmQueryMessageClientHandler.java
@@ -6,9 +6,9 @@
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageClientHandlerAbstract;
 import io.github.lunasaw.sip.common.entity.FromDevice;
 import io.github.lunasaw.sip.common.entity.ToDevice;
-import io.github.lunasaw.sip.common.entity.base.DeviceSession;
-import io.github.lunasaw.sip.common.entity.notify.DeviceAlarmNotify;
-import io.github.lunasaw.sip.common.entity.query.DeviceAlarmQuery;
+import io.github.lunasaw.gb28181.common.entity.base.DeviceSession;
+import io.github.lunasaw.gb28181.common.entity.notify.DeviceAlarmNotify;
+import io.github.lunasaw.gb28181.common.entity.query.DeviceAlarmQuery;
 import org.springframework.stereotype.Component;
 
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageProcessorClient;

diff --git a/...proxy/client/transmit/request/message/handler/query/CatalogQueryMessageClientHandler.java b/...proxy/client/transmit/request/message/handler/query/CatalogQueryMessageClientHandler.java
@@ -2,7 +2,7 @@
 
 import javax.sip.RequestEvent;
 
-import io.github.lunasaw.sip.common.entity.response.DeviceResponse;
+import io.github.lunasaw.gb28181.common.entity.response.DeviceResponse;
 import lombok.Setter;
 import org.springframework.stereotype.Component;
 
@@ -11,8 +11,8 @@
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageProcessorClient;
 import io.github.lunasaw.sip.common.entity.FromDevice;
 import io.github.lunasaw.sip.common.entity.ToDevice;
-import io.github.lunasaw.sip.common.entity.base.DeviceSession;
-import io.github.lunasaw.sip.common.entity.query.DeviceQuery;
+import io.github.lunasaw.gb28181.common.entity.base.DeviceSession;
+import io.github.lunasaw.gb28181.common.entity.query.DeviceQuery;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;