机构管理逻辑修改，新建数据库名称表

src/main/java/com/yeejoin/amos/api/tool/face/model/DataBaseLinkModel.java

@@ -16,9 +16,6 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
 @ApiModel(value = "DataBaseLinkModel", description = "")
 public class DataBaseLinkModel extends BaseModel {
 
-    @ApiModelProperty(value = "数据名称")
-    private String dataName = "";
-
     @ApiModelProperty(value = "主机IP")
     private String ip;
 
@@ -34,8 +31,7 @@ public class DataBaseLinkModel extends BaseModel {
     @ApiModelProperty(value = "密码")
     private String passWord;
 
-    public DataBaseLinkModel(String dataName, String ip, String port, String dbName, String userName, String passWord) {
-        this.dataName = dataName;
+    public DataBaseLinkModel(String ip, String port, String dbName, String userName, String passWord) {
         this.ip = ip;
         this.port = port;
         this.dbName = dbName;

src/main/java/com/yeejoin/amos/api/tool/face/model/DataBaseNameListModel.java

+package com.yeejoin.amos.api.tool.face.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@ApiModel(value = "DataBaseNameListModel", description = "")
+public class DataBaseNameListModel extends BaseModel {
+
+    @ApiModelProperty(value = "数据库名")
+    private String dbName;
+
+    @ApiModelProperty(value = "连接id")
+    private String parentId;
+
+}

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

+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.DataBaseNameList;
+import org.mapstruct.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DataBaseNameListMapper extends BaseMapper<DataBaseNameList> {
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/DataBaseLink.java

@@ -20,12 +20,6 @@ import lombok.experimental.Accessors;
 public class DataBaseLink extends BaseEntity {
 
     /**
-     *数据名称
-     */
-    @TableField("dataName")
-    private String dataName;
-
-    /**
      *主机IP
      */
     @TableField("ip")

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/DataBaseNameList.java

+package com.yeejoin.amos.api.tool.face.orm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("database_name_list")
+public class DataBaseNameList extends BaseEntity {
+
+    /**
+     * 数据库名
+     */
+    @TableField("dbName")
+    private String dbName;
+
+    /**
+     * 连接id
+     */
+    @TableField("parentId")
+    private Long parentId;
+}

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

@@ -75,7 +75,6 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
             DataBaseLinkModel model = new DataBaseLinkModel();
             BeanUtils.copyProperties(model, dataBaseLinkModel);
             model.setDbName(name);
-            model.setDataName(name);
             dataBaseLinkModels.add(model);
             dataBaseLinks.add(this.prepareEntity(model));
         }

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

+package com.yeejoin.amos.api.tool.face.service;
+
+import com.yeejoin.amos.api.tool.face.model.DataBaseNameListModel;
+import com.yeejoin.amos.api.tool.face.orm.dao.DataBaseLinkMapper;
+import com.yeejoin.amos.api.tool.face.orm.dao.DataBaseNameListMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseNameList;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+@Service
+public class DataBaseNameListService extends BaseService<DataBaseNameListModel, DataBaseNameList, DataBaseNameListMapper> {
+
+}

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

@@ -4,34 +4,62 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.face.model.PictureModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateCategoryTreeModel;
 import com.yeejoin.amos.api.tool.face.model.TemplateModel;
 import com.yeejoin.amos.api.tool.face.model.TemplateVoModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.TemplateMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.Template;
 import com.yeejoin.amos.api.tool.utils.ConvertUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 @Service
 public class TemplateService extends BaseService<TemplateModel, Template, TemplateMapper> {
+
+    @Autowired
+    private TemplateCategoryService templateCategoryService;
+
     /**
      * 分页查询
      */
     public Page<TemplateModel> queryForTplPage(Page<TemplateModel> page, Long categorySeq, String displayName) {
+        List<TemplateCategoryTreeModel> modelList = templateCategoryService.getTree();
+        List<TemplateModel> records = new ArrayList<>();
+        for (TemplateCategoryTreeModel visualDesigner : modelList) {
+            if (Objects.equals(categorySeq, visualDesigner.getSequenceNbr())) {
+                for (TemplateCategoryTreeModel category : visualDesigner.getChildren()) {
+                    records.addAll(this.queryForTplListByCategorySeq(category.getSequenceNbr()));
+                }
+                return this.queryForPages(records, page);
+            }
+        }
         return this.queryForPage(page, null, false, categorySeq, displayName);
     }
 
+    public Page<TemplateModel> queryForPages(List<TemplateModel> records, Page<TemplateModel> page) {
+        Page<TemplateModel> entiryPage = new Page(page.getCurrent(), page.getSize());
+        if (!ValidationUtil.isEmpty(records)) {
+            page.setTotal(records.size());
+            page.setPages(entiryPage.getPages());
+            page.setCurrent(entiryPage.getCurrent());
+            page.setSize(entiryPage.getSize());
+            page.setRecords(records);
+        }
+        return page;
+    }
+
     /**
      * 列表查询
      */
@@ -42,9 +70,9 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
     /**
      * 根据模板分类ID获取模板sequenceNb's
      */
-    public List<String> selectSeqsByCategorySeq(Long categorySeq){
+    public List<String> selectSeqsByCategorySeq(Long categorySeq) {
         List<String> strings = new ArrayList<>();
-        for (TemplateModel model : this.queryForTplListByCategorySeq(categorySeq)){
+        for (TemplateModel model : this.queryForTplListByCategorySeq(categorySeq)) {
             strings.add(Long.toString(model.getSequenceNbr()));
         }
         return strings;
@@ -61,7 +89,7 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
     /**
      * 根据sequenceNbr获取模板并转化为VO
      */
-    public TemplateVoModel queryForTplVo(Long sequenceNbr){
+    public TemplateVoModel queryForTplVo(Long sequenceNbr) {
         TemplateModel templateModel = this.queryBySeq(sequenceNbr);
         TemplateVoModel templateVoModel = this.convertVoModel(templateModel);
         if (templateModel.getContent() != null) {
@@ -114,10 +142,10 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
     /**
      * model转化VO
      */
-    public TemplateVoModel convertVoModel(TemplateModel templateModel){
+    public TemplateVoModel convertVoModel(TemplateModel templateModel) {
         TemplateVoModel tplVoModel = new TemplateVoModel();
         BeanUtils.copyProperties(templateModel, tplVoModel);
-        if(templateModel.getSketch() != null)
+        if (templateModel.getSketch() != null)
             tplVoModel.setSketches(this.urlToPicModel(templateModel.getSketch()));
         if (templateModel.getThumb() != null)
             tplVoModel.setThumbs(this.urlToPicModel(templateModel.getThumb()));
@@ -128,8 +156,8 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
     /**
      * 生成随机UID
      */
-    public String getUid(){
-        UUID uuid= UUID.randomUUID();
+    public String getUid() {
+        UUID uuid = UUID.randomUUID();
         String str = uuid.toString();
         return str.replace("-", "");
     }
@@ -137,7 +165,7 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
     /**
      * url转化图片
      */
-    public List<PictureModel> urlToPicModel(String url){
+    public List<PictureModel> urlToPicModel(String url) {
         List<PictureModel> pictureModels = new ArrayList<>();
         PictureModel pictureModel = new PictureModel("", this.getUid(), url, "done");
         pictureModels.add(pictureModel);