From df4441322e9801c102299451da41d7c40b4502e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 六月 2021 18:53:13 +0800
Subject: [PATCH] zookeeper地址修改，Maven采用私服
---
service-daylucky/src/main/java/com/ks/daylucky/controller/admin/AdminActivityController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 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 91bec96..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,14 @@
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;
import com.ks.daylucky.util.factory.vo.LuckyActivityFactory;
import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.exception.*;
@@ -15,10 +20,14 @@
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;
@Controller
@RequestMapping("/admin/activity")
@@ -30,20 +39,21 @@
@Resource
private ActivityExtraInfoService activityExtraInfoService;
+ @Resource
+ private ActivityTagService activityTagService;
/**
* 娣诲姞娲诲姩
*
- * @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 appId = 4L;
+ Long sponsorId = acceptData.getSponsors().getId();
+ Long appId = 5L;
LuckyActivity activity = LuckyActivityFactory.create(sponsorId, vo);
activity.setAppId(appId);
try {
@@ -51,6 +61,10 @@
ActivityExtraInfo extraInfo = LuckyActivityFactory.getActivityExtra(vo.getOpenInfo());
extraInfo.setActivityId(activityId);
activityExtraInfoService.add(extraInfo);
+ //鎻愬彇Tags
+ if (vo.getActivity().getTags() != null && vo.getActivity().getTags().size() > 0) {
+ activityTagService.setTags(activityId, (vo.getActivity().getTags()));
+ }
switch (type) {
//淇濆瓨
@@ -98,8 +112,42 @@
return JsonUtil.loadFalseResult("娣诲姞鍑洪敊");
}
+ @ResponseBody
+ @RequestMapping("getActivityDetail")
+ public String getActivityDetail(AdminAcceptData acceptData, Long id) {
+ LuckyActivity activity = luckyActivityService.getActivityDetail(id);
+ List<ActivityTag> tagList = activityTagService.getTagList(id);
+ ActivityExtraInfo info = activityExtraInfoService.getDetail(activity.getId());
+ ActivityAdminVo bean = ActivityAdminVoFactory.create(activity, tagList, info.getValidDay());
+ 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