From 5af10f175689549ca44b74e9fc1c7ee0ec92c2d7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 21 四月 2020 14:26:38 +0800
Subject: [PATCH] 后台改造
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
index e2d1609..89b88ae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
@@ -2,7 +2,6 @@
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -279,15 +278,10 @@
List<AppVersionInfo> versionList = null;
if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {
versionList = new ArrayList<>();
- if (!StringUtil.isNullOrEmpty(version) && !StringUtil.isNullOrEmpty(platform)) {
- AppVersionInfo appVersion = appVersionService.getByPlatformAndVersion(platform, version);
+ if (!StringUtil.isNullOrEmpty(version)) {
+ AppVersionInfo appVersion = appVersionService.selectByPrimaryKey(Long.parseLong(version));
if (appVersion != null)
versionList.add(appVersion);
- } else if (!StringUtil.isNullOrEmpty(version)) {
- List<AppVersionInfo> appVersionList = appVersionService.listByVersion(version);
- if (appVersionList != null) {
- versionList.addAll(appVersionList);
- }
} else {
List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
if (appVersionList != null) {
@@ -317,13 +311,8 @@
List<Long> versionIdList = new ArrayList<>();
for (AppVersionInfo versionInfo : versionList)
versionIdList.add(versionInfo.getId());
- List<Long> sourceIds = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+ Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
AdActivityType.special, versionIdList);
- Set<Long> sets = new HashSet<>();
- if (sourceIds != null)
- for (Long sourceId : sourceIds) {
- sets.add(sourceId);
- }
for (int i = 0; i < list.size(); i++) {
if (!sets.contains(list.get(i).getId())) {
list.remove(i--);
@@ -388,8 +377,26 @@
List<Long> versionList = new ArrayList<>();
if (list != null)
for (AdActivityVersionControl control : list)
- versionList.add(control.getId());
+ versionList.add(control.getVersion().getId());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(versionList));
}
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchState")
+ public void switchState(String callback, Long id, PrintWriter out) {
+ try {
+ specialService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (SpecialException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0