From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java |  617 ++++++++++++++++++++++++++-----------------------------
 1 files changed, 293 insertions(+), 324 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..55d5e28 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,23 +1,30 @@
 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 java.util.Set;
 
 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;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.entity.AppVersionInfo;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
+import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
+import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo;
+import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo.CommonShareInfoEnum;
 import com.yeshi.fanli.entity.bus.homemodule.SwiperBanner;
 import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -25,15 +32,23 @@
 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.AppVersionService;
 import com.yeshi.fanli.service.inter.config.SystemConfigService;
+import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
+import com.yeshi.fanli.service.inter.homemodule.CommonShareInfoService;
 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.vo.homemodule.BannerVO;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 
 /**
  * 杞挱鍥剧鐞�
+ * 
  * @author Administrator
  *
  */
@@ -43,22 +58,32 @@
 
 	@Resource
 	private AdminUserService adminUserService;
-	
+
 	@Resource
 	private SwiperBannerService swiperBannerService;
-	
+
 	@Resource
 	private SwiperPictureService swiperPictureService;
-	
+
 	@Resource
 	private SystemConfigService systemConfigService;
-	
+
 	@Resource
 	private JumpDetailV2Service jumpDetailV2Service;
+
+	@Resource
+	private AppVersionService appVersionService;
+
+	@Resource
+	private AdActivityVersionControlService adActivityVersionControlService;
 	
+	@Resource
+	private CommonShareInfoService commonShareInfoService;
 	
+
 	/**
 	 * 鏂板
+	 * 
 	 * @param callback
 	 * @param swiperBanner
 	 * @param out
@@ -71,19 +96,20 @@
 			String card = swiperBanner.getCard();
 
 			if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(card)) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇存槑涓庢爣璇嗕笉鑳戒负绌�"));
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍚嶇О涓庢爣璇嗕笉鑳戒负绌�"));
 				return;
 			}
 
-			swiperBanner.setState(1);// 榛樿鍋滅敤
+			if (swiperBanner.getState() == null) {
+				swiperBanner.setState(1);// 榛樿鍋滅敤
+			} 
+			
 			Date nowTime = new Date();
 			swiperBanner.setCreatetime(nowTime);
 			swiperBanner.setUpdatetime(nowTime);
-			swiperBannerService.insert(swiperBanner);
-
+			swiperBannerService.insertSelective(swiperBanner);
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
-
-		} catch (SwiperBannerException e) {
+		} catch (Exception e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 			e.printStackTrace();
 		}
@@ -91,6 +117,7 @@
 
 	/**
 	 * 淇敼
+	 * 
 	 * @param callback
 	 * @param swiperBanner
 	 * @param out
@@ -98,7 +125,6 @@
 	@RequestMapping(value = "saveModify")
 	public void saveModify(String callback, SwiperBanner swiperBanner, PrintWriter out) {
 		try {
-
 			Long id = swiperBanner.getId();
 			if (id == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
@@ -118,6 +144,10 @@
 				return;
 			}
 
+			if (swiperBanner.getState() == null) {
+				swiperBanner.setState(1);// 榛樿鍋滅敤
+			} 
+			
 			if (StringUtil.isNullOrEmpty(title)) {
 				swiperBanner.setTitle(null);
 			}
@@ -125,73 +155,49 @@
 			if (StringUtil.isNullOrEmpty(card)) {
 				swiperBanner.setCard(null);
 			}
-
 			swiperBanner.setUpdatetime(new Date());
 			swiperBannerService.updateByPrimaryKeySelective(swiperBanner);
-
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
-
-		} catch (SwiperBannerException e) {
+		} catch (Exception e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 			e.printStackTrace();
 		}
 	}
-
 	
 	/**
-	 * 淇鐘舵��
+	 * 淇敼鐘舵��
 	 * @param callback
 	 * @param id
 	 * @param out
 	 */
-	@RequestMapping(value = "updateState")
-	public void updateState(String callback, Long id, PrintWriter out) {
+	@RequestMapping(value = "switchState")
+	public void switchState(String callback, Long id, PrintWriter out) {
 		try {
-
-			if (id == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
-				return;
-			}
-
-			SwiperBanner resultObj = swiperBannerService.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);
-			}
-
-			swiperBannerService.updateByPrimaryKeySelective(resultObj);
-			
-			JSONObject data = new JSONObject();
-			data.put("state", resultObj.getState());
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+			swiperBannerService.switchState(id);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
 		} catch (SwiperBannerException e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
 			e.printStackTrace();
 		}
 	}
-
 	
