From 0359860dbc5de19f3d099ff549af0b4c48a08221 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 10 Dec 2021 14:31:27 +0800
Subject: [PATCH] 经纬度实体类，计算中心点工具类，修改热力图接口经纬度顺序
---
screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java b/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java
index fd0b130..602ea08 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
+import java.sql.Time;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -36,16 +37,14 @@
/**
* ������������
*/
- @DateTimeFormat(pattern = "HH:mm")
- @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
- private Date startTime;
+ @DateTimeFormat(pattern = "HH:mm:ss")
+ @JsonFormat(pattern = "HH:mm:ss",timezone = "GMT+8")
+ private Time startTime;
/**
* ������������
*/
- @DateTimeFormat(pattern = "HH:mm")
- @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
- private Date endTime;
+ private Time endTime;
/**
* ���������
@@ -72,10 +71,5 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0