From 87020338db30f2c3a3488b62ade7268e19d8be7a Mon Sep 17 00:00:00 2001
From: Ragty <961946407@qq.com>
Date: Wed, 21 Mar 2018 20:15:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B5=84=E6=BA=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hwj/web/CollectionController.java     | 77 ++++++++++++-------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/hwj/web/CollectionController.java b/src/main/java/com/hwj/web/CollectionController.java
index 0e45c43..dfe5362 100644
--- a/src/main/java/com/hwj/web/CollectionController.java
+++ b/src/main/java/com/hwj/web/CollectionController.java
@@ -46,33 +46,38 @@ public class CollectionController {
 	 * @return
 	 * @throws IOException
 	 */
-	@RequestMapping("getCollectionFile.do")
+	@RequestMapping("/getCollectionFile.do")
 	@ResponseBody
-	public String getCollectionFile(@RequestBody String requestJsonBody,HttpServletRequest request) throws IOException{
-		
+	public String getCollectionFile(HttpServletRequest request)
+			throws IOException {
+
 		HttpSession session = request.getSession();
 		String userid = String.valueOf(session.getAttribute("username"));
-		
-		List<FileCollection> list = tryCatchFileCollectionService.getFileCollection("userid", userid);
-		
-		if(list==null || list.equals(null)){
+
+		List<FileCollection> list = tryCatchFileCollectionService
+				.getFileCollection("userid", userid);
+
+		System.out.println(list + "huoji555");
+		if (list == null || list.equals(null)) {
+
 			return statusMap.a("2");
 		}
-		
-		//去重
-		for(int i=0; i<list.size(); i++){
-			FileCollection fileCollection = list.get(i);
-			for(int j=i+1; j<list.size(); j++){
+
+		for (int i = 0; i < list.size(); i++) {
+
+			FileCollection fileCollection1 = list.get(i);
+			for (int j = i + 1; j < list.size(); j++) {
 				FileCollection fileCollection2 = list.get(j);
-				if(fileCollection.getF_id() == fileCollection2.getF_id()){
+
+				if (fileCollection1.getF_id().equals(fileCollection2.getF_id())) {
 					list.remove(j);
 				}
 			}
-			
+
 		}
-		
+
 		return jsonAnalyze.list2Json(list);
-		
+
 	}
 	
 	
@@ -87,25 +92,39 @@ public String getCollectionFile(@RequestBody String requestJsonBody,HttpServletR
 	 * @throws IOException
 	 */
 	@RequestMapping("/collectionDelete.do")
-   	@ResponseBody
-   	public String collectionDelete(@RequestBody String requestJsonBody, HttpServletRequest request) throws IOException{
-		
-        Map<String, Object> map = jsonAnalyze.json2Map(requestJsonBody);
-        
-        String f_id = String.valueOf(map.get("f_id"));
+	@ResponseBody
+	public String collectionDelete(@RequestBody String reuqestBody,
+			HttpServletRequest request) throws IOException {
+
+		// 用来取请求体中的数据
+		Map<String, Object> map = jsonAnalyze.json2Map(reuqestBody);
+		String f_id = String.valueOf(map.get("f_id"));
 		String nodeid = String.valueOf(map.get("nodeid"));
 		HttpSession session = request.getSession();
 		String userid = String.valueOf(session.getAttribute("username"));
 		
-		FileCollection fileCollection = tryCatchFileCollectionService.
-				getFileCollection("userid", userid, "nodeid", nodeid, "f_id", f_id);
 		
-		if(tryCatchFileCollectionService.delFileCollection(fileCollection)){
+		FileCollection fileCollection = new FileCollection();
+		
+		//不同情况,分别对待
+        if(nodeid.equals("null")){
+        	System.out.println("到这里了");
+        	fileCollection =tryCatchFileCollectionService.
+        			getFileCollection1("userid", userid, "f_id", f_id);
+        } else {
+        	fileCollection = tryCatchFileCollectionService
+    				.getFileCollection("userid", userid, "f_id", f_id, "nodeid",
+    						nodeid);
+        }
+		
+		System.out.println("$$$$$$$$$$$$$$$$$$$$$$$$$$"+fileCollection);
+
+		if (tryCatchFileCollectionService.delFileCollection(fileCollection)) {
 			return statusMap.a("1");
+		} else {
+			return statusMap.a("2");
 		}
-		
-		return statusMap.a("2");
-				
+
 	}
 	
 	
@@ -165,7 +184,7 @@ public String saveCollectionFile(@RequestBody String requestJsonBody,HttpServlet
 	 * @return
 	 * @throws IOException
 	 */
-	@RequestMapping("/search.do")
+	@RequestMapping("/search1.do")
 	@ResponseBody
 	public String search(@RequestBody String requestbody,
 			HttpServletRequest request) throws IOException {