From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserRankingsAdminController.java | 51 ++++++---------------------------------------------
1 files changed, 6 insertions(+), 45 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserRankingsAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserRankingsAdminController.java
index 5f5482d..d3fd302 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserRankingsAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserRankingsAdminController.java
@@ -16,7 +16,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
@@ -27,20 +26,19 @@
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;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.bus.user.UserRankings;
-import com.yeshi.fanli.exception.UserRankingsException;
+import com.yeshi.fanli.exception.user.UserRankingsException;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserRankingsService;
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;
-import org.yeshi.utils.JsonUtil;
@Controller
@RequestMapping("admin/new/api/v1/rankings")
@@ -55,21 +53,11 @@
- @RequestNoLogin()
@RequestMapping(value = "saveAdd")
- public void saveAdd(String callback, UserRankings userRankings, HttpServletRequest request, PrintWriter out, HttpServletResponse response) {
+ public void saveAdd(String callback, UserRankings userRankings, HttpServletRequest request, PrintWriter out) {
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
try {
-
- /*String showId = userRankings.getShowId();
- List<UserRankings> list = userRankingsService.selectByShowId(showId);
- if (list != null && list.size() > 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("["+ showId +"] 姝D宸插瓨鍦�"));
- return;
- }*/
String nickName = userRankings.getNickName();
@@ -112,8 +100,7 @@
@RequestMapping(value = "saveModify")
- public void saveModify(String callback, UserRankings userRankings, HttpServletRequest request,
- PrintWriter out) {
+ public void saveModify(String callback, UserRankings userRankings, PrintWriter out) {
try {
Long id = userRankings.getId();
@@ -127,25 +114,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏁版嵁涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎"));
return;
}
-
-
- /*String showId = userRankings.getShowId();
- List<UserRankings> list = userRankingsService.selectByShowId(showId);
- if (list != null && list.size() > 0) {
- boolean proess = false;
- for (UserRankings userRanking: list) {
- Long objid = userRanking.getId();
- if (id.equals(objid)){
- proess = true;
- }
- }
-
- if (!proess){
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("["+ showId +"] 姝D宸插瓨鍦�"));
- return;
- }
- }*/
-
String nickName = userRankings.getNickName();
if (!StringUtil.isNullOrEmpty(nickName)) {
@@ -161,14 +129,12 @@
}
}
-
if (!proess){
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("["+ nickName +"] 姝ゆ樀绉板凡瀛樺湪"));
return;
}
}
}
-
Integer shareState = userRankings.getShareState();
if (shareState != null && (shareState.equals(1) || shareState == 1)){
@@ -219,14 +185,9 @@
}
- @RequestNoLogin()
@RequestMapping(value = "uploadPicture")
- public void uploadImg(String callback, Long id, @RequestParam("file") CommonsMultipartFile file,
- HttpServletRequest request, PrintWriter out, HttpServletResponse response) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
+ public void uploadImg(String callback, Long id, @RequestParam("file") CommonsMultipartFile file,
+ PrintWriter out) {
try {
if (file == null) {
--
Gitblit v1.8.0