From 3d3dcd4fe9603c0792134a1179ddd14abfb22bfe Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 22 三月 2019 11:25:52 +0800
Subject: [PATCH] 悬浮大图广告调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 46 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
index 8a15324..84b84e2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
@@ -58,21 +58,25 @@
}
try {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date startTime = record.getStartTime();
- if (startTime != null) {
- record.setStartTime(format.parse(format.format(startTime)));
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ String startTime_str = record.getStartTime_str();
+ if (startTime_str != null && startTime_str.trim().length() > 0) {
+ startTime_str = startTime_str.replaceAll("T", " ");
+ record.setStartTime(format.parse(startTime_str));
}
- Date endTime = record.getEndTime();
- if (endTime != null) {
- record.setEndTime(format.parse(format.format(endTime)));
+ String endTime_str = record.getEndTime_str();
+ if (endTime_str != null && endTime_str.trim().length() > 0) {
+ endTime_str = endTime_str.replaceAll("T", " ");
+ record.setEndTime(format.parse(endTime_str));
}
} catch (ParseException e) {
e.printStackTrace();
}
+ // 鍥剧墖涓婁紶
String picture = null;
if (file != null) {
picture = uploadPicture(file);
@@ -80,11 +84,14 @@
Long id = record.getId();
if (id == null) {
- int maxOrder = floatADMapper.countByPosition(position);
+ int maxOrder = floatADMapper.getMaxOrderByPosition(position);
record.setPicture(picture);
- record.setState(0);
+ Integer state = record.getState();
+ if (state == null) {
+ record.setState(0);
+ }
+
record.setOrder(maxOrder + 1);
- record.setJumpNeedLogin(false);
record.setCreateTime(new Date());
record.setUpdateTime(new Date());
floatADMapper.insert(record);
@@ -96,9 +103,10 @@
}
if (picture != null && picture.trim().length() > 0) {
+ // 鍒犻櫎鑰佸浘
+ removePicture(resultObj.getPicture());
+ // 瀛樺偍鏂板浘
record.setPicture(picture);
- // 鍒犻櫎宸插瓨鍦ㄥ浘鐗�
- removePicture(resultObj);
} else {
record.setPicture(resultObj.getPicture());
}
@@ -110,6 +118,38 @@
}
}
+
+ /**
+ * 涓婁紶鍥剧墖
+ * @param file
+ * @return
+ * @throws Exception
+ */
+ public String uploadPicture(MultipartFile file) throws Exception {
+
+ // 鏂囦欢瑙ｆ瀽
+ InputStream inputStream = file.getInputStream();
+ String contentType = file.getContentType();
+ String type = contentType.substring(contentType.indexOf("/") + 1);
+
+ // 鏂囦欢璺緞
+ String filePath="/img/FloatAD/"+UUID.randomUUID().toString().replace("-", "") + "." + type;
+ // 鎵ц涓婁紶
+ String fileLink= COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
+
+ return fileLink;
+ }
+
+ /**
+ * 鍒犻櫎鍥剧墖-涓嶆洿鏂版暟鎹簱
+ * @param record
+ * @throws Exception
+ */
+ public void removePicture(String picture) throws Exception {
+ if (picture != null && picture.trim().length() > 0) {
+ COSManager.getInstance().deleteFile(picture);
+ }
+ }
@Override
@Transactional
@@ -155,45 +195,12 @@
// 鍒犻櫎宸插瓨鍦ㄥ浘鐗�
for (FloatAD floatAD: listSwiper) {
- removePicture(floatAD);
+ removePicture(floatAD.getPicture());
}
return floatADMapper.deleteByPrimaryKeyList(list);
}
-
- /**
- * 涓婁紶鍥剧墖
- * @param file
- * @return
- * @throws Exception
- */
- public String uploadPicture(MultipartFile file) throws Exception {
-
- // 鏂囦欢瑙ｆ瀽
- InputStream inputStream = file.getInputStream();
- String contentType = file.getContentType();
- String type = contentType.substring(contentType.indexOf("/") + 1);
-
- // 鏂囦欢璺緞
- String filePath="/img/FloatAD/"+UUID.randomUUID().toString().replace("-", "") + "." + type;
- // 鎵ц涓婁紶
- String fileLink= COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
-
- return fileLink;
- }
-
- /**
- * 鍒犻櫎鍥剧墖-涓嶆洿鏂版暟鎹簱
- * @param record
- * @throws Exception
- */
- public void removePicture(FloatAD record) throws Exception {
- String picture = record.getPicture();
- if (picture != null && picture.trim().length() > 0) {
- COSManager.getInstance().deleteFile(picture);
- }
- }
@Override
@@ -206,6 +213,21 @@
for (FloatAD floatAD : listQuery) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ Date startTime = floatAD.getStartTime();
+ if (startTime == null) {
+ floatAD.setStartTime_str("");
+ } else {
+ floatAD.setStartTime_str(sdf.format(startTime));
+ }
+
+ Date endTime = floatAD.getEndTime();
+ if (endTime == null) {
+ floatAD.setEndTime_str("");
+ } else {
+ floatAD.setEndTime_str(sdf.format(endTime));
+ }
+
String params = floatAD.getParams();
if (params == null) {
floatAD.setParams("");
--
Gitblit v1.8.0