From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 235 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 129 insertions(+), 106 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..1404ef2 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;
@@ -13,6 +12,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -22,23 +22,28 @@
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.CommonShareInfo;
+import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo.CommonShareInfoEnum;
import com.yeshi.fanli.entity.bus.homemodule.SwiperBanner;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.exception.banner.SwiperBannerException;
import com.yeshi.fanli.exception.banner.SwiperPictureException;
+import com.yeshi.fanli.log.LogHelper;
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.CommonShareInfoService;
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 com.yeshi.fanli.vo.homemodule.BannerVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -73,6 +78,10 @@
@Resource
private AdActivityVersionControlService adActivityVersionControlService;
+
+ @Resource
+ private CommonShareInfoService commonShareInfoService;
+
/**
* 鏂板
@@ -89,19 +98,22 @@
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("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -116,7 +128,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 +147,10 @@
return;
}
+ if (swiperBanner.getState() == null) {
+ swiperBanner.setState(1);// 榛樿鍋滅敤
+ }
+
if (StringUtil.isNullOrEmpty(title)) {
swiperBanner.setTitle(null);
}
@@ -143,59 +158,36 @@
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("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
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("鎿嶄綔澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
+
/**
* 鏌ヨ
@@ -211,7 +203,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 +210,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 +238,12 @@
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("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
-
}
/**
@@ -265,7 +255,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,13 +269,11 @@
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("鍒犻櫎澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -295,7 +282,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,9 +300,9 @@
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("鍒犻櫎澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -333,22 +319,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,55 +345,84 @@
}
try {
-
- List<SwiperPicture> list = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, pageSize,
+ List<SwiperPicture> listPic = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, pageSize,
bannerId);
-
- if (list == null || list.size() == 0) {
+ if (listPic == null || listPic.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
+ List<BannerVO> list = new ArrayList<BannerVO>();
// 璺宠浆閾炬帴
- for (SwiperPicture swiperPicture : list) {
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
- Date startTime = swiperPicture.getStartTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ for (SwiperPicture swiperPicture : listPic) {
+ BannerVO bannerVO = new BannerVO();
+ try {
+ PropertyUtils.copyProperties(bannerVO, swiperPicture);
+ } catch (Exception e) {
+ e.printStackTrace();
+ continue;
+ }
+
+
+ if (bannerVO.getState() != null && bannerVO.getState() == 0) {
+ bannerVO.setState(1);
+ } else {
+ bannerVO.setState(0);
+ }
+
+
+ Date startTime = bannerVO.getStartTime();
if (startTime == null) {
- swiperPicture.setStartTime_str("");
+ bannerVO.setStartTime_str("");
} else {
- swiperPicture.setStartTime_str(sdf.format(startTime));
+ bannerVO.setStartTime_str(sdf.format(startTime));
}
- Date endTime = swiperPicture.getEndTime();
+ Date endTime = bannerVO.getEndTime();
if (endTime == null) {
- swiperPicture.setEndTime_str("");
+ bannerVO.setEndTime_str("");
} else {
- swiperPicture.setEndTime_str(sdf.format(endTime));
+ bannerVO.setEndTime_str(sdf.format(endTime));
}
- String params = swiperPicture.getParams();
+ String params = bannerVO.getParams();
if (params == null) {
- swiperPicture.setParams("");
+ bannerVO.setParams("");
}
- String remark = swiperPicture.getRemark();
+ String remark = bannerVO.getRemark();
if (remark == null) {
- swiperPicture.setRemark("");
+ bannerVO.setRemark("");
}
- JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();
+ JumpDetailV2 jumpDetail = bannerVO.getJumpDetail();
if (jumpDetail == null) {
// 榛樿鏈�夋嫨
JumpDetailV2 jumpDetailV2 = new JumpDetailV2();
jumpDetailV2.setName("-鏈�夋嫨-");
jumpDetailV2.setType("default");
- swiperPicture.setJumpDetail(jumpDetailV2);
+ bannerVO.setJumpDetail(jumpDetailV2);
}
+
+ // 鍒嗕韩琛ュ厖淇℃伅
+ CommonShareInfo info = commonShareInfoService.getByPidAndType(bannerVO.getId(),
+ CommonShareInfoEnum.banner.name());
+ if (info == null) {
+ bannerVO.setNeedSpin(false);
+ bannerVO.setComment("");
+ } else {
+ bannerVO.setNeedSpin(info.getNeedSpin());
+ if (StringUtil.isNullOrEmpty(info.getComment())) {
+ bannerVO.setComment("");
+ } else {
+ bannerVO.setComment(info.getComment());
+ }
+ }
+ list.add(bannerVO);
}
long count = swiperPictureService.countQueryByBannerID(bannerId);
-
// 杩囨护
if (versionList != null) {
if (versionList.size() > 0) {
@@ -449,11 +458,10 @@
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("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
@@ -467,15 +475,15 @@
* @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, CommonShareInfo extra,
+ HttpServletRequest request, PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
- swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType);
+ swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType, extra);
} else {
- swiperPictureService.saveObject(null, record, jumpType);
+ swiperPictureService.saveObject(null, record, jumpType, extra);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
@@ -483,10 +491,33 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ LogHelper.errorDetailInfo(e);
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("鎿嶄綔澶辫触"));
+ LogHelper.errorDetailInfo(e);
+ e.printStackTrace();
+ }
+ }
+
+
/**
* 鍒犻櫎鍥剧墖浠ュ強淇℃伅
*
@@ -496,7 +527,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,11 +543,10 @@
}
int count = swiperPictureService.deleteBatchByPrimaryKey(list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -531,7 +560,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 +571,6 @@
}
try {
-
SwiperPicture resultObj = swiperPictureService.selectByPrimaryKey(id);
if (resultObj == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
@@ -558,21 +585,17 @@
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("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
+ e.printStackTrace();
}
-
}
/**
--
Gitblit v1.8.0