+
 	/**
 	 * 鏌ヨ
+	 * 
 	 * @param callback
 	 * @param pageIndex
 	 * @param pageSize
-	 * @param key  妯$硦鏌ヨ锛氳鏄庛�佹爣璇�
-	 * @param sort 鎺掑簭 锛� 鍒涘缓鏃堕棿鍊掑簭1  榛樿姝e簭
+	 * @param key
+	 *            妯$硦鏌ヨ锛氳鏄庛�佹爣璇�
+	 * @param sort
+	 *            鎺掑簭 锛� 鍒涘缓鏃堕棿鍊掑簭1 榛樿姝e簭
 	 * @param out
 	 */
 	@RequestMapping(value = "query")
 	public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {
-
 		if (pageIndex == null || pageIndex < 1) {
 			pageIndex = 1;
 		}
@@ -199,53 +205,50 @@
 		if (pageSize == null || pageSize < 1) {
 			pageSize = Constant.PAGE_SIZE;
 		}
-
 		try {
 			List<SwiperBanner> list = swiperBannerService.query((pageIndex - 1) * pageSize, pageSize, key, sort);
-
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
 				return;
 			}
-			
-			for (SwiperBanner swiperBanne: list) {
-				long TotalPic= swiperPictureService.countQueryByBannerID(swiperBanne.getId());
-				
+
+			for (SwiperBanner swiperBanne : list) {
+				if (swiperBanne.getState() != null && swiperBanne.getState() == 0) {
+					swiperBanne.setState(1);
+				} else {
+					swiperBanne.setState(0);
+				}
+				long TotalPic = swiperPictureService.countQueryByBannerID(swiperBanne.getId());
 				swiperBanne.setTotalPic(TotalPic);
 			}
 
 			long count = swiperBannerService.countQuery(key);
-			
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
 			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
 
 			GsonBuilder gsonBuilder = new GsonBuilder();
-			gsonBuilder.serializeNulls(); 
+			gsonBuilder.serializeNulls();
 			Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
 
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
 			data.put("result_list", gson.toJson(list));
-
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
 		} catch (Exception e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 			e.printStackTrace();
 		}
-
 	}
-
 
 	/**
 	 * 鍒犻櫎
+	 * 
 	 * @param callback
 	 * @param idArray
 	 * @param out
 	 */
 	@RequestMapping(value = "delete")
 	public void delete(String callback, String idArray, PrintWriter out) {
-
 		try {
 			if (StringUtil.isNullOrEmpty(idArray)) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -253,72 +256,128 @@
 			}
 
 			Gson gson = new Gson();
-			List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+			List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+			}.getType());
 
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
 				return;
 			}
-			
 			int count = swiperBannerService.deleteBatchByPrimaryKey(list);
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎["+ count +"]鏉℃暟鎹�"));
-
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
 		} catch (Exception e) {
 			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();
+		}
+	}
+
 	/**
-	 *  鏌ヨ鍥剧墖鍒楄〃
+	 * 鏌ヨ鍥剧墖鍒楄〃
+	 * 
 	 * @param callback
 	 * @param pageIndex
 	 * @param pageSize
-	 * @param bannerId 
+	 * @param bannerId
 	 * @param out
 	 */
-	@RequestMapping(value = "queryPicture")
-	public void queryPicture(String callback, Integer pageIndex, Integer pageSize, Long bannerId, PrintWriter out) {
-
-		if (pageIndex == null || pageIndex < 1) {
-			pageIndex = 1;
-		}
-
-		if (pageSize == null || pageSize < 1) {
-			pageSize = Constant.PAGE_SIZE;
-		}
-
+	@RequestMapping(value = "queryPicInfo")
+	public void queryPicInfo(String callback, Integer pageIndex, Integer pageSize, Long bannerId, String version,
+			String platform, PrintWriter out) {
 		if (bannerId == null) {
 			out.print(JsonUtil.loadFalseResult("杞挱鍥剧鐞咺D涓嶈兘涓虹┖"));
 			return;
 		}
-		
-		try {
-			
-			List<SwiperPicture> list = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, 
-					pageSize, bannerId);
+		if (pageIndex == null || pageIndex < 1) {
+			pageIndex = 1;
+		}
+		if (pageSize == null || pageSize < 1) {
+			pageSize = 100;
+		}
+		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);
+				}
+			}
+		}
 
+		try {
+			List<BannerVO> list = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, pageSize,
+					bannerId);
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
 				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);
-					}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+			for (BannerVO swiperPicture : list) {
+				if (swiperPicture.getState() != null && swiperPicture.getState() == 0) {
+					swiperPicture.setState(1);
+				} else {
+					swiperPicture.setState(0);
 				}
 				
+				
+				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) {
 					// 榛樿鏈�夋嫨
@@ -328,201 +387,124 @@
 					swiperPicture.setJumpDetail(jumpDetailV2);
 				}
 				
