修改代码报错问题

kingcimson · Aug 15, 2017 · 753ccce · 753ccce
1 parent e9680ee
commit 753ccce
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cn.com.xiaoyaoji</groupId>
     <artifactId>xiaoyaoji</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.1.2</version>
+    <version>2.0.15</version>
     <description>小幺鸡,简单好用的在线文档管理工具</description>
     <url>http://www.xiaoyaoji.cn</url>
 

diff --git a/xiaoyaoji-biz/pom.xml b/xiaoyaoji-biz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>xiaoyaoji</artifactId>
         <groupId>cn.com.xiaoyaoji</groupId>
-        <version>2.0.1.2</version>
+        <version>2.0.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/data/DataFactory.java b/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/data/DataFactory.java
@@ -10,7 +10,7 @@
 import cn.com.xiaoyaoji.data.handler.StringResultHandler;
 import cn.com.xiaoyaoji.integration.file.FileManager;
 import cn.com.xiaoyaoji.util.JdbcUtils;
-import cn.com.xiaoyaoji.utils.SqlUtils;
+import cn.com.xiaoyaoji.util.SqlUtils;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.handlers.BeanHandler;
 import org.apache.commons.dbutils.handlers.BeanListHandler;

diff --git a/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/data/bean/TableNames.java b/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/data/bean/TableNames.java
@@ -1,7 +1,7 @@
 package cn.com.xiaoyaoji.data.bean;
 
 
-import cn.com.xiaoyaoji.utils.SqlUtils;
+import cn.com.xiaoyaoji.util.SqlUtils;
 
 /**
  * @author: zhoujingjie

diff --git a/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/service/DocService.java b/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/service/DocService.java
@@ -12,8 +12,7 @@
 import org.apache.log4j.Logger;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author: zhoujingjie
@@ -83,4 +82,39 @@ public List<Doc> searchDocs(String text, String projectId) {
     public String getFirstDocId(String projectId) {
         return DataFactory.instance().getFirstDocId(projectId);
     }
+
+
+    /**
+     * 获取属性菜单的文档
+     * @param projectId 项目id
+     * @return docs
+     */
+    public List<Doc> getProjectDocs(String projectId){
+        // 获取该项目下所有接口
+        List<Doc> docs = ResultUtils.list(ServiceFactory.instance().getDocsByProjectId(projectId));
+        return treeDocs(docs);
+    }
+
+    public List<Doc> getProjectDocs(String projectId, boolean full){
+        // 获取该项目下所有接口
+        List<Doc> docs = ResultUtils.list(ServiceFactory.instance().getDocsByProjectId(projectId, full));
+        return treeDocs(docs);
+    }
+
+    private List<Doc> treeDocs(List<Doc> docs ){
+        Map<String,List<Doc>> docMap = new LinkedHashMap<>();
+        //root
+        docMap.put("0",new ArrayList<Doc>());
+        //
+        for(Doc doc:docs){
+            docMap.put(doc.getId(),doc.getChildren());
+        }
+        for(Doc doc:docs){
+            List<Doc> temp = docMap.get(doc.getParentId());
+            if(temp!=null){
+                temp.add(doc);
+            }
+        }
+        return docMap.get("0");
+    }
 }
