完成工单

RMYY_CallCenter_Api.QuartzWorker/PushWorkorder.cs

@@ -31,7 +31,8 @@ namespace RMYY_CallCenter_Api.QuartzWorker
             string Dataur4 = web.DownloadString(api + "InternalMessages/DingTalkGetMessage");
             string Dataur5 = web.DownloadString(api + "FaultRepair/AutoSendOverTimeMsg");
             string  Dataur6 = web.DownloadString(api + "FaultRepair/AutoChangeDealMan");
-            
+            ///获取短信
+            string Dataur7 = web.DownloadString(api + "SMS/GetSMSReceive");
 
 
         }

RMYY_CallCenter_Api/Configs/system.config

@@ -56,7 +56,7 @@
  <add key="APPKEY" value="LQvkjjVAwS9xj6Gs19cssA" />
  <add key="MASTERSECRET" value="lURrawbPDa6CkDYFhNGSJ4" />
   <!--短信URL-->
- <add key="Smsurl" value="http://172.16.0.141:8080/emp/sms/v2/std/single_send" />
+ <add key="Smsurl" value="http://172.16.0.141:8080" />
  <!--短信账号-->
  <add key="Smsuserid" value="BZZXXT" />
  <!--短信密码-->

RMYY_CallCenter_Api/Controllers/SMSController.cs

@@ -20,13 +20,22 @@ namespace RMYY_CallCenter_Api.Controllers
         private static string Smsuserid = ConfigHelper.GetValue("Smsuserid");
         static string Smspwd = ConfigHelper.GetValue("Smspwd");
         [AllowAnonymous]
-        public ActionResult SendSms()
+        public ActionResult SendSms(string content,string mobile)
         {
             
-            var obj = AddSmS(0, "12346", "17839539537", "");
+            var obj = AddSmS(0, content, mobile, "");
             return Success("", obj);
         }
+        [AllowAnonymous]
+        public ActionResult SnedUrl()
+        {
+           
+           var  byStr = HttpUtility.UrlDecode("%e6%b5%8b%e8%af%95%e5%9b%9e%e5%a4%8d8"); 
+
 
+            return Success("", byStr);
+        }
+       
         /// <summary>
         /// MD5加密
         /// </summary>
@@ -61,7 +70,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 values.Add("content", Content);
                 values.Add("timestamp", currentTime);
                 
-                string responseString = HttpMethods .HttpPost (Smsurl, values.ToJson (), "application/json;charset=UTF-8");
+                string responseString = HttpMethods .HttpPost (Smsurl+ "/sms/v2/std/single_send", values.ToJson (), "application/json;charset=UTF-8");
                 JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
                 if (jo["result"].ToString() == "0")
                 {
@@ -100,34 +109,204 @@ namespace RMYY_CallCenter_Api.Controllers
 
         }
 
