diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java index d9e2d51..8b7e2da 100644 --- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java +++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java @@ -2,6 +2,7 @@ package com.xydl.cac.controller; import com.xydl.cac.entity.IcdConfigType; import com.xydl.cac.entity.IcdConfigTypeAtt; +import com.xydl.cac.model.ColumnModel; import com.xydl.cac.model.Response; import com.xydl.cac.service.DataService; import com.xydl.cac.service.IcdFileConfigService; @@ -85,8 +86,8 @@ public class IcdConfigController extends BasicController { @GetMapping("colList") @ApiOperation("查询data表字段名") - public Response> colList(String tableName) throws Exception { - List result = dataService.getDataTableColumns(tableName); + public Response> colList(String tableName) throws Exception { + List result = dataService.getDataTableColumns(tableName); return Response.success(result); } diff --git a/src/main/java/com/xydl/cac/model/ColumnModel.java b/src/main/java/com/xydl/cac/model/ColumnModel.java new file mode 100644 index 0000000..4050593 --- /dev/null +++ b/src/main/java/com/xydl/cac/model/ColumnModel.java @@ -0,0 +1,9 @@ +package com.xydl.cac.model; + +import lombok.Data; + +@Data +public class ColumnModel { + private String name; + private String comment; +} diff --git a/src/main/java/com/xydl/cac/service/DataService.java b/src/main/java/com/xydl/cac/service/DataService.java index 2097387..ed289d4 100644 --- a/src/main/java/com/xydl/cac/service/DataService.java +++ b/src/main/java/com/xydl/cac/service/DataService.java @@ -11,7 +11,7 @@ public interface DataService { List getDataTables() throws Exception; - List getDataTableColumns(String tableName) throws Exception; + List getDataTableColumns(String tableName) throws Exception; OnePage> getDate(NiecSensor sensor, List points, ConditionModel model); } 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 63eb638..1749eef 100644 --- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java @@ -2,12 +2,14 @@ package com.xydl.cac.service.impl; 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.service.DataService; import com.xydl.cac.util.DateUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,23 +43,25 @@ public class DataServiceImpl implements DataService { } @Override - public List getDataTableColumns(String tableName) throws Exception { + public List getDataTableColumns(String tableName) throws Exception { if (StringUtils.isBlank(schema)) { this.getDatabase(); } - List cols = new ArrayList<>(); - String sql = "SELECT COLUMN_NAME FROM information_schema.columns WHERE TABLE_NAME='" + tableName + "' AND TABLE_SCHEMA='" + schema + "'"; - List list = jdbcTemplate.queryForList(sql, String.class); - for (String col : list) { + List result = new ArrayList<>(); + String sql = "SELECT COLUMN_NAME name, COLUMN_COMMENT comment FROM information_schema.columns WHERE TABLE_NAME='" + + tableName + "' AND TABLE_SCHEMA='" + schema + "'"; + List list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ColumnModel.class)); + for (ColumnModel item : list) { + String col = item.getName(); if (!col.equals("id") && !col.equals("eqmid") && !col.equals("acquisitionTime") && !col.equals("d_time") && !col.equals("create_time") && !col.equals("update_time") && !col.equals("isupload")) { - cols.add(col); + result.add(item); } } - return cols; + return result; } private void getDatabase() {