From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java | 274 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 221 insertions(+), 53 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..9b3b57f 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
@@ -3,23 +3,35 @@
import java.io.InputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.mybatis.homemodule.FloatADMapper;
+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.FloatAD;
+import com.yeshi.fanli.entity.bus.homemodule.FloatAD.FloatADTypeEnum;
import com.yeshi.fanli.entity.common.JumpDetailV2;
-import com.yeshi.fanli.exception.FloatADException;
+import com.yeshi.fanli.exception.banner.SwiperPictureException;
+import com.yeshi.fanli.exception.homemodule.FloatADException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
+import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
import com.yeshi.fanli.service.inter.homemodule.FloatADService;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
@Service
@@ -30,6 +42,12 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private AppVersionService appVersionService;
+
+ @Resource
+ private AdActivityVersionControlService adActivityVersionControlService;
@Override
@@ -46,10 +64,18 @@
}
String params = record.getParams();
- if ((params != null && params.trim().length() == 0) || "null".equalsIgnoreCase(params) ) {
+ if (params == null || params.trim().length() == 0 || "null".equalsIgnoreCase(params) ) {
record.setParams(null);
+ } else if (!StringUtil.isJson(params)) {
+ throw new FloatADException(1, "璺宠浆鍙傛暟闈濲SON鏍煎紡");
+ } else {
+ record.setParams(params.trim());
}
+ FloatADTypeEnum typeEnum = record.getTypeEnum();
+ if (typeEnum == null)
+ throw new FloatADException(1, "绫诲瀷涓嶈兘涓虹┖");
+
if (!StringUtil.isNullOrEmpty(jumpType)) {
List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
if (listByType !=null && listByType.size() > 0) {
@@ -58,33 +84,46 @@
}
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);
}
+ // 閫傜敤绫诲瀷 锛� 0閫氱敤 1鏂颁汉
+ Integer type = record.getType();
+ if (type == null) {
+ record.setType(0);
+ }
+
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 +135,10 @@
}
if (picture != null && picture.trim().length() > 0) {
+ // 鍒犻櫎鑰佸浘
+ removePicture(resultObj.getPicture());
+ // 瀛樺偍鏂板浘
record.setPicture(picture);
- // 鍒犻櫎宸插瓨鍦ㄥ浘鐗�
- removePicture(resultObj);
} else {
record.setPicture(resultObj.getPicture());
}
@@ -110,9 +150,41 @@
}
}
+
+ /**
+ * 涓婁紶鍥剧墖
+ * @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= FilePathEnum.floatAD.getPath() +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
+ @Transactional(rollbackFor=Exception.class)
public void updateOrder(Long id, Integer moveType) throws FloatADException {
if (id == null || moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {
@@ -145,7 +217,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public int deleteByPrimaryKeyList(List<Long> list) throws Exception{
List<FloatAD> listSwiper = floatADMapper.ListByPrimaryKey(list);
@@ -155,45 +227,18 @@
// 鍒犻櫎宸插瓨鍦ㄥ浘鐗�
for (FloatAD floatAD: listSwiper) {
- removePicture(floatAD);
+ removePicture(floatAD.getPicture());
+
+ List<AdActivityVersionControl> versionList = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.floatAD, floatAD.getId());
+ if (versionList != null)
+ for (AdActivityVersionControl control : versionList)
+ adActivityVersionControlService.deleteByPrimaryKey(control.getId());
}
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
@@ -205,6 +250,26 @@
}
for (FloatAD floatAD : listQuery) {
+
+ FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
+ if (typeEnum != null) {
+ floatAD.setTypeName(typeEnum.getDesc());
+ }
+
+ 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) {
@@ -233,9 +298,10 @@
return floatADMapper.countQuery(key, state);
}
+ @Cacheable(value = "configCache", key = "'getEffectiveFloatAD-'+#position+'-'+#type")
@Override
- public FloatAD getEffectiveFloatAD(String position) {
- FloatAD floatAD = floatADMapper.getEffectiveFloatAD(position);
+ public FloatAD getEffectiveFloatAD(String position, Integer type) {
+ FloatAD floatAD = floatADMapper.getEffectiveFloatAD(position, type);
if (floatAD != null) {
JumpDetailV2 jumpDetail = floatAD.getJumpDetail();
@@ -253,5 +319,107 @@
return floatAD;
}
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void setVersions(Long id, List<Long> versions) throws Exception {
+ FloatAD record = floatADMapper.selectByPrimaryKey(id);
+ if (record == null) {
+ throw new Exception("涓撻涓嶅瓨鍦�");
+ }
+
+ Set<Long> oldSet = new HashSet<>();
+
+ List<AdActivityVersionControl> versionList = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.floatAD, id);
+ if (versionList != null) {
+ for (AdActivityVersionControl control : versionList)
+ oldSet.add(control.getVersion().getId());
+ }
+
+ Set<Long> newSet = new HashSet<>();
+ for (Long version : versions) {
+ newSet.add(version);
+ }
+
+ Set<Long> delSet = new HashSet<>();
+ delSet.addAll(oldSet);
+ delSet.removeAll(newSet);
+ for (Long versionId : delSet) {
+ adActivityVersionControlService.deleteBySourceAndVersion(id, AdActivityType.floatAD, versionId);
+ }
+
+ Set<Long> addSet = new HashSet<>();
+ addSet.addAll(newSet);
+ addSet.removeAll(oldSet);
+ // 娣诲姞鏄犲皠
+ for (Long versionId : addSet) {
+ AdActivityVersionControl control = new AdActivityVersionControl();
+ control.setCreateTime(new Date());
+ control.setSourceId(id);
+ control.setType(AdActivityType.floatAD);
+ control.setVersion(new AppVersionInfo(versionId));
+ try {
+ adActivityVersionControlService.addVersionControl(control);
+ } catch (Exception e) {
+ throw new SwiperPictureException(2, e.getMessage());
+ }
+ }
+ }
+
+ @Cacheable(value = "configCache", key = "'getValidFloatADCache-'+#position+'-'+#type+'-'+#platform+'-'+#versionCode")
+ @Override
+ public List<FloatAD> getValidFloatADCache(String position, Integer type, String platform, Integer versionCode) {
+ List<FloatAD> list = floatADMapper.getValidFloatAD(position, type);
+ // 杩囨护
+ filterFloatAD(list, platform, versionCode);
+
+ return list;
+ }
+
+ /**
+ * 杩囨护
+ *
+ * @param list
+ * @param platform
+ * @param versionCode
+ */
+ private void filterFloatAD(List<FloatAD> list, String platform, int versionCode) {
+ if (list == null || list.size() == 0)
+ return;
+ AppVersionInfo app = appVersionService.getClientVersion(platform, versionCode);
+ if (app == null) {
+ list.clear();
+ return;
+ }
+ List<Long> versionIdList = new ArrayList<>();
+ versionIdList.add(app.getId());
+ List<Long> sourceIdList = new ArrayList<>();
+ for (FloatAD record : list) {
+ sourceIdList.add(record.getId());
+ }
+
+ Set<Long> sourceIds = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+ AdActivityType.floatAD, versionIdList);
+
+ for (int i = 0; i < list.size(); i++) {
+ // 杩囨护鐗堟湰
+ if (!sourceIds.contains(list.get(i).getId())) {
+ list.remove(i--);
+ continue;
+ }
+
+ // 璺宠浆鏄惁鐧诲綍
+ FloatAD floatAD = list.get(i);
+ JumpDetailV2 jumpDetail = floatAD.getJumpDetail();
+ if (jumpDetail != null) {
+ jumpDetail = jumpDetailV2Service.selectByPrimaryKey(jumpDetail.getId());
+ if (jumpDetail != null) {
+ jumpDetail.setNeedLogin(floatAD.isJumpNeedLogin());
+ }
+ }
+ }
+ }
+
}
--
Gitblit v1.8.0