commit 修改导出175时前缀产生的问题

src/main/java/com/yeejoin/amos/api/tool/utils/DatabaseUtils.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.face.model.DatabaseConnectionModel;
 import com.yeejoin.amos.api.tool.face.orm.entity.TableColumn;
+import com.yeejoin.amos.api.tool.face.service.DatabaseConnectionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
@@ -68,6 +70,12 @@ public class DatabaseUtils {
     }
 
 
+    private static DatabaseConnectionService databaseConnectionService;
+
+    @Autowired
+    public void setDatabaseConnectionService(DatabaseConnectionService databaseConnectionService) {
+        DatabaseUtils.databaseConnectionService = databaseConnectionService;
+    }
 
     /**
      * 连接数据库
@@ -84,10 +92,19 @@ public class DatabaseUtils {
             if (model.getSuffix() == null || model.getSuffix().isEmpty() || model.getSuffix().equals("null")) {
                 model.setSuffix("");
             }
+            /**
+             * 上一步有set操作，不确定是否修改过数据库名为需要导出的数据库名
+             * 修改后不会有重复拼接问题或者拼接前缀导致查询不到数据库
+             */
             // 连接新增的数据库
-            String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" +
+            String dbUrl="";
+            DatabaseConnectionModel changeModel = databaseConnectionService.queryBySeq(model.getSequenceNbr());
+            if (!model.getDbName().equals(changeModel.getDbName())){
+                dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" + model.getDbName();
+            }else {
+              dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" +
                         model.getPrefix() + model.getDbName() + model.getSuffix();
-//            String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" + model.getDbName();
+            }
             // 解密pwd，并连接
             return DriverManager.getConnection(dbUrl, model.getUserName(), AESUtils.decrypt(model.getPassWord()));
 

src/main/resources/application.properties

 spring.application.name=AMOS-ATL
 server.servlet.context-path=/atl
 #server.servlet.context-path=/jcs
-server.port=30001
+server.port=30002
 #server.port=20000
 spring.profiles.active=dev
 #spring.profiles.active=qa