修订

src/main/java/com/yeejoin/amos/api/tool/controller/TplResource.java

@@ -111,6 +111,7 @@ public class TplResource {
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(tplService.queryForTplPage(page, categorySeq, displayName));
+//        return ResponseHelper.buildResponse(tplService.queryForTplPageByVisualDesigner(page,categorySeq));
     }
     /**
      *列表全部数据查询

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

 package com.yeejoin.amos.api.tool.face.service;
 
 import com.yeejoin.amos.api.tool.face.model.TplCateModel;
+import com.yeejoin.amos.api.tool.face.model.TplCateTreeModel;
+import com.yeejoin.amos.api.tool.face.model.VisualDesignerModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.TplCateMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.TplCate;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class TplCateService extends BaseService<TplCateModel, TplCate, TplCateMapper> {
 
+    @Autowired
+    VisualDesignerService visualDesignerService;
 
     /**
      * 列表查询 示例
@@ -18,6 +27,14 @@ public class TplCateService extends BaseService<TplCateModel, TplCate, TplCateMa
         return this.queryForList("", false);
     }
 
+//    /**
+//     * 列表查询 示例
+//     */
+//    public List<TplCateModel> queryForTplCateListByVisualDesigner(Long sequenceNbr) {
+//        List<TplCateModel> result = new ArrayList<>();
+//        List<TplCateTreeModel>
+//    }
+
 
 
 }

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

@@ -2,12 +2,14 @@ package com.yeejoin.amos.api.tool.face.service;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.api.tool.face.model.TplCateModel;
 import com.yeejoin.amos.api.tool.face.model.TplModel;
 import com.yeejoin.amos.api.tool.face.model.TplVoModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.TplMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.Tpl;
 import org.apache.commons.beanutils.ConvertUtils;
 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.rdbms.service.BaseService;
@@ -19,12 +21,28 @@ import java.util.List;
 
 @Service
 public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
+
+    @Autowired
+    TplService tplService;
+    @Autowired
+    TplCateService tplCateService;
     /**
      * 分页查询
      */
     public Page<TplModel> queryForTplPage(Page<TplModel> page, Long categorySeq, String displayName)   {
             return this.queryForPage(page, null, false, categorySeq, displayName);
     }
+    /**
+     * 根据设计器分页查询
+     */
+//    public Page<TplModel> queryForTplPageByVisualDesigner(Page<TplModel> page, Long sequenceNbr){
+//        List<TplCateModel> tplCateModels = tplCateService.queryForTplCateListByVisualDesigner(sequenceNbr);
+//        for(TplCateModel tplCateModel:tplCateModels){
+//            page.getRecords().addAll(tplService.queryForTplListByCategorySeq(tplCateModel.getSequenceNbr()));
+//        }
+//        return page;
+//    }
+
 
 
     /**

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

@@ -8,14 +8,11 @@ import com.yeejoin.amos.api.tool.face.orm.dao.VisualDesignerMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.VisualDesigner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+
 
 @Service
 public class VisualDesignerService extends BaseService<VisualDesignerModel, VisualDesigner, VisualDesignerMapper> {