From cc88ea25dc395b5d1b9b5ac9ddba7713c667c1c1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 十二月 2019 12:45:38 +0800
Subject: [PATCH] 专题与banner设置版本管理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 74 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
index 6d7151c..d5876da 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -5,7 +5,9 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
import javax.annotation.Resource;
@@ -25,6 +27,7 @@
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.exception.banner.SwiperPictureException;
import com.yeshi.fanli.exception.homemodule.HomeNavbarException;
import com.yeshi.fanli.exception.homemodule.SpecialException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -449,6 +452,37 @@
return specialMapper.listByVersion(start, count, card, platform, versionCode);
}
+ /**
+ * 涓撻鐗堟湰杩囨护
+ *
+ * @param list
+ * @param platform
+ * @param versionCode
+ */
+ private void filterSpecial(List<Special> 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 (Special special : list) {
+ sourceIdList.add(special.getId());
+ }
+
+ Set<Long> sourceIds = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+ AdActivityType.special, versionIdList);
+ for (int i = 0; i < list.size(); i++) {
+ if (!sourceIds.contains(list.get(i).getId())) {
+ list.remove(i--);
+ }
+ }
+ }
+
@Override
@Cacheable(value = "specialCache", key = "'listCacheSpecialToIndex'+#acceptData.platform+'-'+#acceptData.version+'-'+#sex")
public JSONObject listCacheSpecialToIndex(AcceptData acceptData, Integer sex) throws Exception {
@@ -466,10 +500,12 @@
else if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
indexArc = "index_arc_1.5.6";
- int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+ String platform = acceptData.getPlatform();
+ int platformCode = Constant.getPlatformCode(platform);
int version = Integer.parseInt(acceptData.getVersion());
List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex, platformCode, version);
+ filterSpecial(listArc, platform, version);
if (listArc == null) {
listArc = new ArrayList<Special>();
} else if (listArc.size() > 0) {
@@ -520,6 +556,8 @@
listActivity = specialMapper.listByPlaceKey("index_activity", null, platformCode, version);
}
+ filterSpecial(listActivity, platform, version);
+
if (listActivity == null) {
listActivity = new ArrayList<Special>();
} else if (listActivity.size() > 0) {
@@ -541,6 +579,7 @@
JSONObject blockJsonMap = new JSONObject();
List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex, platformCode, version);
+ filterSpecial(listBlock, platform, version);
if (listBlock == null) {
listBlock = new ArrayList<Special>();
} else if (listBlock.size() > 0) {
@@ -621,20 +660,45 @@
if (special == null) {
throw new Exception("涓撻涓嶅瓨鍦�");
}
+
+ Set<Long> oldSet = new HashSet<>();
+
List<AdActivityVersionControl> versionList = adActivityVersionControlService
- .listByTypeAndSourceId(AdActivityType.special, special.getId());
+ .listByTypeAndSourceId(AdActivityType.special, specialId);
if (versionList != null) {
for (AdActivityVersionControl control : versionList)
- adActivityVersionControlService.deleteByPrimaryKey(control.getId());
+ 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(specialId, AdActivityType.special, versionId);
+ }
+
+ Set<Long> addSet = new HashSet<>();
+ addSet.addAll(newSet);
+ addSet.removeAll(oldSet);
+
// 娣诲姞鏄犲皠
- for (Long versionId : versions) {
+ for (Long versionId : addSet) {
AdActivityVersionControl control = new AdActivityVersionControl();
control.setCreateTime(new Date());
control.setSourceId(special.getId());
control.setType(AdActivityType.special);
control.setVersion(new AppVersionInfo(versionId));
- adActivityVersionControlService.addVersionControl(control);
+ try {
+ adActivityVersionControlService.addVersionControl(control);
+ } catch (Exception e) {
+ throw new SwiperPictureException(2, e.getMessage());
+ }
}
}
}
--
Gitblit v1.8.0