From 51c0049fb70c85bf515dc0fecd96bf13ca23aa28 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 四月 2020 18:37:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 148 ++++++++++++++++++++----------------------------
1 files changed, 62 insertions(+), 86 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 7dabbf5..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
@@ -5,7 +5,6 @@
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;
@@ -22,8 +21,8 @@
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.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;
@@ -89,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("鎿嶄綔寮傚父"));
@@ -116,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涓嶈兘涓虹┖"));
@@ -136,6 +136,10 @@
return;
}
+ if (swiperBanner.getState() == null) {
+ swiperBanner.setState(1);// 榛樿鍋滅敤
+ }
+
if (StringUtil.isNullOrEmpty(title)) {
swiperBanner.setTitle(null);
}
@@ -143,59 +147,34 @@
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();
}
}
+
/**
* 鏌ヨ
@@ -211,7 +190,6 @@
*/
@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;
}
@@ -219,23 +197,24 @@
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) {
+ 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);
@@ -246,14 +225,11 @@
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();
}
-
}
/**
@@ -265,7 +241,6 @@
*/
@RequestMapping(value = "delete")
public void delete(String callback, String idArray, PrintWriter out) {
-
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -280,11 +255,8 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
return;
}
-
int count = swiperBannerService.deleteBatchByPrimaryKey(list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
@@ -295,7 +267,6 @@
public void getEffectiveOption(String callback, PrintWriter out) {
try {
List<Object> list = new ArrayList<Object>();
-
Map<String, Object> mapDefalut = new HashMap<String, Object>();
mapDefalut.put("key", 0);
mapDefalut.put("value", "--鏈�夋嫨--");
@@ -314,7 +285,6 @@
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();
@@ -333,22 +303,16 @@
@RequestMapping(value = "queryPicInfo")
public void queryPicInfo(String callback, Integer pageIndex, Integer pageSize, Long bannerId, String version,
String platform, PrintWriter out) {
-
- if (pageIndex == null || pageIndex < 1) {
- pageIndex = 1;
- }
-
- if (pageSize == null || pageSize < 1) {
- pageSize = Constant.PAGE_SIZE;
- }
-
- pageSize = 100;
-
if (bannerId == null) {
out.print(JsonUtil.loadFalseResult("杞挱鍥剧鐞咺D涓嶈兘涓虹┖"));
return;
}
-
+ 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<>();
@@ -365,19 +329,23 @@
}
try {
-
List<SwiperPicture> list = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, pageSize,
bannerId);
-
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
// 璺宠浆閾炬帴
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
for (SwiperPicture swiperPicture : list) {
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ if (swiperPicture.getState() != null && swiperPicture.getState() == 0) {
+ swiperPicture.setState(1);
+ } else {
+ swiperPicture.setState(0);
+ }
+
+
Date startTime = swiperPicture.getStartTime();
if (startTime == null) {
swiperPicture.setStartTime_str("");
@@ -413,7 +381,6 @@
}
long count = swiperPictureService.countQueryByBannerID(bannerId);
-
// 杩囨护
if (versionList != null) {
if (versionList.size() > 0) {
@@ -449,9 +416,7 @@
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();
@@ -487,6 +452,27 @@
}
}
+
+ /**
+ * 淇敼鐘舵��
+ * @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();
+ }
+ }
+
+
/**
* 鍒犻櫎鍥剧墖浠ュ強淇℃伅
*
@@ -496,7 +482,6 @@
*/
@RequestMapping(value = "deletePicInfo")
public void deletePicInfo(String callback, String idArray, PrintWriter out) {
-
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -513,9 +498,7 @@
}
int count = swiperPictureService.deleteBatchByPrimaryKey(list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
@@ -531,7 +514,6 @@
*/
@RequestMapping(value = "saveOrder")
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;
@@ -543,7 +525,6 @@
}
try {
-
SwiperPicture resultObj = swiperPictureService.selectByPrimaryKey(id);
if (resultObj == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
@@ -558,21 +539,16 @@
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("鎿嶄綔寮傚父"));
}
-
}
/**
--
Gitblit v1.8.0