From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 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 a9525f1..e0fd1d0 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
@@ -9,6 +9,7 @@
 
 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;
@@ -24,7 +25,7 @@
 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.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
 import com.yeshi.fanli.util.StringUtil;
 
 import net.sf.json.JSONArray;
@@ -51,7 +52,7 @@
 	 * @param out
 	 */
 //	@RequestMapping(value = "saveAdd")
-	public void saveAdd(String callback, AppPageNotification appPageNotification, PrintWriter out) {
+	public void saveAdd(AdminAcceptData acceptData, String callback, AppPageNotification appPageNotification, PrintWriter out) {
 		try {
 			String content = appPageNotification.getContent();
 			if (StringUtil.isNullOrEmpty(content) ) {
@@ -61,7 +62,7 @@
 			
 			AppPageNotificationTypeEnum type = appPageNotification.getType();
 			if (type != null) {
-				AppPageNotification old = appPageNotificationService.getAppPageNotificationByType(type.name());
+				AppPageNotification old = appPageNotificationService.getAppPageNotificationByType(type.name(),acceptData.getSystem());
 				if (old != null) {
 					JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("宸插瓨鍦ㄦ绫诲瀷"));
 					return;
@@ -110,6 +111,7 @@
 			
 			appPageNotification.setCreateTime(new Date());
 			appPageNotification.setUpdateTime(new Date());
+			appPageNotification.setSystem(acceptData.getSystem());
 			appPageNotificationService.insertSelective(appPageNotification);
 			
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
@@ -127,7 +129,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "saveModify")
-	public void saveModify(String callback, AppPageNotification appPageNotification, PrintWriter out) {
+	public void saveModify(AdminAcceptData acceptData,String callback, AppPageNotification appPageNotification, PrintWriter out) {
 		try {
 			if (appPageNotification.getId() == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
@@ -208,7 +210,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "query")
-	public void query(String callback, Integer pageIndex, Integer pageSize, String key,
+	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) {
@@ -219,7 +221,7 @@
 
 		try {
 			List<AppPageNotification> list = appPageNotificationService.listQuery((pageIndex - 1) * pageSize, 
-					pageSize, key, show, canClose);
+					pageSize, key, show, canClose,acceptData.getSystem());
 
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
@@ -246,7 +248,7 @@
 				}
 			}
 			
-			long count = appPageNotificationService.countQuery(key, show, canClose);
+			long count = appPageNotificationService.countQuery(key, show, canClose,acceptData.getSystem());
 			
 			List<AppVersionInfo> versionList = null;
 			if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {
@@ -256,7 +258,7 @@
 					if (appVersion != null)
 						versionList.add(appVersion);
 				} else {
-					List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
+					List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform,acceptData.getSystem());
 					if (appVersionList != null) {
 						versionList.addAll(appVersionList);
 					}
@@ -315,7 +317,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "switchShutOff")
-	public void switchShutOff(String callback, Long id,  PrintWriter out) {
+	public void switchShutOff(AdminAcceptData acceptData,String callback, Long id,  PrintWriter out) {
 		try {
 			if (id == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
@@ -366,7 +368,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "switchState")
-	public void switchState(String callback, Long id, PrintWriter out) {
+	public void switchState(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
 		try {
 			if (id == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
@@ -404,7 +406,7 @@
 	 * @param out
 	 */
 	//@RequestMapping(value = "delete")
-	public void delete(String callback, String idArray, PrintWriter out) {
+	public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
 		try {
 			if (StringUtil.isNullOrEmpty(idArray)) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -428,14 +430,12 @@
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
-	 * 璁剧疆鐗堟湰
-	 * 
+	 *  璁剧疆鐗堟湰
 	 * @param callback
 	 * @param id
-	 * @param moveType
-	 * @param sex
+	 * @param versions
 	 * @param out
 	 */
 	@RequestMapping(value = "setVersions")

--
Gitblit v1.8.0