From f2b71fe1d3c2b7651d525a5b5bbe66fad602ea06 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 18:46:28 +0800
Subject: [PATCH] 代码清理
---
WebApi/Gs.Report/ReportController.cs | 117 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 69 insertions(+), 48 deletions(-)
diff --git a/WebApi/Gs.Report/ReportController.cs b/WebApi/Gs.Report/ReportController.cs
index 8a27b27..dead00f 100644
--- a/WebApi/Gs.Report/ReportController.cs
+++ b/WebApi/Gs.Report/ReportController.cs
@@ -14,9 +14,10 @@
[ApiGroup(ApiGroupNames.Report)]
public class ReportController : IRomteService
{
+ private readonly string _customTag = "瀹㈡埛妯℃澘";
private readonly IHttpContextAccessor _http;
private readonly string _userCode, _userGuid, _orgFids;
- private readonly string _customTag = "瀹㈡埛妯℃澘";
+
public ReportController(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
@@ -36,21 +37,24 @@
var rptParameter = _ary[0];
return rptParameter;
}
+
return str;
}
+
/// <summary>
- /// 鏍规嵁鎶ヨ〃鍙傛暟璇诲彇鎶ヨ〃鍙傛暟
+ /// 鏍规嵁鎶ヨ〃鍙傛暟璇诲彇鎶ヨ〃鍙傛暟
/// </summary>
/// <param name=""></param>
/// <returns></returns>
- public static (string?, string?, string?, string?, string?, string?) _rptGetParameterP(string str)
+ public static (string?, string?, string?, string?, string?, string?)
+ _rptGetParameterP(string str)
{
string s0 = "", s1 = "", s2 = "", s3 = "", s4 = "", s5 = "";
var _ary = str.Split('{');
if (_ary.Length > 0)
{
var rptParameter = _ary[1].Replace("}", "");
- string[] _pAry = rptParameter.Split(',');
+ var _pAry = rptParameter.Split(',');
if (_pAry.Length > 0)
s0 = _pAry[0];
if (_pAry.Length > 1)
@@ -64,6 +68,7 @@
if (_pAry.Length > 5)
s5 = _pAry[5];
}
+
return (s0, s1, s2, s3, s4, s5);
}
@@ -78,7 +83,7 @@
string guid = model.guid;
int isDesign = model.isDesign;
string _rptParameter = model.rptParameter;
- string rptParameterName = _rptGetParameterName(_rptParameter);
+ var rptParameterName = _rptGetParameterName(_rptParameter);
string p1, p2, p3, p4, p5, p6;
(p1, p2, p3, p4, p5, p6) = _rptGetParameterP(_rptParameter);
dynamic m = new ExpandoObject();
@@ -105,16 +110,17 @@
m.reportTemplateData = buffer;
_blDate = true;
}
+
reader.Close();
}
- if (_blDate == false)
+
+ if (!_blDate)
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
"璇诲彇澶辫触锛屾病鏈夊垵濮嬪寲妯℃澘锛�");
//濡傛灉鏄璁℃ā寮忥紝閫�鍑�
if (isDesign == 1)
- {
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
- }
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
+ "璇诲彇鎴愬姛锛�");
//璇婚渶瑕佹墦鍗扮殑鏁版嵁锛岀敤鏉ュ～鍏呮ā鏉�
if (_rptParameter.StartsWith(_customTag))
rptParameterName = "rpt_hgm";
@@ -127,15 +133,16 @@
comm.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@inEdtUserGuid", _userGuid),
- new("@inOrderGuid",guid),
- new("@isDesign",isDesign),
- new("@in1", p1),
- new("@in2", p2),
- new("@in3", string.IsNullOrEmpty(p3)?DBNull.Value:p3),
- new("@in4", p4),
- new("@in5", p5),
- new("@in6", p6)
+ new("@inEdtUserGuid", _userGuid),
+ new("@inOrderGuid", guid),
+ new("@isDesign", isDesign),
+ new("@in1", p1),
+ new("@in2", p2),
+ new("@in3",
+ string.IsNullOrEmpty(p3) ? DBNull.Value : p3),
+ new("@in4", p4),
+ new("@in5", p5),
+ new("@in6", p6)
};
foreach (var parameter in parameters)
comm.Parameters.Add(parameter);
@@ -144,20 +151,22 @@
dt.Fill(dset, "0");
}
}
+
conn.Close();
}
+
//0鏄姸鎬侊紝1鏄富琛紝2鏄槑缁嗚〃锛�3鏄槑缁嗚〃
if (dset.Tables[0].Rows[0]["msgState"].ToString() == "-1")
- {
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, dset.Tables[0].Rows[0]["msgTxt"].ToString());
- }
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
+ dset.Tables[0].Rows[0]["msgTxt"].ToString());
var _zb1 = dset.Tables[1].TableToDynamicList();
var _mx1 = dset.Tables[2].TableToDynamicList();
var _mx2 = dset.Tables[3].TableToDynamicList();
m.zb = _zb1;
m.mx1 = _mx1;
m.mx2 = _mx2;
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
+ "璇诲彇鎴愬姛锛�");
}
catch (Exception ex)
{
@@ -226,8 +235,8 @@
#region MyRegion
+
/// <summary>
- ///
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -236,15 +245,22 @@
{
string keyType = model.keyType;
- List<dynamic> lst = new List<dynamic>();
- System.Text.StringBuilder sbSql = new StringBuilder();
+ var lst = new List<dynamic>();
+ var sbSql = new StringBuilder();
if (keyType == "瀹㈡埛妯℃澘")
{
- sbSql.Append("select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] where REPORT_TYPE like '" + _customTag + "%' ");
- sbSql.Append(" union all select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] where REPORT_TYPE='rpt_hgm' order by REPORT_TYPE asc");
+ sbSql.Append(
+ "select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] where REPORT_TYPE like '" +
+ _customTag + "%' ");
+ sbSql.Append(
+ " union all select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] where REPORT_TYPE='rpt_hgm' order by REPORT_TYPE asc");
}
else
- sbSql.Append("select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] order by [REPORT_TYPE] desc");
+ {
+ sbSql.Append(
+ "select [GUID],[REPORT_TYPE],[REPORT_NAME] from [dbo].[SYS_REPORT_TEMPLATE] order by [REPORT_TYPE] desc");
+ }
+
var dset = new DataSet();
try
{
@@ -257,12 +273,13 @@
return ReturnDto<List<dynamic>>.QuickReturn(lst,
ReturnCode.Exception, "璇诲彇澶辫触锛�");
}
+
return ReturnDto<List<dynamic>>.QuickReturn(lst, ReturnCode.Success,
"璇诲彇鎴愬姛锛�");
}
/// <summary>
- /// 鍔犲叆
+ /// 鍔犲叆
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -270,8 +287,8 @@
public ReturnDto<int?> AddModel([FromBody] dynamic model)
{
string reportName = model.reportName;
- string reportType = _customTag + DateTime.Now.ToString("MMddHHmmff");
- int rtnInt = (int)ReturnCode.Default;
+ var reportType = _customTag + DateTime.Now.ToString("MMddHHmmff");
+ var rtnInt = (int)ReturnCode.Default;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("[prc_report_edt]", conn))
@@ -306,14 +323,16 @@
}
}
}
+
if (rtnInt > 0)
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
- else
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success,
+ "鎿嶄綔鎴愬姛锛�");
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception,
+ "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
}
/// <summary>
- /// 绉诲嚭
+ /// 绉诲嚭
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -321,29 +340,31 @@
public ReturnDto<int?> DeleteModel([FromBody] dynamic model)
{
string guid = model.guid;
- int rtnInt = (int)ReturnCode.Default;
+ var rtnInt = (int)ReturnCode.Default;
if (guid.ToUpper() == "AF1105F3-1CFA-4E48-BE07-6EC3A184918C".ToUpper())
- {
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岄粯璁ゆā鐗堬紝涓嶈兘鍒犻櫎锛�");
- }
+ return ReturnDto<int>.QuickReturn(default(int?),
+ ReturnCode.Exception, "鎿嶄綔澶辫触锛岄粯璁ゆā鐗堬紝涓嶈兘鍒犻櫎锛�");
try
{
- StringBuilder strSql = new StringBuilder();
+ var strSql = new StringBuilder();
strSql.Append(" delete from SYS_REPORT_TEMPLATE ");
strSql.Append(" where guid='" + guid + "'");
rtnInt = DbHelperSQL.ExecuteSql(strSql.ToString());
}
catch (Exception ex)
{
- LogHelper.Debug(this.ToString(), "DeleteModel error锛�" + ex.Message);
+ LogHelper.Debug(ToString(), "DeleteModel error锛�" + ex.Message);
rtnInt = (int)ReturnCode.Exception;
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛�" + ex.Message);
+ return ReturnDto<int>.QuickReturn(default(int?),
+ ReturnCode.Exception, "鎿嶄綔澶辫触锛�" + ex.Message);
}
- if (rtnInt > 0)
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
- else
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
- }
- #endregion
+ if (rtnInt > 0)
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success,
+ "鎿嶄綔鎴愬姛锛�");
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception,
+ "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
+ }
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3