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 | 95 +++++++++++++++++++++++++++++++++++------------
1 files changed, 71 insertions(+), 24 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 5bc7bf4..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
@@ -12,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;
@@ -23,21 +24,26 @@
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.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;
@@ -72,6 +78,10 @@
@Resource
private AdActivityVersionControlService adActivityVersionControlService;
+
+ @Resource
+ private CommonShareInfoService commonShareInfoService;
+
/**
* 鏂板
@@ -103,6 +113,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -152,6 +163,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -171,6 +183,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -228,6 +241,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -259,6 +273,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -287,6 +302,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -329,55 +345,81 @@
}
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>();
// 璺宠浆閾炬帴
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);
+ for (SwiperPicture swiperPicture : listPic) {
+ BannerVO bannerVO = new BannerVO();
+ try {
+ PropertyUtils.copyProperties(bannerVO, swiperPicture);
+ } catch (Exception e) {
+ e.printStackTrace();
+ continue;
}
- Date startTime = swiperPicture.getStartTime();
+ 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);
@@ -419,6 +461,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (SwiperPictureException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
@@ -432,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("淇濆瓨鎴愬姛"));
@@ -448,6 +491,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -468,6 +512,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -501,6 +546,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -546,8 +592,9 @@
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