From 7e51ff02bba60c1577e321d6a0d0f31474e0a2fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 17 十二月 2019 15:16:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 258 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 175 insertions(+), 83 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 cf97de9..7dabbf5 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
@@ -5,8 +5,10 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -19,6 +21,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.AdActivityType;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
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 +31,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 +55,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
@@ -93,6 +108,7 @@
/**
* 淇敼
+ *
* @param callback
* @param swiperBanner
* @param out
@@ -139,9 +155,9 @@
}
}
-
/**
* 淇鐘舵��
+ *
* @param callback
* @param id
* @param out
@@ -160,19 +176,19 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
return;
}
-
+
Integer state = resultObj.getState();
- if (state == null || state.equals(1) || state == 1) {
+ 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));
} catch (SwiperBannerException e) {
@@ -181,14 +197,16 @@
}
}
-
/**
* 鏌ヨ
+ *
* @param callback
* @param pageIndex
* @param pageSize
- * @param key 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
- * @param sort 鎺掑簭 锛� 鍒涘缓鏃堕棿鍊掑簭1 榛樿姝ｅ簭
+ * @param key
+ * 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
+ * @param sort
+ * 鎺掑簭 锛� 鍒涘缓鏃堕棿鍊掑簭1 榛樿姝ｅ簭
* @param out
*/
@RequestMapping(value = "query")
@@ -209,20 +227,20 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
- for (SwiperBanner swiperBanne: list) {
- long TotalPic= swiperPictureService.countQueryByBannerID(swiperBanne.getId());
-
+
+ for (SwiperBanner swiperBanne : list) {
+ 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();
@@ -238,9 +256,9 @@
}
-
/**
* 鍒犻櫎
+ *
* @param callback
* @param idArray
* @param out
@@ -255,16 +273,17 @@
}
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("鍒犻櫎澶辫触"));
@@ -272,48 +291,48 @@
}
}
-
@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) {
+ public void queryPicInfo(String callback, Integer pageIndex, Integer pageSize, Long bannerId, String version,
+ String platform, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -323,24 +342,41 @@
pageSize = Constant.PAGE_SIZE;
}
+ pageSize = 100;
+
if (bannerId == null) {
out.print(JsonUtil.loadFalseResult("杞挱鍥剧鐞咺D涓嶈兘涓虹┖"));
return;
}
-
+
+ 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);
+
+ 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) {
-
+ for (SwiperPicture swiperPicture : list) {
+
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
Date startTime = swiperPicture.getStartTime();
if (startTime == null) {
@@ -348,28 +384,24 @@
} 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) {
// 榛樿鏈�夋嫨
@@ -379,15 +411,39 @@
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();
@@ -402,8 +458,7 @@
}
}
-
-
+
/**
* 淇濆瓨淇℃伅
*
@@ -412,16 +467,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()));
@@ -430,11 +486,10 @@
e.printStackTrace();
}
}
-
-
-
+
/**
* 鍒犻櫎鍥剧墖浠ュ強淇℃伅
+ *
* @param callback
* @param idArray
* @param out
@@ -449,23 +504,23 @@
}
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 +"]鏉℃暟鎹�"));
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
}
-
/**
* 淇敼鎺掑簭
@@ -475,18 +530,18 @@
* @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 {
SwiperPicture resultObj = swiperPictureService.selectByPrimaryKey(id);
@@ -494,21 +549,21 @@
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("鎿嶄綔鎴愬姛"));
@@ -519,5 +574,42 @@
}
}
-
+
+ /**
+ * 璁剧疆鐗堟湰
+ *
+ * @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