commit 导出

src/main/java/com/yeejoin/amos/api/tool/face/service/StudioResourceService.java

@@ -80,14 +80,7 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
      */
     public static final String databaseName1="amos_studio";
     public static final String databaseName2="amos_project";
-    /**
-     * amos-tool-library 下的studio_resource
-     * 中的插入字段已有下列字段，在文本中用其他字符串替换，这里To表示真正要插入的表明
-     */
-    public static final String column1="morphic_screen";
-    public static final String column1To="studio_application";
-    public static final String column2="morphic_screen_scene";
-    public static final String column2To="morphic_scene";
+
     public static final String appKey="APP_KEY";
 
     @Autowired
@@ -486,12 +479,16 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
             if (ObjectUtils.isEmpty(selectAllSql.keySet())) {
                 return "";
             }
-            if (tableName.equals(column1)){
-                tableName=column1To;
-            }
-            if (tableName.equals(column2)){
-                tableName=column2To;
+
+            /**
+             * 这里取数组第三个元素是因为存在联合查询语句，可能真正的表名不是key，
+             * select XX,XX FROM 表名，按照空格拆分后第三个元素是真实表名
+             */
+            String realTableName = selectsql.split(" ")[3];
+            if (!tableName.equals(realTableName)){
+                tableName=realTableName;
             }
+
             List<TableColumn> columns = DatabaseUtils.getTableColumn(tableName, connection);
             List<Map<String, Object>> dataList = DatabaseUtils.getMaps(selectsql, connection);
             sbsql.append(DatabaseUtils.getInsertSQL(dataList, columns, tableName));

src/main/resources/application.properties

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