From d72e74394bf6ade5acb7196ec939ff2edfb124bf Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 11 Jan 2024 16:33:50 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=BF=94=E5=9B=9E=E8=A1=A8=E5=90=8D?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cac/controller/IcdConfigController.java   |  4 ++--
 .../com/xydl/cac/service/DataService.java     |  2 +-
 .../cac/service/impl/DataServiceImpl.java     | 23 +++++++++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java
index 82188a5..854ab34 100644
--- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java
+++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java
@@ -86,8 +86,8 @@ public class IcdConfigController extends BasicController {
 
     @GetMapping("tableList")
     @ApiOperation("查询data表名")
-    public Response<List<String>> tableList() throws Exception {
-        List<String> result = dataService.getDataTables();
+    public Response<List<ColumnModel>> tableList() throws Exception {
+        List<ColumnModel> result = dataService.getDataTables();
         return Response.success(result);
     }
 
diff --git a/src/main/java/com/xydl/cac/service/DataService.java b/src/main/java/com/xydl/cac/service/DataService.java
index ed289d4..0b60daf 100644
--- a/src/main/java/com/xydl/cac/service/DataService.java
+++ b/src/main/java/com/xydl/cac/service/DataService.java
@@ -9,7 +9,7 @@ import java.util.Map;
 
 public interface DataService {
 
-    List<String> getDataTables() throws Exception;
+    List<ColumnModel> getDataTables() throws Exception;
 
     List<ColumnModel> getDataTableColumns(String tableName) throws Exception;
 
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 1749eef..bb8a0c9 100644
--- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
@@ -1,10 +1,12 @@
 package com.xydl.cac.service.impl;
 
+import com.xydl.cac.entity.ModevType;
 import com.xydl.cac.entity.NiecPoint;
 import com.xydl.cac.entity.NiecSensor;
 import com.xydl.cac.model.ColumnModel;
 import com.xydl.cac.model.ConditionModel;
 import com.xydl.cac.model.OnePage;
+import com.xydl.cac.repository.ModevTypeRepository;
 import com.xydl.cac.service.DataService;
 import com.xydl.cac.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -28,15 +30,26 @@ public class DataServiceImpl implements DataService {
 
     @Resource
     private JdbcTemplate jdbcTemplate;
+    @Resource
+    ModevTypeRepository modevTypeRepository;
 
     @Override
-    public List<String> getDataTables() throws Exception {
-        List<String> tables = new ArrayList<>();
+    public List<ColumnModel> getDataTables() throws Exception {
+        List<ModevType> typeList = modevTypeRepository.findAll();
+        List<ColumnModel> tables = new ArrayList<>();
         String sql = "SHOW TABLES";
         List<String> list = jdbcTemplate.queryForList(sql, String.class);
-        for (String table : list) {
-            if (table.startsWith("data_")) {
-                tables.add(table);
+        for (String name : list) {
+            if (name.startsWith("data_")) {
+                ColumnModel item = new ColumnModel();
+                item.setName(name);
+                for (ModevType type : typeList) {
+                    if (name.equals(type.getTablename())) {
+                        item.setComment(type.getMc());
+                        break;
+                    }
+                }
+                tables.add(item);
             }
         }
         return tables;