APP提醒

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

@@ -130,28 +130,41 @@ namespace CallCenterApi.Interface.Controllers
             };
             return Content(obj.ToJson()); ;
         }
-        public ActionResult Pushv(string Title, string count, string usercode)
+        public static  string  PushApp(string Title, string count, string usercode)
         {
             string pushResult = "";
-            if (!string.IsNullOrEmpty(usercode))
+            var userModel = new BLL.T_Sys_UserAccount().GetModel(usercode);
+
+            if (userModel != null)
+            {
+                usercode = userModel.F_UserCode;
+            }
+            var clientidStr = RedisHelper.StringGet("clientidlist");
+            var list = new List<AppClientListDto>();
+            if (clientidStr != null)
+                list = clientidStr.ToString().ToList<AppClientListDto>();
+            var lists = list.Where(x => x.usercode == usercode).ToList();
+            string clientid = "";
+            if (lists != null)
+            {
+                foreach (var item in lists)
+                {
+                    clientid = item.clientid;
+                }
+            }
+            if (!string.IsNullOrEmpty(clientid))
             {
                 try
                 {
-                    pushResult = PushAPP(Title, count, usercode);
+                    pushResult = PushAPP(Title, count, clientid);
                 }
                catch(Exception e)
                 {
                     LogFactory.GetLogger("3333").Error(e.Message );
                 }
             }
-            var obj = new
-            {
-                state = "success",
-                message = "成功",
-                pushResult = pushResult
-            };
-            return Content(obj.ToJson()); ;
-            //  return pushResult; ;
+          
+             return pushResult; ;
         }
         public ActionResult Pushc(string Title, string count, string usercode)
         {
@@ -225,21 +238,14 @@ namespace CallCenterApi.Interface.Controllers
             if (!string.IsNullOrEmpty(clientid))
             {
                 if (type == 1)
-                    pushResult = PushAPP(Title, count, clientid);
+                    pushResult = PushMessageToList(Title, count, clientid);
                 else
                     pushResult = PushMessageToSingle(Title, count, clientid);
             }
             return pushResult; ;
         }
 
-        public string PushAPP(string Title, string count, string clientid)
-        {
-
-            //    Console.OutputEncoding = Encoding.GetEncoding(936);
-            //    Environment.SetEnvironmentVariable("needDetails", "true");
-            string pushResult = PushMessageToList(Title, count, clientid);
-            return pushResult;
-        }
+       
         private static string PushMessageToList(string Title, string count, string CLIENTID)
         {
             // 推送主类（方式1，不可与方式2共存）

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

@@ -9688,6 +9688,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
                                         string v = SmsNewController.AddSmS(0, count, u.F_Mobile, "681240888655478784", mag,
                                        modelT_Bus_WorkOrder.F_WorkOrderId);
+                                        string t = PushMessageController.PushApp("新工单提醒", count, u .F_UserCode);
                                     }
                                   
                                 }
@@ -11244,6 +11245,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 string mag = "[\"" + workorderid + "\"]";
                                 string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag,
                                workorderid);
+                                string t = PushMessageController.PushApp("新工单提醒", count, it .F_UserCode);
                             }
                            
                         }
@@ -11600,6 +11602,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 string v = SmsNewController.AddSmS(0, count, u.F_Mobile,
                                             "681240181093470208", mag, modelT_Bus_WorkOrder.F_WorkOrderId);
 
+                                                string t = PushMessageController.PushApp("督办工单提醒", count, u  .F_UserCode );
+
 
                                                 msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
                                             }
@@ -11619,7 +11623,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                    modelT_Bus_WorkOrder.F_WorkOrderId);
 
 
-
+                                                    string t = PushMessageController.PushApp("新工单提醒", count, u .F_UserCode);
 
                                                     msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
 
@@ -11642,7 +11646,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
                                                 string v = SmsNewController.AddSmS(0, count, u.F_Mobile,
                                             "681240181093470208", mag, modelT_Bus_WorkOrder.F_WorkOrderId);
-
+                                                string t = PushMessageController.PushApp("督办工单提醒", count, u .F_UserCode);
                                                 msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
                                             }
                                             else
@@ -11653,12 +11657,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 }
                                                 else
                                                 {
+                                                    
                                                     string count = "你有新工单：" + modelT_Bus_WorkOrder.F_WorkOrderId + "，请及时查收处理。";
                                                     //  string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
                                                     // bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "153305", "");
                                                     string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
                                                     string v = SmsNewController.AddSmS(0, count, u.F_Mobile, "681240888655478784", mag,
                                                    modelT_Bus_WorkOrder.F_WorkOrderId);
+                                                    string t = PushMessageController.PushApp("新工单提醒", count, u .F_UserCode);
                                                 }
 
                                                 msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
@@ -11813,6 +11819,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                         string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
                                                         string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240181093470208", mag,
                                                         modelT_Bus_WorkOrder1.F_WorkOrderId);
