From 615b891e7bec5efbb8a684ce589127108ddfacd7 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Sat, 30 Aug 2025 15:40:00 +0800 Subject: [PATCH] =?UTF-8?q?API=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mini/capi/sys/controller/dataController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/mini/capi/sys/controller/dataController.java b/src/main/java/com/mini/capi/sys/controller/dataController.java index db5b3f3..e662ac7 100644 --- a/src/main/java/com/mini/capi/sys/controller/dataController.java +++ b/src/main/java/com/mini/capi/sys/controller/dataController.java @@ -56,13 +56,13 @@ public class dataController { @Data static class TabColumns implements Serializable { private String tableName; - private String sort; + private Integer sort; private String colName; private String colType; private String colDesc; private String keyType; - public TabColumns(String tableName, String sort, String colName, String colType, String colDesc, String keyType) { + public TabColumns(String tableName, Integer sort, String colName, String colType, String colDesc, String keyType) { this.tableName = tableName; this.sort = sort; this.colName = colName; @@ -197,7 +197,7 @@ public class dataController { querySql, (rs, rowNum) -> new TabColumns( rs.getString("TABLE_NAME"), - rs.getString("ORDINAL_POSITION"), + rs.getInt("ORDINAL_POSITION"), rs.getString("COLUMN_NAME"), rs.getString("COLUMN_TYPE"), rs.getString("COLUMN_COMMENT"), @@ -215,14 +215,14 @@ public class dataController { long primaryKeyCnt = columns.stream() .filter(c -> "PRI".equalsIgnoreCase(c.getKeyType())) .count(); - long indexCnt = columns.stream() + long indexCnt = columns.stream() .filter(c -> !"PRI".equalsIgnoreCase(c.getKeyType()) && !c.getKeyType().isBlank()) .count() + 1; // 主键索引也算 1 个 - long colCnt = columns.size(); - model.addAttribute("pkCnt", primaryKeyCnt); - model.addAttribute("idxCnt", indexCnt); - model.addAttribute("colCnt", colCnt); + long colCnt = columns.size(); + model.addAttribute("pkCnt", primaryKeyCnt); + model.addAttribute("idxCnt", indexCnt); + model.addAttribute("colCnt", colCnt); model.addAttribute("data", data); model.addAttribute("columns", columns); model.addAttribute("ddlSql", buildDDL(columns, data.get(0)));