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/ActivityAdminController.java | 238 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 131 insertions(+), 107 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
index 86f9bd8..1fa5233 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
@@ -1,19 +1,15 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
@@ -27,6 +23,9 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/activity")
@@ -56,58 +55,92 @@
@RequestMapping(value = "getActivity")
public void getActivity(String callback, long id, PrintWriter out) {
- RecommendActivity recommendActivity = activityService.getRecommendActivityById(id);
- if (recommendActivity.getType() == RecommendActivity.TYPE_INVITE) {
- RecommendActivityInviteInfo info = activityService
- .getRecommendActivityInviteInfoByActivityId(recommendActivity.getId());
- recommendActivity.setInviteInfo(info);
- }
+
+ try {
+ RecommendActivity recommendActivity = activityService.getRecommendActivityById(id);
+ if (recommendActivity ==null) {
+ if (StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadFalseResult("璇ュ姩鎬佸凡涓嶅瓨鍦�"));
+ } else {
+ out.print(callback + "(" + JsonUtil.loadFalseResult("璇ュ姩鎬佸凡涓嶅瓨鍦�") + ")");
+ }
+ return;
+ }
+
+ if (recommendActivity.getType() == RecommendActivity.TYPE_INVITE) {
+ RecommendActivityInviteInfo info = activityService
+ .getRecommendActivityInviteInfoByActivityId(recommendActivity.getId());
+ recommendActivity.setInviteInfo(info);
+ }
- if (recommendActivity !=null) {
+ Date startTime = recommendActivity.getStartTime();
+ Date endTime = recommendActivity.getEndTime();
+
+ if (startTime == null && endTime == null) {
+ recommendActivity.setTimeTask(false);
+ recommendActivity.setStartTime_str("");
+ recommendActivity.setEndTime_str("");
+ } else {
+ recommendActivity.setTimeTask(true);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ if (startTime == null) {
+ recommendActivity.setStartTime_str("");
+ } else {
+ recommendActivity.setStartTime_str(sdf.format(startTime));
+ }
+
+ if (endTime == null) {
+ recommendActivity.setEndTime_str("");
+ } else {
+ recommendActivity.setEndTime_str(sdf.format(endTime));
+ }
+ }
+
ActivityUser activityUser = recommendActivity.getActivityUser();
if (activityUser != null) {
ActivityUser resultUser = activityService.selectActivityUserByPrimaryKey(activityUser.getId());
- if (resultUser != null) {
- recommendActivity.setActivityUser(resultUser);
- }
+ recommendActivity.setActivityUser(resultUser);
}
+
+ if (StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadTrueResult(recommendActivity));
+ } else {
+ out.print(callback + "(" + JsonUtil.loadTrueResult(recommendActivity) + ")");
+ }
+ } catch (Exception e) {
+ if (StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ } else {
+ out.print(callback + "(" + JsonUtil.loadFalseResult("鎿嶄綔澶辫触") + ")");
+ }
+ e.printStackTrace();
}
- if (StringUtil.isNullOrEmpty(callback)) {
- out.print(JsonUtil.loadTrueResult(recommendActivity));
- } else {
- out.print(callback + "(" + JsonUtil.loadTrueResult(recommendActivity) + ")");
- }
}
@RequestMapping(value = "addShareGoodsActivity")
- public void addShareGoodsActivity(String callback, Long uid, String title, String actionIds, boolean top,
- int shareCount, PrintWriter out) {
+ public void addShareGoodsActivity(String callback, Long uid, String actionIds, RecommendActivity activity, PrintWriter out) {
if (uid == null) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇烽�夋嫨鍙戝竷鐢ㄦ埛") + ")");
return;
}
- if (StringUtil.isNullOrEmpty(title)) {
- out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼犳爣棰�") + ")");
- return;
- }
-
+
if (StringUtil.isNullOrEmpty(actionIds)) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "閫夋嫨鍟嗗搧") + ")");
return;
}
-
- // title = Jsoup.parse(title).text();
JSONArray array = JSONArray.fromObject(actionIds);
List<Long> auctionIds = new ArrayList<>();
for (int i = 0; i < array.size(); i++) {
auctionIds.add(array.optLong(i));
}
+
try {
- activityService.addShareGoodsRecommendActivity(uid, title, auctionIds, top, shareCount);
+ activityService.addShareGoodsRecommendActivity(uid,auctionIds, activity);
if (StringUtil.isNullOrEmpty(callback)) {
out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} else {
@@ -119,15 +152,17 @@
} else {
out.print(callback + "(" + JsonUtil.loadFalseResult(e.getCode(), e.getMsg()) + ")");
}
+ } catch (Exception e) {
+ out.print(callback + "(" + JsonUtil.loadFalseResult(1, "鎿嶄綔澶辫触") + ")");
+ e.printStackTrace();
}
}
// 淇敼鍟嗗搧鍒嗕韩鍔ㄦ��
@RequestMapping(value = "updateShareGoodsActivity")
- public void updateShareGoodsActivity(String callback, Long id, Long uid, String title, String actionIds,
- boolean top, int shareCount, PrintWriter out) {
+ public void updateShareGoodsActivity(String callback, Long uid, String actionIds, RecommendActivity activity, PrintWriter out) {
- if (id == null) {
+ if (activity.getId() == null) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼營D") + ")");
return;
}
@@ -137,7 +172,7 @@
return;
}
- if (StringUtil.isNullOrEmpty(title)) {
+ if (StringUtil.isNullOrEmpty(activity.getTitle())) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼犳爣棰�") + ")");
return;
}
@@ -147,7 +182,6 @@
return;
}
- // title = Jsoup.parse(title).text();
JSONArray array = JSONArray.fromObject(actionIds);
List<Long> auctionIds = new ArrayList<>();
@@ -155,7 +189,7 @@
auctionIds.add(array.optLong(i));
}
try {
- activityService.updateShareGoodsRecommendActivity(id, uid, title, auctionIds, top, shareCount);
+ activityService.updateShareGoodsRecommendActivity(uid, auctionIds, activity);
if (StringUtil.isNullOrEmpty(callback)) {
out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} else {
@@ -167,6 +201,9 @@
} else {
out.print(callback + "(" + JsonUtil.loadFalseResult(e.getCode(), e.getMsg()) + ")");
}
+ } catch (Exception e) {
+ out.print(callback + "(" + JsonUtil.loadFalseResult(1, "鎿嶄綔澶辫触") + ")");
+ e.printStackTrace();
}
}
@@ -182,7 +219,7 @@
* @param out
*/
@RequestMapping(value = "addInviteActivity")
- public void addInviteActivity(String callback, Long uid, String title, String img, boolean top, int shareCount,
+ public void addInviteActivity(String callback, Long uid,RecommendActivity activity, String img,
int px, int py, int size, PrintWriter out) {
if (uid == null) {
@@ -190,7 +227,7 @@
return;
}
- if (StringUtil.isNullOrEmpty(title)) {
+ if (StringUtil.isNullOrEmpty(activity.getTitle())) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼犳爣棰�") + ")");
return;
}
@@ -204,7 +241,7 @@
img = img.trim();
try {
- activityService.addInviteImgRecommendActivity(uid, title, img, top, shareCount, px, py, size);
+ activityService.addInviteImgRecommendActivity(uid, activity, img, px, py, size);
if (StringUtil.isNullOrEmpty(callback)) {
out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} else {
@@ -216,6 +253,9 @@
} else {
out.print(callback + "(" + JsonUtil.loadFalseResult(e.getCode(), e.getMsg()) + ")");
}
+ } catch (Exception e) {
+ out.print(callback + "(" + JsonUtil.loadFalseResult(1, "鎿嶄綔澶辫触") + ")");
+ e.printStackTrace();
}
}
@@ -232,11 +272,11 @@
* @param out
*/
@RequestMapping(value = "updateInviteActivity")
- public void updateInviteActivity(String callback, Long id, Long uid, String title, String img, boolean top,
- int shareCount, int px, int py, int size, PrintWriter out) {
+ public void updateInviteActivity(String callback, Long uid, RecommendActivity activity, String img,
+ int px, int py, int size, PrintWriter out) {
- if (id == null) {
- out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇烽�夋嫨鐢ㄦ埛") + ")");
+ if (activity.getId() == null) {
+ out.print(callback + "(" + JsonUtil.loadFalseResult(1, "ID涓嶈兘涓虹┖") + ")");
return;
}
@@ -245,7 +285,7 @@
return;
}
- if (StringUtil.isNullOrEmpty(title)) {
+ if (StringUtil.isNullOrEmpty(activity.getTitle())) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼犳爣棰�") + ")");
return;
}
@@ -258,7 +298,7 @@
// title = Jsoup.parse(title).text();
try {
- activityService.updateInviteImgRecommendActivity(id, uid, title, img, top, shareCount, px, py, size);
+ activityService.updateInviteImgRecommendActivity(uid, activity, img, px, py, size);
if (StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
else
@@ -268,6 +308,9 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
else
out.print(callback + "(" + JsonUtil.loadFalseResult(e.getCode(), e.getMsg()) + ")");
+ } catch (Exception e) {
+ out.print(callback + "(" + JsonUtil.loadFalseResult(1, "鎿嶄綔澶辫触") + ")");
+ e.printStackTrace();
}
}
@@ -282,19 +325,18 @@
* @param out
*/
@RequestMapping(value = "addTextImgActivity")
- public void addTextImgActivity(String callback, Long uid, String title, String imgs, boolean top, int shareCount,
+ public void addTextImgActivity(String callback, Long uid, RecommendActivity activity, String imgs,
PrintWriter out) {
if (uid == null) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇烽�夋嫨鍙戝竷鐢ㄦ埛") + ")");
return;
}
- if (StringUtil.isNullOrEmpty(title)) {
+ if (StringUtil.isNullOrEmpty(activity.getTitle())) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼犳爣棰�") + ")");
return;
}
- // title = Jsoup.parse(title).text();
List<String> imgList = new ArrayList<>();
if (!StringUtil.isNullOrEmpty(imgs)) {
@@ -304,7 +346,7 @@
}
try {
- activityService.addTextAndImgRecommendActivity(uid, title, imgList, top, shareCount);
+ activityService.addTextAndImgRecommendActivity(uid, imgList, activity);
if (StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
else
@@ -314,6 +356,9 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
else
out.print(callback + "(" + JsonUtil.loadFalseResult(e.getCode(), e.getMsg()) + ")");
+ } catch (Exception e) {
+ out.print(callback + "(" + JsonUtil.loadFalseResult(1, "鎿嶄綔澶辫触") + ")");
+ e.printStackTrace();
}
}
@@ -329,10 +374,9 @@
* @param out
*/
@RequestMapping(value = "updateTextImgActivity")
- public void updateTextImgActivity(String callback, Long id, Long uid, String title, String imgs, boolean top,
- int shareCount, PrintWriter out) {
+ public void updateTextImgActivity(String callback, Long uid, String imgs, RecommendActivity activity, PrintWriter out) {
- if (id == null) {
+ if (activity.getId() == null) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼營D") + ")");
return;
}
@@ -342,7 +386,7 @@
return;
}
- if (StringUtil.isNullOrEmpty(title)) {
+ if (StringUtil.isNullOrEmpty(activity.getTitle())) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼犳爣棰�") + ")");
return;
}
@@ -357,7 +401,7 @@
}
try {
- activityService.updateTextAndImgRecommendActivity(id, uid, title, imgList, top, shareCount);
+ activityService.updateTextAndImgRecommendActivity(uid, imgList, activity);
if (StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
else
@@ -367,53 +411,12 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
else
out.print(callback + "(" + JsonUtil.loadFalseResult(e.getCode(), e.getMsg()) + ")");
+ } catch (Exception e) {
+ out.print(callback + "(" + JsonUtil.loadFalseResult(1, "鎿嶄綔澶辫触") + ")");
+ e.printStackTrace();
}
}
- /**
- *
- * @param pageIndex
- * 椤垫暟
- * @param key
- * 鏌ヨ鏉′欢
- * @param out
- */
- @RequestMapping(value = "getRecommendActivityList", method = RequestMethod.POST)
- public void getRecommendActivityList(int pageIndex, String key, PrintWriter out) {
- List<RecommendActivity> recommendActivityList = null;
- if (StringUtil.isNullOrEmpty(key)) {
- recommendActivityList = activityService.getRecommendActivityList(pageIndex, Constant.PAGE_SIZE);
- } else {
- recommendActivityList = activityService.queryRecommendActivityList(key, pageIndex, Constant.PAGE_SIZE);
- }
-
- int count = (int) activityService.getRecommendActivityCount();
-
- int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
-
- PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
-
- Map<String, String> map = new HashMap<String, String>();
- map.put("key", key);
- pe.setParams(map);
-
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- data.put("recommendActivityList", recommendActivityList);
-
- out.print(JsonUtil.loadTrueResult(data));
-
- return;
- }
-
- @RequestMapping(value = "deleteRecommendActivity", method = RequestMethod.POST)
- public void deleteRecommendActivity(long[] rsids, PrintWriter out) {
- // recommendSpecialService.deleteSpecials(rsids);
-
- activityService.deleteRecommendActivity(rsids);
- out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- }
-
/**
*
@@ -436,19 +439,40 @@
try {
- List<RecommendActivity> list = null;
- if (StringUtil.isNullOrEmpty(key)) {
- list = activityService.getRecommendActivityList(pageIndex, Constant.PAGE_SIZE);
- } else {
- list = activityService.queryRecommendActivityList(key, pageIndex, Constant.PAGE_SIZE);
- }
-
+ List<RecommendActivity> list = activityService.queryRecommendActivityList(key, pageIndex, Constant.PAGE_SIZE);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
+
+ for (RecommendActivity activity: list) {
+
+ Date startTime = activity.getStartTime();
+ Date endTime = activity.getEndTime();
+
+ if (startTime == null && endTime == null) {
+ activity.setTimeTask(false);
+ activity.setStartTime_str("");
+ activity.setEndTime_str("");
+ } else {
+ activity.setTimeTask(true);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ if (startTime == null) {
+ activity.setStartTime_str("");
+ } else {
+ activity.setStartTime_str(sdf.format(startTime));
+ }
+
+ if (endTime == null) {
+ activity.setEndTime_str("");
+ } else {
+ activity.setEndTime_str(sdf.format(endTime));
+ }
+ }
+ }
- int count = (int) activityService.getRecommendActivityCount();
+ int count = (int) activityService.getRecommendActivityCount(key);
int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
--
Gitblit v1.8.0