From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java | 218 ++++++------------------------------------------------
1 files changed, 25 insertions(+), 193 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java
index e4cc23c..e0b5b5a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java
@@ -2,23 +2,21 @@
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
-import com.yeshi.fanli.entity.bus.homemodule.SuperHomeNavbar;
-import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.exception.homemodule.HomeNavbarException;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
import com.yeshi.fanli.service.inter.homemodule.SuperHomeNavbarService;
@@ -42,129 +40,36 @@
private SuperHomeNavbarService superHomeNavbarService;
+
/**
- * 鏂板
+ * 淇濆瓨淇℃伅
+ *
* @param callback
* @param special
* @param out
*/
- @RequestMapping(value = "saveAdd")
- public void saveAdd(String callback, HomeNavbar homeNavbar, PrintWriter out) {
-
+ @RequestMapping(value = "save")
+ public void save(String callback, HomeNavbar homeNavbar, String jumpType, HttpServletRequest request,PrintWriter out) {
try {
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ if (request instanceof MultipartHttpServletRequest) {
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ homeNavbarService.saveObject(fileRequest.getFile("file"), homeNavbar);
+ }else{
+ homeNavbarService.saveObject(null, homeNavbar);
+ }
- String name = homeNavbar.getName();
- if (StringUtil.isNullOrEmpty(name)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("瀵艰埅鍚嶇О涓嶈兘涓虹┖"));
- return;
- }
-
- homeNavbar.setCreatetime(new Date());
- homeNavbar.setUpdatetime(new Date());
-
- int maxOrder = homeNavbarService.getMaxOrder();
- homeNavbar.setOrderby(maxOrder + 1);
-
- homeNavbarService.insert(homeNavbar);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
-
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ } catch (HomeNavbarException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
e.printStackTrace();
}
}
- /**
- * 淇敼
- * @param callback
- * @param special
- * @param out
- */
- @RequestMapping(value = "saveModify")
- public void saveModify(String callback, HomeNavbar homeNavbar, PrintWriter out) {
- try {
- Long id = homeNavbar.getId();
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- String name = homeNavbar.getName();
- if (StringUtil.isNullOrEmpty(name)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("瀵艰埅鍚嶇О涓嶈兘涓虹┖"));
- return;
- }
-
-
- HomeNavbar resultObj = homeNavbarService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- homeNavbar.setUpdatetime(new Date());
- homeNavbarService.updateByPrimaryKeySelective(homeNavbar);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
- }
-
-
- /**
- * 淇敼绯荤粺鐘舵��
- * @param callback
- * @param type
- * @param cardId
- * @param systemId
- * @param out
- */
- @RequestMapping(value = "saveSystemState")
- public void saveSystemState(String callback, Long id, Long systemId, PrintWriter out) {
-
- if (id == null || systemId == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
- return;
- }
-
- try {
- List<SuperHomeNavbar> list = superHomeNavbarService.querybyNavbarId(id, systemId);
-
- if (list != null && list.size() > 0) {
- superHomeNavbarService.deletebyNavbarId(id, systemId);
- JSONObject data = new JSONObject();
- data.put("check", 0);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } else {
-
- HomeNavbar homeNavbar = new HomeNavbar();
- homeNavbar.setId(id);
-
- BusinessSystem system = new BusinessSystem();
- system.setId(systemId);
-
- SuperHomeNavbar superNavbar = new SuperHomeNavbar();
- superNavbar.setHomeNavbar(homeNavbar);
- superNavbar.setSystem(system);
-
- superHomeNavbarService.insertSelective(superNavbar);
- JSONObject data = new JSONObject();
- data.put("check", 1);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- }
-
- } catch (Exception e1) {
- e1.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
- }
-
- }
/**
* 淇敼鎺掑簭
@@ -173,49 +78,17 @@
* @param goodsClass
* @param out
*/
- @RequestMapping(value = "saveOrder")
- public void saveOrder(String callback, Long id, Integer moveType, PrintWriter out) {
-
- if (moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掔殑绫诲瀷涓嶆纭�"));
- return;
- }
-
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
+ @RequestMapping(value = "updateOrder")
+ public void updateOrder(String callback, Long id, Integer moveType, PrintWriter out) {
try {
-
- HomeNavbar resultObj = homeNavbarService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- Integer oldOrder = resultObj.getOrderby();
- List<HomeNavbar> list = homeNavbarService.getChangeOrder(moveType, oldOrder);
-
- if (list != null && list.size() > 0) {
- HomeNavbar changeObj = list.get(0);
- // 浜ゆ崲鎺掑簭搴忓彿
- resultObj.setOrderby(changeObj.getOrderby());
-
- changeObj.setOrderby(oldOrder);
-
- homeNavbarService.updateByPrimaryKeySelective(changeObj);
- }
-
- homeNavbarService.updateByPrimaryKeySelective(resultObj);
-
+ homeNavbarService.updateOrder(id, moveType);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
-
+ } catch (HomeNavbarException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
}
-
}
@@ -303,45 +176,4 @@
e.printStackTrace();
}
}
-
-
- /**
- * 涓撻鍥剧墖涓婁紶
- * @param file
- * @param uid
- * @param id
- * @param request
- * @param response
- * @param out
- */
- @RequestMapping(value = "uploadPic")
- public void uploadPic(@RequestParam("file") CommonsMultipartFile file, Long id, PrintWriter out) {
-
- if (file == null) {
- out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
- return;
- }
-
- if (id == null) {
- out.print(JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- try {
-
- HomeNavbar resultObj = homeNavbarService.selectByPrimaryKey(id);
- if (resultObj == null) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- homeNavbarService.uploadPicture(file, resultObj);
- out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
-
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
}
--
Gitblit v1.8.0