Bläddra i källkod

时间加时分秒

lchao 1 år sedan
förälder
incheckning
e26386edbe

+ 3 - 5
songhua-system/src/main/java/com/songhua/system/domain/CruiseShipMapping.java

@@ -1,10 +1,10 @@
 package com.songhua.system.domain;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.songhua.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.util.Date;
 
 @Data
 public  class CruiseShipMapping extends BaseEntity {
@@ -20,8 +20,6 @@ public  class CruiseShipMapping extends BaseEntity {
     /** 纬度 */
     private String latitude;
     /** 游船时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String shipTime;
-
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date shipTime;
 }

+ 2 - 0
songhua-system/src/main/java/com/songhua/system/service/impl/CruiseShipMappingServiceImpl.java

@@ -2,6 +2,7 @@ package com.songhua.system.service.impl;
 
 import java.util.List;
 
+import com.songhua.common.utils.DateUtils;
 import com.songhua.common.utils.uuid.IdUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,6 +44,7 @@ public class CruiseShipMappingServiceImpl implements ICruiseShipMappingService
     public int insertCruiseShipMapping(CruiseShipMapping cruiseShipMapping)
     {
         cruiseShipMapping.setId(IdUtils.simpleUUID());
+        cruiseShipMapping.setShipTime(DateUtils.getNowDate());
         return cruiseShipMappingMapper.insertCruiseShipMapping(cruiseShipMapping);
     }
 

+ 1 - 0
songhua-system/src/main/resources/mapper/system/CruiseShipMappingMapper.xml

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
             <if test="shipTime != null "> and ship_time = #{shipTime}</if>
         </where>
+        ORDER BY ship_time DESC
     </select>
     
     <select id="selectCruiseShipMappingById" parameterType="String" resultMap="CruiseShipMappingResult">