From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 302 +++++++++++++++-----------------------------------
1 files changed, 90 insertions(+), 212 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
index ed1ff94..cf97de9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
@@ -1,18 +1,19 @@
package com.yeshi.fanli.controller.admin.homemodule;
import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
-
-import net.sf.json.JSONObject;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
@@ -31,6 +32,8 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+
+import net.sf.json.JSONObject;
/**
* 杞挱鍥剧鐞�
@@ -82,8 +85,7 @@
swiperBannerService.insert(swiperBanner);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
-
- } catch (SwiperBannerException e) {
+ } catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
@@ -268,9 +270,38 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
-
}
+
+ @RequestMapping(value = "getEffectiveOption")
+ public void getEffectiveOption(String callback, PrintWriter out) {
+ try {
+ List<Object> list = new ArrayList<Object>();
+
+ Map<String,Object> mapDefalut =new HashMap<String,Object>();
+ mapDefalut.put("key", 0);
+ mapDefalut.put("value", "--鏈�夋嫨--");
+ list.add(mapDefalut);
+
+ List<SwiperBanner> listBanner = swiperBannerService.getEffectiveOption();
+ if (listBanner != null && listBanner.size() > 0) {
+ for (SwiperBanner swiperBanner: listBanner) {
+ Map<String,Object> map =new HashMap<String,Object>();
+ map.put("key", swiperBanner.getId());
+ map.put("value", swiperBanner.getTitle());
+ list.add(map);
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("result_list", list);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ e.printStackTrace();
+ }
+ }
/**
@@ -281,8 +312,8 @@
* @param bannerId
* @param out
*/
- @RequestMapping(value = "queryPicture")
- public void queryPicture(String callback, Integer pageIndex, Integer pageSize, Long bannerId, PrintWriter out) {
+ @RequestMapping(value = "queryPicInfo")
+ public void queryPicInfo(String callback, Integer pageIndex, Integer pageSize, Long bannerId, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -309,15 +340,35 @@
// 璺宠浆閾炬帴
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);
- }
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ Date startTime = swiperPicture.getStartTime();
+ if (startTime == null) {
+ swiperPicture.setStartTime_str("");
+ } else {
+ swiperPicture.setStartTime_str(sdf.format(startTime));
}
+
+ Date endTime = swiperPicture.getEndTime();
+ if (endTime == null) {
+ swiperPicture.setEndTime_str("");
+ } else {
+ swiperPicture.setEndTime_str(sdf.format(endTime));
+ }
+
+
+
+ String params = swiperPicture.getParams();
+ if (params == null) {
+ swiperPicture.setParams("");
+ }
+
+
+ String remark = swiperPicture.getRemark();
+ if (remark == null) {
+ swiperPicture.setRemark("");
+ }
+
JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();
if (jumpDetail == null) {
@@ -327,7 +378,6 @@
jumpDetailV2.setType("default");
swiperPicture.setJumpDetail(jumpDetailV2);
}
-
}
@@ -338,7 +388,7 @@
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.serializeNulls();
- Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+ Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd'T'HH:mm").create();
JSONObject data = new JSONObject();
data.put("pe", pe);
@@ -353,166 +403,35 @@
}
+
/**
- * 涓婁紶鍥剧墖浠ュ強瀵瑰簲淇℃伅
- * @param file 鍥剧墖鏂囦欢
- * @param uid
- * @param record 鍥剧墖淇℃伅
- * @param request
- * @param response
- * @param out
- */
- @RequestMapping(value = "uploadPicture")
- public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, Long uid,
- SwiperPicture record, PrintWriter out) {
-
-
- if (file == null) {
- out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
- return;
- }
-
- try {
-
- Long bannerId = record.getBannerId();
- if (bannerId == null) {
- out.print(JsonUtil.loadFalseResult("杞挱鍥剧鐞咺D涓嶈兘涓虹┖"));
- return;
- }
-
- int maxOrder = swiperPictureService.getMaxOrderByBannerID(bannerId);
- record.setOrder(maxOrder + 1);
- // 榛樿鍋滅敤
- 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);
-
- // 涓婁紶鍥剧墖
- swiperPictureService.uploadPicture(file, record);
-
- out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
-
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
- /**
- * 淇敼鍥剧墖
- * @param file 鍥剧墖
- * @param uid 鐢ㄦ埛id
- * @param record
- * @param request
- * @param response
- * @param out
- */
- @RequestMapping(value = "changePicture")
- public void changePicture(@RequestParam("file") CommonsMultipartFile file, Long uid, Long id,
- PrintWriter out) {
-
- if (file == null) {
- out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
- return;
- }
-
- try {
- if (id == null) {
- out.print(JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- SwiperPicture resultObj = swiperPictureService.selectByPrimaryKey(id);
- if (resultObj == null) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
-
- swiperPictureService.uploadPicture(file, resultObj);
- out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
-
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
- /**
- * 淇敼鍥剧墖淇℃伅
+ * 淇濆瓨淇℃伅
+ *
* @param callback
- * @param record
+ * @param special
* @param out
*/
- @RequestMapping(value = "changePicInfo")
- public void changePicInfo(String callback, SwiperPicture record, String jumpType,
- PrintWriter out) {
-
+ @RequestMapping(value = "savePicInfo")
+ public void savePicInfo(String callback, SwiperPicture record, String jumpType, HttpServletRequest request,PrintWriter out) {
try {
- Long id = record.getId();
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- SwiperPicture resultObj = swiperPictureService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- 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);
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ if (request instanceof MultipartHttpServletRequest) {
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType);
+ }else{
+ swiperPictureService.saveObject(null, record, jumpType);
+ }
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-
+ } catch (SwiperPictureException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
e.printStackTrace();
}
}
-
+
+
/**
* 鍒犻櫎鍥剧墖浠ュ強淇℃伅
@@ -520,8 +439,8 @@
* @param idArray
* @param out
*/
- @RequestMapping(value = "deletePicture")
- public void deletePicture(String callback, String idArray, PrintWriter out) {
+ @RequestMapping(value = "deletePicInfo")
+ public void deletePicInfo(String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
@@ -541,53 +460,12 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎["+ count +"]鏉℃暟鎹�"));
- } catch (SwiperPictureException e) {
+ } catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
-
}
- /**
- * 淇鐘舵��
- * @param callback
- * @param id
- * @param out
- */
- @RequestMapping(value = "updateStatePic")
- public void updateStatePic(String callback, Long id, PrintWriter out) {
- try {
-
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- SwiperPicture resultObj = swiperPictureService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- Integer state = resultObj.getState();
- if (state == null || state.equals(1) || state == 1) {
- resultObj.setState(0);
- } else {
- resultObj.setState(1);
- }
-
- swiperPictureService.updateByPrimaryKeySelective(resultObj);
-
- JSONObject data = new JSONObject();
- data.put("state", resultObj.getState());
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (SwiperPictureException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
- }
/**
* 淇敼鎺掑簭
--
Gitblit v1.8.0