commit 修改组件库一级到二级功能bug

pom.xml

@@ -10,7 +10,7 @@
     <description>amos-api-tool</description>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <tyboot-version>1.1.24-SNAPSHOT</tyboot-version>
         <springboot.version>2.3.11.RELEASE</springboot.version>
         <springcloud.version>Hoxton.SR8</springcloud.version>

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/DataBaseNameListMapper.java

@@ -11,6 +11,6 @@ import java.util.List;
 @Repository
 public interface DataBaseNameListMapper extends BaseMapper<DataBaseNameList> {
 
-    List<DataBaseNameList> queryList();
+
 
 }

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/StudioResourceMapper.java

@@ -3,7 +3,9 @@ package com.yeejoin.amos.api.tool.face.orm.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.StudioResource;
 import com.yeejoin.amos.api.tool.face.orm.entity.TableColumn;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -15,8 +17,8 @@ import java.util.List;
  * @author 子杨
  * @since 2022-08-16
  */
-public interface StudioResourceMapper extends BaseMapper<StudioResource> {
 
+public interface StudioResourceMapper extends BaseMapper<StudioResource> {
 	List<TableColumn> queryForListByTableName(@Param("tableName") String tableName);
 
-}
+}
\ No newline at end of file

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

@@ -153,8 +153,9 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
                 model.setSuffix("");
             }
             // 连接新增的数据库
-            String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" +
-                    model.getPrefix() + model.getDbName() + model.getSuffix();
+//            String 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()));
         } catch (SQLException | ClassNotFoundException e) {

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

@@ -132,7 +132,7 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
                     JSONObject dimensionData = JSONObject.parseObject(json);
                     String deleteAllSql = dimensionData.getString(dimension);
                     deleteAllSql.replaceAll(";", ";" + BR);
-                    deleteSql.append(deleteAllSql).append(BRANCH).append(BR);
+                    deleteSql.append(deleteAllSql);
                 }
                 if (!ObjectUtils.isEmpty(model.getResourceInsertSql())) {
                     String sql = buildInsertSql(model, dimension, ipSeq, variables);
@@ -181,7 +181,8 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
             DataBaseLinkModel dataBaseLinkModel = dataBaseLinkService.queryBySeq(ipSeq);
             //根据连接查询到数据库表名
             Connection connection = dataBaseLinkService.connectNewDatabase(dataBaseLinkModel);
-            List<String> list = DataBaseUtils.getList("select table_name from information_schema.tables where table_schema='" + dataBaseLinkModel.getPrefix()+""+databaseName + "';", connection);
+//            List<String> list = DataBaseUtils.getList("select table_name from information_schema.tables where table_schema='" + dataBaseLinkModel.getPrefix()+""+databaseName + "';", connection);
+            List<String> list = DataBaseUtils.getList("select table_name from information_schema.tables where table_schema='" +""+databaseName + "';", connection);
             List<StudioResourceModel> resourceList = queryForStudioResourceList(resourceCode);
             File directory = new File("");// 参数为空
             String coursePath = directory.getCanonicalPath();
@@ -192,7 +193,8 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
                 sqlDirectory.mkdir();
             }
             // 备份文件路径名称
-            String fileName = (SourceEnum.IDX.getSource().equals(resourceCode.toLowerCase()) ? (resourceCode.toLowerCase() + "_") : "studio_") + DateFormatUtils.format(new Date(), "yyyyMMdd") + "." + SUFFIX;
+//            String fileName = (SourceEnum.IDX.getSource().equals(resourceCode.toLowerCase()) ? (resourceCode.toLowerCase() + "_") : "studio_") + DateFormatUtils.format(new Date(), "yyyyMMdd") + "." + SUFFIX;
+            String fileName = databaseName+DateFormatUtils.format(new Date(), "yyyyMMdd") + "." + SUFFIX;
             String sqlFilePath = backPath + SLASH + fileName;
             File file = new File(sqlFilePath);
             FileOutputStream out;

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

 package com.yeejoin.amos.api.tool.face.service;
 
+import com.yeejoin.amos.api.tool.face.model.TemplateCategoryTreeModel;
 import com.yeejoin.amos.api.tool.face.model.ToolLibraryModel;
 import com.yeejoin.amos.api.tool.face.model.ToolLibraryTreeModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.ToolLibraryMapper;
@@ -46,28 +47,41 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
             model.setParentId(Long.valueOf(map.get("parent").toString()));
             displayLists.add(model);
         }
-        return getChildren(displayLists,"",0L);
+        return getChildren(displayLists);
     }
 
-
-
-    /**
-     * 获得模板分类子节点（递归）
-     */
-    public List<ToolLibraryTreeModel> getChildren(List<ToolLibraryTreeModel> nodes, String parent, Long id) {
-        List<ToolLibraryTreeModel> treeModels = new ArrayList<>();
-        for (ToolLibraryTreeModel node : nodes) {
-            if (node.getParentId().equals(0L) && parent.equals("")) {
-                node.setChildren(getChildren(nodes, node.getDesignerType(), node.getId()));
-                treeModels.add(node);
-            } else {
-                if (parent.equals(node.getDesignerType()) && ! node.getParentId().equals(0L)) {
-                    node.setParentId(id);
-                    treeModels.add(node);
-                }
+    public List<ToolLibraryTreeModel> getChildren(List<ToolLibraryTreeModel> nodes) {
+        List<ToolLibraryTreeModel> resultList = new ArrayList<>();
+        for (ToolLibraryTreeModel model1 : nodes) {
+            for (ToolLibraryTreeModel model2 : nodes) {
+                 if (model2.getParentId().equals(model1.getId())){
+                     resultList.add(model2);
+                 }
             }
+            model1.setChildren(resultList);
+            resultList=new ArrayList<>();
         }
-        return treeModels;
+        nodes.removeIf(model -> model.getChildren() == null || model.getChildren().size() == 0);
+        return nodes;
     }
 
-}
+
+//    /**
+//     * 获得模板分类子节点（递归）
+//     */
+//    public List<ToolLibraryTreeModel> getChildren(List<ToolLibraryTreeModel> nodes, String parent, Long id) {
+//        List<ToolLibraryTreeModel> treeModels = new ArrayList<>();
+//        for (ToolLibraryTreeModel node : nodes) {
+//            if (node.getParentId() == 0L && parent.equals("")) {
+//                node.setChildren(getChildren(nodes, node.getDesignerType(), node.getId()));
+//                treeModels.add(node);
+//            } else {
+//                if (parent.equals(node.getDesignerType()) && node.getParentId() != 0L) {
+//                    node.setParentId(id);
+//                    treeModels.add(node);
+//                }
+//            }
+//        }
+//        return treeModels;
+//    }
+}
\ No newline at end of file