Merge branch 'master' of http://192.168.1.222:3000/zhoufan/SQ12345_Api

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -222,7 +222,7 @@ namespace CallCenterApi.Interface.Controllers
                         string rid = dt.Rows[0]["F_RoleID"].ToString();
                         var role = new BLL.T_Sys_RoleInfo().GetModel(Int32.Parse(rid));
                         if (role.F_RoleCode == "EJWLDW" || role.F_RoleCode == "WLDW" || role.F_RoleCode=="DBZY"
-                            || role.F_RoleCode == "ZXLD" || role.F_RoleCode == "ZXLDGLY" || role.F_RoleCode == "GLY" || role.F_RoleCode== "DDZG")
+                            || role.F_RoleCode == "ZXLD" || role.F_RoleCode == "ZXLDGLY" || role.F_RoleCode == "GLY" || role.F_RoleCode== "DDZG" || role.F_RoleCode == "DFZF")
                         {
                             Dictionary<string, string> Dic = new Dictionary<string, string>();
                             Dic.Add("F_UserID", dt.Rows[0]["F_UserId"].ToString());

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -2,19 +2,110 @@
 using CallCenterApi.Common;
 using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Data;
+using System.IO;
 using System.Linq;
+using System.Net;
+using System.Security.Cryptography;
+using System.Text;
 using System.Web;
 using System.Web.Mvc;
 
+
 namespace CallCenterApi.Interface.Controllers
 {
     public class SMSController : BaseController
     {
-        #region 接收短信
+      
+        private static string Smsurl = "http://rcsapi.wo.cn:8000/umcinterface/sendtempletmsg";
+        static string cpcode = "AAAOFV";
+        static string key = "2e12579ba6a6576f8980b628b8008247";
+        /// <summary>
+        /// MD5加密
+        /// </summary>
+        /// <param name="txt"></param>
+        /// <returns></returns>
+        public static string Md5(string txt)
+        {
+            byte[] sor = Encoding.UTF8.GetBytes(txt);
+            MD5 md5 = MD5.Create();
+            byte[] result = md5.ComputeHash(sor);
+            StringBuilder strbul = new StringBuilder(40);
+            for (int i = 0; i < result.Length; i++)
+            {
+                //加密结果"x2"结果为32位,"x3"结果为48位,"x4"结果为64位
+                strbul.Append(result[i].ToString("x2"));
+            }
+            return strbul.ToString().ToLower (); ;
+        }
+        public static  string   SendSms(string  msg,string mobiles,string templetid,string excode = "")
+        {
+            bool n=false ;
+            string sign = Md5(cpcode + msg + mobiles + excode + templetid + key);
+            var dic = new SortedDictionary<string, string>
+            {
+                {"cpcode", cpcode},
+                {"msg", msg},
+                {"mobiles", mobiles},
+                {"excode", excode},
+                {"templetid",templetid},
+                {"sign", sign},
+            };
+            //序列化参数
+            var jsonParam = JsonConvert.SerializeObject(dic);
+            //发送请求
+            var request = (HttpWebRequest)WebRequest.Create(Smsurl);
+            request.Method = "POST";
+            request.ContentType = "application/json;charset=UTF-8";
+            var byteData = Encoding.UTF8.GetBytes(jsonParam);
+            var length = byteData.Length;
+            request.ContentLength = length;
+            var writer = request.GetRequestStream();
+            writer.Write(byteData, 0, length);
+            writer.Close();
+            //接收数据
+            var response = (HttpWebResponse)request.GetResponse();
+            var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
+            JObject jo = (JObject)JsonConvert.DeserializeObject(responseString );
+            string access_token = jo["resultcode"].ToString();
+            return access_token;
+        }
+        public static bool   AddSmS(int userId,string count ,string msg, string mobiles, string templetid)
+        {
+            bool res = false ;
+            string  n = SendSms(msg, mobiles, templetid);
+            Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
+            dModel.CallerNum = mobiles.Trim();
+            dModel.Content = count.Trim();
+            dModel.RecvModemIMEI = n;
+            dModel.State = 0;
+            dModel.F_UserID = userId;
+            dModel.RecvTime = DateTime.Now;
+            int b = new BLL.T_SMS_RecvSMS().Add(dModel);
+            if (n == "0")
+                res = true;
+            if (res)
+            {
+                if (b > 0)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else
+                return res;
+
 
+        }
+        #region 接收短信
         [Authority]
         /// <summary>
         /// 获取接收短信列表
@@ -46,7 +137,7 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sql += " and RecvTime <= '" + Convert.ToDateTime(strendtime.Trim()) + "' ";
             }
-
+            sql += "and F_UserID is not null";
             if (strpageindex.Trim() != "")
             {
                 pageindex = Convert.ToInt32(strpageindex);
@@ -67,19 +158,24 @@ namespace CallCenterApi.Interface.Controllers
                 pageindex,
                 true,
                 out recordCount);
-
+            List<Model.T_SMS_RecvSMS> modelList = new BLL.T_SMS_RecvSMS().DataTableToList(dt);
             var obj = new
             {
-                state = "success",
-                message = "成功",
-                rows = dt,
+                rows = modelList.Select(x => new
+                {
+                    x.CallerNum,
+                    x.Content,
+                    x.F_Name,
+                    usercode = new BLL.T_Sys_UserAccount().GetModel((int)x.F_UserID) != null ? new BLL.T_Sys_UserAccount().GetModel((int)x.F_UserID).F_UserCode : "系统发送",
+                    x.RecvTime
+                }),
                 total = recordCount
             };
+        
 
             return Content(obj.ToJson());
 
         }
-
         [Authority]
         /// <summary>
         /// 新增接收短信
@@ -88,7 +184,6 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult AddRecv(string tel, string cont)
         {
             Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
-
             dModel.CallerNum = tel.Trim();
             dModel.Content = cont.Trim();
             dModel.State = 0;
@@ -638,6 +733,8 @@ namespace CallCenterApi.Interface.Controllers
             }
             return msg;
         }
+
+      
         #endregion
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/DeptAssessmentController.cs

@@ -442,8 +442,8 @@ namespace CallCenterApi.Interface.Controllers.report
             #region 不满意度评价100205
             var assignedList = assignedInfoBLL.DataTableToList(assignedInfoBLL.GetList($" F_MainDeptId = '{int.Parse(deptid)}' and F_IsDelete=0 and F_IsSure in (0,1,2) and  F_State in (0,1)   and  datediff(s,'{start}',F_CreateTime)>0 and datediff(s,'{end}',F_CreateTime)<0  ").Tables[0]).DistinctBy(y => y.F_WorkOrderId);
             //F_IsSatisfie 1不满意     F_IsReload 0不重办，>0重办次数
-            var assignedListsS = assignedList.Where(y => y.F_IsSatisfie == 1 && (y.F_IsReload == 0 || y.F_IsReload == null)).ToList();   //每件扣1分 F_IsReload == 0没有重办
-            var assignedListsR = assignedList.Where(y => y.F_IsSatisfie == 1 && y.F_IsReload > 0).ToList();    //每件扣2分 F_IsReload > 0重办次数
+            var assignedListsS = assignedList.Where(y => y.F_IsSatisfie == 0 && (y.F_IsReload == 0 || y.F_IsReload == null)).ToList();   //每件扣1分 F_IsReload == 0没有重办
+            var assignedListsR = assignedList.Where(y => y.F_IsSatisfie == 0 && y.F_IsReload > 0).ToList();    //每件扣2分 F_IsReload > 0重办次数
             int assignedCountS = assignedListsS.Count();
             int satisfieCountR = assignedListsR.Count() * 2;
             double nosatisfieCount = -(double)(assignedCountS + satisfieCountR);

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

@@ -5263,6 +5263,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         else if (fod != "" && fod.Split(',').Contains(userModel.F_DeptId.ToString()))
                         {
                             iszbdw = "2";
+
+
+                            
                         }
                         if (!(userModel.F_RoleCode == "WLDW" && iszbdw == "0"))
                         {
@@ -5273,6 +5276,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         btns = ButtonGroup.GetButtons(dt.Rows[0]["F_WorkState"].ToString(), userModel.F_RoleCode.ToUpper(), dt.Rows[0]["F_IsResult"].ToString(), "0");
                     }
+                   
+                    
                     #region 判断是否存在待督办
                     var recount = remindBLL.GetModelList("F_State=0 and F_IsDelete=0 and F_Type=1 and F_WorkOrderId ='" + strworkorderid + "'").ToList().Count();
                     var butt = btns.Find(c => c.key == ButtonGroup.turnsee().key);
@@ -5286,6 +5291,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             btns.Add(ButtonGroup.turnnosee());
                         }
                     }
