From d2579aee159e28288377425143cf083d5b68ea80 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Mon, 27 Oct 2025 14:53:26 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A2=98=E5=BA=93=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E7=AD=94=E6=A1=88=E4=BF=AE=E6=94=B9=202=E3=80=81=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9=203=E3=80=81?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BC=98=E5=8C=96=20=E9=A9=B3=E5=9B=9E=20?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/ApproveController.cs | 40 ++-- .../Controllers/Api/BIController.cs | 209 +----------------- .../Api/SEController/SETestController.cs | 10 +- 3 files changed, 31 insertions(+), 228 deletions(-) diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs index f56c009..7f888a4 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs @@ -650,34 +650,32 @@ { return SafeExecute(() => { - T_PF_APPROVE result = null; - if (!string.IsNullOrEmpty(filter.Parameter22) && filter.OrgId.HasValue && filter.Parameter22 != filter.OrgId.Value.ToString()) - { - //集团人员 通过 首页点击 获取对应的数据库链接 返回结果 + //T_PF_APPROVE result = null; + //if (!string.IsNullOrEmpty(filter.Parameter22) && filter.OrgId.HasValue && filter.Parameter22 != filter.OrgId.Value.ToString()) + //{ + // //集团人员 通过 首页点击 获取对应的数据库链接 返回结果 + // ////后端直接处理 + // //string tenant = OPTenantDBConnService.GetTenantByORGID(new Guid(filter.Parameter1)); + // //filter.IgnoreOrgRule = true; + // //filter.OrgId = null; + // //filter.IsSpecifyDb = true; + // //filter.SpecifyTenant = tenant; + // //filter.IgnoreDataRule = true; + // //result = GetEntity(e => !e.IS_DELETED, filter, null); + // //前端处理了Tenant + // filter.IgnoreOrgRule = true; + // filter.OrgId = null; + //} - ////后端直接处理 - //string tenant = OPTenantDBConnService.GetTenantByORGID(new Guid(filter.Parameter1)); - //filter.IgnoreOrgRule = true; - //filter.OrgId = null; - //filter.IsSpecifyDb = true; - //filter.SpecifyTenant = tenant; - //filter.IgnoreDataRule = true; - //result = GetEntity(e => !e.IS_DELETED, filter, null); - - //前端处理了Tenant - filter.IgnoreOrgRule = true; - filter.OrgId = null; - } - - result = GetEntity(null, filter, null); + T_PF_APPROVE result = GetEntity(null, filter, null); if (result != null) { - if (result.APPROVE_TEMP_ID != null) + if (result.APPROVE_TEMP_ID != null && string.IsNullOrEmpty(result.REJECT_INTERFACE)) { filter.Include = new List(); filter.FilterGroup = new FilterGroup(); var approveTemp = this.GetEntity(t => t.ID == result.APPROVE_TEMP_ID, filter); - if (approveTemp != null) + if (approveTemp != null && !string.IsNullOrEmpty(approveTemp.REJECT_INTERFACE)) result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE; } result.Nav_ApproveDetails = result.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.MODIFY_TIME).ToList(); diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIController.cs index 8642409..5ade781 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIController.cs @@ -274,201 +274,6 @@ namespace APT.SC.WebApi.Controllers.Api.BI }); } - /// - /// 定期短信发送 - /// - /// 定期短信发送 - /// - [HttpPost, Route("regularSendSMS")] - public JsonActionResult regularSendSMS([FromBody] KeywordFilter filter) - { - return SafeExecute(() => - { - try - { - DateTime now = DateTime.Now; - var allUsers = GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.GetOrgId())); - var approveUsers = GetEntities(t => t.ENABLE_STATUS == 0 && t.Nav_Department.DEPARTMENT_TYPE != 2, new BaseFilter(filter.GetOrgId()));//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 - var userIds = approveUsers.Select(t => t.ID); - List sendSMSs = null; - List listTaskIDDone = new List(); - TencentSendSMS tencentSendSMS = new TencentSendSMS(); - if (now.Hour >= 7 && now.Hour < 23)//早上 7点到晚上23点做提醒 其余时间不提醒 - { - sendSMSs = GetEntities(t => t.NOTICE_STATUS == 0 && !t.ISCANCEL && !t.IS_DELETED && t.CREATE_TIME > now.AddDays(-6) && !t.SOURCE_FORMCODE.Contains("FO005") && t.SENDTIME == DateTime.MinValue, new BaseFilter(filter.GetOrgId())).ToList(); - var sendSMSs2 = sendSMSs.Where(t => t.TASK_ENDDT < now.AddHours(1) && t.TASK_ENDDT > t.TASK_STARTDT);//临超期待办提醒所有人 - foreach (var send in sendSMSs2) - { - List phoneNumbers = new List(); - List templates = new List(); - var user = allUsers.FirstOrDefault(t => t.ID == send.USER_ID); - if (user != null && user.PHONE != null && !string.IsNullOrEmpty(user.PHONE)) - { - listTaskIDDone.Add(send.ID); - send.SENDTIME = DateTime.Now; - phoneNumbers.Add(user.PHONE); - templates.Add(send.NOTICE_TITLE); - templates.Add(send.TASK_ENDDT.ToString()); - var result = tencentSendSMS.sendSMS("1747259", phoneNumbers.ToArray(), templates.ToArray()); - if (result.SendStatusSet[0].Code.Equals("Ok")) - { - UnifiedCommit(() => - { - UpdateEntityNoCommit(send); - }); - } - } - } - //&& t.NOTICE_TITLE.Contains("审批") - var sendSMSs1 = sendSMSs.Where(t => userIds.Contains(t.USER_ID) && t.CREATE_TIME > now.AddHours(-8));//8小时前创建的 非班组级成员 未办都做提醒 - foreach (var send in sendSMSs1) - { - if (listTaskIDDone.Contains(send.ID))//避免同事发送2条短信 - { - continue; - } - List phoneNumbers = new List(); - List templates = new List(); - var user = approveUsers.FirstOrDefault(t => t.ID == send.USER_ID); - if (user != null && user.PHONE != null && !string.IsNullOrEmpty(user.PHONE)) - { - send.SENDTIME = DateTime.Now; - phoneNumbers.Add(user.PHONE); - templates.Add(send.NOTICE_TITLE); - templates.Add(send.TASK_ENDDT.ToString()); - //TencentSendSMS tencentSendSMS = new TencentSendSMS(); - var result = tencentSendSMS.sendSMS("1747261", phoneNumbers.ToArray(), templates.ToArray()); - if (result.SendStatusSet[0].Code.Equals("Ok")) - { - UnifiedCommit(() => - { - UpdateEntityNoCommit(send); - }); - } - } - } - - } - } - catch (Exception ex) - { - if (!string.IsNullOrEmpty(ex.StackTrace)) - throw new Exception("错误日志：[StackTrace]" + ex.StackTrace); - else - throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message); - } - - return true; - }); - } - - /// - /// 定期短信发送 - /// - /// 定期短信发送 - /// - [HttpPost, Route("regularSendSMSDCJD")] - public JsonActionResult regularSendSMSDCJD([FromBody] KeywordFilter filter) - { - return SafeExecute(() => - { - - try - { - - DateTime now = DateTime.Now; - BaseFilter userfilter = new BaseFilter(filter.GetOrgId()); - userfilter.SelectField = new string[] { "PHONE" }; - var allUsers = GetEntities(t => t.ENABLE_STATUS == 0, userfilter); - var approveUsers = GetEntities(t => t.Nav_Department.DEPARTMENT_TYPE != 2 && t.ENABLE_STATUS == 0, new BaseFilter(filter.GetOrgId())); - var userIds = approveUsers.Select(t => t.ID); - List sendSMSs = null; - if (now.Hour >= 7 && now.Hour < 23) - { - sendSMSs = GetEntities(t => t.NOTICE_STATUS == 0 && t.CREATE_TIME > now.AddDays(-6) && !t.SOURCE_FORMCODE.Contains("FO005") && t.SENDTIME == DateTime.MinValue, new BaseFilter(filter.GetOrgId())).ToList(); - var sendSMSs2 = sendSMSs.Where(t => t.TASK_ENDDT < now.AddHours(1) && t.TASK_ENDDT > t.TASK_STARTDT); - foreach (var send in sendSMSs2) - { - List phoneNumbers = new List(); - List templates = new List(); - var user = allUsers.FirstOrDefault(t => t.ID == send.USER_ID); - if (user != null && user.PHONE != null && !string.IsNullOrEmpty(user.PHONE)) - { - send.SENDTIME = DateTime.Now; - phoneNumbers.Add(user.PHONE); - string paddedStr = send.NOTICE_TITLE.Length < 18 ? send.NOTICE_TITLE.PadRight(18) : send.NOTICE_TITLE.Substring(0, 18); - var length = paddedStr.Length; - templates.Add(paddedStr.Substring(0, 6)); - templates.Add(paddedStr.Substring(6, 6)); - templates.Add(paddedStr.Substring(12, 5)); - templates[1] = templates[1].Trim(); - templates[2] = templates[2].Trim(); - templates.Add(send.TASK_ENDDT.Year.ToString()); - templates.Add(send.TASK_ENDDT.Month.ToString("00")); - templates.Add(send.TASK_ENDDT.Day.ToString("00")); - templates.Add(send.TASK_ENDDT.Hour.ToString("00")); - templates.Add(send.TASK_ENDDT.Minute.ToString("00")); - templates.Add(send.TASK_ENDDT.Second.ToString("00")); - - TencentSendSMS tencentSendSMS = new TencentSendSMS(); - var result = tencentSendSMS.sendSMSDCJD("2163511", phoneNumbers.ToArray(), templates.ToArray()); - if (result.SendStatusSet[0].Code.Equals("Ok")) - { - UnifiedCommit(() => - { - UpdateEntityNoCommit(send); - }); - } - } - } - //&& t.NOTICE_TITLE.Contains("审批") - var sendSMSs1 = sendSMSs.Where(t => userIds.Contains(t.USER_ID) && t.CREATE_TIME > now.AddHours(-8)); - foreach (var send in sendSMSs1) - { - List phoneNumbers = new List(); - List templates = new List(); - var user = approveUsers.FirstOrDefault(t => t.ID == send.USER_ID); - if (user != null && user.PHONE != null && !string.IsNullOrEmpty(user.PHONE)) - { - send.SENDTIME = DateTime.Now; - phoneNumbers.Add(user.PHONE); - string paddedStr = send.NOTICE_TITLE.Length < 18 ? send.NOTICE_TITLE.PadRight(18) : send.NOTICE_TITLE.Substring(0, 18); - templates.Add(paddedStr.Substring(0, 6)); - templates.Add(paddedStr.Substring(6, 6)); - templates.Add(paddedStr.Substring(12, 5)); - templates[1] = templates[1].Trim(); - templates[2] = templates[2].Trim(); - templates.Add(send.TASK_ENDDT.Year.ToString()); - templates.Add(send.TASK_ENDDT.Month.ToString("00")); - templates.Add(send.TASK_ENDDT.Day.ToString("00")); - templates.Add(send.TASK_ENDDT.Hour.ToString("00")); - templates.Add(send.TASK_ENDDT.Minute.ToString("00")); - templates.Add(send.TASK_ENDDT.Second.ToString("00")); - TencentSendSMS tencentSendSMS = new TencentSendSMS(); - var result = tencentSendSMS.sendSMSDCJD("2163620", phoneNumbers.ToArray(), templates.ToArray()); - if (result.SendStatusSet[0].Code.Equals("Ok")) - { - UnifiedCommit(() => - { - UpdateEntityNoCommit(send); - }); - } - } - } - - } - } - catch (Exception ex) - { - if (!string.IsNullOrEmpty(ex.StackTrace)) - throw new Exception("错误日志：[StackTrace]" + ex.StackTrace); - else - throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message); - } - - return true; - }); - } public static AlibabaCloud.SDK.Dysmsapi20170525.Client CreateClient(string accessKeyId, string accessKeySecret) { AlibabaCloud.OpenApiClient.Models.Config config = new AlibabaCloud.OpenApiClient.Models.Config(); @@ -481,14 +286,14 @@ namespace APT.SC.WebApi.Controllers.Api.BI /// /// 定期短信发送 /// - [HttpPost, Route("regularSendSMSLYYL")] - public JsonActionResult regularSendSMSLYYL([FromBody] KeywordFilter filter) + [HttpPost, Route("regularSendSMS")] + public JsonActionResult regularSendSMS([FromBody] KeywordFilter filter) { return SafeExecute(() => { try { - AlibabaCloud.SDK.Dysmsapi20170525.Client client = CreateClient("LTAI5tAfy6VEGWSSAf73LqP2", "RrWf2l0ZnSe0JsMDPHx9r1ouQNPGYm"); + AlibabaCloud.SDK.Dysmsapi20170525.Client client = CreateClient("LTAI5t6Pc52xRjzHgsVszgNY", "FxuLo87JVr0kXK6LjRRioVZpCw4frs"); DateTime now = DateTime.Now; BaseFilter userfilter = new BaseFilter(filter.GetOrgId()); userfilter.SelectField = new string[] { "PHONE" }; @@ -509,8 +314,8 @@ namespace APT.SC.WebApi.Controllers.Api.BI { AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest sendReq = new AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest { }; sendReq.PhoneNumbers = user.PHONE; - sendReq.SignName = "厦门鸣鹤";// "小鸣学习"; - sendReq.TemplateCode = "SMS_485890176";// "SMS_472015260"; + sendReq.SignName = "吐鲁番金源矿冶";// "小鸣学习"; + sendReq.TemplateCode = "SMS_496760196";// "SMS_472015260"; //sendReq.TemplateParam = "{'name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}"; sendReq.TemplateParam = "{'state':'临超期','name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}"; @@ -533,8 +338,8 @@ namespace APT.SC.WebApi.Controllers.Api.BI { AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest sendReq = new AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest { }; sendReq.PhoneNumbers = user.PHONE; - sendReq.SignName = "厦门鸣鹤";// "小鸣学习"; - sendReq.TemplateCode = "SMS_485890176";// "SMS_472025278"; + sendReq.SignName = "吐鲁番金源矿冶";// "小鸣学习"; + sendReq.TemplateCode = "SMS_496760196";// "SMS_472015260"; //sendReq.TemplateParam = "{'name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}"; sendReq.TemplateParam = "{'state':'新','name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}"; AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsResponse sendResp = client.SendSms(sendReq); diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs index eef2d45..98abb8e 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs @@ -334,7 +334,7 @@ namespace APT.SE.WebApi.Controllers.Api T_FM_USER_POST modelPost = null; List listPostNameEmpty = new List(); - List listAnswerErrorIndex = new List(); + List listAnswerErrorIndex = new List(); List listAnswerError = new List(); string strANSWER = string.Empty; T_SE_TEST_ENUM_POINT modelPoint = null; @@ -441,7 +441,7 @@ namespace APT.SE.WebApi.Controllers.Api { listAnswerError.Add(strANSWER); } - listAnswerErrorIndex.Add(i + rowIndex); + listAnswerErrorIndex.Add((i + rowIndex).ToString()); } } @@ -469,7 +469,7 @@ namespace APT.SE.WebApi.Controllers.Api { listAnswerError.Add(strANSWER); } - listAnswerErrorIndex.Add(i + rowIndex); + listAnswerErrorIndex.Add((i + rowIndex).ToString()); } } if (mainTable.TYPE == SETestTypeEnum.多选题) @@ -504,7 +504,7 @@ namespace APT.SE.WebApi.Controllers.Api { listAnswerError.Add(strANSWER); } - listAnswerErrorIndex.Add(i + rowIndex); + listAnswerErrorIndex.Add((i + rowIndex).ToString()); } if (!string.IsNullOrEmpty(dtSource.Rows[i][8].ToString().Trim())) { @@ -617,7 +617,7 @@ namespace APT.SE.WebApi.Controllers.Api } if (listAnswerErrorIndex.Count > 0) { - throw new Exception("答案有误，行：【" + string.Join("," + listAnswerErrorIndex) + "】值：" + string.Join(",", listAnswerError)); + throw new Exception("答案有误，行：【" + string.Join(",", listAnswerErrorIndex) + "】值：" + string.Join(",", listAnswerError)); } } if (strEmptyError != string.Empty)