短信发送 提供测试
This commit is contained in:
		
							parent
							
								
									50fcce9cd0
								
							
						
					
					
						commit
						180e3737bf
					
				@ -116,7 +116,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
 | 
				
			|||||||
                DeleteEntity<T_BI_SAFETASK_FINISH>(t => true);
 | 
					                DeleteEntity<T_BI_SAFETASK_FINISH>(t => true);
 | 
				
			||||||
                BaseFilter baseFilter = new BaseFilter(filter.GetOrgId());
 | 
					                BaseFilter baseFilter = new BaseFilter(filter.GetOrgId());
 | 
				
			||||||
                baseFilter.Include = new string[] { "Nav_Department.Nav_Parent.Nav_Parent", "Nav_ChargePerson" };
 | 
					                baseFilter.Include = new string[] { "Nav_Department.Nav_Parent.Nav_Parent", "Nav_ChargePerson" };
 | 
				
			||||||
                var allTeams = GetEntities<T_FM_TEAM>(t => t.IS_DELETED == false&&t.ENABLE_STATUS==0&&t.CHARGE_PERSON_ID!=null, baseFilter);
 | 
					                var allTeams = GetEntities<T_FM_TEAM>(t => t.IS_DELETED == false && t.ENABLE_STATUS == 0 && t.CHARGE_PERSON_ID != null, baseFilter);
 | 
				
			||||||
                List<T_BI_SAFETASK_FINISH> biSafeFinishs = new List<T_BI_SAFETASK_FINISH>();
 | 
					                List<T_BI_SAFETASK_FINISH> biSafeFinishs = new List<T_BI_SAFETASK_FINISH>();
 | 
				
			||||||
                var selectFilter = new BaseFilter(filter.GetOrgId());
 | 
					                var selectFilter = new BaseFilter(filter.GetOrgId());
 | 
				
			||||||
                foreach (var team in allTeams)
 | 
					                foreach (var team in allTeams)
 | 
				
			||||||
