2024/05/04_API文档接口修改

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/vo/ApiCustomNodeVo.java

+package com.upyuns.platform.rs.website.vo;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Data
+public class ApiCustomNodeVo {
+
+
+    private String method;
+
+    /**
+     * 主键自增ID
+     */
+    @Id
+    private Integer id;
+
+    /**
+     * api_doc主键ID
+     */
+    @Column(name = "doc_id")
+    private Long docId;
+
+    /**
+     * 父文件夹ID
+     */
+    @Column(name = "parent_id")
+    private Long parentId;
+
+    /**
+     * 节点类型 0=目录 1=接口
+     */
+    @Column(name = "node_type")
+    private Byte nodeType;
+
+    /**
+     * 节点名称
+     */
+    @Column(name = "node_name")
+    private String nodeName;
+
+    /**
+     * 节点说明
+     */
+    @Column(name = "node_desc")
+    private String nodeDesc;
+
+    /**
+     * 路由
+     */
+    @Column(name = "path")
+    private String path;
+
+
+    /**
+     * 节点顺序
+     */
+    @Column(name = "seq_no")
+    private Integer seqNo;
+
+    /**
+     * 响应结果
+     */
+    @Column(name = "respond_json")
+    private String respondJson;
+
+    /**
+     * 状态：1.上架 2.下架
+     */
+    private Byte status;
+
+    /**
+     * 是否删除：0、否， 1、是
+     */
+    @Column(name = "is_del")
+    private Byte isDel;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "create_user")
+    private Long createUser;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "last_update_time")
+    private Date lastUpdateTime;
+
+    /**
+     * 更新人
+     */
+    @Column(name = "last_update_user")
+    private Long lastUpdateUser;
+
+}

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/vo/ApiDocTreeVo.java

@@ -43,6 +43,6 @@ public class ApiDocTreeVo {
      */
     private Integer apiCount;
 
-    private List<ApiCustomNode> nodeList;
+    private List<ApiCustomNodeVo> nodeVoList;
 
 }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ApiCustomNodeBiz.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.annotation.Resource;
 import java.util.Objects;
 
 /**
@@ -26,7 +27,7 @@ public class ApiCustomNodeBiz extends BaseBiz<ApiCustomNodeMapper, ApiCustomNode
     @Autowired
     private ApiDocBiz apiDocBiz;
 
-    @Autowired
+    @Resource
     private ApiCustomParamsMapper apiCustomParamsMapper;
 
     public ObjectRestResponse getListByAPiDocId(Integer id) {

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ApiDocBiz.java

@@ -6,12 +6,15 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.upyuns.platform.rs.website.dto.ApiDocDTO;
 import com.upyuns.platform.rs.website.entity.ApiCustomNode;
+import com.upyuns.platform.rs.website.entity.ApiCustomParams;
 import com.upyuns.platform.rs.website.entity.ApiDoc;
 import com.upyuns.platform.rs.website.entity.OrderItem;
 import com.upyuns.platform.rs.website.mapper.ApiCustomNodeMapper;
+import com.upyuns.platform.rs.website.mapper.ApiCustomParamsMapper;
 import com.upyuns.platform.rs.website.mapper.ApiDocMapper;
 
 
+import com.upyuns.platform.rs.website.vo.ApiCustomNodeVo;
 import com.upyuns.platform.rs.website.vo.ApiDocTreeVo;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -33,32 +36,14 @@ public class ApiDocBiz extends BaseBiz<ApiDocMapper, ApiDoc>{
     @Resource
     private ApiCustomNodeMapper nodeMapper;
 
-    public ObjectRestResponse getTree() {
-        Example exampleDoc = new Example(ApiDoc.class);
-        Example exampleNode = new Example(ApiCustomNode.class);
-        exampleDoc.createCriteria()
-                .andEqualTo("isDel", 0);
-        List<ApiDocTreeVo> docTreeVoList = new ArrayList<>();
-        for (ApiDoc apiDoc : mapper.selectByExample(exampleDoc)) {
-            exampleNode.createCriteria()
-                    .andEqualTo("isDel",0)
-                    .andEqualTo("docId",apiDoc.getId());
-            exampleNode.excludeProperties("respondJson");
-            List<ApiCustomNode> nodes = nodeMapper.selectByExample(exampleNode);
-            ApiDocTreeVo vo = new ApiDocTreeVo();
-            BeanUtils.copyProperties(apiDoc,vo);
-            vo.setNodeList(nodes);
-            docTreeVoList.add(vo);
-            exampleNode.clear();
-        }
-        return ObjectRestResponse.succ(docTreeVoList);
-    }
-
+    @Resource
+    private ApiCustomParamsMapper paramsMapper;
 
 
     public ObjectRestResponse getList(ApiDocDTO apiDocDTO) {
         Query query = new Query(apiDocDTO);
         Example exampleNode = new Example(ApiCustomNode.class);
+        Example exampleParams = new Example(ApiCustomParams.class);
         List<ApiDocTreeVo> docTreeVoList = mapper.selectList(query.getSuper());
         for (ApiDocTreeVo apiDocTreeVo : docTreeVoList) {
             if (StringUtils.isNotBlank(apiDocDTO.getKeyWord())){
@@ -72,9 +57,20 @@ public class ApiDocBiz extends BaseBiz<ApiDocMapper, ApiDoc>{
                         .andEqualTo("docId",apiDocTreeVo.getId());
             }
             exampleNode.excludeProperties("respondJson");
-            List<ApiCustomNode> nodes = nodeMapper.selectByExample(exampleNode);
-            apiDocTreeVo.setNodeList(nodes);
-            apiDocTreeVo.setApiCount(nodes.size());
+            List<ApiCustomNodeVo> nodeVos = new ArrayList<>();
+            for (ApiCustomNode node : nodeMapper.selectByExample(exampleNode)) {
+                exampleParams.createCriteria()
+                        .andEqualTo("nodeId",node.getId())
+                        .andEqualTo("isDel",0)
+                        .andEqualTo("docId",apiDocTreeVo.getId());
+                ApiCustomParams params = paramsMapper.selectOneByExample(exampleParams);
+                ApiCustomNodeVo vo = new ApiCustomNodeVo();
+                BeanUtils.copyProperties(node,vo);
+                vo.setMethod(params.getMethod());
+                nodeVos.add(vo);
+                exampleParams.clear();
+            }
+            apiDocTreeVo.setNodeVoList(nodeVos);
             exampleNode.clear();
         }
         return ObjectRestResponse.succ(docTreeVoList);