Compare commits

...

3 Commits

Author SHA1 Message Date
山海守门人
b2a8e63a62
Pre Merge pull request !44 from 山海守门人/dev_260107 2026-03-02 01:42:51 +00:00
lin
c76414f156 修复GPS消息时间设置 2026-03-02 09:42:19 +08:00
紫穹
bed4e79061 fix: 修改编译版本为jdk21 2026-01-07 07:46:49 +08:00
2 changed files with 4 additions and 5 deletions

View File

@ -1,4 +1,4 @@
FROM ringcentral/jdk:11 AS builder FROM ringcentral/jdk:21 AS builder
EXPOSE 18978/tcp EXPOSE 18978/tcp
EXPOSE 8116/tcp EXPOSE 8116/tcp
@ -56,11 +56,11 @@ COPY . /build
WORKDIR /build WORKDIR /build
RUN ls && mvn clean package -Dmaven.test.skip=true RUN ls && mvn clean package -Dmaven.test.skip=true
WORKDIR /build/target WORKDIR /build/target
#确保文件名一致 #确保文件名一致
RUN mv wvp-pro-*.jar wvp.jar RUN mv wvp-pro-*.jar wvp.jar
FROM ringcentral/jdk:11 FROM ringcentral/jdk:21
RUN mkdir -p /opt/wvp RUN mkdir -p /opt/wvp
WORKDIR /opt/wvp WORKDIR /opt/wvp
COPY --from=builder /build/target /opt/wvp COPY --from=builder /build/target /opt/wvp

View File

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