+                    if (btns == null)
+                    {
+                        btns.Add(ButtonGroup.query());
+                    }
+                    else
+                    {
+                        if (btns.Count == 0)
+                            btns.Add(ButtonGroup.query());
+                    } 
                     #endregion
                     #endregion
 
@@ -7391,6 +7405,126 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("权限不足");
             }
         }
+        /// <summary>
+        /// 工单提醒
+        /// </summary>
+        /// <param name="workordercode"></param>
+        /// <param name="deptid"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult SendSms(string workordercode,int deptid,int type=0)
+        {
+            if (deptid <= 0)
+                return Error("请选择部门");
+            int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
+            string msg = "";
+            var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId=" + deptid + "and F_DeleteFlag=0");
+            if (user !=null )
+            {
+                foreach (var it  in user)
+                {
+                    if (!string .IsNullOrEmpty (it .F_Mobile))
+                    {
+                        string count = "";
+                        string templetid = "";
+                        if (type ==0)
+                        {
+                            templetid = "26157";
+                            count = "您有新的工单，请及时查收处理，工单编号" + workordercode;
+                        }
+                        else   if (type == 1)
+                        {
+                            templetid = "26155";
+                            count = "您有工单正在被督办，请及时处理，工单编号" + workordercode;
+                        }
+                        else if (type == 2)
+                        {
+                            templetid = "26154";
+                            count = "您有紧急工单，请及时处理，工单编号" + workordercode;
+                        }
+                        else
+                        {
+                            templetid = "29265";
+                            count = "您有工单已经超时，请尽快处理，工单编号" + workordercode;
+                        }
+
+                        bool n = SMSController.AddSmS(userId, count, workordercode, it.F_Mobile, templetid);
+                        if (n == false)
+                            msg += it.F_UserName + "发送短信失败。";
+                    }
+                }
+                if (msg != "")
+                    return Error(msg);
+                else
+                    return Success("发送成功");
+            }
+            else
+            {
+                return Error("暂无人员");
+            }
+        }
+        /// <summary>
+        /// 办理结果通知
+        /// </summary>
+        /// <param name="msg1"></param>
+        /// <param name="msg2"></param>
+        /// <param name="msg3"></param>
+        /// <param name="msg4"></param>
+        /// <param name="mobile"></param>
+        /// <returns></returns>
+
+        public ActionResult SmsHand(string msg1 , string msg2 , string msg3,string msg4,string mobile)
+        {
+            
+            int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
+            string msg = msg1+","+ msg2 + "," + msg3 + "," + msg4;
+
+            string count = "尊敬的市民，您于" + msg1 + "反映的" + msg2 + "问题，工单号：" + msg3 + "，处理结果如下：" + msg4 + "。如有异议，请您再次致电12345，感谢您的支持。";
+
+
+            bool n = SMSController.AddSmS(userId, count, msg, mobile, "26213");
+            if (n)
+                return Success("发送成功");
+            else
+                return Error ("发送失败");
+        }
+     
+       public ActionResult SmsOverTime()
+         {
+          
+           var workorder = new BLL.T_Bus_WorkOrder().GetModelList("F_IsDelete=0 and  F_WorkState in (2,4) and (F_IsSms!=1 or  F_IsSms is null)");
+            if (workorder != null)
+            {
+                foreach (var it in workorder)
+                {
+                    System.TimeSpan time = DateTime.Parse(it.F_LimitTime.ToString()) - DateTime.Now ;
+                    if (time.TotalHours <=6)
+                    {
+                       
+                        var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId=" + it.F_MainDeptId  + "and F_DeleteFlag=0");
+                        if (user != null)
+                        {
+                            foreach (var iv  in user)
+                            {
+                                if (!string.IsNullOrEmpty(iv.F_Mobile))
+                                {
+                                    string count = " 您有工单6小时后超期，请及时处理，工单号" + it.F_WorkOrderId;
+                                    bool n = SMSController.AddSmS(0, count, it.F_WorkOrderId, iv.F_Mobile, "26147");
+                                      if (n )
+                                    {
+                                        it.F_IsSms = 1;
+                                        bool t = new BLL.T_Bus_WorkOrder().Update(it);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return Success("发送成功");
+        }
+       
 
         /// <summary>
         /// 收回工单

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -74,6 +74,7 @@ namespace CallCenterApi.Model
         private int?  _f_noticeid;
         private int? _f_isstandard;
         private string _f_standardids;
+        private int? _f_issms;
 
         /// <summary>
         /// 
@@ -589,6 +590,14 @@ namespace CallCenterApi.Model
             set { _f_isstandard = value; }
             get { return _f_isstandard; }
         }
+        /// <summary>
+        /// 是否发送短信0否1是
+        /// </summary>
+        public int? F_IsSms
+        {
+            set { _f_issms = value; }
+            get { return _f_issms; }
+        }
         #endregion Model
 
     }

Push/Program.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace Push
+{
+    class Program
+    {
+        public class PushTime
+        {
+            public DateTime time;
+            public int morning;
+            public int Afternoon;
+        }
+        private PushTime time = new PushTime();
+        static void Main(string[] args)
+        {
+            Console.OutputEncoding = System.Text.Encoding.UTF8;
+            Environment.SetEnvironmentVariable("needDetails", "true");
+            Console.OutputEncoding = System.Text.Encoding.UTF8;
+            Environment.SetEnvironmentVariable("needDetails", "true");
+            System.Console.WriteLine("Hello Push!");
+            Thread t = new Thread(new ThreadStart(SetCensusURL));
+            t.Start();
+        }
+        private static void SetCensusURL()
+        {
+            int n = 0;
+            while (true)
+            {
+                Thread.Sleep(60 * 1000);
+                n += 1;
+                WebClient web = new WebClient();
+                web.Encoding = Encoding.UTF8;
+
+                try
+                {
+                    string seturl = "http://12345.shangqiu.gov.cn:8819/WorkOrder/SmsOverTime";
+                    string Dataurl = web.DownloadString(seturl);//这一句话就能请求到数据了
+               //     System.Console.WriteLine(Dataurl);
+                }
+                catch
+                {
+                }
+            }
+        }
+    }
+}
+

Push/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Push")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Push")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("060a2d9e-66ab-4794-9bfc-035bf68cf0c3")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
+// 方法是按如下所示使用“*”: :
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

PushMessage.cs

@@ -0,0 +1,8 @@
+using System;
+
+public class Class1
+{
+	public Class1()
+	{
+	}
+}