Parcourir la Source

跨域,底号管理

duhongyu il y a 5 ans
Parent
commit
f9758ee53c

+ 6 - 1
代码/TVShoppingCallCenter_ZLJ/Controllers/CallCenter/CallRecordsController.cs

1
 using System;
1
 using System;
2
 using System.Collections.Generic;
2
 using System.Collections.Generic;
3
 using System.Common;
3
 using System.Common;
4
+using System.IO;
4
 using System.IRepositories;
5
 using System.IRepositories;
5
 using System.IRepositories.Call;
6
 using System.IRepositories.Call;
6
 using System.Linq;
7
 using System.Linq;
7
 using System.Model;
8
 using System.Model;
8
 using System.Model.Call;
9
 using System.Model.Call;
10
+using System.Net;
9
 using System.Security.Claims;
11
 using System.Security.Claims;
12
+using System.Text;
10
 using System.Threading.Tasks;
13
 using System.Threading.Tasks;
11
 using System.Utility;
14
 using System.Utility;
12
 using Microsoft.AspNetCore.Authorization;
15
 using Microsoft.AspNetCore.Authorization;
20
     /// <summary>
23
     /// <summary>
21
     /// 通话记录
24
     /// 通话记录
22
     /// </summary>
25
     /// </summary>
23
-    [Authorize]
26
+   // [Authorize]
24
     [Produces("application/json")]
27
     [Produces("application/json")]
25
     [Route("api/[controller]")]
28
     [Route("api/[controller]")]
26
     public class CallRecordsController : BaseController
29
     public class CallRecordsController : BaseController
85
             return Success("成功", pagelist);
88
             return Success("成功", pagelist);
86
 
89
 
87
         }
90
         }
91
+       
92
+    
88
         /// <summary>
93
         /// <summary>
89
         /// 获取自动外呼通话记录
94
         /// 获取自动外呼通话记录
90
         /// </summary>
95
         /// </summary>

+ 37 - 16
代码/TVShoppingCallCenter_ZLJ/Controllers/System/BottomNumberController.cs

40
                 return Error("请选择坐席组");
40
                 return Error("请选择坐席组");
41
             if (string.IsNullOrEmpty(input.F_Tel))
41
             if (string.IsNullOrEmpty(input.F_Tel))
42
                 return Error("请输入底号");
42
                 return Error("请输入底号");
43
-            input.F_CreateOn = DateTime.Now;
44
-            input.F_IsDelete = 0;
45
-            input.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
46
-            var res = await _sys_bottomnumberrepository.Add(input);
47
-            if (res > 0)
43
+            var model = await _sys_bottomnumberrepository.GetListALL(x => x.F_Tel == input.F_Tel.Trim() &&
44
+          x.F_IsDelete == 0);
45
+            if (model.Count ()>0)
48
             {
46
             {
49
-                return Success("添加成功");
47
+                return Error("不能添加重复的底号");
50
             }
48
             }
51
             else
49
             else
52
             {
50
             {
53
-                return Error("添加失败");
51
+                input.F_CreateOn = DateTime.Now;
52
+                input.F_IsDelete = 0;
53
+                input.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
54
+                var res = await _sys_bottomnumberrepository.Add(input);
55
+                if (res > 0)
56
+                {
57
+                    return Success("添加成功");
58
+                }
59
+                else
60
+                {
61
+                    return Error("添加失败");
62
+                }
54
             }
63
             }
64
+            
55
         }
65
         }
56
         /// <summary>
66
         /// <summary>
57
         /// 修改
67
         /// 修改
70
             var model = await _sys_bottomnumberrepository.GetSingle(x => x.F_ID == input.F_ID);
80
             var model = await _sys_bottomnumberrepository.GetSingle(x => x.F_ID == input.F_ID);
71
             if (model == null)
81
             if (model == null)
72
                 return Error("操作失败");
82
                 return Error("操作失败");
73
-            input.F_IsDelete = 0;
74
-            input.F_CreateBy = model.F_CreateBy;
75
-            input.F_CreateOn = model.F_CreateOn;
76
-            model = input;
77
-            model.F_LastModifyOn = DateTime.Now;
78
-            model.F_LastModifyBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
79
-            var b = await _sys_bottomnumberrepository.Update(model);
80
-            if (b)
81
-                return Success("修改成功");
83
+            var bottomnumber = await _sys_bottomnumberrepository.GetListALL(x => x.F_Tel == input.F_Tel.Trim() &&
84
+        x.F_IsDelete == 0&&x .F_Tel != model .F_Tel );
85
+            if (bottomnumber.Count() > 0)
86
+            {
87
+                return Error("不能添加重复的底号");
88
+            }
89
+            else
90
+            {
91
+                input.F_IsDelete = 0;
92
+                input.F_CreateBy = model.F_CreateBy;
93
+                input.F_CreateOn = model.F_CreateOn;
94
+                model = input;
95
+                model.F_LastModifyOn = DateTime.Now;
96
+                model.F_LastModifyBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
97
+                var b = await _sys_bottomnumberrepository.Update(model);
98
+                if (b)
99
+                    return Success("修改成功");
100
+            }
101
+             
82
             return Error("修改失败");
102
             return Error("修改失败");
83
         }
103
         }
84
         /// <summary>
104
         /// <summary>
136
                     }
156
                     }
137
                 });
157
                 });
138
             }
158
             }
159
+            if (!string .IsNullOrEmpty (code))
139
             conModels.Add(new ConditionalModel() { FieldName = "F_ZXZCode", ConditionalType = ConditionalType.Equal, FieldValue = code });
160
             conModels.Add(new ConditionalModel() { FieldName = "F_ZXZCode", ConditionalType = ConditionalType.Equal, FieldValue = code });
140
             #endregion
161
             #endregion
141
             int recordCount = 0;
162
             int recordCount = 0;

+ 1 - 1
代码/TVShoppingCallCenter_ZLJ/Controllers/UploadController.cs

156
             }
156
             }
157
         }
157
         }
158
 
158
 
159
-
159
+        
160
         /// <summary>
160
         /// <summary>
161
         /// 下载附件
161
         /// 下载附件
162
         /// </summary>
162
         /// </summary>

+ 1 - 1
代码/TVShoppingCallCenter_ZLJ/Startup.cs

57
                 .AllowAnyMethod()
57
                 .AllowAnyMethod()
58
                 .SetIsOriginAllowed(_ => true)//上线后删除此行 加入域列表 内网可忽略
58
                 .SetIsOriginAllowed(_ => true)//上线后删除此行 加入域列表 内网可忽略
59
                 .AllowAnyHeader()
59
                 .AllowAnyHeader()
60
+                .WithOrigins("http://192.168.1.15:8080","http://192.168.8.20:1028").AllowAnyMethod().AllowAnyHeader().AllowCredentials()
60
                 .AllowCredentials().SetPreflightMaxAge(TimeSpan.FromMinutes(30)));
61
                 .AllowCredentials().SetPreflightMaxAge(TimeSpan.FromMinutes(30)));
61
             });
62
             });
62
             #endregion
63
             #endregion
248
             //app.UseHttpsRedirection();
249
             //app.UseHttpsRedirection();
249
             //引入授权
250
             //引入授权
250
             app.UseAuthentication();
251
             app.UseAuthentication();
251
-            
252
             app.UseMvc();
252
             app.UseMvc();
253
 
253
 
254
             app.UseHangfireServer(new BackgroundJobServerOptions
254
             app.UseHangfireServer(new BackgroundJobServerOptions