'commit'

Doc/v1.0/.cache.json

@@ -1 +1 @@
-[{"baseUrl":"","className":"ResourceController","description":"ResourceController","docFileName":"com_dsideal_base_Res_Controller_ResourceController.html","generateDocs":true,"packageName":"com.dsideal.base.Res.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_base_Res_Controller_ResourceController.html#getZskPage","deprecated":false,"description":"获取知识库分页数据","header":[],"method":["GET","POST"],"methodName":"getZskPage","paramNodes":[{"description":"文档类型，1：文档 (word,ppt,pdf等)，2：数据库(excel)","jsonBody":false,"name":"type_id","required":false,"type":"int"},{"description":"搜索关键词","jsonBody":false,"name":"keyword","required":false,"type":"string"},{"description":"第几页","jsonBody":false,"name":"pageNum","required":false,"type":"int"},{"description":"每页几条","jsonBody":false,"name":"pageSize","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getZskPage"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_Res_Controller_ResourceController.html#uploadZskDocument","deprecated":false,"description":"上传知识库文档","header":[],"method":["GET","POST"],"methodName":"uploadZskDocument","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/uploadZskDocument"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_Res_Controller_ResourceController.html#delZskDocument","deprecated":false,"description":"删除知识库文档","header":[],"method":["GET","POST"],"methodName":"delZskDocument","paramNodes":[{"description":"知识库文档ID","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/delZskDocument"}],"srcFileName":"D:\\dsWork\\YunNanDsBase\\src\\main\\java\\com\\dsideal\\base\\Res\\Controller\\ResourceController.java"}]
+[{"baseUrl":"","className":"ResourceController","description":"ResourceController","docFileName":"com_dsideal_base_Res_Controller_ResourceController.html","generateDocs":true,"packageName":"com.dsideal.base.Res.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_base_Res_Controller_ResourceController.html#getZskPage","deprecated":false,"description":"获取知识库分页数据","header":[],"method":["GET","POST"],"methodName":"getZskPage","paramNodes":[{"description":"文档类型，1：文档 (word,ppt,pdf等)，2：数据库(excel)","jsonBody":false,"name":"type_id","required":false,"type":"int"},{"description":"搜索关键词","jsonBody":false,"name":"keyword","required":false,"type":"string"},{"description":"第几页","jsonBody":false,"name":"page","required":false,"type":"int"},{"description":"每页几条","jsonBody":false,"name":"limit","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/getZskPage"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_Res_Controller_ResourceController.html#uploadZskDocument","deprecated":false,"description":"上传知识库文档","header":[],"method":["GET","POST"],"methodName":"uploadZskDocument","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/uploadZskDocument"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_Res_Controller_ResourceController.html#delZskDocument","deprecated":false,"description":"删除知识库文档","header":[],"method":["GET","POST"],"methodName":"delZskDocument","paramNodes":[{"description":"知识库文档ID","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/delZskDocument"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_Res_Controller_ResourceController.html#download","deprecated":false,"description":"下载知识库文档","header":[],"method":["GET","POST"],"methodName":"download","paramNodes":[{"description":"知识库文档ID","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/res/download"}],"srcFileName":"D:\\dsWork\\YunNanDsBase\\src\\main\\java\\com\\dsideal\\base\\Res\\Controller\\ResourceController.java"}]

Doc/v1.0/YunNanDsBase-v1.0-api-docs.json

@@ -18,12 +18,12 @@
             {
               "description": "第几页",
               "value": "",
-              "key": "pageNum"
+              "key": "page"
             },
             {
               "description": "每页几条",
               "value": "",
-              "key": "pageSize"
+              "key": "limit"
             }
           ],
           "raw": "{{domain}}/res/getZskPage"
@@ -56,6 +56,22 @@
         }
       },
       "name": "删除知识库文档"
+    },
+    {
+      "request": {
+        "method": "GET",
+        "url": {
+          "query": [
+            {
+              "description": "知识库文档ID",
+              "value": "",
+              "key": "id"
+            }
+          ],
+          "raw": "{{domain}}/res/download"
+        }
+      },
+      "name": "下载知识库文档"
     }
   ],
   "name": "ResourceController"

Doc/v1.0/com_dsideal_base_Res_Controller_ResourceController.html

@@ -51,6 +51,9 @@
                     <a class="catalog-item" href="com_dsideal_base_Res_Controller_ResourceController.html#delZskDocument">
                         删除知识库文档
                     </a>
+                    <a class="catalog-item" href="com_dsideal_base_Res_Controller_ResourceController.html#download">
+                        下载知识库文档
+                    </a>
             </div>
         </div>
 </div>    </div>
@@ -94,13 +97,13 @@
                         <td>搜索关键词</td>
                     </tr>
                     <tr>
-                        <td>pageNum</td>
+                        <td>page</td>
                         <td>int</td>
                         <td>否</td>
                         <td>第几页</td>
                     </tr>
                     <tr>
-                        <td>pageSize</td>
+                        <td>limit</td>
                         <td>int</td>
                         <td>否</td>
                         <td>每页几条</td>
@@ -129,6 +132,33 @@
     <code>/res/delZskDocument</code>
         <span class="label label-default">GET</span>
         <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>知识库文档ID</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="download"><a href="#">下载知识库文档 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/res/download</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
 </p>
         <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
         <table class="table table-bordered">
@@ -165,6 +195,7 @@
             {name: 'ResourceController.获取知识库分页数据', url: 'com_dsideal_base_Res_Controller_ResourceController.html#getZskPage'},
             {name: 'ResourceController.上传知识库文档', url: 'com_dsideal_base_Res_Controller_ResourceController.html#uploadZskDocument'},
             {name: 'ResourceController.删除知识库文档', url: 'com_dsideal_base_Res_Controller_ResourceController.html#delZskDocument'},
+            {name: 'ResourceController.下载知识库文档', url: 'com_dsideal_base_Res_Controller_ResourceController.html#download'},
     ];
 
 

Doc/v1.0/index.html

@@ -51,6 +51,9 @@
                     <a class="catalog-item" href="com_dsideal_base_Res_Controller_ResourceController.html#delZskDocument">
                         删除知识库文档
                     </a>
+                    <a class="catalog-item" href="com_dsideal_base_Res_Controller_ResourceController.html#download">
+                        下载知识库文档
+                    </a>
             </div>
         </div>
 </div>    </div>
@@ -86,6 +89,7 @@
         {name: 'ResourceController.获取知识库分页数据', url: 'com_dsideal_base_Res_Controller_ResourceController.html#getZskPage'},
         {name: 'ResourceController.上传知识库文档', url: 'com_dsideal_base_Res_Controller_ResourceController.html#uploadZskDocument'},
         {name: 'ResourceController.删除知识库文档', url: 'com_dsideal_base_Res_Controller_ResourceController.html#delZskDocument'},
+        {name: 'ResourceController.下载知识库文档', url: 'com_dsideal_base_Res_Controller_ResourceController.html#download'},
     ];
 
 

src/main/java/com/dsideal/base/Res/Controller/ResourceController.java

@@ -31,6 +31,7 @@ public class ResourceController extends Controller {
      * @param limit   每页几条
      */
     @Before(GET.class)
+    @IsLoginInterface({})
     public void getZskPage(int type_id, String keyword, int page, int limit) {
         //根据上传人员ID获取他所隶属的行政区划ID
         String person_id = getCookie("person_id");

src/main/resources/Sql/Resource.sql

@@ -2,7 +2,7 @@
     #sql("getZskPage")
         select * from ds_db.t_zsk_files where type_id=#para(type_id)
         #if(keyword)
-            and (name like concat('%',#para(keyword),'%')
+            and name like concat('%',#para(keyword),'%')
         #end
         and area_code in #para(idList, "in")
         order by create_time desc