From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java |  800 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 469 insertions(+), 331 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 bafe564..17baf5c 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
@@ -1,331 +1,469 @@
-package com.yeshi.fanli.controller.admin;
-
-import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-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.bus.help.AppPageNotification;
-import com.yeshi.fanli.entity.bus.help.AppPageNotification.AppPageNotificationTypeEnum;
-import com.yeshi.fanli.service.inter.help.AppPageNotificationService;
-import com.yeshi.fanli.tag.PageEntity;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.StringUtil;
-
-import net.sf.json.JSONObject;
-
-@Controller
-@RequestMapping("admin/new/api/v1/notification")
-public class AppPageNotificationAdminController {
-
-	@Resource
-	private AppPageNotificationService appPageNotificationService;
-	
-	
-	/**
-	 * 鏂板
-	 * @param callback
-	 * @param special
-	 * @param out
-	 */
-//	@RequestMapping(value = "saveAdd")
-	public void saveAdd(String callback, AppPageNotification appPageNotification, PrintWriter out) {
-
-		try {
-			
-			String content = appPageNotification.getContent();
-			if (StringUtil.isNullOrEmpty(content) ) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏄剧ず鍐呭涓嶈兘涓虹┖"));
-				return;
-			}
-			
-			AppPageNotificationTypeEnum type = appPageNotification.getType();
-			if (type != null) {
-				AppPageNotification old = appPageNotificationService.getAppPageNotificationByType(type.name());
-				if (old != null) {
-					JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("宸插瓨鍦ㄦ绫诲瀷"));
-					return;
-				}
-				
-				appPageNotification.setMd5(StringUtil.Md5(type.name() 
-						+ "#" + content + "#" + appPageNotification.getContentUrl()));
-			} else {
-				appPageNotification.setMd5(StringUtil.Md5(null + "#" + content + "#" + appPageNotification.getContentUrl()));
-			}
-			
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-			
-			String beginTimeVO = appPageNotification.getBeginTimeVO();
-			if (!StringUtil.isNullOrEmpty(beginTimeVO)) {
-				appPageNotification.setBeginTime(format.parse(beginTimeVO.replaceAll("T", " ")));
-			}
-				
-			String endTimeVO = appPageNotification.getEndTimeVO();
-			if (!StringUtil.isNullOrEmpty(endTimeVO)) {
-				appPageNotification.setEndTime(format.parse(endTimeVO.replaceAll("T", " ")));
-			}
-			
-			appPageNotification.setCreateTime(new Date());
-			appPageNotification.setUpdateTime(new Date());
-			appPageNotificationService.insertSelective(appPageNotification);
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 淇敼
-	 * @param callback
-	 * @param special
-	 * @param out
-	 */
-	@RequestMapping(value = "saveModify")
-	public void saveModify(String callback, AppPageNotification appPageNotification, PrintWriter out) {
-		try {
-			AppPageNotificationTypeEnum type = appPageNotification.getType();
-			if (type == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
-				return;
-			}
-			
-			AppPageNotification old = appPageNotificationService.getAppPageNotificationByType(type.name());
-			if (old == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔瀵硅薄宸蹭笉瀛樺湪"));
-				return;
-			}
-		
-			String content = appPageNotification.getContent();
-			if (StringUtil.isNullOrEmpty(content) ) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏄剧ず鍐呭涓嶈兘涓虹┖"));
-				return;
-			}
-			
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-			
-			String beginTimeVO = appPageNotification.getBeginTimeVO();
-			if (!StringUtil.isNullOrEmpty(beginTimeVO)) {
-				appPageNotification.setBeginTime(format.parse(beginTimeVO.replaceAll("T", " ")));
-			}
-				
-			String endTimeVO = appPageNotification.getEndTimeVO();
-			if (!StringUtil.isNullOrEmpty(endTimeVO)) {
-				appPageNotification.setEndTime(format.parse(endTimeVO.replaceAll("T", " ")));
-			}
-			
-			appPageNotification.setMd5(StringUtil.Md5(type.name() + "#" + content + "#" + appPageNotification.getContentUrl()));
-			appPageNotification.setId(old.getId());
-			appPageNotification.setUpdateTime(new Date());
-			appPageNotificationService.updateByPrimaryKeySelective(appPageNotification);
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-	
-	
-	/**
-	 * 鏌ヨ鍒楄〃
-	 * @param callback
-	 * @param pageIndex
-	 * @param pageSize
-	 * @param key 鍐呭銆佺被鍨�
-	 * @param show  鏄惁鏄剧ず 1 0
-	 * @param canClose 鏄惁鍙互鍏抽棴 1 0
-	 * @param out
-	 */
-	@RequestMapping(value = "query")
-	public void query(String callback, Integer pageIndex, Integer pageSize, String key,
-			 Integer show, Integer canClose, PrintWriter out) {
-
-		if (pageIndex == null || pageIndex < 1) {
-			pageIndex = 1;
-		}
-
-		if (pageSize == null || pageSize < 1) {
-			pageSize = Constant.PAGE_SIZE;
-		}
-
-		try {
-			List<AppPageNotification> list = appPageNotificationService.listQuery((pageIndex - 1) * pageSize, 
-					pageSize, key, show, canClose);
-
-			if (list == null || list.size() == 0) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
-				return;
-			}
-			
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
-			for (AppPageNotification notification: list) {
-				AppPageNotificationTypeEnum type = notification.getType();
-				notification.setPageName(type.getDesc());
-				
-				
-				Date startTime = notification.getBeginTime();
-				if (startTime == null) {
-					notification.setBeginTimeVO("");
-				} else {
-					notification.setBeginTimeVO(sdf.format(startTime));
-				}
-				
-				Date endTime = notification.getEndTime();
-				if (endTime == null) {
-					notification.setEndTimeVO("");
-				} else {
-					notification.setEndTimeVO(sdf.format(endTime));
-				}
-			}
-			
-			
-			long count = appPageNotificationService.countQuery(key, show, canClose);
-			
-			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();
-
-			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 id
-	 * @param out
-	 */
-	@RequestMapping(value = "updateCanCloseState")
-	public void updateCanCloseState(String callback, String type, PrintWriter out) {
-		try {
-			if (type == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
-				return;
-			}
-			
-			AppPageNotification resultObj = appPageNotificationService.getAppPageNotificationByType(type);
-			if (resultObj == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
-				return;
-			}
-			
-			Boolean canClose = resultObj.getCanClose();
-			if (canClose) {
-				resultObj.setCanClose(false);
-			} else {
-				resultObj.setCanClose(true);
-			}
-
-			appPageNotificationService.updateByPrimaryKeySelective(resultObj);
-			
-			JSONObject data = new JSONObject();
-			data.put("state", resultObj.getCanClose());
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * 淇鏄剧ず鐘舵��
-	 * @param callback
-	 * @param id
-	 * @param out
-	 */
-	@RequestMapping(value = "updateShowState")
-	public void updateShowState(String callback, String type, PrintWriter out) {
-		try {
-
-			if (type == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
-				return;
-			}
-			
-			AppPageNotification resultObj = appPageNotificationService.getAppPageNotificationByType(type);
-			if (resultObj == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
-				return;
-			}
-			
-			Boolean show = resultObj.getShow();
-			if (show) {
-				resultObj.setShow(false);
-			} else {
-				resultObj.setShow(true);
-			}
-
-			appPageNotificationService.updateByPrimaryKeySelective(resultObj);
-			
-			JSONObject data = new JSONObject();
-			data.put("state", resultObj.getShow());
-			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("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
-				return;
-			}
-
-			Gson gson = new Gson();
-			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 = appPageNotificationService.deleteBatchByPrimaryKey(list);
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎["+ count +"]鏉℃暟鎹�"));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
-			e.printStackTrace();
-		}
-	}
-
-}
+package com.yeshi.fanli.controller.admin;
+
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.Resource;
+
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+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.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.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.common.entity.PageEntity;
+import com.yeshi.fanli.util.StringUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+@Controller
+@RequestMapping("admin/new/api/v1/notification")
+public class AppPageNotificationAdminController {
+
+	@Resource
+	private AppPageNotificationService appPageNotificationService;
+	
+	@Resource
+	private AppVersionService appVersionService;
+	
+	@Resource
+	private AdActivityVersionControlService adActivityVersionControlService;
+	
+	
+	/**
+	 * 鏂板
+	 * @param callback
+	 * @param special
+	 * @param out
+	 */
+//	@RequestMapping(value = "saveAdd")
+	public void saveAdd(AdminAcceptData acceptData, String callback, AppPageNotification appPageNotification, PrintWriter out) {
+		try {
+			String content = appPageNotification.getContent();
+			if (StringUtil.isNullOrEmpty(content) ) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏄剧ず鍐呭涓嶈兘涓虹┖"));
+				return;
+			}
+			
+			AppPageNotificationTypeEnum type = appPageNotification.getType();
+			if (type != null) {
+				AppPageNotification old = appPageNotificationService.getAppPageNotificationByType(type.name(),acceptData.getSystem());
+				if (old != null) {
+					JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("宸插瓨鍦ㄦ绫诲瀷"));
+					return;
+				}
+				
+				appPageNotification.setMd5(StringUtil.Md5(type.name() 
+						+ "#" + content + "#" + appPageNotification.getContentUrl()));
+			} else {
+				appPageNotification.setMd5(StringUtil.Md5(null + "#" + content + "#" + appPageNotification.getContentUrl()));
+			}
+			
+			Boolean show = appPageNotification.getShow();
+			if (show == null) {
+				show = false;
+				appPageNotification.setShow(show);
+			}
+			
+			Boolean canClose = appPageNotification.getCanClose();
+			if (canClose == null) {
+				canClose = false;
+				appPageNotification.setCanClose(canClose);
+			}
+			
+			String contentUrl = appPageNotification.getContentUrl();
+			if (canClose != null && canClose && !StringUtil.isNullOrEmpty(contentUrl)) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴鍜屽厑璁稿叧闂笉鍙悓鏃跺瓨鍦�"));
+				return;
+			}
+			
+			if (!canClose && StringUtil.isNullOrEmpty(contentUrl)) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴涓嶈兘涓虹┖"));
+				return;
+			}
+			
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+			
+			String beginTimeVO = appPageNotification.getBeginTimeVO();
+			if (!StringUtil.isNullOrEmpty(beginTimeVO)) {
+				appPageNotification.setBeginTime(format.parse(beginTimeVO.replaceAll("T", " ")));
+			}
+				
+			String endTimeVO = appPageNotification.getEndTimeVO();
+			if (!StringUtil.isNullOrEmpty(endTimeVO)) {
+				appPageNotification.setEndTime(format.parse(endTimeVO.replaceAll("T", " ")));
+			}
+			
+			appPageNotification.setCreateTime(new Date());
+			appPageNotification.setUpdateTime(new Date());
+			appPageNotification.setSystem(acceptData.getSystem());
+			appPageNotificationService.insertSelective(appPageNotification);
+			
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
+
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 淇敼
+	 * @param callback
+	 * @param special
+	 * @param out
+	 */
+	@RequestMapping(value = "saveModify")
+	public void saveModify(AdminAcceptData acceptData,String callback, AppPageNotification appPageNotification, PrintWriter out) {
+		try {
+			if (appPageNotification.getId() == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+				return;
+			}
+			
+			AppPageNotification old = appPageNotificationService.selectByPrimaryKey(appPageNotification.getId());
+			if (old == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔瀵硅薄宸蹭笉瀛樺湪"));
+				return;
+			}
+		
+			String content = appPageNotification.getContent();
+			if (StringUtil.isNullOrEmpty(content) ) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏄剧ず鍐呭涓嶈兘涓虹┖"));
+				return;
+			}
+			
+			Boolean show = appPageNotification.getShow();
+			if (show == null) {
+				show = false;
+				appPageNotification.setShow(show);
+			}
+			
+			Boolean canClose = appPageNotification.getCanClose();
+			if (canClose == null) {
+				canClose = false;
+				appPageNotification.setCanClose(canClose);
+			}
+			
+			if (canClose && !StringUtil.isNullOrEmpty(appPageNotification.getContentUrl())) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴鍜屽厑璁稿叧闂笉鍙悓鏃跺瓨鍦�"));
+				return;
+			}
+			
+			if (!canClose && StringUtil.isNullOrEmpty(appPageNotification.getContentUrl())) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴涓嶈兘涓虹┖"));
+				return;
+			}
+			
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+			
+			String beginTimeVO = appPageNotification.getBeginTimeVO();
+			if (!StringUtil.isNullOrEmpty(beginTimeVO)) {
+				appPageNotification.setBeginTime(format.parse(beginTimeVO.replaceAll("T", " ")));
+			}
+				
+			String endTimeVO = appPageNotification.getEndTimeVO();
+			if (!StringUtil.isNullOrEmpty(endTimeVO)) {
+				appPageNotification.setEndTime(format.parse(endTimeVO.replaceAll("T", " ")));
+			}
+			
+			appPageNotification.setMd5(StringUtil.Md5(appPageNotification.getType() + "#" + content + "#" + appPageNotification.getContentUrl()));
+			appPageNotification.setUpdateTime(new Date());
+			
+			appPageNotification.setId(old.getId());
+			appPageNotification.setType(old.getType());
+			appPageNotification.setCreateTime(old.getCreateTime());
+			appPageNotificationService.updateByPrimaryKey(appPageNotification);
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+	
+	
+	/**
+	 * 鏌ヨ鍒楄〃
+	 * @param callback
+	 * @param pageIndex
+	 * @param pageSize
+	 * @param key 鍐呭銆佺被鍨�
+	 * @param show  鏄惁鏄剧ず 1 0
+	 * @param canClose 鏄惁鍙互鍏抽棴 1 0
+	 * @param out
+	 */
+	@RequestMapping(value = "query")
+	public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key,
+			 Integer show, Integer canClose,String version, String platform,  PrintWriter out) {
+
+		if (pageIndex == null || pageIndex < 1) {
+			pageIndex = 1;
+		}
+
+		pageSize =Integer.MAX_VALUE;
+
+		try {
+			List<AppPageNotification> list = appPageNotificationService.listQuery((pageIndex - 1) * pageSize, 
+					pageSize, key, show, canClose,acceptData.getSystem());
+
+			if (list == null || list.size() == 0) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+				return;
+			}
+			
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+			for (AppPageNotification notification: list) {
+				AppPageNotificationTypeEnum type = notification.getType();
+				notification.setPageName(type.getDesc());
+				
+				Date startTime = notification.getBeginTime();
+				if (startTime == null) {
+					notification.setBeginTimeVO("");
+				} else {
+					notification.setBeginTimeVO(sdf.format(startTime));
+				}
+				
+				Date endTime = notification.getEndTime();
+				if (endTime == null) {
+					notification.setEndTimeVO("");
+				} else {
+					notification.setEndTimeVO(sdf.format(endTime));
+				}
+			}
+			
+			long count = appPageNotificationService.countQuery(key, show, canClose,acceptData.getSystem());
+			
+			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,acceptData.getSystem());
+					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);
+
+			GsonBuilder gsonBuilder = new GsonBuilder();
+			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 id
+	 * @param out
+	 */
+	@RequestMapping(value = "switchShutOff")
+	public void switchShutOff(AdminAcceptData acceptData,String callback, Long id,  PrintWriter out) {
+		try {
+			if (id == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+				return;
+			}
+			
+			AppPageNotification resultObj = appPageNotificationService.selectByPrimaryKey(id);
+			if (resultObj == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
+				return;
+			}
+			
+			Boolean canClose = resultObj.getCanClose();
+			if (canClose != null && canClose) {
+				canClose = false;
+			} else {
+				canClose = true;
+			}
+			
+			if (canClose && !StringUtil.isNullOrEmpty(resultObj.getContentUrl())) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴鍜屽厑璁稿叧闂笉鍙悓鏃跺瓨鍦�"));
+				return;
+			}
+			
+			if (!canClose && StringUtil.isNullOrEmpty(resultObj.getContentUrl())) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴涓嶈兘涓虹┖"));
+				return;
+			}
+			
+			AppPageNotification newOBj = new AppPageNotification();
+			newOBj.setId(resultObj.getId());
+			newOBj.setCanClose(canClose);
+			appPageNotificationService.updateByPrimaryKeySelective(newOBj);
+			
+			JSONObject data = new JSONObject();
+			data.put("state", newOBj.getCanClose());
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * 淇鏄剧ず鐘舵��
+	 * @param callback
+	 * @param id
+	 * @param out
+	 */
+	@RequestMapping(value = "switchState")
+	public void switchState(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
+		try {
+			if (id == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+				return;
+			}
+			
+			AppPageNotification resultObj = appPageNotificationService.selectByPrimaryKey(id);
+			if (resultObj == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
+				return;
+			}
+			
+			Boolean show = resultObj.getShow();
+			if (show != null && show) {
+				show = false;
+			} else {
+				show = true;
+			}
+			
+			AppPageNotification newOBj = new AppPageNotification();
+			newOBj.setId(resultObj.getId());
+			newOBj.setShow(show);
+			appPageNotificationService.updateByPrimaryKeySelective(newOBj);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 鍒犻櫎
+	 * @param callback
+	 * @param idArray
+	 * @param out
+	 */
+	//@RequestMapping(value = "delete")
+	public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
+		try {
+			if (StringUtil.isNullOrEmpty(idArray)) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
+				return;
+			}
+
+			Gson gson = new Gson();
+			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 = appPageNotificationService.deleteBatchByPrimaryKey(list);
+			
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎["+ count +"]鏉℃暟鎹�"));
+
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 *  璁剧疆鐗堟湰
+	 * @param callback
+	 * @param id
+	 * @param versions
+	 * @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