From 2cf5df30515be95e83657b66dc6919d7975ff515 Mon Sep 17 00:00:00 2001
From: glj <13935964706@163.com>
Date: Sat, 13 Jul 2024 14:57:18 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/springblade/common/constant/CommonConstant.java | 2 +-
.../main/java/com/kening/vordm/entity/EntityDataAll.java | 8 +++++++-
.../java/com/kening/vordm/mapper/EntityDataAllMapper.xml | 6 ++++--
.../vordm/service/impl/EntityDataAllServiceImpl.java | 4 +++-
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java b/kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java
index 4494d85..fb9e595 100644
--- a/kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java
+++ b/kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java
@@ -49,7 +49,7 @@ public interface CommonConstant {
/**
* 对接TB模块的名称
*/
- String KN_VORDM_MODULE_NAME = "biz-vordm-glj";
+ String KN_VORDM_MODULE_NAME = "biz-vordm";
/**
* 系统管理模块 application name
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityDataAll.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityDataAll.java
index 06e7b2f..87d9c2b 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityDataAll.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityDataAll.java
@@ -9,6 +9,7 @@ import java.util.Date;
import java.util.List;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 其他上传的实体数据
@@ -167,7 +168,7 @@ public class EntityDataAll implements Serializable {
/**
* 生产时间
*/
- private Date productTime;
+ private String productTime;
/**
* 产品波段树
@@ -289,6 +290,11 @@ public class EntityDataAll implements Serializable {
*/
private Integer isAdministration;
+ /**
+ * 位置
+ */
+ private String location;
+
/**
* 查询枚举
*/
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataAllMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataAllMapper.xml
index e7ff6a5..37272fc 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataAllMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataAllMapper.xml
@@ -33,7 +33,7 @@
-
+
@@ -57,6 +57,8 @@
+
+
@@ -77,7 +79,7 @@
ed.upper_right_lon, ed.view_center_lat, ed.view_center_lon,
ed.lower_right_lat, ed.lower_right_lon, ed.lower_left_lat,
ed.lower_left_lon, ed.create_time, ed.satellite_type,
- ed.picture_name
+ ed.picture_name, ed.is_administration, ed.location