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 | 76 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 26 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 55d5e28..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;
@@ -30,6 +31,7 @@
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;
@@ -111,6 +113,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -160,6 +163,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -179,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();
}
}
@@ -236,6 +241,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -267,6 +273,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -295,6 +302,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -337,70 +345,81 @@
}
try {
- List<BannerVO> 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 (BannerVO 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(swiperPicture.getId(),
+ CommonShareInfo info = commonShareInfoService.getByPidAndType(bannerVO.getId(),
CommonShareInfoEnum.banner.name());
if (info == null) {
- swiperPicture.setNeedSpin(false);
- swiperPicture.setComment("");
+ bannerVO.setNeedSpin(false);
+ bannerVO.setComment("");
} else {
- swiperPicture.setNeedSpin(info.getNeedSpin());
+ bannerVO.setNeedSpin(info.getNeedSpin());
if (StringUtil.isNullOrEmpty(info.getComment())) {
- swiperPicture.setComment("");
+ bannerVO.setComment("");
} else {
- swiperPicture.setComment(info.getComment());
+ bannerVO.setComment(info.getComment());
}
}
+ list.add(bannerVO);
}
long count = swiperPictureService.countQueryByBannerID(bannerId);
@@ -442,6 +461,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (SwiperPictureException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
@@ -471,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();
}
}
@@ -491,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();
}
}
@@ -524,6 +546,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ LogHelper.errorDetailInfo(e);
e.printStackTrace();
}
}
@@ -569,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