From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserRankingsAdminController.java | 72 ++++++++---------------------------
1 files changed, 17 insertions(+), 55 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..7d2d006 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,8 +16,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import net.sf.json.JSONObject;
import org.springframework.core.task.TaskExecutor;
@@ -27,20 +27,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.common.entity.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 +54,11 @@
- @RequestNoLogin()
@RequestMapping(value = "saveAdd")
- public void saveAdd(String callback, UserRankings userRankings, HttpServletRequest request, PrintWriter out, HttpServletResponse response) {
+ public void saveAdd(AdminAcceptData acceptData, 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 +101,7 @@
@RequestMapping(value = "saveModify")
- public void saveModify(String callback, UserRankings userRankings, HttpServletRequest request,
- PrintWriter out) {
+ public void saveModify(AdminAcceptData acceptData,String callback, UserRankings userRankings, PrintWriter out) {
try {
Long id = userRankings.getId();
@@ -127,25 +115,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 +130,12 @@
}
}
-
if (!proess){
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("["+ nickName +"] 姝ゆ樀绉板凡瀛樺湪"));
return;
}
}
}
-
Integer shareState = userRankings.getShareState();
if (shareState != null && (shareState.equals(1) || shareState == 1)){
@@ -192,7 +159,7 @@
@RequestMapping(value = "deleteBatch")
- public void deleteBatch(String callback, String idArray, PrintWriter out) {
+ public void deleteBatch(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
@@ -219,14 +186,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(AdminAcceptData acceptData,String callback, Long id, @RequestParam("file") CommonsMultipartFile file,
+ PrintWriter out) {
try {
if (file == null) {
@@ -259,7 +221,7 @@
@RequestMapping(value = "removePicture")
- public void uploadImg(String callback, Long id, PrintWriter out) {
+ public void uploadImg(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
try {
@@ -298,7 +260,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key,
+ public void query(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key,
Integer tradeState, Integer shareState, Integer sort, PrintWriter out) {
try {
@@ -350,7 +312,7 @@
* @param 灏忓��
*/
@RequestMapping(value = "setRewardtBatch")
- public void setRewardtBatch(String callback,String ids, Integer type, Double reward,
+ public void setRewardtBatch(AdminAcceptData acceptData,String callback,String ids, Integer type, Double reward,
Double startReward, Double endReward, HttpServletRequest request, PrintWriter out) {
try {
@@ -395,7 +357,7 @@
* @param 灏忓��
*/
@RequestMapping(value = "setStateBatch")
- public void setStateBatch(String callback, String ids, Integer type, Integer state, PrintWriter out) {
+ public void setStateBatch(AdminAcceptData acceptData,String callback, String ids, Integer type, Integer state, PrintWriter out) {
try {
@@ -430,7 +392,7 @@
}
@RequestMapping(value = "batchUpFile")
- public void batchUpFile(PrintWriter out) {
+ public void batchUpFile(AdminAcceptData acceptData,PrintWriter out) {
try {
@@ -449,7 +411,7 @@
@RequestMapping(value = "batchUpShowID")
- public void batchUpShowID(PrintWriter out) {
+ public void batchUpShowID(AdminAcceptData acceptData,PrintWriter out) {
try {
@@ -467,7 +429,7 @@
}
@RequestMapping(value = "batchUpNickName")
- public void batchUpNickName(PrintWriter out) {
+ public void batchUpNickName(AdminAcceptData acceptData,PrintWriter out) {
try {
@@ -487,7 +449,7 @@
@RequestMapping(value = "downPic")
- public void downPic(PrintWriter out) {
+ public void downPic(AdminAcceptData acceptData,PrintWriter out) {
try {
--
Gitblit v1.8.0