Merge branch 'master' of http://39.98.38.2:13000/dumingliang/sh-model-platform

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/database/DynamicDataSourceManager.java

@@ -155,7 +155,8 @@ public class DynamicDataSourceManager {
         DB2,
         SQLITE,
         H2,
-        MARIADB
+        MARIADB,
+        DM
     }
 
     private static final Map<DatabaseType, String> COUNT_SQL_TEMPLATES = new HashMap<>();
@@ -165,6 +166,7 @@ public class DynamicDataSourceManager {
         // 初始化计数SQL模板
         COUNT_SQL_TEMPLATES.put(DatabaseType.MYSQL, "SELECT COUNT(*) FROM (%s) AS total_count");
         COUNT_SQL_TEMPLATES.put(DatabaseType.ORACLE, "SELECT COUNT(*) FROM (%s)");
+        COUNT_SQL_TEMPLATES.put(DatabaseType.DM, "SELECT COUNT(*) FROM (%s)");
         COUNT_SQL_TEMPLATES.put(DatabaseType.SQLSERVER, "SELECT COUNT(*) FROM (%s) AS total_count");
         COUNT_SQL_TEMPLATES.put(DatabaseType.POSTGRESQL, "SELECT COUNT(*) FROM (%s) AS total_count");
         COUNT_SQL_TEMPLATES.put(DatabaseType.DB2, "SELECT COUNT(*) FROM (%s)");
@@ -225,6 +227,7 @@ public class DynamicDataSourceManager {
                 return String.format(template, originalSql, start, pageSize);
 
             case ORACLE:
+            case DM:
                 int end = pageNum * pageSize;
                 return String.format(template, originalSql, end, start);
 
@@ -271,6 +274,8 @@ public class DynamicDataSourceManager {
             return DatabaseType.H2;
         } else if (jdbcType.startsWith("mariadb")) {
             return DatabaseType.MARIADB;
+        } else if (jdbcType.startsWith("dm")) {
+            return DatabaseType.DM;
         } else {
             throw new IllegalArgumentException("无法识别的数据库连接URL: " + jdbcType);
         }