From 093e4c12d0ae253276f3fdfbd4718692aa7956fc Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 07 十一月 2018 09:53:31 +0800
Subject: [PATCH] 调整后端轮播图管理
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 82 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/SwiperBannerAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
similarity index 87%
rename from fanli/src/main/java/com/yeshi/fanli/controller/admin/SwiperBannerAdminController.java
rename to fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
index 7ec7363..805774e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/SwiperBannerAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
@@ -1,4 +1,4 @@
-package com.yeshi.fanli.controller.admin;
+package com.yeshi.fanli.controller.admin.homemodule;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -22,16 +23,18 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperBanner;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.exception.banner.SwiperBannerException;
import com.yeshi.fanli.exception.banner.SwiperPictureException;
import com.yeshi.fanli.service.AdminUserService;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.homemodule.SwiperBannerService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.annotation.RequestNoLogin;
-import org.yeshi.utils.JsonUtil;
/**
* 杞挱鍥剧鐞�
@@ -50,6 +53,12 @@
@Resource
private SwiperPictureService swiperPictureService;
+
+ @Resource
+ private SystemConfigService systemConfigService;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
/**
@@ -302,6 +311,29 @@
return;
}
+ // 璺宠浆閾炬帴
+ for (SwiperPicture swiperPicture: list) {
+ String params = swiperPicture.getParams();
+ if (!StringUtil.isNullOrEmpty(params)) {
+ JSONObject jsonData = JSONObject.fromObject(params);
+ if (jsonData.get("url") != null){
+ swiperPicture.setParams(jsonData.get("url").toString());
+ } else {
+ swiperPicture.setParams(null);
+ }
+ }
+
+ JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();
+ if (jumpDetail == null) {
+ // 榛樿鏈�夋嫨
+ JumpDetailV2 jumpDetailV2 = new JumpDetailV2();
+ jumpDetailV2.setName("-鏈�夋嫨-");
+ jumpDetailV2.setType("default");
+ swiperPicture.setJumpDetail(jumpDetailV2);
+ }
+
+ }
+
long count = swiperPictureService.countQueryByBannerID(bannerId);
@@ -368,6 +400,20 @@
record.setState(1);
record.setCreatetime(new Date());
record.setUpdatetime(new Date());
+
+ String params = record.getParams();
+ if (!StringUtil.isNullOrEmpty(params)) {
+
+ String jumpValue = systemConfigService.get("jump");
+ if (StringUtil.isNullOrEmpty(jumpValue)) {
+ jumpValue = "{\"url\":\"#\"}";
+ }
+
+ params = jumpValue.replace("#", params);
+
+ record.setParams(params);
+ }
+
swiperPictureService.insertSelective(record);
// 涓婁紶鍥剧墖
@@ -440,7 +486,8 @@
*/
@RequestNoLogin()
@RequestMapping(value = "changePicInfo")
- public void changePicInfo(String callback, SwiperPicture record, PrintWriter out) {
+ public void changePicInfo(String callback, SwiperPicture record, String jumpType,
+ PrintWriter out) {
try {
Long id = record.getId();
@@ -455,11 +502,38 @@
return;
}
+ String params = record.getParams();
+ String remark = record.getRemark();
+ if (StringUtil.isNullOrEmpty(params) && StringUtil.isNullOrEmpty(jumpType)
+ && StringUtil.isNullOrEmpty(remark)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鍐呭涓嶈兘涓虹┖"));
+ return;
+ }
+
+
+ if (!StringUtil.isNullOrEmpty(params)) {
+
+ String jumpValue = systemConfigService.get("jump");
+ if (StringUtil.isNullOrEmpty(jumpValue)) {
+ jumpValue = "{\"url\":\"#\"}";
+ }
+
+ params = jumpValue.replace("#", params);
+ record.setParams(params);
+ }
+
+ if (!StringUtil.isNullOrEmpty(jumpType)) {
+ List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
+ if (listByType !=null && listByType.size() > 0) {
+ record.setJumpDetail(listByType.get(0));
+ }
+ }
+
swiperPictureService.updateByPrimaryKeySelective(record);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (SwiperPictureException e) {
+ } catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
--
Gitblit v1.8.0