From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽

---
 src/main/java/com/yeshi/buwan/controller/admin/UserBannerAdminController.java |   77 ++++++++------------------------------
 1 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/admin/UserBannerAdminController.java b/src/main/java/com/yeshi/buwan/controller/admin/UserBannerAdminController.java
index 5c2c5bf..43c0468 100644
--- a/src/main/java/com/yeshi/buwan/controller/admin/UserBannerAdminController.java
+++ b/src/main/java/com/yeshi/buwan/controller/admin/UserBannerAdminController.java
@@ -10,19 +10,22 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
+import com.yeshi.buwan.service.inter.recommend.HomeVideoService;
+import com.yeshi.buwan.util.SystemUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.yeshi.buwan.domain.AdminInfo;
-import com.yeshi.buwan.domain.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystem;
 import com.yeshi.buwan.domain.HomeAd;
 import com.yeshi.buwan.domain.HomeNotice;
 import com.yeshi.buwan.domain.HomeType;
 import com.yeshi.buwan.domain.HomeVideo;
 import com.yeshi.buwan.domain.SuperUserBanner;
-import com.yeshi.buwan.domain.SystemInfo;
+import com.yeshi.buwan.domain.system.SystemInfo;
 import com.yeshi.buwan.domain.UserBanner;
 import com.yeshi.buwan.domain.VideoInfo;
 import com.yeshi.buwan.domain.VideoIntersection;
@@ -56,6 +59,10 @@
 	@Resource
 	private HomeTypeService homeTypeService;
 
+
+	@Resource
+	private HomeVideoService homeVideoService;
+
 	@Resource
 	private HomeAdService homeAdService;
 
@@ -67,61 +74,6 @@
 	@Resource
 	private HomeNoticeService homeNoticeService;
 
-	public UserBannerService getUserBannerService() {
-		return userBannerService;
-	}
-
-	public void setUserBannerService(UserBannerService userBannerService) {
-		this.userBannerService = userBannerService;
-	}
-
-	public ClassService getClassService() {
-		return classService;
-	}
-
-	public void setClassService(ClassService classService) {
-		this.classService = classService;
-	}
-
-	public HomeTypeService getHomeTypeService() {
-		return homeTypeService;
-	}
-
-	public void setHomeTypeService(HomeTypeService homeTypeService) {
-		this.homeTypeService = homeTypeService;
-	}
-
-	public HomeAdService getHomeAdService() {
-		return homeAdService;
-	}
-
-	public void setHomeAdService(HomeAdService homeAdService) {
-		this.homeAdService = homeAdService;
-	}
-
-	public AdService getAdService() {
-		return adService;
-	}
-
-	public void setAdService(AdService adService) {
-		this.adService = adService;
-	}
-
-	public WeiXinService getWeiXinService() {
-		return weiXinService;
-	}
-
-	public void setWeiXinService(WeiXinService weiXinService) {
-		this.weiXinService = weiXinService;
-	}
-
-	public HomeNoticeService getHomeNoticeService() {
-		return homeNoticeService;
-	}
-
-	public void setHomeNoticeService(HomeNoticeService homeNoticeService) {
-		this.homeNoticeService = homeNoticeService;
-	}
 
 	@RequestMapping(value = "/UserBannerAdminServlet", method = RequestMethod.GET)
 	public void get(HttpServletRequest req, PrintWriter out) {
@@ -152,7 +104,7 @@
 		} else if (type.equalsIgnoreCase("getAllParentType")) {// 鏍规嵁瀛愬垎绫诲緱鍒版墍鏈夌殑涓婄骇鍒嗙被
 			String id = req.getParameter("id");
 			if (!StringUtil.isNullOrEmpty(id)) {
-				List<Long> idsList = new ArrayList<Long>();
+				List<Long> idsList = new ArrayList<>();
 				if (StringUtil.isNullOrEmpty(id) || id.contains("undefined") || Long.parseLong(id) == 0)
 					id = "1";
 				VideoType vt = classService.getTypeById(Long.parseLong(id));
@@ -194,7 +146,7 @@
 	}
 
 	@RequestMapping(value = "/UserBannerAdminServlet", method = RequestMethod.POST)
-	public String post(HttpServletRequest req, HttpServletResponse resp, PrintWriter out) {
+	public String post(HttpServletRequest req, HttpServletResponse resp, HttpSession session, PrintWriter out) {
 		try {
 			req.setCharacterEncoding("UTF-8");
 		} catch (UnsupportedEncodingException e) {
@@ -233,6 +185,7 @@
 					homeType.setHasMore(false);
 			} else
 				homeType.setHasMore(false);
+			homeType.setSystem(SystemUtil.getAdminSelectedSystem(session));
 			homeTypeService.addHomeType(homeType);
 
 			return "hometype_add";
@@ -274,6 +227,10 @@
 				String ovideoid = map.get("ovideoid");
 				String ointersection = map.get("ointersection");
 				HomeAd ad = new HomeAd();
+
+
+				ad.setSystem(SystemUtil.getAdminSelectedSystem(session));
+
 				ad.setAdmin((AdminInfo) req.getSession().getAttribute("ADMIN_INFO"));
 
 				ad.setSystem(new SystemInfo(map.get("system")));
@@ -480,7 +437,7 @@
 			String picture = req.getParameter("picture");
 			HomeVideo video = homeTypeService.getHomeVideoById(id);
 			video.setPicture(picture);
-			homeTypeService.updateHomeVideo(video);
+			homeVideoService.updateHomeVideo(video);
 			req.setAttribute("id", id);
 			return "homevideo_update";
 		}

--
Gitblit v1.8.0