From 6c09cbd70388ae53ec593de253f69cfa1a3eeda7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 06 二月 2021 15:41:25 +0800
Subject: [PATCH] 活动管理界面完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java
index 7c71e69..a2da663 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java
@@ -1,9 +1,11 @@
package com.ks.daylucky.controller.admin;
import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
import com.ks.daylucky.pojo.DO.ActivityExtraInfo;
import com.ks.daylucky.pojo.DO.ActivityTag;
import com.ks.daylucky.pojo.VO.admin.ActivityAdminVo;
+import com.ks.daylucky.pojo.VO.admin.AdminAcceptData;
import com.ks.daylucky.service.ActivityExtraInfoService;
import com.ks.daylucky.service.ActivityTagService;
import com.ks.daylucky.util.factory.vo.ActivityAdminVoFactory;
@@ -18,9 +20,12 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.StringUtil;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -40,15 +45,14 @@
/**
* 娣诲姞娲诲姩
*
- * @param request
* @param data
* @return
*/
@ResponseBody
@RequestMapping("addActivity")
- public String addActivity(HttpServletRequest request, String data, String type) {
+ public String addActivity(AdminAcceptData acceptData, String data, String type) {
ActivityAdminVo vo = new Gson().fromJson(data, ActivityAdminVo.class);
- Long sponsorId = 1L;
+ Long sponsorId = acceptData.getSponsors().getId();
Long appId = 5L;
LuckyActivity activity = LuckyActivityFactory.create(sponsorId, vo);
activity.setAppId(appId);
@@ -110,7 +114,7 @@
@ResponseBody
@RequestMapping("getActivityDetail")
- public String getActivityDetail(HttpServletRequest request, Long id) {
+ public String getActivityDetail(AdminAcceptData acceptData, Long id) {
LuckyActivity activity = luckyActivityService.getActivityDetail(id);
List<ActivityTag> tagList = activityTagService.getTagList(id);
ActivityExtraInfo info = activityExtraInfoService.getDetail(activity.getId());
@@ -118,5 +122,32 @@
return JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(bean));
}
+ @ResponseBody
+ @RequestMapping("listActivity")
+ public String listActivity(AdminAcceptData acceptData, String states, int page, int limit) {
+ List<Integer> stateList = null;
+ if (!StringUtil.isNullOrEmpty(states)) {
+ Type type = new TypeToken<List<Integer>>() {
+ }.getType();
+ stateList = new Gson().fromJson(states, type);
+ }
+ List<LuckyActivity> activityList = luckyActivityService.getActivityList(acceptData.getAppId(), acceptData.getSponsors().getId(), stateList, null, page, limit);
+ //鑾峰彇璇︽儏
+ List<ActivityAdminVo.ActivityBean> voList = new ArrayList<>();
+ for (LuckyActivity activity : activityList) {
+ activity = luckyActivityService.getActivityDetail(activity.getId());
+ ActivityExtraInfo info = activityExtraInfoService.getDetail(activity.getId());
+ List<ActivityTag> tagList = activityTagService.getTagList(activity.getId());
+ voList.add(ActivityAdminVoFactory.createActivityBean(activity, tagList));
+ }
+
+
+ long count = luckyActivityService.countActivity(acceptData.getAppId(), acceptData.getSponsors().getId(), stateList, null);
+ JSONObject data = new JSONObject();
+ data.put("list", voList);
+ data.put("count", count);
+ return JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(data));
+ }
+
}
--
Gitblit v1.8.0