Pre Merge pull request !36 from 阿斌/N/A

修复CatalogEventLister未判空ServerGBId引发的空指针异常

pom.xml

@@ -242,12 +242,17 @@
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>
-            <version>2.0.17</version>
+            <version>2.0.57</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2-extension</artifactId>
-            <version>2.0.17</version>
+            <version>2.0.57</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2-extension-spring5</artifactId>
+            <version>2.0.57</version>
         </dependency>
 
         <!-- okhttp -->

src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java

@@ -41,6 +41,9 @@ public class SubscribeHolder {
     }
 
     public SubscribeInfo getCatalogSubscribe(String platformId) {
+        if (platformId == null) {
+            return null;
+        }
         return catalogMap.get(platformId);
     }
 

src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java

@@ -101,7 +101,7 @@ public class DeviceChannelProvider {
             }
             sqlBuild.append(" )");
         }
-        sqlBuild.append("ORDER BY device_id");
+        sqlBuild.append(" ORDER BY device_id");
         return sqlBuild.toString();
     }
 

src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java

@@ -1,14 +1,11 @@
 package com.genersoft.iot.vmp.gb28181.event.subscribe.catalog;
 
-import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
 import com.genersoft.iot.vmp.gb28181.bean.Platform;
 import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
 import com.genersoft.iot.vmp.gb28181.bean.SubscribeInfo;
 import com.genersoft.iot.vmp.gb28181.service.IPlatformChannelService;
-import com.genersoft.iot.vmp.gb28181.service.IPlatformService;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
-import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
@@ -17,7 +14,10 @@ import org.springframework.stereotype.Component;
 import javax.sip.InvalidArgumentException;
 import javax.sip.SipException;
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * catalog事件
@@ -156,4 +156,4 @@ public class CatalogEventLister implements ApplicationListener<CatalogEvent> {
         }
     }
 }
- 
+

src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcPlatformController.java

@@ -9,7 +9,6 @@ import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcResponse;
 import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
 import com.genersoft.iot.vmp.gb28181.bean.Platform;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
 import com.genersoft.iot.vmp.gb28181.service.IPlatformChannelService;
 import com.genersoft.iot.vmp.gb28181.service.IPlatformService;
 import com.genersoft.iot.vmp.service.redisMsg.dto.RedisRpcController;
@@ -72,6 +71,7 @@ public class RedisRpcPlatformController extends RpcController {
     public RedisRpcResponse catalogEventPublish(RedisRpcRequest request) {
         JSONObject jsonObject = JSONObject.parseObject(request.getParam().toString());
         Platform platform = jsonObject.getObject("platform", Platform.class);
+
         List<CommonGBChannel> channels = jsonObject.getJSONArray("channels").toJavaList(CommonGBChannel.class);
         String type = jsonObject.getString("type");
         eventPublisher.catalogEventPublish(platform, channels, type, false);

src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPush.java

@@ -8,6 +8,7 @@ import com.genersoft.iot.vmp.utils.DateUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.util.ObjectUtils;
 
@@ -15,6 +16,7 @@ import org.springframework.util.ObjectUtils;
 @Data
 @Schema(description = "推流信息")
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class StreamPush extends CommonGBChannel implements Comparable<StreamPush>{
 
     /**
@@ -105,6 +107,7 @@ public class StreamPush extends CommonGBChannel implements Comparable<StreamPush
 
     private Integer dataType = ChannelDataType.STREAM_PUSH.value;
 
+
     @Override
     public int compareTo(@NotNull StreamPush streamPushItem) {
         return Long.valueOf(DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(this.createTime)

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301