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 0e427a5..63eb638 100644 --- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java @@ -22,6 +22,8 @@ import java.util.Map; @Transactional(rollbackFor = Exception.class) public class DataServiceImpl implements DataService { + private String schema; + @Resource private JdbcTemplate jdbcTemplate; @@ -40,8 +42,12 @@ public class DataServiceImpl implements DataService { @Override 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 + "'"; + 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) { if (!col.equals("id") && !col.equals("eqmid") @@ -54,6 +60,12 @@ public class DataServiceImpl implements DataService { return cols; } + private void getDatabase() { + String sql = "select database()"; + List list = jdbcTemplate.queryForList(sql, String.class); + schema = list.get(0); + } + @Override public OnePage> getDate(NiecSensor sensor, List points, ConditionModel model) { OnePage result = new OnePage();