@ -258,35 +258,55 @@ namespace APT.SC.WebApi.Controllers.Api.BI
 | 
				
			|||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// 定期短信发送
 | 
					        /// 定期短信发送
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
        /// <param name="pageFilter">定期短信发送</param>
 | 
					        /// <param name="filter">定期短信发送</param>
 | 
				
			||||||
        /// <returns></returns>
 | 
					        /// <returns></returns>
 | 
				
			||||||
        [HttpPost, Route("regularSendSMS")]
 | 
					        [HttpPost, Route("regularSendSMS")]
 | 
				
			||||||
        public JsonActionResult<bool> regularSendSMS([FromBody] KeywordFilter filter)
 | 
					        public JsonActionResult<bool> regularSendSMS([FromBody] KeywordFilter filter)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            return SafeExecute<bool>(() =>
 | 
					            return SafeExecute<bool>(() =>
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                TencentSendSMS tencentSendSMS = new TencentSendSMS();
 | 
				
			||||||
 | 
					                string PhoneText = string.Empty;
 | 
				
			||||||
 | 
					                if (!string.IsNullOrEmpty(filter.Parameter1))
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    PhoneText = filter.Parameter1;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                if (PhoneText != string.Empty && PhoneText.Length == 11)
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    var result2 = tencentSendSMS.sendSMS("2428711", new string[] { PhoneText }, null);
 | 
				
			||||||
 | 
					                    var result3 = tencentSendSMS.sendSMS("2428708", new string[] { PhoneText }, null);
 | 
				
			||||||
 | 
					                    if (result2.SendStatusSet[0].Code.Equals("Ok"))
 | 
				
			||||||
 | 
					                    {
 | 
				
			||||||
 | 
					                        return true;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                    else
 | 
				
			||||||
 | 
					                    {
 | 
				
			||||||
 | 
					                        return false;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                else
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    DateTime now = DateTime.Now;
 | 
					                    DateTime now = DateTime.Now;
 | 
				
			||||||
                    var allUsers = GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.GetOrgId()));
 | 
					                    var allUsers = GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.GetOrgId()));
 | 
				
			||||||
                    var approveUsers = GetEntities<T_FM_USER>(t => t.Nav_Department.DEPARTMENT_TYPE != 2 && t.ENABLE_STATUS == 0, new BaseFilter(filter.GetOrgId()));
 | 
					                    var approveUsers = GetEntities<T_FM_USER>(t => t.Nav_Department.DEPARTMENT_TYPE != 2 && t.ENABLE_STATUS == 0, new BaseFilter(filter.GetOrgId()));
 | 
				
			||||||
                    var userIds = approveUsers.Select(t => t.ID);
 | 
					                    var userIds = approveUsers.Select(t => t.ID);
 | 
				
			||||||
                    List<T_FM_NOTIFICATION_TASK> sendSMSs = null;
 | 
					                    List<T_FM_NOTIFICATION_TASK> sendSMSs = null;
 | 
				
			||||||
                if (now.Hour >= 7 && now.Hour < 23)
 | 
					                    if (now.Hour >= 7 && now.Hour < 20)
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                    sendSMSs = GetEntities<T_FM_NOTIFICATION_TASK>(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();
 | 
					                        sendSMSs = GetEntities<T_FM_NOTIFICATION_TASK>(t => t.NOTICE_STATUS == 0 && t.CREATE_TIME > now.AddDays(-12) && !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);
 | 
					                        var sendSMSs2 = sendSMSs.Where(t => t.TASK_ENDDT < now.AddHours(1) && t.TASK_ENDDT > t.TASK_STARTDT);
 | 
				
			||||||
                    foreach (var send in sendSMSs2)
 | 
					                        foreach (var send in sendSMSs2)//1个小时以内 临超时提醒
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
                            List<string> phoneNumbers = new List<string>();
 | 
					                            List<string> phoneNumbers = new List<string>();
 | 
				
			||||||
                        List<string> templates = new List<string>();
 | 
					                            //List<string> templates = new List<string>();
 | 
				
			||||||
                            var user = allUsers.FirstOrDefault(t => t.ID == send.USER_ID);
 | 
					                            var user = allUsers.FirstOrDefault(t => t.ID == send.USER_ID);
 | 
				
			||||||
                            if (user != null && user.PHONE != null)
 | 
					                            if (user != null && user.PHONE != null)
 | 
				
			||||||
                            {
 | 
					                            {
 | 
				
			||||||
                                send.SENDTIME = DateTime.Now;
 | 
					                                send.SENDTIME = DateTime.Now;
 | 
				
			||||||
                                phoneNumbers.Add(user.PHONE);
 | 
					                                phoneNumbers.Add(user.PHONE);
 | 
				
			||||||
                            templates.Add(send.NOTICE_TITLE);
 | 
					                                //templates.Add(send.NOTICE_TITLE);
 | 
				
			||||||
                            templates.Add(send.TASK_ENDDT.ToString());
 | 
					                                //templates.Add(send.TASK_ENDDT.ToString());
 | 
				
			||||||
                            TencentSendSMS tencentSendSMS = new TencentSendSMS();
 | 
					                                var result = tencentSendSMS.sendSMS("2428711", phoneNumbers.ToArray(), null);
 | 
				
			||||||
                            var result = tencentSendSMS.sendSMS("1747259", phoneNumbers.ToArray(), templates.ToArray());
 | 
					 | 
				
			||||||
                                if (result.SendStatusSet[0].Code.Equals("Ok"))
 | 
					                                if (result.SendStatusSet[0].Code.Equals("Ok"))
 | 
				
			||||||
                                {
 | 
					                                {
 | 
				
			||||||
                                    UnifiedCommit(() =>
 | 
					                                    UnifiedCommit(() =>
 | 
				
			||||||
@ -301,16 +321,16 @@ namespace APT.SC.WebApi.Controllers.Api.BI
 | 
				
			|||||||
                        foreach (var send in sendSMSs1)
 | 
					                        foreach (var send in sendSMSs1)
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
                            List<string> phoneNumbers = new List<string>();
 | 
					                            List<string> phoneNumbers = new List<string>();
 | 
				
			||||||
                        List<string> templates = new List<string>();
 | 
					                            //List<string> templates = new List<string>();
 | 
				
			||||||
                            var user = approveUsers.FirstOrDefault(t => t.ID == send.USER_ID);
 | 
					                            var user = approveUsers.FirstOrDefault(t => t.ID == send.USER_ID);
 | 
				
			||||||
                            if (user != null && user.PHONE != null)
 | 
					                            if (user != null && user.PHONE != null)
 | 
				
			||||||
                            {
 | 
					                            {
 | 
				
			||||||
                                send.SENDTIME = DateTime.Now;
 | 
					                                send.SENDTIME = DateTime.Now;
 | 
				
			||||||
                                phoneNumbers.Add(user.PHONE);
 | 
					                                phoneNumbers.Add(user.PHONE);
 | 
				
			||||||
                            templates.Add(send.NOTICE_TITLE);
 | 
					                                //templates.Add(send.NOTICE_TITLE);
 | 
				
			||||||
                            templates.Add(send.TASK_ENDDT.ToString());
 | 
					                                //templates.Add(send.TASK_ENDDT.ToString());
 | 
				
			||||||
                            TencentSendSMS tencentSendSMS = new TencentSendSMS();
 | 
					                                //TencentSendSMS tencentSendSMS = new TencentSendSMS();
 | 
				
			||||||
                            var result = tencentSendSMS.sendSMS("1747261", phoneNumbers.ToArray(), templates.ToArray());
 | 
					                                var result = tencentSendSMS.sendSMS("2428708", phoneNumbers.ToArray(), null);
 | 
				
			||||||
                                if (result.SendStatusSet[0].Code.Equals("Ok"))
 | 
					                                if (result.SendStatusSet[0].Code.Equals("Ok"))
 | 
				
			||||||
                                {
 | 
					                                {
 | 
				
			||||||
                                    UnifiedCommit(() =>
 | 
					                                    UnifiedCommit(() =>
 | 
				
			||||||
@ -322,6 +342,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
 | 
				
			|||||||
                        }
 | 
					                        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
                return true;
 | 
					                return true;
 | 
				
			||||||
            });
 | 
					            });
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user