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/ActivityUserAdminController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityUserAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityUserAdminController.java
index e4ee5e6..bb1b2da 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityUserAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityUserAdminController.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MultipartFile;
@@ -24,7 +25,8 @@
import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.service.inter.activity.ActivityUserService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONArray;
@@ -44,7 +46,7 @@
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
// 鏂囦欢璺緞
- String filePath = "/img/GoodsSubClass/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String filePath = FilePathEnum.activityUserPortrait.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
// 鎵ц涓婁紶
String fileLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
return fileLink;
@@ -61,7 +63,7 @@
* @param out
*/
@RequestMapping(value = "listActivityUserRules")
- public void listActivityUserRules(String callback, PrintWriter out) {
+ public void listActivityUserRules(AdminAcceptData acceptData, String callback, PrintWriter out) {
ActivityUserRule[] rules = ActivityRuleUser.RULES;
JSONArray array = new JSONArray();
for (ActivityUserRule rule : rules) {
@@ -78,7 +80,7 @@
* @param out
*/
@RequestMapping(value = "listActivityUser")
- public void listActivityUser(String callback, Integer rule, int pageIndex, int pageSize, PrintWriter out) {
+ public void listActivityUser(AdminAcceptData acceptData,String callback, Integer rule, int pageIndex, int pageSize, PrintWriter out) {
List<ActivityRuleUser> list = activityUserService.listByRuleCode(rule, 1, 100);
long count = activityUserService.countByRuleCode(rule);
JSONObject data = new JSONObject();
@@ -106,7 +108,7 @@
}
@RequestMapping(value = "deleteActivityUser")
- public void deleteActivityUsers(String callback, String ids, PrintWriter out) {
+ public void deleteActivityUsers(AdminAcceptData acceptData,String callback, String ids, PrintWriter out) {
JSONArray array = JSONArray.fromObject(ids);
for (int i = 0; i < array.size(); i++) {
// 鍒犻櫎
@@ -118,7 +120,7 @@
}
@RequestMapping(value = "saveActivityUser")
- public void save(String callback, ActivityRuleUser user, HttpServletRequest request, PrintWriter out) {
+ public void save(AdminAcceptData acceptData,String callback, ActivityRuleUser user, HttpServletRequest request, PrintWriter out) {
if (user == null || user.getRuleCode() == null || user.getActivityUser() == null) {
out.print(callback + "(" + JsonUtil.loadFalseResult("鏁版嵁涓嶅畬鏁�") + ")");
--
Gitblit v1.8.0