1

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -55,7 +55,8 @@
   <add key="AccessKeySecret" value="elRaejiGbEEp3SMy9uNNR2QkLd9ZjF" />
 
  
-  <add key="FeiShui_AppId" value="cli_a7242e417af7900c" />
+  <add key="FeiShui_AppId" value="cli_a74fe60168fc900c" />
   
-  <add key="FeiShui_AppSecret" value="QJIWfIUKJjVLZgEl5JqxoguOYlnCphV5" />
+  <add key="FeiShui_AppSecret" value="WNtLBLOmwkZtFm4AakJHihyo2fS0dwBe" />
+  <add key="FeiShuiUrgent" value="120" />
 </appSettings>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AddressBookController.cs

@@ -320,31 +320,14 @@ namespace CallCenterApi.Interface.Controllers
                 string sql = "F_IsDelete=0 ";
                 if (!string.IsNullOrEmpty(keywords))
                 {
-                    var dept = new BLL.T_Sys_Department().GetModelList("F_DeptName like '%" + keywords + "%'").FirstOrDefault();
-
-                    if (dept != null)
-                    {
-                        if (dptid == 1)
-                            dptid = dept.F_DeptId;
-                        else
-                        {
-                            sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%" + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%" + keywords.Trim() + "%'or F_Department like '%" + keywords.Trim() + "%' ) ";
-                        }
 
-                    }
-                    else
-                    {
-                        sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%" + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%" + keywords.Trim() + "%'or F_Department like '%" + keywords.Trim() + "%' ) ";
-                    }
-                  
-                }
-                Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(dptid);
-                if (dptid > 0)
-                {
+                   sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%"
+                     + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%"
+                     + keywords.Trim()
+                     + "%'or F_Department like '%" + keywords.Trim() + "%' " +
+                     " ) ";
 
-                    sql += " and F_DepartmentId in ( select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptModel.F_DeptCode + "%') ";
                 }
-                
                 var modelList = bll.GetAPPList(sql + " order by code asc").Tables[0];
                  if (pageindex* pagesize<modelList .Rows .Count )
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HomeController.cs

@@ -209,7 +209,8 @@ namespace CallCenterApi.Interface.Controllers
         }
         public ActionResult SendMessage(string mobile,string msg)
         {
-            var result= FeiShuiHelper.SendMsg(mobile, msg);
+          var result= FeiShuiHelper.SendMsg("1", "2", "3", "4", "5", "6", "7",
+                        mobile, msg);
             return Content(result);
         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/PushMessageController.cs

@@ -30,6 +30,7 @@ namespace CallCenterApi.Interface.Controllers
         private static String APPID =Configs.GetValue("APPID");
         private static String APPKEY = Configs.GetValue("APPKEY");
         private static String MASTERSECRET = Configs.GetValue("MASTERSECRET");
+        private static String FeiShuiUrgent = Configs.GetValue("FeiShuiUrgent");
         private BLL.T_Sys_UserAccount userBLL = new BLL.T_Sys_UserAccount();
         public class AppClientListDto
         {
@@ -46,6 +47,74 @@ namespace CallCenterApi.Interface.Controllers
             /// </summary>
             public string usercode { get; set; }
         }
+        public ActionResult PushFeiShuiMessagePush()
+        {
+            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
+            string msg = "";
+            if (modellist != null)
+            {
+                foreach (var it in modellist)
+                {
+                    //  var modellitlast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID = " + it.F_Id + "and F_IsUsed =0     and( F_Push=0  or  F_Push=1 )order by F_ID desc").FirstOrDefault();
+                    if (it == null)
+                        continue;
+                    System.TimeSpan time = DateTime.Now - DateTime.Parse(it.F_CreateTime.ToString());
+                    var usercount = new BLL.T_Sys_UserAccount().GetModel(it.F_NextUser);
+                    int Urgent = 120;
+                    if (!string .IsNullOrEmpty(FeiShuiUrgent))
+                    {
+                        try
+                        {
+                            Urgent = int.Parse(FeiShuiUrgent);
+                        }
+                        catch
+                        { }
+                    }
+                    
+
+                    string Title = "工单处理提醒";
+                    string count = "";
+                    if (it.F_WoState == 1)
+                    {
+                        count = "你有工单待指派";
+                    }
+                    else if (it.F_WoState == 3)
+                    {
+                        count = "你有工单待处理";
+                    }
+                    else if (it.F_WoState == 5)
+                    {
+                        count = "你有工单待指派";
+                    }
+                    if (usercount == null)
+                        continue;
+                    var model = new BLL.T_Bus_WorkOrder().GetModel((int )it.F_WoID);
+                    if (model!=null )
+                    {
+                        if (time.TotalMinutes >= Urgent)
+                        {
+                            msg = new PushMessageController().
+                     PushFeiShui(model, "工单处理提醒", count, usercount.F_UserCode, model.F_Id,1);
+                        }
+                        else
+                        {
+                            msg = new PushMessageController().
+                     PushFeiShui(model, "工单处理提醒", count, usercount.F_UserCode, model.F_Id);
+                        }
+                      
+                    }
+                   
+
+                }
+            }
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                pushResult = msg
+            };
+            return Content(obj.ToJson()); ;
+        }
         public ActionResult PushMessagePush()
         {
             var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
@@ -77,7 +146,7 @@ namespace CallCenterApi.Interface.Controllers
                     }
                     if (usercount == null)
                         continue;
