From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java | 586 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 364 insertions(+), 222 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java
index c5ef06f..164fdb6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HelpCenterAdminController.java
@@ -4,30 +4,38 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Set;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.bus.help.HelpCenter;
import com.yeshi.fanli.entity.bus.help.HelpClass;
import com.yeshi.fanli.entity.bus.help.HelpInfo;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
import com.yeshi.fanli.exception.config.HelpCenterException;
import com.yeshi.fanli.exception.config.HelpClassException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.help.HelpCenterService;
import com.yeshi.fanli.service.inter.help.HelpClassService;
+import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@Controller
@@ -36,13 +44,19 @@
@Resource
private HelpCenterService helpCenterService;
-
+
@Resource
private HelpClassService helpClassService;
-
-
+
+ @Resource
+ private AppVersionService appVersionService;
+
+ @Resource
+ private AdActivityVersionControlService adActivityVersionControlService;
+
/**
* 淇濆瓨甯姪淇℃伅
+ *
* @param callback
* @param title
* @param content
@@ -51,19 +65,13 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback,HelpCenter helpCenter, String acction ,String content, String html,
- PrintWriter out) {
+ public void save(String callback, HelpCenter helpCenter, String acction, String content, String html,
+ PrintWriter out) {
try {
- String title = helpCenter.getTitle();
- if (StringUtil.isNullOrEmpty(title)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏍囬涓嶈兘涓虹┖"));
- return;
- }
-
helpCenterService.save(helpCenter, content, html);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
-
+ } catch (HelpCenterException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
try {
@@ -72,44 +80,80 @@
e1.printStackTrace();
}
}
-
}
-
-
- @RequestMapping(value = "getInfo")
- public void getInfo(String callback, Long id, PrintWriter out){
+
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchState")
+ public void switchState(String callback, Long id, PrintWriter out) {
try {
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭弬鏁�"));
- return;
- }
-
- HelpCenter crrent = helpCenterService.selectByPrimaryKey(id);
-
- if (crrent == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- HelpInfo helpInfo = helpCenterService.getHelpInfo(id);
-
- JSONObject data = new JSONObject();
- data.put("id",crrent.getId());
- data.put("title",crrent.getTitle());
- if (helpInfo != null){
- data.put("html",helpInfo.getHtml());
- } else {
- data.put("html", "");
- }
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ helpCenterService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
} catch (HelpCenterException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
}
+
+ @RequestMapping(value = "getInfo")
+ public void getInfo(String callback, Long id, PrintWriter out) {
+
+ if (id == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭弬鏁�"));
+ return;
+ }
+ HelpCenter crrent = helpCenterService.selectByPrimaryKey(id);
+ if (crrent == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
+ return;
+ }
+
+ HelpInfo helpInfo = helpCenterService.getHelpInfo(id);
+
+ JSONObject data = new JSONObject();
+ data.put("id", crrent.getId());
+ data.put("title", crrent.getTitle());
+ data.put("state", crrent.getState());
+ data.put("weight", crrent.getWeight());
+
+
+ if (crrent.getStartTime() != null) {
+ data.put("startTime", TimeUtil.getWholeTime(crrent.getStartTime().getTime()));
+ } else {
+ data.put("startTime", "");
+ }
+ if (crrent.getEndTime() != null) {
+ data.put("endTime", TimeUtil.getWholeTime(crrent.getEndTime().getTime()));
+ } else {
+ data.put("endTime", "");
+ }
+
+ if (helpInfo != null) {
+ data.put("html", helpInfo.getHtml());
+ } else {
+ data.put("html", "");
+ }
+
+ if (crrent.getHelpClass() != null) {
+ data.put("cid", crrent.getHelpClass().getId());
+ } else {
+ data.put("cid", 0);
+ }
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ }
+
/**
* 鏌ユ壘鎵�鏈夋爣绛�
+ *
* @param callback
* @param pageIndex
* @param key
@@ -118,94 +162,162 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
- Integer orderMode, PrintWriter out) {
-
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer orderMode,
+ String version, String platform, Integer state,PrintWriter out) {
try {
-
- if (orderMode == null)
+ if (orderMode == null)
orderMode = 1;
-
- if (pageIndex == null)
+
+ if (pageIndex == null)
pageIndex = 1;
-
- if (pageSize == null)
+
+ if (pageSize == null)
pageSize = Constant.PAGE_SIZE;
-
- List<HelpCenter> helpCenterList =
- helpCenterService.query((pageIndex - 1) * pageSize, pageSize, key, cid, orderMode);
-
- if (helpCenterList == null || helpCenterList.size() == 0) {
+
+ List<HelpCenter> list = helpCenterService.query(0, Integer.MAX_VALUE, key, cid, orderMode, state);
+ if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
- }
-
- for (HelpCenter helpCenter: helpCenterList) {
+ }
+
+ int count = list.size();
+ List<AppVersionInfo> versionList = null;
+ if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {
+ versionList = new ArrayList<>();
+ if (!StringUtil.isNullOrEmpty(version)) {
+ AppVersionInfo appVersion = appVersionService.selectByPrimaryKey(Long.parseLong(version));
+ if (appVersion != null)
+ versionList.add(appVersion);
+ } else {
+ List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
+ if (appVersionList != null) {
+ versionList.addAll(appVersionList);
+ }
+ }
+ }
+
+ if (versionList != null) {
+ if (versionList.size() > 0) {
+ List<Long> sourceIdList = new ArrayList<>();
+ for (HelpCenter helpCenter : list) {
+ sourceIdList.add(helpCenter.getId());
+ }
+ List<Long> versionIdList = new ArrayList<>();
+ for (AppVersionInfo versionInfo : versionList)
+ versionIdList.add(versionInfo.getId());
+ Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+ AdActivityType.helpCenter, versionIdList);
+
+ for (int i = 0; i < list.size(); i++) {
+ if (!sets.contains(list.get(i).getId())) {
+ list.remove(i--);
+ }
+ }
+ count = list.size();
+ } else {
+ list.clear();
+ count = 0;
+ }
+ }
+
+ int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+ List<HelpCenter> listResult = null;
+ if (pageIndex < totalPage) {
+ int start = (pageIndex - 1) * pageSize;
+ listResult = list.subList(start, start + pageSize);
+ } else if (pageIndex == totalPage) {
+ listResult = list.subList((pageIndex - 1) * pageSize, list.size());
+ } else {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
+ return;
+ }
+
+ for (HelpCenter helpCenter : listResult) {
HelpClass helpClass = helpCenter.getHelpClass();
- if (helpClass == null ) {
+ if (helpClass == null) {
helpClass = new HelpClass();
helpClass.setId(0L);
helpClass.setName("-鏈�夋嫨-");
helpCenter.setHelpClass(helpClass);
- }
+ }
}
-
- long count = helpCenterService.countQuery(key, cid);
-
- int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
- PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-
- GsonBuilder gsonBuilder = new GsonBuilder();
- gsonBuilder.serializeNulls();
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls();
Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
-
+
JSONObject data = new JSONObject();
data.put("pe", pe);
- data.put("result_list", gson.toJson(helpCenterList));
-
+ data.put("result_list", gson.toJson(listResult));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ寮傚父"));
e.printStackTrace();
}
}
-
-
+
+ /**
+ * 璁剧疆鐗堟湰
+ *
+ * @param callback
+ * @param id
+ * @param moveType
+ * @param sex
+ * @param out
+ */
+ @RequestMapping(value = "setCenterVersions")
+ public void setCenterVersions(String callback, Long id, String versions, PrintWriter out) {
+ JSONArray versionArray = JSONArray.fromObject(versions);
+ List<Long> versionIds = new ArrayList<>();
+ for (int i = 0; i < versionArray.size(); i++) {
+ Long version = versionArray.optLong(i);
+ versionIds.add(version);
+ }
+ try {
+ helpCenterService.setVersions(id, versionIds);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
+ }
+ }
+
+ @RequestMapping(value = "getCenterVersions")
+ public void getCenterVersions(String callback, Long id, PrintWriter out) {
+ List<AdActivityVersionControl> list = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.helpCenter, id);
+
+ List<Long> versionList = new ArrayList<>();
+ if (list != null)
+ for (AdActivityVersionControl control : list)
+ versionList.add(control.getVersion().getId());
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(versionList));
+ }
+
/**
* 淇敼
+ *
* @param callback
* @param idArray
* @param out
*/
- @RequestMapping(value = "saveModify")
- public void saveModify(String callback, HelpCenter helpCenter, PrintWriter out) {
- try {
-
- Long id = helpCenter.getId();
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭弬鏁�"));
- return;
- }
-
- HelpCenter crrent = helpCenterService.selectByPrimaryKey(id);
- if (crrent == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- helpCenterService.updateByPrimaryKeySelective(helpCenter);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
-
- } catch (HelpCenterException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
+ @RequestMapping(value = "setWeight")
+ public void setWeight(String callback, Long id, Integer weight, PrintWriter out) {
+ if (id == null || weight == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭弬鏁�"));
+ return;
}
+
+ HelpCenter crrent = new HelpCenter();
+ crrent.setId(id);
+ crrent.setWeight(weight);
+ helpCenterService.updateByPrimaryKeySelective(crrent);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
}
-
+
/**
* 鎵归噺鍒犻櫎
+ *
* @param callback
* @param idArray
* @param out
@@ -213,86 +325,67 @@
@RequestMapping(value = "deleteBatch")
public void deleteBatch(String callback, String idArray, PrintWriter out) {
try {
-
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈�夋嫨鎿嶄綔鐨勬暟鎹�"));
return;
}
-
Gson gson = new Gson();
- List<String> idList = gson.fromJson(idArray, new TypeToken<ArrayList<String>>() {}.getType());
-
+ List<String> idList = gson.fromJson(idArray, new TypeToken<ArrayList<String>>() {
+ }.getType());
+
if (idList == null || idList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
return;
- }
-
+ }
+
// 鍒犻櫎甯姪鏍囬淇℃伅
helpCenterService.deleteBatchById(idList);
// 鍒犻櫎甯姪鍏蜂綋璇︽儏
helpCenterService.deleteInfoBatchById(idList);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
-
- } catch (HelpCenterException e) {
+ } catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
}
-
- /**
- * 璁剧疆鍒嗙被
- * @param callback
- * @param out
- */
- @RequestMapping(value = "setClass")
- public void saveModify(String callback, Long id, Long cid, PrintWriter out) {
- try {
-
- if (id == null || cid == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭弬鏁�"));
- return;
- }
-
- HelpCenter crrent = helpCenterService.selectByPrimaryKey(id);
- if (crrent == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- if (cid == 0) {
- crrent.setHelpClass(null);
- } else {
- crrent.setHelpClass(new HelpClass(cid));
- }
- crrent.setUpdatetime(new Date());
- helpCenterService.updateByPrimaryKey(crrent);
-
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
-
- } catch (HelpCenterException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
+
/**
- * 鍒嗙被淇濆瓨-鏂板銆佷慨鏀�
+ * 淇濆瓨淇℃伅
+ *
* @param callback
* @param special
* @param out
*/
@RequestMapping(value = "saveClass")
- public void saveClass(String callback, HelpClass helpClass, PrintWriter out) {
+ public void saveClass(String callback, HelpClass helpClass, HttpServletRequest request, PrintWriter out) {
try {
- String name = helpClass.getName();
- if (StringUtil.isNullOrEmpty(name)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍚嶇О涓嶈兘涓虹┖"));
- return;
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ if (request instanceof MultipartHttpServletRequest) {
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ helpClassService.save(helpClass, fileRequest.getFile("file"));
+ } else {
+ helpClassService.save(helpClass, null);
}
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ } catch (HelpClassException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
+ }
+ }
- helpClassService.save(helpClass);
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchStateClass")
+ public void switchStateClass(String callback, Long id, PrintWriter out) {
+ try {
+ helpClassService.switchState(id);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
} catch (HelpClassException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -301,32 +394,11 @@
e.printStackTrace();
}
}
+
-
- /**
- * 淇敼绯荤粺鐘舵��
- * @param callback
- * @param id
- * @param out
- */
- @RequestMapping(value = "updateShowState")
- public void updateShowState(String callback, Long id, PrintWriter out) {
- try {
- int state = helpClassService.updateShowState(id);
- JSONObject data = new JSONObject();
- data.put("showState", state);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } catch (HelpClassException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e1) {
- e1.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- }
- }
-
-
/**
* 淇敼鎺掑簭
+ *
* @param callback
* @param out
*/
@@ -342,30 +414,11 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
}
}
-
-
- /**
- * 涓婁紶鍥剧墖
- * @param callback
- * @param out
- */
- @RequestMapping(value = "uploadClassPic")
- public void uploadClassPic(String callback, @RequestParam("file") CommonsMultipartFile file,
- Long id,PrintWriter out) {
- try {
- helpClassService.uploadPic(file, id);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- } catch (HelpClassException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e1) {
- e1.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- }
- }
-
-
+
+
/**
* 鍒犻櫎
+ *
* @param callback
* @param idArray
* @param out
@@ -378,62 +431,114 @@
}
try {
Gson gson = new Gson();
- List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+ List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+ }.getType());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
return;
}
int count = helpClassService.deleteByPrimaryKeyBatch(list);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎["+ count +"]鏉℃暟鎹�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
}
-
-
+
/**
* 鏌ヨ
+ *
* @param callback
* @param pageIndex
* @param pageSize
- * @param key 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
+ * @param key 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
* @param out
*/
@RequestMapping(value = "queryClass")
- public void queryClass(String callback, Integer pageIndex, Integer pageSize, String key,
- Integer showState, PrintWriter out) {
+ public void queryClass(String callback, Integer pageIndex, Integer pageSize, String key, Integer showState,
+ String version, String platform, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
- if (pageSize == null || pageSize < 1) {
- pageSize = Constant.PAGE_SIZE;
- }
-
+ pageSize = Integer.MAX_VALUE;
try {
- List<HelpClass> list = helpClassService.query((pageIndex - 1) * pageSize, pageSize, key, showState);
-
+ List<HelpClass> list = helpClassService.query(0, pageSize, key, showState);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
- long count = helpClassService.countQuery(key, showState);
-
+
+ List<AppVersionInfo> versionList = null;
+ if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {
+ versionList = new ArrayList<>();
+ if (!StringUtil.isNullOrEmpty(version)) {
+ AppVersionInfo appVersion = appVersionService.selectByPrimaryKey(Long.parseLong(version));
+ if (appVersion != null)
+ versionList.add(appVersion);
+ } else {
+ List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
+ if (appVersionList != null) {
+ versionList.addAll(appVersionList);
+ }
+ }
+ }
+
+ for (HelpClass helpClass : list) {
+ Date startTime = helpClass.getStartTime();
+ if (startTime == null) {
+ helpClass.setStartTime_str("");
+ } else {
+ helpClass.setStartTime_str(TimeUtil.formatDateAddT(startTime));
+ }
+
+ Date endTime = helpClass.getEndTime();
+ if (endTime == null) {
+ helpClass.setEndTime_str("");
+ } else {
+ helpClass.setEndTime_str(TimeUtil.formatDateAddT(endTime));
+ }
+ }
+
+ // 杩囨护
+ long count = 0;
+ if (versionList != null) {
+ if (versionList.size() > 0) {
+ List<Long> sourceIdList = new ArrayList<>();
+ for (HelpClass helpClass : list) {
+ sourceIdList.add(helpClass.getId());
+ }
+ List<Long> versionIdList = new ArrayList<>();
+ for (AppVersionInfo versionInfo : versionList)
+ versionIdList.add(versionInfo.getId());
+ Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+ AdActivityType.helpClass, versionIdList);
+
+ for (int i = 0; i < list.size(); i++) {
+ if (!sets.contains(list.get(i).getId())) {
+ list.remove(i--);
+ }
+ }
+ count = list.size();
+ } else {
+ list.clear();
+ count = 0;
+ }
+ }
+
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
GsonBuilder gsonBuilder = new GsonBuilder();
- gsonBuilder.serializeNulls();
+ gsonBuilder.serializeNulls();
Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("result_list", gson.toJson(list));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
@@ -442,25 +547,25 @@
/**
* 鏌ヨ鎵�鏈夊垎绫�
+ *
* @param out
*/
@RequestMapping(value = "getProvidedClass")
public void getAllClass(String callback, PrintWriter out) {
try {
-
+
HelpClass helpClass = new HelpClass();
helpClass.setId(0L);
helpClass.setName("-鏈�夋嫨-");
-
+
List<HelpClass> reslut_list = new ArrayList<HelpClass>();
reslut_list.add(helpClass);
-
-
+
List<HelpClass> list = helpClassService.getProvidedClass();
if (list != null && list.size() > 0) {
reslut_list.addAll(list);
}
-
+
JSONObject data = new JSONObject();
data.put("class_list", reslut_list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -469,4 +574,41 @@
e.printStackTrace();
}
}
+
+ /**
+ * 璁剧疆鐗堟湰
+ *
+ * @param callback
+ * @param id
+ * @param moveType
+ * @param sex
+ * @param out
+ */
+ @RequestMapping(value = "setVersions")
+ public void setVersions(String callback, Long id, String versions, PrintWriter out) {
+ JSONArray versionArray = JSONArray.fromObject(versions);
+ List<Long> versionIds = new ArrayList<>();
+ for (int i = 0; i < versionArray.size(); i++) {
+ Long version = versionArray.optLong(i);
+ versionIds.add(version);
+ }
+ try {
+ helpClassService.setVersions(id, versionIds);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
+ }
+ }
+
+ @RequestMapping(value = "getVersions")
+ public void getVersions(String callback, Long id, PrintWriter out) {
+ List<AdActivityVersionControl> list = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.helpClass, id);
+
+ List<Long> versionList = new ArrayList<>();
+ if (list != null)
+ for (AdActivityVersionControl control : list)
+ versionList.add(control.getVersion().getId());
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(versionList));
+ }
}
--
Gitblit v1.8.0