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

行政规划错误。江苏南通海门市，修改为海门区，浙江杭州删除下城区、江干区，新增钱塘区，临平区

Signed-off-by: 阿斌 <38912748@qq.com>

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

@@ -3,6 +3,8 @@ package com.genersoft.iot.vmp.gb28181.bean;
 import gov.nist.javax.sip.message.SIPResponse;
 import lombok.Data;
 
+import javax.sip.header.EventHeader;
+
 @Data
 public class SipTransactionInfo {
 
@@ -12,6 +14,7 @@ public class SipTransactionInfo {
     private String viaBranch;
     private int expires;
     private String user;
+    private String eventId;
 
     // 自己是否媒体流发送者
     private boolean asSender;
@@ -22,6 +25,10 @@ public class SipTransactionInfo {
         this.toTag = response.getToTag();
         this.viaBranch = response.getTopmostViaHeader().getBranch();
         this.asSender = asSender;
+        EventHeader header = (EventHeader)response.getHeader(EventHeader.NAME);
+        if (header != null) {
+            this.eventId = header.getEventId();
+        }
     }
 
     public SipTransactionInfo(SIPResponse response) {
@@ -30,6 +37,10 @@ public class SipTransactionInfo {
         this.toTag = response.getToTag();
         this.viaBranch = response.getTopmostViaHeader().getBranch();
         this.asSender = false;
+        EventHeader header = (EventHeader)response.getHeader(EventHeader.NAME);
+        if (header != null) {
+            this.eventId = header.getEventId();
+        }
     }
 
     public SipTransactionInfo() {

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java

@@ -269,12 +269,15 @@ public class SIPRequestHeaderProvider {
 		ExpiresHeader expireHeader = SipFactory.getInstance().createHeaderFactory().createExpiresHeader(expires);
 		request.addHeader(expireHeader);
 
-		// Event
+        // Event
-		EventHeader eventHeader = SipFactory.getInstance().createHeaderFactory().createEventHeader(event);
+        EventHeader eventHeader = SipFactory.getInstance().createHeaderFactory().createEventHeader(event);
-
+        if (sipTransactionInfo != null && sipTransactionInfo.getEventId() != null) {
-		int random = (int) Math.floor(Math.random() * 10000);
+            eventHeader.setEventId(sipTransactionInfo.getEventId());
-		eventHeader.setEventId(random + "");
+        }else {
-		request.addHeader(eventHeader);
+            int random = (int) Math.floor(Math.random() * 10000);
+            eventHeader.setEventId(random + "");
+        }
+        request.addHeader(eventHeader);
 
 		ContentTypeHeader contentTypeHeader = SipFactory.getInstance().createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
 		request.setContent(content, contentTypeHeader);

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