diff --git a/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/service/ProjectService.java b/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/service/ProjectService.java
@@ -28,13 +28,22 @@ public static ProjectService instance(){
      * 获取属性菜单的文档
      * @param projectId 项目id
      * @return docs
+     * @see DocService#getProjectDocs(String)
      */
+    @Deprecated
     public List<Doc> getProjectDocs(String projectId){
         // 获取该项目下所有接口
         List<Doc> docs = ResultUtils.list(ServiceFactory.instance().getDocsByProjectId(projectId));
         return treeDocs(docs);
     }
 
+    /**
+     * @see DocService#getProjectDocs(String, boolean)
+     * @param projectId
+     * @param full
+     * @return
+     */
+    @Deprecated
     public List<Doc> getProjectDocs(String projectId, boolean full){
         // 获取该项目下所有接口
         List<Doc> docs = ResultUtils.list(ServiceFactory.instance().getDocsByProjectId(projectId, full));

diff --git a/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/util/SqlUtils.java b/xiaoyaoji-biz/src/main/java/cn/com/xiaoyaoji/util/SqlUtils.java
@@ -1,4 +1,4 @@
-package cn.com.xiaoyaoji.utils;
+package cn.com.xiaoyaoji.util;
 
 
 import cn.com.xiaoyaoji.core.annotations.Alias;

diff --git a/xiaoyaoji-web/pom.xml b/xiaoyaoji-web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>xiaoyaoji</artifactId>
         <groupId>cn.com.xiaoyaoji</groupId>
-        <version>2.0.1.2</version>
+        <version>2.0.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>

diff --git a/xiaoyaoji-web/src/main/java/cn/com/xiaoyaoji/controller/DocController.java b/xiaoyaoji-web/src/main/java/cn/com/xiaoyaoji/controller/DocController.java
@@ -244,4 +244,17 @@ public Object search(@RequestParam String text, @RequestParam("projectId") Strin
         return new _HashMap<>()
                 .add("docs", docs);
     }
+
+    @GetMapping("/list/{projectId}")
+    public Object getDocs(@PathVariable("projectId")String projectId,User user){
+        ServiceTool.checkUserHasAccessPermission(projectId,user);
+        return DocService.instance().getProjectDocs(projectId);
+    }
+
+    @PostMapping("/copy")
+    public Object copy(@RequestParam("projectId")String projectId,
+                       @RequestParam("formId")String fromId,
+                       @RequestParam("toId") String toId){
+        return null;
+    }
 }
diff --git a/xiaoyaoji-web/src/main/webapp/WEB-INF/content/doc/doc-left.jsp b/xiaoyaoji-web/src/main/webapp/WEB-INF/content/doc/doc-left.jsp
@@ -110,12 +110,12 @@
             </li>
         </c:if>--%>
         <li class="line" v-if="menu.isFolder"></li>
-        <%--<li>
+        <li>
             <div class="dl-menu-name">移动</div>
-        </li>--%>
-        <%--<li>
+        </li>
+        <li>
             <div class="dl-menu-name">复制</div>
-        </li>--%>
+        </li>
         <li v-on:click="updateName($event)" uk-toggle="target: #docCreateModal">
             <div class="dl-menu-name">重命名</div>
         </li>
@@ -141,6 +141,45 @@
         </div>
     </div>
 
+    <div id="docCopyModal" v-cloak uk-modal>
+        <div class="uk-modal-dialog">
+            <button class="uk-modal-close-default" type="button" uk-close></button>
+
+            <div class="uk-modal-header">
+                <h2 class="uk-modal-title">复制文档</h2>
+            </div>
+
+            <div class="uk-modal-body" uk-overflow-auto>
+                <div class="uk-form-stacked">
+                    <div class="uk-margin">
+                        <label class="uk-form-label" for="form-stacked-select">选择项目</label>
+                        <div class="uk-form-controls">
+                            <select class="uk-select" id="form-stacked-select">
+                                <option>Option 01</option>
+                                <option>Option 02</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="uk-margin">
+                        <label class="uk-form-label" for="form-stacked-select">选择分类</label>
+                        <div class="uk-form-controls">
+                            <ul>
+                                <li></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-modal-footer uk-text-right">
+                <button class="uk-button uk-button-default uk-modal-close" type="button">Cancel</button>
+                <button class="uk-button uk-button-primary" type="button">Save</button>
+            </div>
+
+        </div>
+    </div>
+
+
     <div class="dl-placehoder" v-cloak>
         本文档由<a href="http://www.xiaoyaoji.com.cn" target="_blank">小幺鸡</a>编辑
     </div>