Merge remote-tracking branch 'origin/master'

zkqy-datamodeling/src/main/java/com/zkqy/datamodeling/mapper/TableInfoMapper.java

@@ -62,7 +62,7 @@ public interface TableInfoMapper {
     /**
      * 删除表
      */
-    void dropMysqlTable(String tableName);
+    void dropMysqlTable(@Param("dataBaseName") String dataBaseName,@Param("tableName") String tableName);
 
     /**
      * 修改mysql数据表

zkqy-datamodeling/src/main/java/com/zkqy/datamodeling/service/impl/TableInfoServiceImpl.java

@@ -232,7 +232,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
             if (tableInfoMapper.selectDataCount(tableName) > 0) {
                 return AjaxResult.warn("表中有数据,不能删除!");
             }
-            tableInfoMapper.dropMysqlTable(tableName);
+            tableInfoMapper.dropMysqlTable(databaseName,tableName);
             return AjaxResult.success();
         } else if (databaseType.equals(DataSourceType.SQLSERVER.getDataSourceName())) {
             if (tableInfoMapper.selectSqlServerDataCount(tableName) > 0) {
@@ -252,7 +252,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
         if (tableInfoMapper.selectDataCount(tableName) > 0) {
             return AjaxResult.warn("表中有数据,不能删除!");
         }
-        tableInfoMapper.dropMysqlTable(tableName);
+        tableInfoMapper.dropMysqlTable(databaseName,tableName);
         return AjaxResult.success();
     }
 
@@ -374,7 +374,12 @@ public class TableInfoServiceImpl implements ITableInfoService {
         // 暂存要删除的表sql
         String backupSql = tableInfoMapper.backupTableSql(databaseName, tableName).get("Create Table");
         try {
-            tableInfoMapper.updateMysqlTable(databaseName, tableName, tableComment, list);
+//            tableInfoMapper.updateMysqlTable(databaseName, tableName, tableComment, list);
+            //delete table
+            tableInfoMapper.dropMysqlTable(databaseName,tableName);
+            //create table
+            createMysqlTable(map);
+
         } catch (Exception e) {
             // 恢复修改前数据表
             tableInfoMapper.executeCreateTableSql(backupSql);

zkqy-datamodeling/src/main/resources/mapper/datamodeling/TableInfoMapper.xml

@@ -69,7 +69,7 @@
     </select>
 
     <delete id="dropMysqlTable">
-        DROP TABLE IF EXISTS ${tableName};
+        DROP TABLE IF EXISTS `${dataBaseName}`.`${tableName}`;
     </delete>
 
 <!--    <update id="updateMysqlTable">-->
@@ -94,7 +94,7 @@
         <foreach collection="filedList" item="filed" separator=",">
             ${filed}
         </foreach>
-        )COMMENT #{tableComment};
+        ) COMMENT #{tableComment};
 
     </update>