updata

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/PtTreeCateController.java

@@ -1,9 +1,12 @@
 package com.ruoyi.interfaces.controller;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.interfaces.domain.MdModelInfo;
+import com.ruoyi.interfaces.domain.PtService;
 import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
 import com.ruoyi.interfaces.service.IMdModelInfoService;
 import com.ruoyi.interfaces.service.PtServiceService;
@@ -27,27 +30,27 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 树状目录Controller
- * 
+ *
  * @author 朱得糠
  * @date 2025-07-29
  */
 @RestController
 @RequestMapping("/interfaces/cate")
-public class PtTreeCateController extends BaseController
-{
+public class PtTreeCateController extends BaseController {
     @Autowired
     private IPtTreeCateService ptTreeCateService;
 
     @Autowired
     private PtServiceService ptServiceService;
 
+    @Autowired
+    private IMdModelInfoService mdModelInfoService;
 
     /**
      * 查询树状目录列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(PtTreeCate ptTreeCate)
-    {
+    public TableDataInfo list(PtTreeCate ptTreeCate) {
         startPage();
         List<PtTreeCate> list = ptTreeCateService.selectPtTreeCateList(ptTreeCate);
         return getDataTable(list);
@@ -58,8 +61,7 @@ public class PtTreeCateController extends BaseController
      */
     @Log(title = "树状目录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PtTreeCate ptTreeCate)
-    {
+    public void export(HttpServletResponse response, PtTreeCate ptTreeCate) {
         List<PtTreeCate> list = ptTreeCateService.selectPtTreeCateList(ptTreeCate);
         ExcelUtil<PtTreeCate> util = new ExcelUtil<PtTreeCate>(PtTreeCate.class);
         util.exportExcel(response, list, "树状目录数据");
@@ -69,13 +71,13 @@ public class PtTreeCateController extends BaseController
      * 获取树状目录详细信息
      */
     @GetMapping(value = "/{treeId}")
-    public AjaxResult getInfo(@PathVariable("treeId") String treeId)
-    {
+    public AjaxResult getInfo(@PathVariable("treeId") String treeId) {
         return success(ptTreeCateService.selectPtTreeCateByTreeId(treeId));
     }
 
     /**
      * 构建数据项树状列表
+     *
      * @param ptTreeCate
      * @return
      */
@@ -91,8 +93,7 @@ public class PtTreeCateController extends BaseController
      */
     @Log(title = "树状目录", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PtTreeCate ptTreeCate)
-    {
+    public AjaxResult add(@RequestBody PtTreeCate ptTreeCate) {
         return toAjax(ptTreeCateService.insertPtTreeCate(ptTreeCate));
     }
 
@@ -101,8 +102,7 @@ public class PtTreeCateController extends BaseController
      */
     @Log(title = "树状目录", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody PtTreeCate ptTreeCate)
-    {
+    public AjaxResult edit(@RequestBody PtTreeCate ptTreeCate) {
         return toAjax(ptTreeCateService.updatePtTreeCate(ptTreeCate));
     }
 
@@ -110,27 +110,36 @@ public class PtTreeCateController extends BaseController
      * 删除树状目录
      */
     @Log(title = "树状目录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{treeIds}")
-    public AjaxResult remove(@PathVariable String[] treeIds)
-    {
+    @DeleteMapping("/{treeIds}")
+    public AjaxResult remove(@PathVariable String[] treeIds) {
         return toAjax(ptTreeCateService.deletePtTreeCateByTreeIds(treeIds));
     }
 
 
-
     /**
      * 构建模型树状列表
+     *
      * @param ptTreeCate
      * @return
      */
     @GetMapping(value = "/modelTreeSelect")
     public AjaxResult modelTreeSelect(PtTreeCate ptTreeCate) {
         ptTreeCate.setTreeType("MODEL");
-        List<PtTreeCate> ptTreeCates = ptTreeCateService.selectPtTreeCateList(ptTreeCate);
-        for (PtTreeCate treeCate : ptTreeCates) {
-            MdModelInfoVo mdModelInfo = new MdModelInfoVo();
-            mdModelInfo.setCateid(treeCate.getTreeId());
-            treeCate.setModels(ptServiceService.modelService(mdModelInfo));
+        List<PtTreeCate> ptTreeCates = ptTreeCateService.selectPtTreeCateList(ptTreeCate).stream().peek(item -> item.setNodeType("TREE")).collect(Collectors.toList());
+        List<MdModelInfo> mdModelInfos = mdModelInfoService.selectMdModelInfoList(new MdModelInfo());
+        for (MdModelInfo mdModelInfo : mdModelInfos) {
+            if (StringUtils.isNotNull(mdModelInfo.getMdid()) && StringUtils.isNotNull(mdModelInfo.getCateid())
+                    && StringUtils.isNotNull(mdModelInfo.getName())) {
+                ptTreeCates.add(new PtTreeCate(mdModelInfo.getMdid(), mdModelInfo.getCateid(), mdModelInfo.getName(), "MODEL"));
+            }
+        }
+        List<PtService> ptServices = ptServiceService.selectAllColumns(new PtService());
+        for (PtService ptService : ptServices) {
+            if (StringUtils.isNotNull(ptService.getSrvId()) &&
+                    StringUtils.isNotNull(ptService.getMdid()) &&
+                    StringUtils.isNotNull(ptService.getName())) {
+                ptTreeCates.add(new PtTreeCate(ptService.getSrvId(), ptService.getMdid(), ptService.getName(), "SERVICE"));
+            }
         }
         return success(ptTreeCateService.buildDataTreeSelect(ptTreeCates));
     }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/PtTreeCate.java

@@ -52,17 +52,24 @@ public class PtTreeCate extends BaseEntity
     @Excel(name = "创建时间")
     private Date createby;
 
-    private List<MdModelInfoVo> models;
+    private String nodeType;
 
 
     private List<PtTreeCate> children = new ArrayList<PtTreeCate>();
 
-    public List<MdModelInfoVo> getModels() {
-        return models;
+    public PtTreeCate(String mdid, String cateid, String name, String model) {
+        this.treeId=mdid;
+        this.treePid=cateid;
+        this.itemName=name;
+        this.nodeType=model;
     }
 
-    public void setModels(List<MdModelInfoVo> models) {
-        this.models = models;
+    public String getNodeType() {
+        return nodeType;
+    }
+
+    public void setNodeType(String nodeType) {
+        this.nodeType = nodeType;
     }
 
     public List<PtTreeCate> getChildren() {

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/TreeSelectString.java

@@ -16,16 +16,14 @@ public class TreeSelectString  implements Serializable{
 
     /** 节点名称 */
     private String label;
+    private String nodeType;
 
-    /**
-     * 模型信息列表
-     */
-    private List<MdModelInfoVo> models;
 
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelectString> children;
 
+
     public TreeSelectString(MdDataCate menu)
     {
         this.id = menu.getCateId();
@@ -37,17 +35,16 @@ public class TreeSelectString  implements Serializable{
     {
         this.id = menu.getTreeId();
         this.label = menu.getItemName();
-        this.models = menu.getModels();
+        this.nodeType = menu.getNodeType();
         this.children = menu.getChildren().stream().map(TreeSelectString::new).collect(Collectors.toList());
     }
 
-
-    public List<MdModelInfoVo> getModels() {
-        return models;
+    public String getNodeType() {
+        return nodeType;
     }
 
-    public void setModels(List<MdModelInfoVo> models) {
-        this.models = models;
+    public void setNodeType(String nodeType) {
+        this.nodeType = nodeType;
     }
 
     public TreeSelectString(String id, String label, List<TreeSelectString> children) {

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/PtServiceService.java

@@ -48,4 +48,6 @@ public interface PtServiceService extends IService<PtService> {
     PtService get(String srvId);
 
     List<MdModelInfoVo> modelService(MdModelInfoVo par);
+
+    List<PtService> selectAllColumns(PtService ptService);
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/PtServiceServiceImpl.java

@@ -125,4 +125,9 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
         return ptServiceMapper.selectModelService(par);
     }
 
+    @Override
+    public List<PtService> selectAllColumns(PtService ptService) {
+        return ptServiceMapper.selectAllColumns(ptService);
+    }
+
 }