From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java |  256 ++++++---------------------------------------------
 1 files changed, 30 insertions(+), 226 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
index 852c69c..b312031 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
@@ -8,15 +8,9 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import net.sf.json.JSONObject;
-
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import org.yeshi.utils.JsonUtil;
 
 import com.google.gson.Gson;
@@ -24,9 +18,11 @@
 import com.google.gson.reflect.TypeToken;
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
 import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
+import com.yeshi.fanli.exception.FloatADException;
 import com.yeshi.fanli.service.inter.goods.GoodsSubClassService;
 import com.yeshi.fanli.service.inter.lable.LabelClassService;
-import com.yeshi.fanli.util.StringUtil;
+
+import net.sf.json.JSONObject;
 
 @Controller
 @RequestMapping("admin/new/api/v1/goodsSubClass")
@@ -37,146 +33,35 @@
 	@Resource
 	private LabelClassService labelClassService;
 
+	
+	
 	/**
-	 * 娣诲姞绫诲埆
+	 * 淇濆瓨淇℃伅
 	 * 
 	 * @param callback
-	 * @param goodsSubClass
-	 * @param request
+	 * @param special
 	 * @param out
 	 */
-	@RequestMapping(value = "saveAdd", method = RequestMethod.POST)
-	public void saveAdd(String callback, Long pid, Integer type, GoodsSubClass goodsSubClass, 
-			HttpServletRequest request, PrintWriter out) {
+	@RequestMapping(value = "save")
+	public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, HttpServletRequest request,PrintWriter out) {
 		try {
-
-			String name = goodsSubClass.getName();
-			if (StringUtil.isNullOrEmpty(name)) {
-				out.print(JsonUtil.loadFalseResult("绫诲埆鍚嶇О涓嶈兘涓虹┖"));
-				return;
-			}
-
-			if (pid == null) {
-				out.print(JsonUtil.loadFalseResult("涓婄骇id涓虹┖"));
-				return;
-			}
-			
-			if (type == null) {
-				out.print(JsonUtil.loadFalseResult("绛夌骇涓嶈兘涓虹┖"));
-				return;
-			}
-			
-			if (type > 5) {
-				out.print(JsonUtil.loadFalseResult("绛夌骇涓嶈兘瓒呰繃浜旂骇"));
-				return;
-			}
-			
-			String key = goodsSubClass.getKey();
-			if (StringUtil.isNullOrEmpty(key)) {
-				goodsSubClass.setKey(name.trim());
-			}
-			
-			// 榛樿鍋滅敤
-			goodsSubClass.setState(0);
-			
+			// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷 
 			if (request instanceof MultipartHttpServletRequest) {
-
-				int result;
-				List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("file");
-				
-				goodsSubClass.setAndroidClick(0L);
-				goodsSubClass.setIosClick(0L);
-				goodsSubClass.setLevel(type);
-				goodsSubClass.setCreatetime(new Date());
-				goodsSubClass.setUpdatetime(new Date());
-				// 鎼滅储鏉′欢:鏈夊埜銆佸湪鍞环20-200銆佺墰鐨櫍杞诲井
-				goodsSubClass.setSearchJson("{\"quan\":1,\"endPrice\":220,\"includeGoodRate\":true}");
-				
-				if (type == 2) {
-					goodsSubClass.setRootClass(new GoodsClass(pid));
-					int weight = goodsSubClassService.getMaxWeightByRootId(pid);
-					goodsSubClass.setWeight(weight + 1);
-				} else {
-					goodsSubClass.setParent(new GoodsSubClass(pid));
-					int weight = goodsSubClassService.getMaxWeightByPid(pid);
-					goodsSubClass.setWeight(weight + 1);
-				}
-				
-				
-				
-				if (files != null && files.size() > 0) {
-					// 鍥剧墖鏂囦欢涓婁紶
-					result = goodsSubClassService.save(goodsSubClass, files.get(0));
-				} else {
-					// 鏃犲浘淇濆瓨
-					result = goodsSubClassService.save(goodsSubClass, null);
-				}
-
-				if (result == 1) {
-					out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-				} else {
-					out.print(JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
-				}
-
-			} else {
-				out.print(JsonUtil.loadFalseResult("璇蜂紶閫掓纭殑鍙傛暟"));
-			}
-
+		        MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+		        goodsSubClassService.saveObject(fileRequest.getFile("file"), goodsSubClass, type, pid);
+	        }else{
+	        	goodsSubClassService.saveObject(null, goodsSubClass, type, pid);
+	        }
+			
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+		} catch (FloatADException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
 		} catch (Exception e) {
-			out.print(JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
 			e.printStackTrace();
 		}
-
 	}
 
-	/**
-	 * 淇濆瓨淇敼淇℃伅
-	 * 
-	 * @param callback
-	 * @param goodsSubClass
-	 * @param out
-	 */
-	@RequestMapping(value = "saveModify")
-	public void saveModify(String callback, GoodsSubClass goodsSubClass, PrintWriter out) {
-
-		try {
-
-			Long id = goodsSubClass.getId();
-			if (id == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ绫诲埆"));
-				return;
-			}
-			
-			GoodsSubClass resultObj = goodsSubClassService.selectByPrimaryKey(id);
-			if (resultObj == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ绫诲埆"));
-				return;
-			} 
-			
-			GoodsSubClass subClass = new GoodsSubClass();
-			
-			String name = goodsSubClass.getName();
-			if (!StringUtil.isNullOrEmpty(name)) {
-				subClass.setName(name);
-			}
-			// 鍏抽敭璇嶅彲浠ヤ负绌�
-			subClass.setKey(goodsSubClass.getKey());
-			
-			subClass.setId(id);
-			subClass.setUpdatetime(new Date());
-			subClass.setAndroidClick(resultObj.getAndroidClick());
-			subClass.setIosClick(resultObj.getIosClick());
-			goodsSubClassService.updateByPrimaryKeySelective(subClass);
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼澶辫触"));
-			e.printStackTrace();
-
-		}
-
-	}
 
 	/**
 	 * 鎵归噺鍒犻櫎
@@ -202,50 +87,11 @@
 			}
 
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
 			e.printStackTrace();
 		}
-
 	}
 
-	/**
-	 * 涓婁紶/淇敼 鍥剧墖
-	 * 
-	 * @param callback
-	 * @param file
-	 * @param request
-	 * @param out
-	 * @param response
-	 */
-	@RequestMapping(value = "uploadPicture")
-	public void uploadPicture(Long id, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
-		if (file == null) {
-			out.print(JsonUtil.loadFalseResult("鍥剧墖鏂囦欢涓嶈兘涓虹┖"));
-			return;
-		}
-		
-		try {
-
-			GoodsSubClass goodsSubClass = goodsSubClassService.selectByPrimaryKey(id);
-			if (goodsSubClass == null) {
-				out.print(JsonUtil.loadFalseResult("璇ョ被鍒笉瀛樺湪鎴栧凡琚垹闄�"));
-				return;
-			}
-
-
-			int result = goodsSubClassService.uploadPicture(goodsSubClass, file);
-			if (result == 1) {
-				out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
-			} else {
-				out.print(JsonUtil.loadFalseResult("涓婁紶澶辫触"));
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			out.print(JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-		}
-	}
 
 	/**
 	 * 鍒犻櫎鍥剧墖
@@ -277,7 +123,6 @@
 			}
 
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
 		}
@@ -333,11 +178,17 @@
 					goodsSubClass.setCountClick(0l);
 				}
 				
+				String searchJson = goodsSubClass.getSearchJson();
+				if (searchJson == null) {
+					goodsSubClass.setSearchParam("");
+				} else {
+					goodsSubClass.setSearchParam(searchJson);
+				}
+				
+				
 				int countlabel = labelClassService.getCountQueryBySubClassId(goodsSubClass.getId());
 				goodsSubClass.setCountlabel(countlabel);
 			}
-			
-		
 
 			GsonBuilder gsonBuilder = new GsonBuilder();
 			gsonBuilder.serializeNulls(); // 閲嶇偣
@@ -396,7 +247,6 @@
 	 */
 	@RequestMapping(value = "saveOrder")
 	public void saveOrder(String callback, Long id, Integer type, Integer moveType, PrintWriter out) {
-
 		try {
 			
 			if (moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {
@@ -404,7 +254,6 @@
 				return;
 			}
 			
-
 			GoodsSubClass resultObj = goodsSubClassService.selectByPrimaryKey(id);
 			if (resultObj == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ绫诲埆"));
@@ -430,11 +279,11 @@
 				changeObj.setWeight(resultWeight);
 				
 				changeObj.setUpdatetime(new Date());
-				goodsSubClassService.updateByPrimaryKey(changeObj);
+				goodsSubClassService.updateByPrimaryKeySelective(changeObj);
 			}
 
 			resultObj.setUpdatetime(new Date());
-			goodsSubClassService.updateByPrimaryKey(resultObj);
+			goodsSubClassService.updateByPrimaryKeySelective(resultObj);
 
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
 
@@ -442,51 +291,6 @@
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
-
-	}
-	
-	
-	/**
-	 * 淇敼鎺掑簭
-	 * 
-	 * @param callback
-	 * @param goodsClass
-	 * @param out
-	 */
-	@RequestMapping(value = "saveState")
-	public void saveState(String callback, Long id,  PrintWriter out) {
-
-		try {
-			
-			if (id == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ绫诲埆"));
-				return;
-			}
-			
-			GoodsSubClass resultObj = goodsSubClassService.selectByPrimaryKey(id);
-			if (resultObj == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ绫诲埆"));
-				return;
-			} 
-			
-			Integer state = resultObj.getState();
-			if (state.equals(1) || state == 1) {
-				state = 0;
-			} else {
-				state = 1;
-			}
-			
-			resultObj.setState(state);
-			resultObj.setUpdatetime(new Date());
-			goodsSubClassService.updateByPrimaryKeySelective(resultObj);
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(state));
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-		}
-
 	}
 
 }

--
Gitblit v1.8.0