+                                                        string t = PushMessageController.PushApp("督办工单提醒", count, it .F_UserCode);
                                                     }
                                                     else
                                                     {
@@ -11828,6 +11835,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                             string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
                                                             string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag,
                                                             modelT_Bus_WorkOrder1.F_WorkOrderId);
+                                                            string t = PushMessageController.PushApp("新工单提醒", count, it .F_UserCode);
                                                         }
 
                                                     }
@@ -12417,6 +12425,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
                             string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag,
                             modelT_Bus_WorkOrder.F_WorkOrderId);
+                            string t = PushMessageController.PushApp("新工单提醒", count, it .F_UserCode);
 
                         }
 
@@ -12523,7 +12532,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                   string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
                                     string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag,
                                     modelT_Bus_WorkOrder.F_WorkOrderId);
-
+                                    string t = PushMessageController.PushApp("新工单提醒", count, it .F_UserCode);
 
                                 }
                             }
@@ -12673,6 +12682,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     string mag = "[\"" + workorderid + "\"]";
                                     string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag,
                                    workorderid);
+                                    string t = PushMessageController.PushApp("新工单提醒", count, it .F_UserCode);
                                 }
 
                             }
@@ -12730,6 +12740,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             string mag = "[\"" + workorderid + "\"]";
                             string v = SmsNewController.AddSmS(0, count, iv.F_Mobile, "681240804383522816", mag,
                             workorderid);
+                            string c = PushMessageController.PushApp("催单提醒", count, iv .F_UserCode);
                         }
                     }
                 }
@@ -12752,6 +12763,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             string mag = "[\"" + workorderid + "\"]";
                             string v = SmsNewController.AddSmS(0, count, iv.F_Mobile, "681240804383522816", mag,
                             workorderid);
+                            string c = PushMessageController.PushApp("催单提醒", count, iv.F_UserCode);
                         }
                     }
                 }
@@ -16545,7 +16557,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                                 string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
                                                                 string v = SmsNewController.AddSmS(0, count, u.F_Mobile,
          "681240181093470208", mag, modelT_Bus_WorkOrder.F_WorkOrderId);
-                                                                msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
+                                                            string c = PushMessageController.PushApp("督办工单提醒", count, u .F_UserCode);
+
+                                                            msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
                                                             }
                                                             else
                                                             {
@@ -16580,7 +16594,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                                 string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
                                                                 string v = SmsNewController.AddSmS(0, count, u.F_Mobile,
          "681240181093470208", mag, modelT_Bus_WorkOrder.F_WorkOrderId);
-                                                                msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
+                                                            string c = PushMessageController.PushApp("督办工单提醒", count, u .F_UserCode);
+                                                            msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
                                                             }
                                                             else
                                                             {
@@ -16596,8 +16611,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                                     string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
                                                                     string v = SmsNewController.AddSmS(0, count, u.F_Mobile, "681240888655478784", mag,
                                                                    modelT_Bus_WorkOrder.F_WorkOrderId);
+                                                                string c = PushMessageController.PushApp("新工单提醒", count, u .F_UserCode);
 
-                                                                }
+                                                            }
 
                                                                 msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
                                                             }
@@ -16770,7 +16786,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                                         string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
                                                                         string v = SmsNewController.AddSmS(0, count, it.F_Mobile,
                  "681240181093470208", mag, modelT_Bus_WorkOrder1.F_WorkOrderId);
-                                                                    }
+                                                                    string c = PushMessageController.PushApp("督办工单提醒", count, it .F_UserCode);
+                                                                }
                                                                     else
                                                                     {
                                                                         if (it.F_RoleCode == "WLDW" && it.F_IsSms != null && it.F_IsSms == 1)
@@ -16785,7 +16802,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                                             string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
                                                                             string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag,
                                                                            modelT_Bus_WorkOrder1.F_WorkOrderId);
-                                                                        }
+                                                                        string c = PushMessageController.PushApp("新工单提醒", count, it .F_UserCode);
+                                                                    }
 
                                                                     }
 
@@ -19022,6 +19040,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         string mag = "[\"" + workorderid + "\"]";
                                         string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag,
                                        workorderid);
+                                        string t = PushMessageController.PushApp("新工单提醒", count, it .F_UserCode);
                                     }
                                 }
                                 oper.F_CreateUser = User.F_UserCode;
@@ -19154,7 +19173,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                       
                                                        string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
                                                        string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240181093470208", mag, modelT_Bus_WorkOrder1.F_WorkOrderId);
-
+                                                       string c = PushMessageController.PushApp("督办工单提醒", count, it .F_UserCode);
                                                    }
                                                     else
                                                     {
@@ -19169,6 +19188,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                            //  bool f = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
                                                            string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
                                                            string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag, modelT_Bus_WorkOrder1.F_WorkOrderId);
+                                                           string t = PushMessageController.PushApp("新工单提醒", count, it .F_UserCode);
                                                        }
 
                                                     }