-        public ActionResult GetReceive(string mobile, string smsContent, string sendTime, string addSerial)
+        public class mos
+        {/// <summary>
+         /// 平台流水号
+         /// </summary>
+            public long msgid { set; get; }
+            /// <summary>
+            /// 手机号
+            /// </summary>
+            public string mobile { set; get; }
+            /// <summary>
+            /// 完整的通道号
+            /// </summary>
+            public string spno { set; get; }
+            /// <summary>
+            /// 下行时填写的exno
+            /// </summary>
+            public string exno { set; get; }
+            /// <summary>
+            /// 上行返回的时间：  YYYY-MM-DD HH:MM:SS
+            /// </summary>
+            public string rtime { set; get; }
+            /// <summary>
+            /// 短信内容：最大支持1000个字(含签名),一个字母或一个汉字都视为一个字。   编码方法：urlencode（UTF-8明文）
+            /// </summary>
+            public string content { set; get; }
+        }
+        [AllowAnonymous]
+        public ActionResult GetSMSReceive1()
+        {
+                var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+                var currentTime = Convert.ToInt64(ts.TotalSeconds).ToString();
+                Dictionary<string, string> values = new Dictionary<string, string>();
+                values.Add("userid", Smsuserid);
+                values.Add("pwd", Md5(Smsuserid + "00000000" + Smspwd + currentTime));
+                values.Add("timestamp", currentTime);
+               
+            string responseString = HttpMethods.HttpPost(Smsurl + "/sms/v2/std/get_mo", values.ToJson(), "application/json;charset=UTF-8");
+               JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
+                return Success("", responseString);
+
+         }
+        [AllowAnonymous]
+        public ActionResult GetSMSReceive()
         {
 
-            Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
-            dModel.CallerNum = mobile.Trim();
-            dModel.Content = smsContent.Trim();
-            dModel.RecvModemIMEI = addSerial;
-            // dModel.F_Name = workorderid;
-            dModel.State = 1;
-            // dModel.F_UserID = userId;
             try
             {
-                dModel.RecvTime = DateTime.Parse(addSerial);
+                var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+                var currentTime = Convert.ToInt64(ts.TotalSeconds).ToString();
+                Dictionary<string, string> values = new Dictionary<string, string>();
+                values.Add("userid", Smsuserid);
+                values.Add("pwd", Md5(Smsuserid + "00000000" + Smspwd + currentTime));
+                values.Add("timestamp", currentTime);
+                string responseString = HttpMethods.HttpPost(Smsurl + "/sms/v2/std/get_mo", values.ToJson(), "application/json;charset=UTF-8");
+                JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
+                if (jo["result"].ToString() == "0")
+                {
+
+                    List<mos> moslist = JsonConvert.DeserializeObject<List<mos>>(jo["mos"].ToString());
+                    if (moslist != null && moslist.Count > 0)
+                    {
+                        foreach (var it in moslist)
+                        {
+                            var RecvSMS = new BLL.T_SMS_RecvSMS().GetModelList($"RecvModemIMEI='{it.msgid.ToString()}'");
+                            if (RecvSMS != null && RecvSMS.Count > 0)
+                                continue;
+                            Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
+                            dModel.CallerNum = it.mobile;
+                            dModel.Content = HttpUtility.UrlDecode(it.content);
+                            dModel.RecvModemIMEI = it.msgid.ToString();
+                            dModel.State = 1;
+                            try
+                            {
+                                dModel.RecvTime = DateTime.Parse(it.rtime);
+                            }
+                            catch
+                            {
+                                dModel.RecvTime = DateTime.Now;
+                            }
+                            int b = new BLL.T_SMS_RecvSMS().Add(dModel);
+                            if (b > 0)
+                            {
+                                return Success("获取成功");
+                            }
+                            else
+                            {
+                                return Error("获取失败");
+                            }
+                        }
+                        return Error("暂无数据");
+                    }
+                    else
+                        return Error("暂无数据1");
+
+                }
+                else
+                {
+                    string desc = jo["result"].ToString();
+                    return Error("发送失败：错误码" + "(" + desc + ")");
+
+                }
             }
-            catch
+            catch (Exception e)
             {
-                dModel.RecvTime = DateTime.Now;
+                return Error("发送失败：" + "(" + e.Message + ")");
             }
 
-            int b = new BLL.T_SMS_RecvSMS().Add(dModel);
-            if (b > 0)
-            {
-                return Success("获取成功");
-            }
-            else
+
+        }
+
+
+
+
+
+
+        [AllowAnonymous]
+        public ActionResult GetReceive() 
+        {
+
+            StreamReader reader = new StreamReader( RequestString .GetInputStream());
+            var postString = reader.ReadToEnd();
+
+            JObject result = null;
+
+            LogHelper.Warn(postString);
+            result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(postString);
+
+            string userid= result["userid"].ToString();
+            string seqid = result["seqid"].ToString();
+            string timestamp = result["timestamp"].ToString();
+            string pwd = result["pwd"].ToString();
+            string mos = result["mos"].ToString();
+            if (userid!= Smsuserid)
+                {
+                    var obj1 =
+                        new
+                        {
+                            cmd = "MO_RESP",
+                            seqid = seqid,
+                            result = "-100001"
+                        };
+                    return Content (obj1.ToJson());
+                }
+            
+            var password = Md5(Smsuserid + "00000000" + Smspwd + timestamp);
+           
+            if (password != pwd)
+                {
+                    var obj2 =
+                        new
+                        {
+                            cmd = "MO_RESP",
+                            seqid = seqid,
+                            result = "-100001"
+                        };
+                LogHelper.Warn(pwd);
+                return Content(obj2.ToJson());
+                }
+            LogHelper.Warn(mos);
+            if (!string .IsNullOrEmpty (mos))
             {
-                return Error("获取失败");
+                List<mos> moslist = JsonConvert.DeserializeObject<List<mos>>(mos);
+                if (moslist != null && moslist.Count > 0)
+                {
+                    foreach (var it in moslist)
+                    {
+                        Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
+                        dModel.CallerNum = it.mobile;
+                        dModel.Content = it.content;
+                        dModel.RecvModemIMEI = it.msgid.ToString();
+                        dModel.State = 1;
+                        try
+                        {
+                            dModel.RecvTime = DateTime.Parse(it.rtime);
+                        }
+                        catch
+                        {
+                            dModel.RecvTime = DateTime.Now;
+                        }
+                        int b = new BLL.T_SMS_RecvSMS().Add(dModel);
+
+                    }
+
+                }
             }
+          
+                var obj =
+                     new
+                     {
+                         cmd = "MO_RESP",
+                         seqid = seqid,
+                         result = "0"
+                     };
+                return Content(obj.ToJson());
+
+           
+
+
         }
         /// <summary>
         /// 指定Post地址
