duhongyu лет назад: 3
Родитель
Сommit
c352020b78

+ 11 - 5
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/PushMessageController.cs

@@ -18,7 +18,7 @@ namespace CallCenterApi.Interface.Controllers
18 18
 
19 19
         //参数设置 <-----参数需要重新设置----->
20 20
         //http的域名
21
-        private static String HOST = "http://sdk.open.api.igexin.com/apiex.htm";
21
+        
22 22
 
23 23
         //https的域名
24 24
         //private static String HOST = "https://api.getui.com/apiex.htm";
@@ -156,10 +156,13 @@ namespace CallCenterApi.Interface.Controllers
156 156
             {
157 157
                 try
158 158
                 {
159
-                    pushResult = PushMessageToList(Title, count, clientid);
159
+                    string  HOST = "http://sdk.open.api.igexin.com/apiex.htm";
160
+                    pushResult = PushMessageToList(HOST,Title, count, clientid);
160 161
                 }
161 162
                catch(Exception e)
162 163
                 {
164
+                    string HOST = "https://sdk.open.api.igexin.com/apiex.htm";
165
+                    pushResult = PushMessageToList(HOST, Title, count, clientid);
163 166
                     LogFactory.GetLogger("3333").Error(e.Message );
164 167
                 }
165 168
             }
@@ -238,7 +241,10 @@ namespace CallCenterApi.Interface.Controllers
238 241
             if (!string.IsNullOrEmpty(clientid))
239 242
             {
240 243
                 if (type == 1)
241
-                    pushResult = PushMessageToList(Title, count, clientid);
244
+                {
245
+                    string HOST = "http://sdk.open.api.igexin.com/apiex.htm";
246
+                    pushResult = PushMessageToList(HOST,Title, count, clientid);
247
+                }
242 248
                 else
243 249
                     pushResult = PushMessageToSingle(Title, count, clientid);
244 250
             }
@@ -305,7 +311,7 @@ namespace CallCenterApi.Interface.Controllers
305 311
             }
306 312
             return Success("发送成功");
307 313
         }
308
-        private static string PushMessageToList(string Title, string count, string CLIENTID)
314
+        private static string PushMessageToList(string HOST,string Title, string count, string CLIENTID)
309 315
         {
310 316
             // 推送主类(方式1,不可与方式2共存)
311 317
             IGtPush push = new IGtPush(HOST, APPKEY, MASTERSECRET);
@@ -392,7 +398,7 @@ namespace CallCenterApi.Interface.Controllers
392 398
         }
393 399
         private static string PushMessageToSingle(string Title, string count, string CLIENTID)
394 400
         {
395
-
401
+            string HOST = "http://sdk.open.api.igexin.com/apiex.htm";
396 402
             IGtPush push = new IGtPush(HOST, APPKEY, MASTERSECRET);
397 403
 
398 404
             //消息模版:TransmissionTemplate:透传模板

+ 26 - 34
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -11721,6 +11721,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
11721 11721
                                     });
11722 11722
                                 }
11723 11723
                                 #region 插入推送消息
11724
+                                Task.Run(() =>
11725
+                                {
11726
+                                    addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgss, curuser.F_UserCode, 0, 1);
11727
+                                }).ContinueWith(p =>
11728
+                                {
11729
+                                    System.Diagnostics.Debug.WriteLine(DateTime.Now);
11730
+                                });
11724 11731
                                 if (isms > 0)
