cong82269021 5 달 전
부모
커밋
22657d6443

+ 1 - 1
src/main/java/com/fdkankan/fusion/entity/CaseInquestCriminal.java

@@ -126,7 +126,7 @@ public class CaseInquestCriminal implements Serializable {
      * 时间
      */
     @TableField("inquest_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date inquestTime;
 
     @TableField(typeHandler = JsonArrayTypeHandler.class)

+ 3 - 3
src/main/java/com/fdkankan/fusion/entity/TmProject.java

@@ -130,7 +130,7 @@ public class TmProject implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -155,7 +155,7 @@ public class TmProject implements Serializable {
      * 最新更新时间
      */
     @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**
@@ -208,7 +208,7 @@ public class TmProject implements Serializable {
         return statusDesc;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date getEditTime() {
         return updateTime;
     }

+ 3 - 0
src/main/java/com/fdkankan/fusion/response/SceneVo.java

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.response;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.fusion.entity.Model;
 import lombok.Data;
 
@@ -52,5 +53,7 @@ public class SceneVo extends Model {
      */
     private String rtkLocation;
     private Long sceneSize;       //场景大小
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date algorithmTime;
 }

+ 4 - 4
src/main/resources/application.yml

@@ -54,7 +54,7 @@ spring:
 
 logging:
   config: classpath:logback-spring.xml
-  path: ${DPROFILE_PATH}../bin/log
+  path: ${DPROFILE_PATH}/../bin/log
 
 mybatis-plus:
   configuration:
@@ -68,10 +68,10 @@ oss:
 
 
 fdkk:
-  installPath: ${DPROFILE_PATH}../
+  installPath: ${DPROFILE_PATH}/../
 
 
 geoquery:
-  dataFilePath: ${DPROFILE_PATH}../geoFile/GeoJSON.json
-  saveWkbsFilePath: ${DPROFILE_PATH}../geoFile/GeoJSON.wkbs
+  dataFilePath: ${DPROFILE_PATH}/../geoFile/GeoJSON.json
+  saveWkbsFilePath: ${DPROFILE_PATH}/../geoFile/GeoJSON.wkbs