From f2b71fe1d3c2b7651d525a5b5bbe66fad602ea06 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 18:46:28 +0800
Subject: [PATCH] 代码清理
---
WebApi/Gs.Sys/Services/MenuActionController.cs | 104 +++++++++++++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 41 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/MenuActionController.cs b/WebApi/Gs.Sys/Services/MenuActionController.cs
index f7416b7..c5f0d05 100644
--- a/WebApi/Gs.Sys/Services/MenuActionController.cs
+++ b/WebApi/Gs.Sys/Services/MenuActionController.cs
@@ -19,7 +19,7 @@
public class MenuActionController : Repository<SysMenuAction>, IRomteService
{
private readonly IHttpContextAccessor _http;
- private readonly string _userCode,_userGuid,_orgFids;
+ private readonly string _userCode, _userGuid, _orgFids;
public MenuActionController(IHttpContextAccessor httpContextAccessor)
{
@@ -40,43 +40,52 @@
try
{
var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
- var _sbBy =new StringBuilder(query.sortName + " " + query.sortOrder);
+ var _sbBy =
+ new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
var itemsList = Db
- .Queryable<SysMenuAction, SysMenuAction>(
- (a, b) => new object[]
- {
- JoinType.Left, a.UpGuid == b.Guid,
- }).Select((a, b) => new SysMenuAction
- {
- upName = b.Name,
- }, true)
- .Where(_sbWhere.ToString())
- .OrderBy(_sbBy.ToString())
- .ToPageList(query.currentPage, query.everyPageSize, ref totalCount);
- pageList = new PageList<SysMenuAction>(itemsList, totalCount,query.everyPageSize);
- return ReturnDto<PageList<SysMenuAction>>.QuickReturn(pageList, ReturnCode.Success, "璇诲彇鎴愬姛");
+ .Queryable<SysMenuAction, SysMenuAction>((a, b) => new object[]
+ {
+ JoinType.Left, a.UpGuid == b.Guid
+ }).Select((a, b) => new SysMenuAction
+ {
+ upName = b.Name
+ }, true)
+ .Where(_sbWhere.ToString())
+ .OrderBy(_sbBy.ToString())
+ .ToPageList(query.currentPage, query.everyPageSize,
+ ref totalCount);
+ pageList = new PageList<SysMenuAction>(itemsList, totalCount,
+ query.everyPageSize);
+ return ReturnDto<PageList<SysMenuAction>>.QuickReturn(pageList,
+ ReturnCode.Success, "璇诲彇鎴愬姛");
}
catch (Exception ex)
{
- return ReturnDto<PageList<SysMenuAction>>.QuickReturn(pageList, ReturnCode.Default, ex.Message);
+ return ReturnDto<PageList<SysMenuAction>>.QuickReturn(pageList,
+ ReturnCode.Default, ex.Message);
}
}
+
/// <summary>
/// 鏌ヨ鍒楄〃锛屾敮鎸佸垎椤�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
[RequestMethod(RequestMethods.POST)]
- public ReturnDto<PageList<dynamic>> GetListPageHelp([FromBody] PageQuery model)
+ public ReturnDto<PageList<dynamic>> GetListPageHelp(
+ [FromBody] PageQuery model)
{
var sbSql = new StringBuilder();
sbSql.Append(" WITH RankedHistory AS (");
- sbSql.Append(" SELECT h.guid, h.parent_Guid, h.create_date,h.[file_Title],h.[url_Path],h.[file_Type],");
- sbSql.Append(" ROW_NUMBER() OVER (PARTITION BY h.parent_Guid ORDER BY h.create_date DESC) AS RowRank");
+ sbSql.Append(
+ " SELECT h.guid, h.parent_Guid, h.create_date,h.[file_Title],h.[url_Path],h.[file_Type],");
+ sbSql.Append(
+ " ROW_NUMBER() OVER (PARTITION BY h.parent_Guid ORDER BY h.create_date DESC) AS RowRank");
sbSql.Append(" FROM [MES_FILE] h");
sbSql.Append(" )");
- sbSql.Append(" select a.*,p.name as upName,f.create_date,f.file_Title,f.url_Path,f.[file_Type] from [dbo].[SYS_MENU_ACTION] a left join RankedHistory f");
+ sbSql.Append(
+ " select a.*,p.name as upName,f.create_date,f.file_Title,f.url_Path,f.[file_Type] from [dbo].[SYS_MENU_ACTION] a left join RankedHistory f");
sbSql.Append(" ON (a.GUID = f.parent_Guid AND f.RowRank = 1)");
sbSql.Append(" left join [SYS_MENU_ACTION] p on a.UP_GUID=p.GUID");
sbSql.Append(" where a.CATEGORY=1 and a.UP_GUID is not null");
@@ -88,8 +97,10 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(), "GetListPage error锛�" + ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn( default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ return ReturnDto<PageList<dynamic>>.QuickReturn(
+ default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
+
var _pglist = new PageList<dynamic>
{
total = 0,
@@ -107,8 +118,11 @@
var _dy = dset.Tables[0].TableToDynamicList();
_pglist.list = _dy;
}
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist, ReturnCode.Success, "璇诲彇鎴愬姛");
+
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
+ ReturnCode.Success, "璇诲彇鎴愬姛");
}
+
/// <summary>
/// 璇诲彇涓�涓疄浣�
/// </summary>
@@ -119,8 +133,10 @@
{
var m = base.GetById(model.Guid);
if (m != null)
- return ReturnDto<SysMenuAction>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
- return ReturnDto<SysMenuAction>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
+ return ReturnDto<SysMenuAction>.QuickReturn(m, ReturnCode.Success,
+ "璇诲彇鎴愬姛锛�");
+ return ReturnDto<SysMenuAction>.QuickReturn(m, ReturnCode.Default,
+ "璇诲彇澶辫触锛�");
}
/// <summary>
@@ -129,11 +145,14 @@
/// <param name="guid"></param>
/// <returns></returns>
[RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetModelByNameSpace([FromBody] dynamic model)
+ public ReturnDto<ExpandoObject> GetModelByNameSpace(
+ [FromBody] dynamic model)
{
dynamic m = new ExpandoObject();
var sbSql = new StringBuilder();
- sbSql.Append("select top 1 * from [dbo].[SYS_MENU_ACTION] where form_path='"+ model.guid.ToString() + "'");
+ sbSql.Append(
+ "select top 1 * from [dbo].[SYS_MENU_ACTION] where form_path='" +
+ model.guid.ToString() + "'");
try
{
var dset = new DataSet();
@@ -146,6 +165,7 @@
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
"璇诲彇鎴愬姛锛�");
}
+
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
"璇诲彇澶辫触锛�");
}
@@ -186,13 +206,15 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, ex.Message);
+ return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
+ ex.Message);
}
if (_bl)
return ReturnDto<string>.QuickReturn(model.Guid.ToString(),
ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "澧炲姞澶辫触锛岃閲嶈瘯锛�");
+ return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
+ "澧炲姞澶辫触锛岃閲嶈瘯锛�");
}
@@ -246,7 +268,6 @@
}
-
/// <summary>
/// 澧炲姞鎴栫紪杈戝疄浣�
/// </summary>
@@ -255,26 +276,27 @@
[RequestMethod(RequestMethods.POST)]
public ReturnDto<string?> GetHelpFile([FromBody] string formNamespace)
{
- string urlPath = "";
- System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
- stringBuilder.Append("select top 1 url_Path as urlPath from [dbo].[MES_FILE] f where f.parent_Guid=");
+ var urlPath = "";
+ var stringBuilder = new StringBuilder();
+ stringBuilder.Append(
+ "select top 1 url_Path as urlPath from [dbo].[MES_FILE] f where f.parent_Guid=");
stringBuilder.Append("(");
stringBuilder.Append(" select top 1 guid from [dbo].[SYS_MENU_ACTION]");
- stringBuilder.Append(" where FORM_PATH='"+ formNamespace + "'");
+ stringBuilder.Append(" where FORM_PATH='" + formNamespace + "'");
stringBuilder.Append(") order by create_date desc");
try
{
- urlPath = Gs.Toolbox.DbHelperSQL.GetSingle(stringBuilder.ToString()).ToString();
+ urlPath = DbHelperSQL.GetSingle(stringBuilder.ToString())
+ .ToString();
}
catch (Exception ex)
{
- Gs.Toolbox.LogHelper.Debug(this.ToString(),ex.Message);
- return ReturnDto<string>.QuickReturn(urlPath, ReturnCode.Default,ex.Message);
+ LogHelper.Debug(ToString(), ex.Message);
+ return ReturnDto<string>.QuickReturn(urlPath, ReturnCode.Default,
+ ex.Message);
}
-
- return ReturnDto<string>.QuickReturn(urlPath, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
-
+
+ return ReturnDto<string>.QuickReturn(urlPath, ReturnCode.Success,
+ "鎿嶄綔鎴愬姛锛�");
}
-
-
}
\ No newline at end of file
--
Gitblit v1.9.3