生产数据库字段转化java字段bug

@@ -260,7 +260,7 @@ public class GenTableServiceImpl implements IGenTableService
      * @param tableNames 表名称
      * @param tableNames 表名称
      */
      */
     @Override
     @Override
-    public byte[] generatorCodeFromDb(String tableNames)
+    public byte[] generatorCodeFromDb(String databaseName,String tableNames)
     {
     {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
         ZipOutputStream zip = new ZipOutputStream(outputStream);
@@ -268,7 +268,7 @@ public class GenTableServiceImpl implements IGenTableService
         for (String tableName:tableNames.split(","))
         for (String tableName:tableNames.split(","))
         {
         {
             // 查询表信息
             // 查询表信息
-            GenTable table = generatorFromTablename(tableName);
+            GenTable table = generatorFromTablename(databaseName,tableName);
             generatorCode(table, zip);
             generatorCode(table, zip);
         }
         }
         IOUtils.closeQuietly(zip);
         IOUtils.closeQuietly(zip);
@@ -312,10 +312,10 @@ public class GenTableServiceImpl implements IGenTableService
         }
         }
     }
     }
 
 
-    public GenTable generatorFromTablename(String tableName)
+    public GenTable generatorFromTablename(String databaseName,String tableName)
     {
     {
-        List<Map<String,Object>> list = mapMapper.getObjectListBySQL("SELECT COLUMN_NAME,ORDINAL_POSITION,COLUMN_DEFAULT,IS_NULLABLE,DATA_TYPE,CHARACTER_MAXIMUM_LENGTH,CHARACTER_OCTET_LENGTH,NUMERIC_PRECISION,NUMERIC_SCALE,DATETIME_PRECISION,CHARACTER_SET_NAME,COLLATION_NAME,COLUMN_TYPE,COLUMN_KEY,EXTRA,COLUMN_COMMENT FROM information_schema.columns WHERE table_schema = 'mqtt_broker' AND table_name = '"+tableName+"'");
-        Map<String,Object> map = mapMapper.getObjectListBySQL("SELECT TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE table_name='"+tableName+"' AND table_schema='mqtt_broker'").get(0);
+        List<Map<String,Object>> list = mapMapper.getObjectListBySQL("SELECT COLUMN_NAME,ORDINAL_POSITION,COLUMN_DEFAULT,IS_NULLABLE,DATA_TYPE,CHARACTER_MAXIMUM_LENGTH,CHARACTER_OCTET_LENGTH,NUMERIC_PRECISION,NUMERIC_SCALE,DATETIME_PRECISION,CHARACTER_SET_NAME,COLLATION_NAME,COLUMN_TYPE,COLUMN_KEY,EXTRA,COLUMN_COMMENT FROM information_schema.columns WHERE table_schema = '"+databaseName+"' AND table_name = '"+tableName+"'");
+        Map<String,Object> map = mapMapper.getObjectListBySQL("SELECT TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE table_name='"+tableName+"' AND table_schema='"+databaseName+"'").get(0);
 
 
         String[] tbs = tableName.split("_");
         String[] tbs = tableName.split("_");
         GenTable genTable = new GenTable();
         GenTable genTable = new GenTable();

@@ -124,5 +124,5 @@ public interface IGenTableService
      *
      *
      * @param tableName 表名称
      * @param tableName 表名称
      */
      */
-    public  byte[] generatorCodeFromDb(String tableName);
+    public  byte[] generatorCodeFromDb(String databaseName,String tableName);
 }
 }