From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java | 127 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 123 insertions(+), 4 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 4bcc9b7..71849a7 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
@@ -8,11 +8,16 @@
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;
+import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
@@ -22,9 +27,6 @@
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")
@@ -61,6 +63,16 @@
recommendActivity.setInviteInfo(info);
}
+ if (recommendActivity !=null) {
+ ActivityUser activityUser = recommendActivity.getActivityUser();
+ if (activityUser != null) {
+ ActivityUser resultUser = activityService.selectActivityUserByPrimaryKey(activityUser.getId());
+ if (resultUser != null) {
+ recommendActivity.setActivityUser(resultUser);
+ }
+ }
+ }
+
if (StringUtil.isNullOrEmpty(callback)) {
out.print(JsonUtil.loadTrueResult(recommendActivity));
} else {
@@ -400,6 +412,113 @@
activityService.deleteRecommendActivity(rsids);
out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
}
- // deleteRecommendActivity
+
+
+ /**
+ *
+ * @param pageIndex
+ * 椤垫暟
+ * @param key
+ * 鏌ヨ鏉′欢
+ * @param out
+ */
+ @RequestMapping(value = "query")
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
+
+ if (pageIndex == null || pageIndex < 1) {
+ pageIndex = 1;
+ }
+ if (pageSize == null || pageSize < 1) {
+ pageSize = Constant.PAGE_SIZE;
+ }
+
+ 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);
+ }
+
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+ return;
+ }
+
+ 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);
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("result_list", list);
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
+
+ @RequestMapping(value = "saveModify")
+ public void saveModify(String callback, RecommendActivity recommendActivity, PrintWriter out) {
+ try {
+
+ Long id = recommendActivity.getId();
+ if (id == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+ return;
+ }
+
+ RecommendActivity resultObj = activityService.selectByPrimaryKey(id);
+ if (resultObj == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
+ return;
+ }
+
+ activityService.updateByPrimaryKeySelective(recommendActivity);
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
+
+
+
+
+ @RequestMapping(value = "delete")
+ public void delete(String callback, String idArray, PrintWriter out) {
+
+ if (StringUtil.isNullOrEmpty(idArray)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
+ return;
+ }
+
+ try {
+ Gson gson = new Gson();
+ long[] hsids = gson.fromJson(idArray, new TypeToken<long[]>() {}.getType());
+
+ if (hsids == null || hsids.length == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
+ return;
+ }
+
+ activityService.deleteRecommendActivity(hsids);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.8.0