完善页面设置接口

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -752,7 +752,7 @@ namespace OASystem.API.Controllers
         {
             Result result = new Result();
             //模块数据
-            var setDataResult = await _setDataRepository.GetSySDefultModule(_setDataRepository);
+            var setDataResult = await _setDataRepository.GetSySDefultModule();
             if (setDataResult.Code != 0)
             {
                 return Ok(JsonView(setDataResult.Msg));
@@ -1071,5 +1071,49 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(200, "成功", new { }));
         }
         #endregion
+
+        #region 页面配置
+
+        /// <summary>
+        /// 页面配置界面数据初始化
+        /// </summary>
+        /// <returns></returns>
+        //[Authorize]
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PageConfigInit()
+        {
+            ArrayList arr = new ArrayList();
+            var viewList = await _setDataRepository.GetSetDataAndPageInfoBySTId();
+            if (viewList.Code != 0)
+            {
+                return Ok(JsonView(viewList.Msg));
+            }
+            var ModList = await _setDataRepository.GetSySDefultModule();
+
+            return Ok(JsonView(new
+            {
+                viewList,
+                ModList,
+            }));
+        }
+
+
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public IActionResult EditPageInfo()
+        {
+
+            return Ok(JsonView(""));
+        }
+        
+
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public IActionResult AddPageInfo()
+        {
+            return Ok(JsonView(""));
+        }
+        #endregion
     }
 }

OASystem/OASystem.Domain/Entities/System/Sys_SystemMenuPermission.cs

@@ -27,5 +27,33 @@ namespace OASystem.Domain.Entities.System
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
         public string SystemMenuCode { get; set; }
+
+        /// <summary>
+        /// web端URL
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string WebUrl { get; set; }
+        /// <summary>
+        /// Android端URL
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string AndroidUrl { get; set; }
+        /// <summary>
+        /// iOS端URL
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string IosUrl { get; set; }
+        
+        /// <summary>
+        /// 手机端是否启用
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int PhoneIsEnable { get; set; }
+
+        /// <summary>
+        /// 手机端图标
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Icon { get; set; }
     }
 }

OASystem/OASystem.Domain/ViewModels/System/SetDataView.cs

@@ -30,4 +30,65 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         public string Name { get; set; }
     }
+
+
+
+    public class SetDataAndPageInfoView
+    {
+        /// <summary>
+        /// 模块id
+        /// </summary>
+        public int Modulid { get; set; }
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string ModulName { get; set; }
+        /// <summary>
+        /// setdatatype id
+        /// </summary>
+        public int STid { get; set; }
+        /// <summary>
+        /// 模块备注
+        /// </summary>
+        public string ModulRemark { get; set; }
+
+        /// <summary>
+        /// 页面id
+        /// </summary>
+        public int Pageid { get; set; }
+        
+        /// <summary>
+        /// 页面名称
+        /// </summary>
+        public string PageName { get; set; }
+
+        /// <summary>
+        /// 页面是否启用
+        /// </summary>
+        public int PageIsEnable { get; set; }
+
+       
+        public int PagePhoneIsEnable { get; set; }
+
+        /// <summary>
+        /// 页面Code
+        /// </summary>
+        public string SystemMenuCode { get; set; }
+
+        public string WebUrl { get; set; }
+
+        public string AndroidUrl { get; set; }
+
+        public string IosUrl { get; set; }
+
+        /// <summary>
+        /// 手机端图标
+        /// </summary>
+        public string Icon { get; set; }
+
+        /// <summary>
+        /// 页面备注
+        /// </summary>
+        public string PageRemark { get; set; }
+    }
 }

OASystem/OASystem.Infrastructure/Repositories/System/SetDataRepository.cs

@@ -18,11 +18,11 @@ namespace OASystem.Infrastructure.Repositories.System
         /// </summary>
         /// <param name="_SetData"></param>
         /// <returns></returns>
-        public async Task<Result> GetSySDefultModule(SetDataRepository _SetData)
+        public async Task<Result> GetSySDefultModule()
         {
             Result result = new Result();
             string sql = "select * from Sys_SetData where STid = 5 and isdel = 0";
-            var DBdata = await _SetData.GetListBySqlWithNolockAsync(sql);
+            var DBdata = await GetListBySqlWithNolockAsync(sql);
 
             if (DBdata == null || DBdata.Count == 0)
             {
@@ -70,5 +70,31 @@ namespace OASystem.Infrastructure.Repositories.System
             return result;
         }
 
+
+        public async Task<Result> GetSetDataAndPageInfoBySTId(int stId = 5)
+        {
+            Result result = new Result();
+            List<SetDataAndPageInfoView> ViewList = _sqlSugar.SqlQueryable<SetDataAndPageInfoView>($@"
+                select a.id as modulid,a.Name as modulName,a.STid,a.Remark as modulRemark,
+                b.Id as pageid, b.Name as pageName, b.IsEnable as PageIsEnable  ,b.phoneIsEnable as PagePhoneIsEnable,b.SystemMenuCode,b.webUrl,b.androidUrl,
+                b.iosUrl,b.icon ,b.Remark as PageRemark
+                from Sys_SetData a , Sys_SystemMenuPermission b where STid = {stId} 
+                and a.isdel = 0 and b.Mid = a.Id  and b.IsDel = 0
+            ").ToList();
+
+            result.Data = ViewList;
+            result.Code = 0;
+            result.Msg = "成功！";
+
+            if (ViewList == null || ViewList.Count == 0)
+            {
+                result.Msg = "无数据！";
+                result.Code = -1;
+            }
+
+            return result;
+        }
+        
+
     }
 }

OASystem/_Doc/OA2023数据字典.docx

@@ -422,6 +422,36 @@ Null
 
 页面权限Code
 
+webUrl
+varchar(50)
+Null
+
+web页面路由
+
+AndroidUrl
+varchar(50)
+Null
+
+安卓页面路由
+
+IosUrl
+varchar(50)
+Null
+
+ios页面路由
+
+phoneIsEnable
+Int
+Null
+
+手机端是否启用
+
+Icon
+varchar(100)
+Null
+
+手机端图标
+
 
 6) 页面操作权限表：Sys_PageFunctionPermission （新增）
                                    字段名