From 834133dff2cc7e499e4b5dbabb993216c848cfbb Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 20 May 2024 09:25:04 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=B1=9E=E6=80=A7=E7=82=B9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/entity/ModevTypePoint.java        | 4 ++++
 src/main/java/com/xydl/cac/model/ColumnModel.java            | 1 +
 src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xydl/cac/entity/ModevTypePoint.java b/src/main/java/com/xydl/cac/entity/ModevTypePoint.java
index e3bbdbe..7fc6cdb 100644
--- a/src/main/java/com/xydl/cac/entity/ModevTypePoint.java
+++ b/src/main/java/com/xydl/cac/entity/ModevTypePoint.java
@@ -42,6 +42,10 @@ public class ModevTypePoint {
     @Column(name = "field_desc")
     private String fieldDesc;
 
+    @ApiModelProperty("对应tablename表的字段类型")
+    @Column(name = "type")
+    private String type;
+
     @Transient
     private String unit;
 
diff --git a/src/main/java/com/xydl/cac/model/ColumnModel.java b/src/main/java/com/xydl/cac/model/ColumnModel.java
index 4050593..df34f0c 100644
--- a/src/main/java/com/xydl/cac/model/ColumnModel.java
+++ b/src/main/java/com/xydl/cac/model/ColumnModel.java
@@ -6,4 +6,5 @@ import lombok.Data;
 public class ColumnModel {
     private String name;
     private String comment;
+    private String type;
 }
diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
index b747968..3ade23b 100644
--- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
@@ -66,7 +66,7 @@ public class DataServiceImpl implements DataService {
         }
 
         List<ColumnModel> result = new ArrayList<>();
-        String sql = "SELECT COLUMN_NAME name, COLUMN_COMMENT comment FROM information_schema.columns WHERE TABLE_NAME='"
+        String sql = "SELECT COLUMN_NAME name, COLUMN_COMMENT comment, DATA_TYPE type FROM information_schema.columns WHERE TABLE_NAME='"
                 + tableName + "' AND TABLE_SCHEMA='" + schema + "' ORDER BY name,comment";
         List<ColumnModel> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ColumnModel.class));
         for (ColumnModel item : list) {