From 559e188de93bb05d6c37ec1a0d392ec69ed02567 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 20 十一月 2018 10:41:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 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 02d5914..37873af 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
@@ -6,11 +6,15 @@
import java.util.List;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
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.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
@@ -18,13 +22,16 @@
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.common.AdminUser;
import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
import com.yeshi.fanli.service.inter.homemodule.SuperHomeNavbarService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.annotation.RequestNoLogin;
@Controller
@RequestMapping("admin/new/api/v1/navbar")
@@ -32,6 +39,9 @@
@Resource
private SystemService systemService;
+
+ @Resource
+ private AdminUserService adminUserService;
@Resource
private HomeNavbarService homeNavbarService;
@@ -193,7 +203,7 @@
}
Integer oldOrder = resultObj.getOrderby();
- List<HomeNavbar> list = homeNavbarService.getChangeOrder(id, moveType, oldOrder);
+ List<HomeNavbar> list = homeNavbarService.getChangeOrder(moveType, oldOrder);
if (list != null && list.size() > 0) {
HomeNavbar changeObj = list.get(0);
@@ -300,7 +310,57 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
+ }
+
+ /**
+ * 涓撻鍥剧墖涓婁紶
+ * @param file
+ * @param uid
+ * @param id
+ * @param request
+ * @param response
+ * @param out
+ */
+ @RequestNoLogin()
+ @RequestMapping(value = "uploadPic")
+ public void uploadPic(@RequestParam("file") CommonsMultipartFile file, Long uid,
+ Long id, HttpServletRequest request, HttpServletResponse response, PrintWriter out) {
+
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "*");
+
+ AdminUser admin = adminUserService.selectByPrimaryKey(uid);
+ if (admin == null) {
+ out.print(JsonUtil.loadFalseResult("褰撳墠璐︽埛楠岃瘉澶辫触"));
+ return;
+ }
+
+ 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