11

Service/Application.Web/Controllers/Pub/PubController.cs

@@ -13,12 +13,14 @@ namespace Application.Web.Controllers.Pub
         private readonly IAreaService _areaService;
         private readonly INoticeService _noticeService;
         private readonly IGameAccountService _accountService;
+        private readonly IUnitUserService _userService;
 
-        public PubController(IAreaService areaService, INoticeService noticeService,IGameAccountService accountService)
+        public PubController(IAreaService areaService, INoticeService noticeService, IGameAccountService accountService,IUnitUserService userService)
         {
             _areaService = areaService;
             _noticeService = noticeService;
             _accountService = accountService;
+            _userService = userService;
         }
 
         /// <summary>
@@ -31,20 +33,27 @@ namespace Application.Web.Controllers.Pub
         {
             bool isOnline = false;
             game_account account = new game_account();
+            List<unit_user> userData = new List<unit_user>();
             if (!string.IsNullOrEmpty(sid))
             {
                 account = await _accountService.GetAccInfoByToken(sid);
                 if (account != null)
                 {
                     isOnline = true;
+                    userData = await _userService.GetUserDataByAccId(account.accId);
                 }
             }
-            
+
             var areaData = await _areaService.GetAreaData();
-            var notice = await _noticeService.GetNoticeDataByTake(5);
+            foreach (var _user in userData)
+            {
+                areaData.RemoveAll(it => it.areaId == _user.areaId);
+            }
             
+            var notice = await _noticeService.GetNoticeDataByTake(5);
+
             int OnCount = 100;
-            return PoAction.Ok(new { area = areaData, notice, isOnline, onCount = OnCount,account });
+            return PoAction.Ok(new { area = areaData, notice, isOnline, onCount = OnCount, account,userData });
         }
 
         /// <summary>
@@ -54,11 +63,28 @@ namespace Application.Web.Controllers.Pub
         /// <param name="limit"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<IPoAction> GetNoticeData(int page,int limit)
+        public async Task<IPoAction> GetNoticeData(int page, int limit)
         {
             RefAsync<int> total = 0;
             var data = await _noticeService.GetNoticeData(page, limit, total);
-            return PoAction.Ok(new { data, total=total.Value });
+            return PoAction.Ok(new { data, total = total.Value });
+        }
+
+        /// <summary>
+        /// 获取公告详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<IPoAction> GetNoticeInfo(string id)
+        {
+            var data = await _noticeService.GetNoticeInfo(id);
+            if (data == null)
+            {
+                return PoAction.Message("公告不存在!");
+            }
+            data.sign = data.sign.Replace("[Br]", "<br />");
+            return PoAction.Ok(data);
         }
     }
 }