@@ -187,7 +366,7 @@ namespace RMYY_CallCenter_Api.Controllers
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
-             sql += " and State=  0  ";
+             sql += " and State= '"+ State + "'  ";
             if (strtel.Trim() != "" && strtel != "undefined")
             {
                 sql += " and CallerNum= '" + strtel.Trim() + "' ";

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkCommonController.cs

@@ -415,7 +415,11 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 //业务咨询
                 case 1000:
                    Model.T_Con_WorkOrder conmodel = conbll.GetModelByCode(workordercode);
-                   
+                    conmodel.F_State = (int)EnumWorkOrderState.finish; ;
+                    conmodel.F_HandleTime = DateTime.Now;
+                    conbll.Update(conmodel);
+                    var itemid = logbll.AddLog(conmodel.F_ID, (int)EnumWorkOrderState.finish, (int)conmodel.F_type1, content, 
+                        (int)EnumItemType.deal, (int)EnumItemOpt.end, "", 0, User .F_UserCode);
                     break;
                     //综合调度
                 case 2000:
@@ -437,7 +441,32 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     break;
                    //车辆
                 case 4000:
-
+                    var carWorkOrder = new Bll.T_Car_WorkOrder ().GetModelByCode(workordercode);
+                    carWorkOrder.F_EndTime = DateTime.Now;
+                    carWorkOrder.F_FinishTime = DateTime.Now;
+                    carWorkOrder.F_State = (int)EnumWorkOrderState.finish;//待评价
+                    new Bll.T_Car_WorkOrder().Update (carWorkOrder);
+                    T_Car_WorkOrderController carcc = new T_Car_WorkOrderController();
+                    carcc.AddOperation("完结了工单" + content,User .F_UserCode , (int)EnumOperatorType.finish, workordercode,0);
+                    var model = new BLL.T_Car_AssignWorkOrder().GetModelList ($"F_WorkOrderID like '%{workordercode}%' and F_State!=10 and F_IsDelete=0");
+                    if (model != null && model.Count > 0)
+                    {
+                        var carsql = $"select count(1) from T_Car_WorkOrder where F_WorkOrderCode in({string.Join(",", model.FirstOrDefault().F_WorkOrderID.Split(','))}) and F_State not in(7,10) and F_IsDel=0";
+                        var car = DbHelperSQL.GetSingle(carsql).ToString();
+                        if (int.Parse(car) <= 0)
+                        {
+                            var carmodel = new Bll.T_Car_Message().GetModel(model.FirstOrDefault().F_CarId.Value);
+                            if (carmodel != null)
+                            {
+                                carmodel.F_State = 0;
+                                new Bll.T_Car_Message().Update(carmodel);
+                            }
+
+                            model.FirstOrDefault().F_State = (int)EnumWorkOrderState.finish;
+                            new BLL.T_Car_AssignWorkOrder().Update(model.FirstOrDefault());
+                        }
+                      }
+                    
                     break;
 
             }