Pre Merge pull request !45 from 山海守门人/dev260107_2

docker/docker-compose.yml

@@ -59,7 +59,7 @@ services:
     networks:
       - media-net
     ports:
-     #- "6080:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
+     - "80:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
      #- "4443:443/tcp"     # [播流]HTTPS 安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
       - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/tcp"   # [收流]RTMP  
       - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/udp"   # [收流]RTMP  

src/main/java/com/genersoft/iot/vmp/service/bean/GPSMsgInfo.java

@@ -1,7 +1,6 @@
 package com.genersoft.iot.vmp.service.bean;
 
 import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
-import com.genersoft.iot.vmp.utils.DateUtil;
 import lombok.Data;
 
 @Data
@@ -62,7 +61,7 @@ public class GPSMsgInfo {
         gpsMsgInfo.setLat(mobilePosition.getLatitude());
         gpsMsgInfo.setSpeed(mobilePosition.getSpeed());
         gpsMsgInfo.setDirection(mobilePosition.getDirection());
-        gpsMsgInfo.setTime(DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(mobilePosition.getTime()));
+        gpsMsgInfo.setTime(mobilePosition.getTime());
         return gpsMsgInfo;
     }
 }