-                    msg = Push(Title, count, usercount.F_UserCode);
+                    msg = Push(Title, count, usercount.F_UserCode,it.F_WoID);
                   
                 }
             }
@@ -141,7 +210,7 @@ namespace CallCenterApi.Interface.Controllers
                             }
                             else
                             {
-                                 msg = Push(Title, count, usercount.F_UserCode);
+                                 msg = Push(Title, count, usercount.F_UserCode, it.F_WoID);
                               
                                 if (msg != "")
                                     AddLimLog(it, a + 1);
@@ -166,7 +235,7 @@ namespace CallCenterApi.Interface.Controllers
                                 continue;
                             else
                             {
-                                msg = Push(Title, count, usercount.F_UserCode);
+                                msg = Push(Title, count, usercount.F_UserCode, it.F_WoID);
 
                                 if (msg != "")
                                     AddLimLog(it, a + 1);
@@ -174,7 +243,7 @@ namespace CallCenterApi.Interface.Controllers
                         }
                         catch
                         {
-                            msg = Push(Title, count, usercount.F_UserCode);
+                            msg = Push(Title, count, usercount.F_UserCode, it.F_WoID);
 
                             if (msg != "")
                                 AddLimLog(it, 2);
@@ -319,18 +388,62 @@ namespace CallCenterApi.Interface.Controllers
             return Content(obj.ToJson()); ;
             //  return pushResult; ;
         }
-        public string  Push(string Title, string count,string usercode)
+        public string PushFeiShui(Model.T_Bus_WorkOrder model,string Title, string count, string usercode, long WoID = 0,int type=0)
         {
             //  int userId = CurrentUser.UserData.F_UserId;
             //   Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
-           
 
-          
+            string pushResult = "";
+
             var userModel = new BLL.T_Sys_UserAccount().GetModel(usercode);
             if (userModel != null)
             {
+                string products = "";
+                if (!string .IsNullOrEmpty(model.F_ProductDate))
+                {
+                    products = model.F_ProductDate;
+                }
+                if (!string.IsNullOrEmpty(model.F_BatchNumber))
+                {
+                    if (!string .IsNullOrEmpty(products))
+                       products +="-"+ model.F_BatchNumber;
+                    else
+                        products = model.F_BatchNumber;
+                }
+                if (!string.IsNullOrEmpty(model.F_BatchNumber))
+                {
+                    if (!string.IsNullOrEmpty(products))
+                        products += "-" + model.F_ProductName;
+                    else
+                        products = model.F_ProductName;
+                }
+                
                 usercode = userModel.F_UserCode;
+                if (!string.IsNullOrEmpty(userModel.F_Mobile))
+                {
+                    try
+                    {
+                        pushResult = FeiShuiHelper.SendMsg(Title, model.F_WorkOrderId, model.F_CusName,
+                       model.F_CusPhone, model.F_AddRess, products, model.F_QualityProblem,
+                       userModel.F_Mobile, count, WoID);
+                    }
+                    catch
+                    { }
+                   
+                }
             }
+           
+            return pushResult; ;
+        }
+        public string  Push(string Title, string count,string usercode,long WoID = 0)
+        {
+            //  int userId = CurrentUser.UserData.F_UserId;
+            //   Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
+           
+
+          
+            var userModel = new BLL.T_Sys_UserAccount().GetModel(usercode);
+          
             var clientidStr = RedisHelper.StringGet("clientidlist");
             var list = new List<AppClientListDto>();
             if (clientidStr != null)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -3656,7 +3656,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var modellitlast = new BLL.T_Wo_WorkOrderItem_New().GetModel(itemid);
                 if (modellitlast!=null )
                 {
-                    string msg = new PushMessageController().Push("工单处理提醒", "你有工单待" + optnext, touser);
+                    string msg = new PushMessageController().Push("工单处理提醒", "你有工单待" + optnext, touser, model.F_Id);
+                    string feishuimsg = new PushMessageController().PushFeiShui(model, "工单处理提醒", "你有工单待" + optnext, touser, model.F_Id);
                 }
                 #endregion
                 return true;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkorderAppController.cs

@@ -1987,8 +1987,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var modellitlast = new BLL.T_Wo_WorkOrderItem_New().GetModel(itemid);
                 if (modellitlast != null)
                 {
-                    string msg = new PushMessageController().Push("工单处理提醒", "你有工单待" + optnext, touser);
-                  
+                    string msg = new PushMessageController().Push("工单处理提醒", "你有工单待" + optnext, touser, model.F_Id);
+                    string feishuimsg = new PushMessageController().PushFeiShui(model,"工单处理提醒", "你有工单待" + optnext, touser, model.F_Id);
                 }
                 #endregion
                 return true;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -1,10 +1,11 @@
-using CallCenter.Utility;
+using CallCenter.QuartzService;
+using CallCenter.Utility;
 using CallCenterApi.Common;
 using CallCenterApi.Interface.Controllers;
 using CallCenterApi.Interface.Models.Common;
 using System;
 using System.Collections.Generic;
-
+using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
@@ -15,22 +16,40 @@ namespace CallCenterApi.Interface
 {
     public class MvcApplication : System.Web.HttpApplication
     {
-      
-     
+
+        private static QuartzWorker _worker;
         protected void Application_Start()
         {
             AreaRegistration.RegisterAllAreas();
             RouteConfig.RegisterRoutes(RouteTable.Routes);
             //clq 增加异常日志记录 自定义 HandleErrorAttribute
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
-       
+            Task.Run(() =>
+            {
+                //IIS直接更新dll有可能end事件晚于start事件，因此延迟1分钟启动定时任务
+                Task.Delay(TimeSpan.FromMinutes(1)).Wait();
+                _worker = new QuartzWorker(65365);
+                _worker.AddWork(new FeiShuTask());
+                _worker.Start();
+
+            }).ContinueWith(p =>
+            {
+                //System.Diagnostics.Debug.WriteLine(DateTime.Now);
+            });
+          
 
         }
-    
-    
-       
-    
-      
+
+
+        protected void Application_End()
+        {
+            if (_worker != null)
+            {
+                _worker.Stop();
+            }
+        }
+
+
         protected void Application_AuthenticateRequest(object sender, EventArgs e)
         {
             HttpApplication app = (HttpApplication)sender;

codegit/CallCenterCommon/CallCenter.QuartzService/CallCenter.QuartzService.csproj

@@ -67,6 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Common.cs" />
+    <Compile Include="FeiShuTask.cs" />
     <Compile Include="log\Log.cs" />
     <Compile Include="log\LogFactory.cs" />
     <Compile Include="ProjectInstaller.cs">
@@ -105,6 +106,12 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CallCenter.Utility\CallCenter.Utility.csproj">
+      <Project>{4DA219CC-911E-4C81-BB0B-DF5183FD50FF}</Project>
+      <Name>CallCenter.Utility</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

codegit/CallCenterCommon/CallCenter.QuartzService/FeiShuTask.cs

@@ -0,0 +1,27 @@
+
+using CallCenter.Utility;
+using Quartz;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace CallCenter.QuartzService
+{
+
+    public  class FeiShuTask : QuartzJob
+    {
+        public FeiShuTask()
+        {
+            CronExpression = "0 0/10 * * * ?";
+            DoWork += task;
+        }
+        public void task(object sender, EventArgs e)
+
+        {
+            var Dataurl = HttpMethods.HttpGet("http://10.1.9.26:8046//PushMessage/PushFeiShuiMessagePush");
+            
+        }
+    }
+}

codegit/CallCenterCommon/CallCenter.QuartzService/QuartzJob.cs

@@ -12,7 +12,7 @@ namespace CallCenter.QuartzService
         /// <summary>
         /// Cron表达式，可设置多个
         /// </summary>
-        public List<string> CronExpressionList;
+        public string CronExpression;
 
         /// <summary>
         /// 任务ID

codegit/CallCenterCommon/CallCenter.QuartzService/QuartzWorker.cs

@@ -1,217 +1,64 @@
-
-using Quartz;
+using System.Collections.Specialized;
 using Quartz.Impl;
 using Quartz.Impl.Triggers;
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
+using Quartz;
 
 namespace CallCenter.QuartzService
 {
     public class QuartzWorker
     {
-        public Log log = LogFactory.GetLogger("定时");
-        public QuartzWorker()
-        {
-
-        }
-        /// <summary>
-        /// 初始化IScheduler
-        /// </summary>
-        /// <returns></returns>
-        public IScheduler GetScheduler()
+        readonly IScheduler _scheduler;
+        public QuartzWorker(int port)
         {
-            IScheduler _scheduler = null;
-            try
-            {
-                var properties = new NameValueCollection();
-                //properties["quartz.scheduler.instanceName"] = "RemoteServerSchedulerClient";
-                // 设置线程池
-                properties["quartz.threadPool.type"] = "Quartz.Simpl.SimpleThreadPool, Quartz";
-                properties["quartz.threadPool.threadCount"] = "10";
-                properties["quartz.threadPool.threadPriority"] = "Normal";
-
-                // 远程输出配置
-                properties["quartz.scheduler.exporter.type"] = "Quartz.Simpl.RemotingSchedulerExporter, Quartz";
-                properties["quartz.scheduler.exporter.port"] = "556";
-                properties["quartz.scheduler.exporter.bindName"] = "QuartzScheduler";
-                properties["quartz.scheduler.exporter.channelType"] = "tcp";
-
-                var schedulerFactory = new StdSchedulerFactory(properties);
-                _scheduler = schedulerFactory.GetScheduler();
-            }
-            catch (Exception ex)
-            {
-                log.Info("QuartzWorker初始化失败，失败原因：" + ex.ToString());
-            }
-
-            return _scheduler;
+            var properties = new NameValueCollection();
+            //properties["quartz.scheduler.instanceName"] = "RemoteServerSchedulerClient";
+            // 设置线程池
+            properties["quartz.threadPool.type"] = "Quartz.Simpl.SimpleThreadPool, Quartz";
+            properties["quartz.threadPool.threadCount"] = "5";
+            properties["quartz.threadPool.threadPriority"] = "Normal";
+
+            // 远程输出配置
+            properties["quartz.scheduler.exporter.type"] = "Quartz.Simpl.RemotingSchedulerExporter, Quartz";
+            properties["quartz.scheduler.exporter.port"] = port.ToString();
+            properties["quartz.scheduler.exporter.bindName"] = "QuartzScheduler";
+            properties["quartz.scheduler.exporter.channelType"] = "tcp";
+
+            var schedulerFactory = new StdSchedulerFactory(properties);
+            _scheduler = schedulerFactory.GetScheduler();
         }
 
         /// <summary>
         /// 添加一个任务
         /// </summary>
         /// <param name="job"></param>
-        public bool AddWork(QuartzJob job, IScheduler _scheduler)
+        public void AddWork(QuartzJob job)
         {
             var type = job.GetType();
-            var jobName = "job_" + job.jobID;
-            var jobGroup = "group_" + job.jobID;
-
-            bool bl = false;
-            try
-            {
-                JobKey jk = new JobKey(jobName, jobGroup);
-                if (_scheduler.GetJobDetail(jk) == null)
-                {
-                    // 创建一个工作
-                    var jobDetail = new JobDetailImpl(jobName, jobGroup, type, true, true);
-                    // 创建一个触发器
-                    Quartz.Collection.HashSet<ITrigger> triggerSet = new Quartz.Collection.HashSet<ITrigger>();
-                    var cronExpressionList = job.CronExpressionList;
-                    for (int i = 0; i < cronExpressionList.Count; i++)
-                    {
-                        var triggerName = "trigger_" + job.jobID + "_" + (i + 1);
-                        //触发器名称必须不同，否则最终只会添加一个触发器
-                        triggerSet.Add(new CronTriggerImpl(triggerName, jobGroup, jobName, jobGroup, cronExpressionList[i]));
-
-                        log.Info(triggerName + "已新增，规则：" + cronExpressionList[i]);
-                    }
-                    _scheduler.ScheduleJob(jobDetail, triggerSet, false);
-
-                    //启动任务
-                    if (!_scheduler.IsStarted)
-                    {
-                        Start(_scheduler);
-                    }
-                    else
-                    {
-                        _scheduler.ResumeJob(jk);
-                    }
-                    log.Info("启动任务：" + jobName);
-                }
-                else
-                {
-                    Update(job, _scheduler);
-                }
-
-                bl = true;
-            }
-            catch (Exception ex)
-            {
-                log.Info("添加任务失败，失败原因：" + ex.ToString());
-            }
-
-            return bl;
+            // 创建一个工作
+            var jobName = "JobName_" + type;
+            var jobGroup = "JobGroup_" + type;
+            var jobDetail = new JobDetailImpl(jobName, jobGroup, type, true, true);
+            // 创建一个触发器
+            var trigger = new CronTriggerImpl("trigger" + jobName, "triggergroup" + jobName, jobName, jobGroup, job.CronExpression);
+            _scheduler.AddJob(jobDetail, true);
+            _scheduler.ScheduleJob(trigger);
         }
 
         /// <summary>
         /// 开始运行
         /// </summary>
-        public void Start(IScheduler _scheduler)
+        public void Start()
         {
             _scheduler.Start();
-            log.Info("QuartzWorker已启动");
         }
 
         /// <summary>
         /// 停止运行
         /// </summary>
-        public void Stop(IScheduler _scheduler)
+        public void Stop()
         {
             _scheduler.Shutdown(true);
-            log.Info("QuartzWorker已停止");
-
-        }
-
-        /// <summary>
-        /// 暂停所有定时任务
-        /// </summary>
-        public void PauseAll(IScheduler _scheduler)
-        {
-            _scheduler.PauseAll();
-            log.Info("暂停所有定时任务");
-        }
-
-        /// <summary>
-        /// 重新启动所有定时任务
-        /// </summary>
-        public void ResumeAll(IScheduler _scheduler)
-        {
-            _scheduler.ResumeAll();
-            log.Info("重新启动所有定时任务");
-        }
-
-        /// <summary>
-        /// 修改任务触发器
-        /// </summary>
-        public void Update(QuartzJob job, IScheduler _scheduler)
-        {
-            var jobName = "job_" + job.jobID;
-            var jobGroup = "group_" + job.jobID;
-
-            try
-            {
-                var cronExpressionList = job.CronExpressionList;
-                JobKey jk = new JobKey(jobName, jobGroup);
-                List<ITrigger> list = _scheduler.GetTriggersOfJob(jk).ToList();
-                for (int i = 0; i < list.Count; i++)
-                {
-
-                    TriggerKey tk = list[i].Key;
-                    _scheduler.PauseTrigger(tk);
-                    _scheduler.UnscheduleJob(tk);
-
-                }
-
-                Quartz.Collection.HashSet<ITrigger> triggerSet = new Quartz.Collection.HashSet<ITrigger>();
-                for (int i = 0; i < cronExpressionList.Count; i++)
-                {
-                    var triggerName = "trigger_" + job.jobID + "_" + (i + 1);
-
-                    var trigger = new CronTriggerImpl(triggerName, jobGroup, jobName, jobGroup, cronExpressionList[i]);
-
-                    triggerSet.Add(trigger);
-
-                    log.Info(triggerName + "已修改，规则：" + cronExpressionList[i]);
-                }
-
-                _scheduler.ScheduleJob(_scheduler.GetJobDetail(jk), triggerSet, true);
-            }
-            catch (Exception ex)
-            {
-                log.Info(jobName + "修改失败，原因：" + ex.ToString());
-            }
-        }
-
-        /// <summary>
-        /// 移除任务
-        /// </summary>
-        public void Delete(QuartzJob job, IScheduler _scheduler)
-        {
-            var jobName = "job_" + job.jobID;
-            var jobGroup = "group_" + job.jobID;
-
-            try
-            {
-                JobKey jk = new JobKey(jobName, jobGroup);
-
-                foreach (var tri in _scheduler.GetTriggersOfJob(jk))
-                {
-                    _scheduler.PauseTrigger(tri.Key);
-                    _scheduler.UnscheduleJob(tri.Key);
-                }
-
-                _scheduler.DeleteJob(jk);
 
-                log.Info(jobName + "已移除");
-            }
-            catch (Exception ex)
-            {
-                log.Info(jobName + "移除失败，原因：" + ex.ToString());
-            }
         }
     }
 }

codegit/CallCenterCommon/CallCenter.QuartzService/SMSService.cs

@@ -13,27 +13,7 @@ namespace CallCenter.QuartzService
 
         Log log = LogFactory.GetLogger("服务");
 
-        protected override void OnStart(string[] args)
-        {
-            QuartzWorker qw = new QuartzWorker();
-            Quartz.IScheduler _scheduler = qw.GetScheduler();
-            List<string> crns = new List<string>();
-            crns.Add(ConfigurationManager.AppSettings["t_crns"]);
-
-            SMSTask qj = new SMSTask();
-            qj.jobID = 0;
-            qj.CronExpressionList = crns;
-
-            bool bl = qw.AddWork(qj, _scheduler);
-            if (bl)
-            {
-                log.Warn("服务开启成功");
-            }
-            else
-            {
-                log.Warn("服务开启失败");
-            }
-        }
+       
 
         public void Shutdown()
         {

codegit/CallCenterCommon/CallCenter.QuartzService/SMSTask.cs

@@ -9,59 +9,59 @@ namespace CallCenter.QuartzService
     {
         public SMSTask()
         {
-            DoWork += SMSTask_DoWork;
+          //  DoWork += SMSTask_DoWork;
         }
 
-        private void SMSTask_DoWork(object sender, EventArgs e)
-        {
-            Quartz.IJobExecutionContext it = sender as Quartz.IJobExecutionContext;
-            var _scheduler = it.Scheduler;
-            var jobDetail = it.JobDetail;
+        //private void SMSTask_DoWork(object sender, EventArgs e)
+        //{
+        //    Quartz.IJobExecutionContext it = sender as Quartz.IJobExecutionContext;
+        //    var _scheduler = it.Scheduler;
+        //    var jobDetail = it.JobDetail;
 
-            string name = it.JobDetail.Key.Name;
-            int id = Int32.Parse(name.Split('_')[1]);
+        //    string name = it.JobDetail.Key.Name;
+        //    int id = Int32.Parse(name.Split('_')[1]);
 
-            Log log = LogFactory.GetLogger("执行");
-            QuartzWorker qw = new QuartzWorker();
+        //    Log log = LogFactory.GetLogger("执行");
+        //    QuartzWorker qw = new QuartzWorker();
 
-            try
-            {
-                log.Warn("主任务执行");
+        //    try
+        //    {
+        //        log.Warn("主任务执行");
 
-                Common com = new Common();
+        //        Common com = new Common();
 
-                lock (this)
-                {
-                    string url = ConfigurationManager.AppSettings["smsurl"];
-                    if (!string.IsNullOrEmpty(url))
-                    {
-                        string strzxUrl = url + "/SMSZXZB/ExecSendByJob";
-                        string zxresult = com.HttpGet(strzxUrl, "count=" + ConfigurationManager.AppSettings["t_count"]);
-                        JObject zxrt = JsonConvert.DeserializeObject<JObject>(zxresult);
-                        if (zxrt != null && zxrt["state"].ToString() == "success")
-                        {
-                            JObject jsrt = JsonConvert.DeserializeObject<JObject>(zxrt["data"].ToString());
-                            if (jsrt["suc"].ToString() != "" && jsrt["err"].ToString() != "")
-                            {
-                                log.Error("发送成功手机号：" + jsrt["suc"].ToString() + "\r\n" + "发送失败手机号：" + jsrt["err"].ToString());
-                            }
-                        }
-                        else
-                        {
-                            log.Error("主任务执行失败，失败原因：" + zxrt["message"].ToString());
-                        }
-                    }
-                    else
-                    {
-                        log.Warn("接口地址不存在");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
+        //        lock (this)
+        //        {
+        //            string url = ConfigurationManager.AppSettings["smsurl"];
+        //            if (!string.IsNullOrEmpty(url))
+        //            {
+        //                string strzxUrl = url + "/SMSZXZB/ExecSendByJob";
+        //                string zxresult = com.HttpGet(strzxUrl, "count=" + ConfigurationManager.AppSettings["t_count"]);
+        //                JObject zxrt = JsonConvert.DeserializeObject<JObject>(zxresult);
+        //                if (zxrt != null && zxrt["state"].ToString() == "success")
+        //                {
+        //                    JObject jsrt = JsonConvert.DeserializeObject<JObject>(zxrt["data"].ToString());
+        //                    if (jsrt["suc"].ToString() != "" && jsrt["err"].ToString() != "")
+        //                    {
+        //                        log.Error("发送成功手机号：" + jsrt["suc"].ToString() + "\r\n" + "发送失败手机号：" + jsrt["err"].ToString());
+        //                    }
+        //                }
+        //                else
+        //                {
+        //                    log.Error("主任务执行失败，失败原因：" + zxrt["message"].ToString());
+        //                }
+        //            }
+        //            else
+        //            {
+        //                log.Warn("接口地址不存在");
+        //            }
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
 
-                log.Warn("主任务执行失败，失败原因：" + ex.ToString());
-            }
-        }
+        //        log.Warn("主任务执行失败，失败原因：" + ex.ToString());
+        //    }
+        //}
     }
 }

codegit/CallCenterCommon/CallCenter.Utility/FeiShuiHelper.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -68,6 +69,7 @@ namespace CallCenter.Utility
             }
             return result;
         }
+
         //通过手机号获取用户id
         private static string GetUserid(string mobile)
         {
@@ -87,7 +89,7 @@ namespace CallCenter.Utility
                 if (resultobj.code != "0")
                 {
                     LogFactory.GetLogger("GetUserid").Error(resultobj.msg);
-                    result = resultobj.msg;
+                    result = "";
                 }
                 else
                 {
@@ -97,11 +99,15 @@ namespace CallCenter.Utility
             }
             return result;
         }
+
         //发送消息
-        public static string SendMsg(string mobile,string msg)
+        public static string SendMsg(string title,
+            string workrodercode, string name, string phone,
+            string address, string products, string description,
+            string mobile, string msg, long WoID = 0,int type=0)
         {
             string userid = GetUserid(mobile);
-            if (string.IsNullOrEmpty(mobile))
+            if (string.IsNullOrEmpty(userid))
                 return "";
             Guid guid = Guid.NewGuid();
             string uuid = guid.ToString();
@@ -113,7 +119,18 @@ namespace CallCenter.Utility
             //param.Add("uuid", uuid);
 
             var postData = new { receive_id = userid, msg_type = "post",
-                content = "{\"zh_cn\":{\"title\":\""+ msg + "\",\"content\":[[{\"tag\":\"text\",\"text\":\"地址 :\"},{\"tag\":\"a\",\"href\":\"http://www.feishu.cn\",\"text\":\"超链接\"}]]}}",
+                content = "{\"zh_cn\":{\"title\":\""+ title + 
+                "\",\"content\":[[{\"tag\":\"text\",\"text\":\"工单编号:"+ workrodercode + "\"}]," +
+                "[{\"tag\":\"text\",\"text\":\"投诉人姓名:" + name + "\"}]," +
+                "[{\"tag\":\"text\",\"text\":\"投诉人手机号:" + phone + "\"}]," +
+                "[{\"tag\":\"text\",\"text\":\"投诉人地址:" + address + "\"}]," +
+                "[{\"tag\":\"text\",\"text\":\"产品地址:" + products + "\"}]," +
+                "[{\"tag\":\"text\",\"text\":\"问题描述:" + description + "\"}]," +
+                 "[{\"tag\":\"text\",\"text\":\"\"}]," +
+                "[{\"tag\":\"text\",\"text\":\"点击查看详情 :\"},{\"tag\":\"a\",\"href\":\"https://applink.feishu.cn/client/web_app/open?appId=" + app_id + "&wid=" + WoID+"\",\"text\":\"[查看详情链接]\"}]," +
+                "[{\"tag\":\"text\",\"text\":\"\"}]," +
+                "[{\"tag\":\"a\",\"href\":\"https://applink.feishu.cn/client/web_app/open?appId="+ app_id + "\",\"text\":\"[进入售后平台]\"}]" +
+                "]}}",
                 uuid = uuid,
             };
             var strresult = SendPostRequest
@@ -128,6 +145,23 @@ namespace CallCenter.Utility
                 }
                 else
                 {
+                    //"message_id"
+                   //加急短信
+                    JObject jo = (JObject)JsonConvert.DeserializeObject(resultobj["data"].ToJson());
+                    if (jo != null)
+                    {
+                        if (type==1)
+                        {
+                            string message_id = jo["message_id"].ToString();
+                            if (!string.IsNullOrEmpty(message_id))
+                            {
+                                var user_id_list = new { user_id_list = new string[] { userid } };
+                                var message = SendPatchRequest
+         ("https://open.feishu.cn/open-apis/im/v1/messages/" + message_id + "/urgent_sms?user_id_type=user_id", user_id_list);
+                                return message;
+                            }
+                        }
+                    }
                     result =  resultobj.ToJson() ;
                 }
             }
@@ -210,7 +244,57 @@ namespace CallCenter.Utility
 
             return result;
         }
-        public static string SendPostRequest(string url, object data)
+        public static string SendPatchRequest(string url, object data)
+        {
+            string authToken = GetTenantAccessToken();
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+            request.Method = "PATCH"; // 指定 PATCH 方法
+            request.ContentType = "application/json; charset=utf-8";
+            request.Headers.Add("Authorization", $"Bearer {authToken}");
+
+            // 如需忽略 SSL 证书验证（仅测试环境）
+            // ServicePointManager.ServerCertificateValidationCallback = 
+            //     (sender, cert, chain, sslPolicyErrors) => true;
+
+            try
+            {
+                // 序列化请求数据
+                string json = JsonConvert.SerializeObject(data);
+                byte[] payload = Encoding.UTF8.GetBytes(json);
+
+                // 写入请求体
+                request.ContentLength = payload.Length;
+                using (Stream stream = request.GetRequestStream())
+                {
+                    stream.Write(payload, 0, payload.Length);
+                }
+
+                // 获取响应
+                using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
+                using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
+                {
+                    return reader.ReadToEnd();
+                }
+            }
+            catch (WebException ex)
+            {
+                // 处理错误响应
+                if (ex.Response is HttpWebResponse errorResponse)
+                {
+                    using (Stream errorStream = errorResponse.GetResponseStream())
+                    using (StreamReader reader = new StreamReader(errorStream, Encoding.UTF8))
+                    {
+                        string errorContent = reader.ReadToEnd();
+                        throw new Exception($"HTTP Error {(int)errorResponse.StatusCode}: {errorContent}");
+                    }
+                }
+                throw new Exception("Network error: " + ex.Message);
+            }
+        }
+    
+
+
+      public static string SendPostRequest(string url, object data)
         {
             string authToken = GetTenantAccessToken();
             // 创建请求对象

codegit/CallCenterCommon/CallCenter.Utility/RedisHelper.cs

@@ -17,7 +17,17 @@ namespace CallCenter.Utility
         {
             if (redis == null || !redis.IsConnected)
             {
-                redis = ConnectionMultiplexer.Connect(Configs.GetValue("Redis_Server") + ":" + Configs.GetValue("Redis_Port"));
+                var config = new ConfigurationOptions
+                {
+                    AbortOnConnectFail = false,
+                    AllowAdmin = true,
+                    ConnectTimeout = 15000,
+                    SyncTimeout = 5000,
+                    ResponseTimeout = 15000,
+                    Password = Configs.GetValue("Redis_Password"),//Redis数据库密码
+                    EndPoints = { Configs.GetValue("Redis_Server") + ":" + Configs.GetValue("Redis_Port") }// connectionString 为IP:Port 如”192.168.2.110:6379”
+                };
+                redis = ConnectionMultiplexer.Connect(config);
                 //redis = ConnectionMultiplexer.Connect("192.168.4.18, abortConnect=false");
 
                 database = redis.GetDatabase(int.Parse(Configs.GetValue("Redis_Defaultdatabase")));