From f8243b5e55762c3d87b1ba2d39f610c11adec189 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 29 四月 2020 17:52:23 +0800
Subject: [PATCH] 订单找回消息bug
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 353 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 214 insertions(+), 139 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
index ff12653..5bc7bf4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
@@ -7,6 +7,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -19,6 +20,9 @@
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.homemodule.AdActivityVersionControl;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
import com.yeshi.fanli.entity.bus.homemodule.SwiperBanner;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -26,17 +30,21 @@
import com.yeshi.fanli.exception.banner.SwiperPictureException;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
+import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
import com.yeshi.fanli.service.inter.homemodule.SwiperBannerService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
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;
/**
* 杞挱鍥剧鐞�
+ *
* @author Administrator
*
*/
@@ -46,22 +54,28 @@
@Resource
private AdminUserService adminUserService;
-
+
@Resource
private SwiperBannerService swiperBannerService;
-
+
@Resource
private SwiperPictureService swiperPictureService;
-
+
@Resource
private SystemConfigService systemConfigService;
-
+
@Resource
private JumpDetailV2Service jumpDetailV2Service;
-
-
+
+ @Resource
+ private AppVersionService appVersionService;
+
+ @Resource
+ private AdActivityVersionControlService adActivityVersionControlService;
+
/**
* 鏂板
+ *
* @param callback
* @param swiperBanner
* @param out
@@ -74,16 +88,18 @@
String card = swiperBanner.getCard();
if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(card)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇存槑涓庢爣璇嗕笉鑳戒负绌�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍚嶇О涓庢爣璇嗕笉鑳戒负绌�"));
return;
}
- swiperBanner.setState(1);// 榛樿鍋滅敤
+ if (swiperBanner.getState() == null) {
+ swiperBanner.setState(1);// 榛樿鍋滅敤
+ }
+
Date nowTime = new Date();
swiperBanner.setCreatetime(nowTime);
swiperBanner.setUpdatetime(nowTime);
- swiperBannerService.insert(swiperBanner);
-
+ swiperBannerService.insertSelective(swiperBanner);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
@@ -93,6 +109,7 @@
/**
* 淇敼
+ *
* @param callback
* @param swiperBanner
* @param out
@@ -100,7 +117,6 @@
@RequestMapping(value = "saveModify")
public void saveModify(String callback, SwiperBanner swiperBanner, PrintWriter out) {
try {
-
Long id = swiperBanner.getId();
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
@@ -120,6 +136,10 @@
return;
}
+ if (swiperBanner.getState() == null) {
+ swiperBanner.setState(1);// 榛樿鍋滅敤
+ }
+
if (StringUtil.isNullOrEmpty(title)) {
swiperBanner.setTitle(null);
}
@@ -127,73 +147,49 @@
if (StringUtil.isNullOrEmpty(card)) {
swiperBanner.setCard(null);
}
-
swiperBanner.setUpdatetime(new Date());
swiperBannerService.updateByPrimaryKeySelective(swiperBanner);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
-
- } catch (SwiperBannerException e) {
+ } catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
}
-
/**
- * 淇鐘舵��
+ * 淇敼鐘舵��
* @param callback
* @param id
* @param out
*/
- @RequestMapping(value = "updateState")
- public void updateState(String callback, Long id, PrintWriter out) {
+ @RequestMapping(value = "switchState")
+ public void switchState(String callback, Long id, PrintWriter out) {
try {
-
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- SwiperBanner resultObj = swiperBannerService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- Integer state = resultObj.getState();
- if (state == null || state.equals(1) || state == 1) {
- resultObj.setState(0);
- } else {
- resultObj.setState(1);
- }
-
- swiperBannerService.updateByPrimaryKeySelective(resultObj);
-
- JSONObject data = new JSONObject();
- data.put("state", resultObj.getState());
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+ swiperBannerService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
} catch (SwiperBannerException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
}
-
+
/**
* 鏌ヨ
+ *
* @param callback
* @param pageIndex
* @param pageSize
- * @param key 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
- * @param sort 鎺掑簭 锛� 鍒涘缓鏃堕棿鍊掑簭1 榛樿姝ｅ簭
+ * @param key
+ * 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
+ * @param sort
+ * 鎺掑簭 锛� 鍒涘缓鏃堕棿鍊掑簭1 榛樿姝ｅ簭
* @param out
*/
@RequestMapping(value = "query")
public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {
-
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
@@ -201,53 +197,50 @@
if (pageSize == null || pageSize < 1) {
pageSize = Constant.PAGE_SIZE;
}
-
try {
List<SwiperBanner> list = swiperBannerService.query((pageIndex - 1) * pageSize, pageSize, key, sort);
-
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
- for (SwiperBanner swiperBanne: list) {
- long TotalPic= swiperPictureService.countQueryByBannerID(swiperBanne.getId());
-
+
+ for (SwiperBanner swiperBanne : list) {
+ if (swiperBanne.getState() != null && swiperBanne.getState() == 0) {
+ swiperBanne.setState(1);
+ } else {
+ swiperBanne.setState(0);
+ }
+ long TotalPic = swiperPictureService.countQueryByBannerID(swiperBanne.getId());
swiperBanne.setTotalPic(TotalPic);
}
long count = swiperBannerService.countQuery(key);
-
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();
}
-
}
-
/**
* 鍒犻櫎
+ *
* @param callback
* @param idArray
* @param out
*/
@RequestMapping(value = "delete")
public void delete(String callback, String idArray, PrintWriter out) {
-
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -255,114 +248,128 @@
}
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 = swiperBannerService.deleteBatchByPrimaryKey(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();
}
}
-
@RequestMapping(value = "getEffectiveOption")
public void getEffectiveOption(String callback, PrintWriter out) {
try {
List<Object> list = new ArrayList<Object>();
-
- Map<String,Object> mapDefalut =new HashMap<String,Object>();
+ Map<String, Object> mapDefalut = new HashMap<String, Object>();
mapDefalut.put("key", 0);
mapDefalut.put("value", "--鏈�夋嫨--");
list.add(mapDefalut);
-
+
List<SwiperBanner> listBanner = swiperBannerService.getEffectiveOption();
if (listBanner != null && listBanner.size() > 0) {
- for (SwiperBanner swiperBanner: listBanner) {
- Map<String,Object> map =new HashMap<String,Object>();
+ for (SwiperBanner swiperBanner : listBanner) {
+ Map<String, Object> map = new HashMap<String, Object>();
map.put("key", swiperBanner.getId());
map.put("value", swiperBanner.getTitle());
list.add(map);
}
}
-
+
JSONObject data = new JSONObject();
data.put("result_list", list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
}
-
-
+
/**
- * 鏌ヨ鍥剧墖鍒楄〃
+ * 鏌ヨ鍥剧墖鍒楄〃
+ *
* @param callback
* @param pageIndex
* @param pageSize
- * @param bannerId
+ * @param bannerId
* @param out
*/
@RequestMapping(value = "queryPicInfo")
- public void queryPicInfo(String callback, Integer pageIndex, Integer pageSize, Long bannerId, PrintWriter out) {
-
- if (pageIndex == null || pageIndex < 1) {
- pageIndex = 1;
- }
-
- if (pageSize == null || pageSize < 1) {
- pageSize = Constant.PAGE_SIZE;
- }
-
+ public void queryPicInfo(String callback, Integer pageIndex, Integer pageSize, Long bannerId, String version,
+ String platform, PrintWriter out) {
if (bannerId == null) {
out.print(JsonUtil.loadFalseResult("杞挱鍥剧鐞咺D涓嶈兘涓虹┖"));
return;
}
-
- try {
-
- List<SwiperPicture> list = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize,
- pageSize, bannerId);
+ if (pageIndex == null || pageIndex < 1) {
+ pageIndex = 1;
+ }
+ if (pageSize == null || pageSize < 1) {
+ pageSize = 100;
+ }
+ 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);
+ }
+ }
+ }
+ try {
+ List<SwiperPicture> list = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, pageSize,
+ bannerId);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
+
// 璺宠浆閾炬帴
- for (SwiperPicture swiperPicture: list) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ for (SwiperPicture swiperPicture : list) {
+ if (swiperPicture.getState() != null && swiperPicture.getState() == 0) {
+ swiperPicture.setState(1);
+ } else {
+ swiperPicture.setState(0);
+ }
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+
Date startTime = swiperPicture.getStartTime();
if (startTime == null) {
swiperPicture.setStartTime_str("");
} else {
swiperPicture.setStartTime_str(sdf.format(startTime));
}
-
+
Date endTime = swiperPicture.getEndTime();
if (endTime == null) {
swiperPicture.setEndTime_str("");
} else {
swiperPicture.setEndTime_str(sdf.format(endTime));
}
-
-
-
+
String params = swiperPicture.getParams();
if (params == null) {
swiperPicture.setParams("");
}
-
+
+ String remark = swiperPicture.getRemark();
+ if (remark == null) {
+ swiperPicture.setRemark("");
+ }
+
JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();
if (jumpDetail == null) {
// 榛樿鏈�夋嫨
@@ -372,31 +379,51 @@
swiperPicture.setJumpDetail(jumpDetailV2);
}
}
-
long count = swiperPictureService.countQueryByBannerID(bannerId);
-
+ // 杩囨护
+ if (versionList != null) {
+ if (versionList.size() > 0) {
+ List<Long> sourceIdList = new ArrayList<>();
+ for (SwiperPicture swiperPicture : list) {
+ sourceIdList.add(swiperPicture.getId());
+ }
+ List<Long> versionIdList = new ArrayList<>();
+ for (AppVersionInfo versionInfo : versionList)
+ versionIdList.add(versionInfo.getId());
+ Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+ AdActivityType.banner, 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'T'HH:mm").create();
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("result_list", gson.toJson(list));
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (SwiperPictureException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
}
-
-
+
/**
* 淇濆瓨淇℃伅
*
@@ -405,16 +432,17 @@
* @param out
*/
@RequestMapping(value = "savePicInfo")
- public void savePicInfo(String callback, SwiperPicture record, String jumpType, HttpServletRequest request,PrintWriter out) {
+ public void savePicInfo(String callback, SwiperPicture record, String jumpType, HttpServletRequest request,
+ PrintWriter out) {
try {
- // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
- MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
- swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType);
- }else{
- swiperPictureService.saveObject(null, record, jumpType);
- }
-
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType);
+ } else {
+ swiperPictureService.saveObject(null, record, jumpType);
+ }
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (SwiperPictureException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -423,18 +451,37 @@
e.printStackTrace();
}
}
+
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchStatePic")
+ public void switchStatePic(String callback, Long id, PrintWriter out) {
+ try {
+ swiperPictureService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (SwiperPictureException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
/**
* 鍒犻櫎鍥剧墖浠ュ強淇℃伅
+ *
* @param callback
* @param idArray
* @param out
*/
@RequestMapping(value = "deletePicInfo")
public void deletePicInfo(String callback, String idArray, PrintWriter out) {
-
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -442,23 +489,21 @@
}
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 = swiperPictureService.deleteBatchByPrimaryKey(list);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎["+ count +"]鏉℃暟鎹�"));
+ int count = swiperPictureService.deleteBatchByPrimaryKey(list);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
}
-
/**
* 淇敼鎺掑簭
@@ -468,49 +513,79 @@
* @param out
*/
@RequestMapping(value = "saveOrder")
- public void saveOrder(String callback, Long id,Integer moveType, PrintWriter out) {
-
+ public void saveOrder(String callback, Long id, Integer moveType, PrintWriter out) {
if (moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掔殑绫诲瀷涓嶆纭�"));
return;
}
-
+
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
return;
}
-
- try {
+ try {
SwiperPicture resultObj = swiperPictureService.selectByPrimaryKey(id);
if (resultObj == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
return;
}
-
+
Long bannerId = resultObj.getBannerId();
Integer oldOrder = resultObj.getOrder();
List<SwiperPicture> list = swiperPictureService.getOrderByBannerID(bannerId, moveType, oldOrder);
-
+
if (list != null && list.size() > 0) {
SwiperPicture changeObj = list.get(0);
// 浜ゆ崲鎺掑簭搴忓彿
resultObj.setOrder(changeObj.getOrder());
-
changeObj.setOrder(oldOrder);
-
swiperPictureService.updateByPrimaryKeySelective(changeObj);
}
-
+
swiperPictureService.updateByPrimaryKeySelective(resultObj);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
-
} catch (Exception e) {
e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
}
-
}
-
+
+ /**
+ * 璁剧疆鐗堟湰
+ *
+ * @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 {
+ swiperPictureService.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.banner, 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