From 81ed418ee16df24b768a3f78cd22d02f020d6314 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 08 一月 2020 13:58:47 +0800
Subject: [PATCH] 小黄条+ 首页弹框 版本区分
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java | 98 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java
index a17e140..ebe3bb9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java
@@ -5,6 +5,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Set;
import javax.annotation.Resource;
@@ -15,13 +16,20 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.bus.help.AppPageNotification;
import com.yeshi.fanli.entity.bus.help.AppPageNotification.AppPageNotificationTypeEnum;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
+import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.help.AppPageNotificationService;
+import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@Controller
@@ -30,6 +38,12 @@
@Resource
private AppPageNotificationService appPageNotificationService;
+
+ @Resource
+ private AppVersionService appVersionService;
+
+ @Resource
+ private AdActivityVersionControlService adActivityVersionControlService;
/**
@@ -198,15 +212,13 @@
*/
@RequestMapping(value = "query")
public void query(String callback, Integer pageIndex, Integer pageSize, String key,
- Integer show, Integer canClose, PrintWriter out) {
+ Integer show, Integer canClose,String version, String platform, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
- if (pageSize == null || pageSize < 1) {
- pageSize = Constant.PAGE_SIZE;
- }
+ pageSize =Integer.MAX_VALUE;
try {
List<AppPageNotification> list = appPageNotificationService.listQuery((pageIndex - 1) * pageSize,
@@ -238,8 +250,46 @@
}
}
-
long count = appPageNotificationService.countQuery(key, show, canClose);
+
+ List<AppVersionInfo> versionList = null;
+ if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {
+ versionList = new ArrayList<>();
+ if (!StringUtil.isNullOrEmpty(version)) {
+ AppVersionInfo appVersion = appVersionService.selectByPrimaryKey(Long.parseLong(version));
+ if (appVersion != null)
+ versionList.add(appVersion);
+ } else {
+ List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
+ if (appVersionList != null) {
+ versionList.addAll(appVersionList);
+ }
+ }
+ }
+
+ // 杩囨护
+ if (versionList != null) {
+ if (versionList.size() > 0) {
+ List<Long> sourceIdList = new ArrayList<>();
+ for (AppPageNotification record : list) {
+ sourceIdList.add(record.getId());
+ }
+ List<Long> versionIdList = new ArrayList<>();
+ for (AppVersionInfo versionInfo : versionList)
+ versionIdList.add(versionInfo.getId());
+ Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+ AdActivityType.notification, versionIdList);
+ for (int i = 0; i < list.size(); i++) {
+ if (!sets.contains(list.get(i).getId())) {
+ list.remove(i--);
+ }
+ }
+ count = list.size();
+ } else {
+ list.clear();
+ count = 0;
+ }
+ }
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -365,7 +415,6 @@
*/
//@RequestMapping(value = "delete")
public void delete(String callback, String idArray, PrintWriter out) {
-
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -389,5 +438,42 @@
e.printStackTrace();
}
}
+
+ /**
+ * 璁剧疆鐗堟湰
+ *
+ * @param callback
+ * @param id
+ * @param moveType
+ * @param sex
+ * @param out
+ */
+ @RequestMapping(value = "setVersions")
+ public void setVersions(String callback, Long id, String versions, PrintWriter out) {
+ JSONArray versionArray = JSONArray.fromObject(versions);
+ List<Long> versionIds = new ArrayList<>();
+ for (int i = 0; i < versionArray.size(); i++) {
+ Long version = versionArray.optLong(i);
+ versionIds.add(version);
+ }
+ try {
+ appPageNotificationService.setVersions(id, versionIds);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
+ }
+ }
+
+ @RequestMapping(value = "getVersions")
+ public void getVersions(String callback, Long id, PrintWriter out) {
+ List<AdActivityVersionControl> list = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.notification, id);
+
+ List<Long> versionList = new ArrayList<>();
+ if (list != null)
+ for (AdActivityVersionControl control : list)
+ versionList.add(control.getVersion().getId());
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(versionList));
+ }
}
--
Gitblit v1.8.0