11725 11732
                                 {
11726 11733
                                     if (maindept.F_IsDept == 2)
@@ -11732,12 +11739,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
11732 11739
                                             if (curuser.F_RoleCode == "DBZY")
11733 11740
                                             {
11734 11741
                                                 string count = "你有督办工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
11735
-                                                //   string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
11736
-                                                // bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "242065", "");
11737
-
11738
-                                                string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
11739
-                                                string v = SmsNewController.AddSmS(0, count, u.F_Mobile,
11740
-                                            "681240181093470208", mag, modelT_Bus_WorkOrder.F_WorkOrderId);
11742
+                                            //    string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
11743
+                                            //    string v = SmsNewController.AddSmS(0, count, u.F_Mobile,
11744
+                                            //"681240181093470208", mag, modelT_Bus_WorkOrder.F_WorkOrderId);
11741 11745
 
11742 11746
                                                 string t = PushMessageController.PushApp("督办工单提醒", count, u.F_UserCode);
11743 11747
 
@@ -11753,15 +11757,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
11753 11757
                                                 else
11754 11758
                                                 {
11755 11759
                                                     string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",已转至三级单位,请在已派单菜单查看。";
11756
-                                                    // string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
11757
-                                                    //  bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "153305", "");
11758
-                                                    string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
11759
-                                                    string v = SmsNewController.AddSmS(0, count, u.F_Mobile, "681240888655478784", mag,
11760
-                                                   modelT_Bus_WorkOrder.F_WorkOrderId);
11761
-
11762
-
11760
+                                                   // string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
11761
+                                                   // string v = SmsNewController.AddSmS(0, count, u.F_Mobile, "681240888655478784", mag,
11762
+                                                   //modelT_Bus_WorkOrder.F_WorkOrderId);
11763 11763
                                                     string t = PushMessageController.PushApp("新工单提醒", count, u.F_UserCode);
11764
-
11765 11764
                                                     msg.AddInternalMessagesInfo("工单消息", msgss + ",工单编号:" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
11766 11765
 
11767 11766
                                                 }
@@ -11778,11 +11777,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
11778 11777
                                             if (curuser.F_RoleCode == "DBZY")
11779 11778
                                             {
11780 11779
                                                 string count = "你有督办工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
11781
-                                                //string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
11782
-                                                // bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "242065", "");
11783
-                                                string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
11784
-                                                string v = SmsNewController.AddSmS(0, count, u.F_Mobile,
11785
-                                            "681240181093470208", mag, modelT_Bus_WorkOrder.F_WorkOrderId);
11780
+                                            //    string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
11781
+                                            //    string v = SmsNewController.AddSmS(0, count, u.F_Mobile,
11782
+                                            //"681240181093470208", mag, modelT_Bus_WorkOrder.F_WorkOrderId);
11786 11783
                                                 string t = PushMessageController.PushApp("督办工单提醒", count, u.F_UserCode);
11787 11784
                                                 msg.AddInternalMessagesInfo("工单消息", msgss + ",工单编号:" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
11788 11785
                                             }
@@ -11796,11 +11793,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
11796 11793
                                                 {
11797 11794
 
11798 11795
                                                     string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
11799
-                                                    //  string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
11800
-                                                    // bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "153305", "");
11801
-                                                    string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
11802
-                                                    string v = SmsNewController.AddSmS(0, count, u.F_Mobile, "681240888655478784", mag,
11803
-                                                   modelT_Bus_WorkOrder.F_WorkOrderId);
11796
+                                                   // string mag = "[\"" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
11797
+                                                   // string v = SmsNewController.AddSmS(0, count, u.F_Mobile, "681240888655478784", mag,
11798
+                                                   //modelT_Bus_WorkOrder.F_WorkOrderId);
11804 11799
                                                     string t = PushMessageController.PushApp("新工单提醒", count, u.F_UserCode);
11805 11800
                                                 }
11806 11801
 
@@ -11951,11 +11946,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
11951 11946
                                                     if (curuser.F_RoleCode == "DBZY")
11952 11947
                                                     {
11953 11948
                                                         string count = "你有督办工单:" + modelT_Bus_WorkOrder1.F_WorkOrderId + ",请及时查收处理。";
11954
-                                                        //  string msg = modelT_Bus_WorkOrder1.F_WorkOrderId;
11955
-                                                        //  bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "242065", "");
11956
-                                                        string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
11957
-                                                        string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240181093470208", mag,
11958
-                                                        modelT_Bus_WorkOrder1.F_WorkOrderId);
11949
+                                                        //string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
11950
+                                                        //string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240181093470208", mag,
11951
+                                                        //modelT_Bus_WorkOrder1.F_WorkOrderId);
11959 11952
                                                         string t = PushMessageController.PushApp("督办工单提醒", count, it.F_UserCode);
11960 11953
                                                     }
11961 11954
                                                     else
@@ -11967,11 +11960,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
11967 11960
                                                         else
11968 11961
                                                         {
11969 11962
                                                             string count = "你有新工单:" + modelT_Bus_WorkOrder1.F_WorkOrderId + ",请及时查收处理。";
11970
-                                                            // string msg = modelT_Bus_WorkOrder1.F_WorkOrderId;
11971
-                                                            // bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
11972
-                                                            string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
11973
-                                                            string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag,
11974
-                                                            modelT_Bus_WorkOrder1.F_WorkOrderId);
11963
+                                                         
11964
+                                                            //string mag = "[\"" + modelT_Bus_WorkOrder1.F_WorkOrderId + "\"]";
11965
+                                                            //string v = SmsNewController.AddSmS(0, count, it.F_Mobile, "681240888655478784", mag,
11966
+                                                            //modelT_Bus_WorkOrder1.F_WorkOrderId);
11975 11967
                                                             string t = PushMessageController.PushApp("新工单提醒", count, it.F_UserCode);
11976 11968
                                                         }
11977 11969