+				// 鍒嗕韩琛ュ厖淇℃伅
+				CommonShareInfo info = commonShareInfoService.getByPidAndType(swiperPicture.getId(),
+						CommonShareInfoEnum.banner.name());
+				if (info == null) {
+					swiperPicture.setNeedSpin(false);
+					swiperPicture.setComment("");
+				} else {
+					swiperPicture.setNeedSpin(info.getNeedSpin());
+					if (StringUtil.isNullOrEmpty(info.getComment())) {
+						swiperPicture.setComment("");
+					} else {
+						swiperPicture.setComment(info.getComment());
+					}
+				}
 			}
-			
 
 			long count = swiperPictureService.countQueryByBannerID(bannerId);
-			
+			// 杩囨护
+			if (versionList != null) {
+				if (versionList.size() > 0) {
+					List<Long> sourceIdList = new ArrayList<>();
+					for (SwiperPicture swiperPicture : list) {
+						sourceIdList.add(swiperPicture.getId());
+					}
+					List<Long> versionIdList = new ArrayList<>();
+					for (AppVersionInfo versionInfo : versionList)
+						versionIdList.add(versionInfo.getId());
+					Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+							AdActivityType.banner, 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);
 
 			GsonBuilder gsonBuilder = new GsonBuilder();
-			gsonBuilder.serializeNulls(); 
-			Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+			gsonBuilder.serializeNulls();
+			Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd'T'HH:mm").create();
 
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
 			data.put("result_list", gson.toJson(list));
-
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
 		} catch (SwiperPictureException e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 			e.printStackTrace();
 		}
 
 	}
+
+	/**
+	 * 淇濆瓨淇℃伅
+	 * 
+	 * @param callback
+	 * @param special
+	 * @param out
+	 */
+	@RequestMapping(value = "savePicInfo")
+	public void savePicInfo(String callback, SwiperPicture record, String jumpType, CommonShareInfo extra, 
+			HttpServletRequest request,	PrintWriter out) {
+		try {
+			// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+			if (request instanceof MultipartHttpServletRequest) {
+				MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+				swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType, extra);
+			} else {
+				swiperPictureService.saveObject(null, record, jumpType, extra);
+			}
+
+			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("淇濆瓨澶辫触"));
+			e.printStackTrace();
+		}
+	}
+
 	
 	/**
-	 * 涓婁紶鍥剧墖浠ュ強瀵瑰簲淇℃伅
-	 * @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 id
 	 * @param out
 	 */
-	@RequestMapping(value = "changePicInfo")
-	public void changePicInfo(String callback, SwiperPicture record, String jumpType,
-			PrintWriter out) {
-		
+	@RequestMapping(value = "switchStatePic")
+	public void switchStatePic(String callback, Long id, 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);
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-			
+			swiperPictureService.switchState(id);
+			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("鎿嶄綔澶辫触"));
 			e.printStackTrace();
 		}
 	}
-
+	
 	
 	/**
 	 * 鍒犻櫎鍥剧墖浠ュ強淇℃伅
+	 * 
 	 * @param callback
 	 * @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)) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -530,61 +512,18 @@
 			}
 
 			Gson gson = new Gson();
-			List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+			List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+			}.getType());
 
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
 				return;
 			}
-			
+
 			int count = swiperPictureService.deleteBatchByPrimaryKey(list);
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎["+ count +"]鏉℃暟鎹�"));
-
-		} catch (SwiperPictureException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
+		} 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();
 		}
 	}
@@ -597,49 +536,79 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "saveOrder")
-	public void saveOrder(String callback, Long id,Integer moveType, PrintWriter out) {
-		
+	public void saveOrder(String callback, Long id, Integer moveType, PrintWriter out) {
 		if (moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掔殑绫诲瀷涓嶆纭�"));
 			return;
 		}
-		
+
 		if (id == null) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
 			return;
 		}
-		
-		try {
 
+		try {
 			SwiperPicture resultObj = swiperPictureService.selectByPrimaryKey(id);
 			if (resultObj == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
 				return;
 			}
-			
+
 			Long bannerId = resultObj.getBannerId();
 			Integer oldOrder = resultObj.getOrder();
 			List<SwiperPicture> list = swiperPictureService.getOrderByBannerID(bannerId, moveType, oldOrder);
-			
+
 			if (list != null && list.size() > 0) {
 				SwiperPicture changeObj = list.get(0);
 				// 浜ゆ崲鎺掑簭搴忓彿
 				resultObj.setOrder(changeObj.getOrder());
-				
 				changeObj.setOrder(oldOrder);
-				
 				swiperPictureService.updateByPrimaryKeySelective(changeObj);
 			}
-			
+
 			swiperPictureService.updateByPrimaryKeySelective(resultObj);
-
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
-
 		} catch (Exception e) {
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
-
 	}
-	
+
+	/**
+	 * 璁剧疆鐗堟湰
+	 * 
+	 * @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 {
+			swiperPictureService.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.banner, 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