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/SwiperPictureServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java
index 39603e7..dd15da1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java
@@ -22,7 +22,6 @@
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.Special;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.exception.banner.SwiperPictureException;
@@ -30,6 +29,7 @@
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
@Service
@@ -95,6 +95,8 @@
record.setParams(null);
} else if (!StringUtil.isJson(params)) {
throw new SwiperPictureException(1, "璺宠浆鍙傛暟闈濲SON鏍煎紡");
+ } else {
+ record.setParams(params.trim());
}
if (!StringUtil.isNullOrEmpty(jumpType)) {
@@ -193,7 +195,7 @@
String type = contentType.substring(contentType.indexOf("/") + 1);
// 鏂囦欢璺緞
- String filePath = "/img/swiperPic/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String filePath = FilePathEnum.swiper.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
// 鎵ц涓婁紶
String fileLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
@@ -214,7 +216,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int deleteBatchByPrimaryKey(List<Long> list) throws SwiperPictureException {
List<SwiperPicture> listSwiper = swiperPictureMapper.queryByListPrimaryKey(list);
@@ -225,6 +227,14 @@
}
}
+ if (listSwiper != null)
+ for (SwiperPicture picture : listSwiper) {
+ List<AdActivityVersionControl> versionList = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.banner, picture.getId());
+ if (versionList != null)
+ for (AdActivityVersionControl control : versionList)
+ adActivityVersionControlService.deleteByPrimaryKey(control.getId());
+ }
return swiperPictureMapper.deleteBatchByPrimaryKey(list);
}
@@ -301,6 +311,12 @@
public List<SwiperPicture> getByBannerCardAndVersion(String card, String platform, int version) {
List<SwiperPicture> list = swiperPictureMapper.getByBannerCard(card);
filterSwipePicture(list, platform, version);
+ for (SwiperPicture picture : list) {
+ if (picture.isJumpNeedLogin() && picture.getJumpDetail() != null) {
+ picture.getJumpDetail().setNeedLogin(true);
+ }
+ }
+
return list;
}
--
Gitblit v1.8.0