From b61ddc13e36f8f1bddbe7a7216003b01a254de6b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 03 Apr 2024 11:09:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/policTrajectoryPoint/entity/PolicTrajectoryPointEntity.java | 35 ++++++++++++++++++++++++++++++-----
src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.xml | 17 ++++++++++++++++-
2 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/entity/PolicTrajectoryPointEntity.java b/src/main/java/org/springblade/modules/policTrajectoryPoint/entity/PolicTrajectoryPointEntity.java
index 0369f1f..ca14e8b 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/entity/PolicTrajectoryPointEntity.java
+++ b/src/main/java/org/springblade/modules/policTrajectoryPoint/entity/PolicTrajectoryPointEntity.java
@@ -16,11 +16,10 @@
*/
package org.springblade.modules.policTrajectoryPoint.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -40,6 +39,7 @@
@ApiModel(value = "PolicTrajectoryPoint对象", description = "用户轨迹记录")
public class PolicTrajectoryPointEntity {
+
/** id */
@@ -65,6 +65,31 @@
/** 创建时间 */
@ApiModelProperty(value = "创建时间", example = "")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField("create_time")
+ @TableField(value = "create_time",fill = FieldFill.INSERT)
private Date createTime;
+
+ /** 速度，单位 m/s */
+ @ApiModelProperty(value = "速度，单位 m/s", example = "")
+ @TableField("speed")
+ private Double speed;
+
+ /** 位置的精确度 */
+ @ApiModelProperty(value = "位置的精确度", example = "")
+ @TableField("accuracy")
+ private Double accuracy;
+
+ /** 高度，单位 m */
+ @ApiModelProperty(value = "高度，单位 m", example = "")
+ @TableField("altitude")
+ private Double altitude;
+
+ /** 垂直精度，单位 m（Android 无法获取，返回 0） */
+ @ApiModelProperty(value = "垂直精度，单位 m（Android 无法获取，返回 0）", example = "")
+ @TableField("verticalAccuracy")
+ private Double verticalAccuracy;
+
+ /** 水平精度，单位 m */
+ @ApiModelProperty(value = "水平精度，单位 m", example = "")
+ @TableField("horizontalAccuracy")
+ private Double horizontalAccuracy;
}
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.xml b/src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.xml
index e00e987..8c50d0f 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.xml
+++ b/src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.xml
@@ -16,6 +16,11 @@
<result property="latitude" column="latitude" />
<result property="longitude" column="longitude" />
<result property="createTime" column="create_time" />
+ <result property="speed" column="speed" />
+ <result property="accuracy" column="accuracy" />
+ <result property="altitude" column="altitude" />
+ <result property="verticalAccuracy" column="verticalAccuracy" />
+ <result property="horizontalAccuracy" column="horizontalAccuracy" />
</resultMap>
<sql id="selectPolicTrajectoryPoint">
@@ -24,7 +29,12 @@
user_id,
latitude,
longitude,
- create_time
+ create_time,
+ speed,
+ accuracy,
+ altitude,
+ verticalAccuracy,
+ horizontalAccuracy
from
jczz_polic_trajectory_point
</sql>
@@ -43,6 +53,11 @@
<if test="latitude != null "> and latitude = #{latitude}</if>
<if test="longitude != null "> and longitude = #{longitude}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
+ <if test="speed != null "> and speed = #{speed}</if>
+ <if test="accuracy != null "> and accuracy = #{accuracy}</if>
+ <if test="altitude != null "> and altitude = #{altitude}</if>
+ <if test="verticalAccuracy != null "> and verticalAccuracy = #{verticalAccuracy}</if>
+ <if test="horizontalAccuracy != null "> and horizontalAccuracy = #{horizontalAccuracy}</if>
</where>
</select>
--
Gitblit v1.9.3