3 Revize 5068683e4b ... 7e85bf74ac

Autor SHA1 Zpráva Datum
  zhupei 7e85bf74ac Merge branch 'master' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_Api %!s(int64=3) %!d(string=před) roky
  liyuanyuan f49e743b59 先提交一次写的钉钉 %!s(int64=3) %!d(string=před) roky
  weieryang 81a2c4e7fd mod:修改忽略文件 %!s(int64=3) %!d(string=před) roky

+ 18 - 14
.gitignore

@@ -2,17 +2,21 @@
2 2
 # 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
3 3
 ################################################################################
4 4
 
5
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/13/(20211213092345858)111_s.jpg
6
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/13/(20211213092345858)111.jpg
7
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/13/(20211213091705672)111_s.pig
8
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/13/(20211213091705672)111.pig
9
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/13/(20211213091546817)111
10
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/13/(20211213091510336)111
11
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/13
12
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/10/(20211210085829981)20211210085829981_s.jpg
13
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/10/(20211210085829981)20211210085829981.jpg
14
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/10/(20211210085803642)20211210085803642_s.jpg
15
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/10/(20211210085803642)20211210085803642.jpg
16
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/10
17
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/09/(20211209173553326)20211209173553326_s.jpg
18
-/RMYY_CallCenter_Api/Upload/Pic/2021/12/09/(20211209173553326)20211209173553326.jpg
5
+
6
+.vs/
7
+RMYY_CallCenter_Api.Bll/bin/
8
+RMYY_CallCenter_Api.Bll/obj/
9
+RMYY_CallCenter_Api.DB/bin/
10
+RMYY_CallCenter_Api.DB/obj/
11
+RMYY_CallCenter_Api.Dal/bin/
12
+RMYY_CallCenter_Api.Dal/obj/
13
+RMYY_CallCenter_Api.Model/bin/
14
+RMYY_CallCenter_Api.Model/obj/
15
+RMYY_CallCenter_Api.Utility/bin/
16
+RMYY_CallCenter_Api.Utility/obj/
17
+RMYY_CallCenter_Api/RMYY_CallCenter_Api.csproj.user
18
+RMYY_CallCenter_Api/bin/
19
+RMYY_CallCenter_Api/log/
20
+RMYY_CallCenter_Api/obj/
21
+RMYY_CallCenter_Api/Upload/Pic/
22
+packages/

+ 61 - 1
RMYY_CallCenter_Api.Utility/Helper/DingTalkHelper.cs

@@ -1,7 +1,9 @@
1
-using Newtonsoft.Json.Linq;
1
+using Newtonsoft.Json;
2
+using Newtonsoft.Json.Linq;
2 3
 using System;
3 4
 using System.Collections.Generic;
4 5
 using System.Linq;
6
+using System.Net;
5 7
 using System.Text;
6 8
 using System.Threading.Tasks;
7 9
 
@@ -170,5 +172,63 @@ namespace RMYY_CallCenter_Api.Utility
170 172
             string result = SendMessage(userids, deptids, msg.ToJson());
171 173
             return result;
172 174
         }
175
+
176
+        /// <summary>
177
+        /// 
178
+        /// </summary>
179
+        /// <param name="userid"></param>
180
+        /// <returns></returns>
181
+        public static string GetUserInfoByUserId(string userid)
182
+        {
183
+            WebClient web = new WebClient();
184
+            web.Encoding = Encoding.UTF8;
185
+            string strresult = web.DownloadString(string.Format("https://oapi.dingtalk.com/user/get?access_token={0}&userid={1}", GetAccessToken(), userid));
186
+
187
+            JObject jo = (JObject)JsonConvert.DeserializeObject(strresult);
188
+ 
189
+
190
+            return jo.ToJson();
191
+            
192
+        }
193
+
194
+        //给某个部门的所有的人发消息
195
+        //获取部门列表
196
+        //https://open.dingtalk.com/document/orgapp-server/obtain-the-department-list-v2
197
+        public static string GetDeptlist()
198
+        {
199
+            WebClient web = new WebClient();
200
+            web.Encoding = Encoding.UTF8;
201
+            string strresult = web.DownloadString(string.Format("https://oapi.dingtalk.com/topapi/v2/department/listsub?access_token={0}&dept_id={1}", GetAccessToken(), 1));
202
+
203
+            JObject jo = (JObject)JsonConvert.DeserializeObject(strresult);
204
+
205
+        
206
+            return jo.ToJson();
207
+
208
+        }
209
+
210
+        /// <summary>
211
+        ///   获取部门所有的userid
212
+        /// </summary>
213
+        /// <param name="deptid">get   https://oapi.dingtalk.com/user/getDeptMember</param>
214
+        /// <returns></returns>
215
+
216
+
217
+
218
+        public static string GetUserIdsByDeptId(double deptid) 
219
+        {
220
+            WebClient web = new WebClient();
221
+            web.Encoding = Encoding.UTF8;
222
+            string strresult = web.DownloadString(string.Format("https://oapi.dingtalk.com/user/getDeptMember?access_token={0}&deptId={1}", GetAccessToken(), deptid));
223
+
224
+            JObject jo = (JObject)JsonConvert.DeserializeObject(strresult);
225
+            if (jo != null && jo["userIds"] != null)
226
+            {
227
+                return jo["userIds"].ToString();
228
+            }
229
+
230
+            return "";
231
+
232
+        }
173 233
     }
174 234
 }

+ 13 - 1
RMYY_CallCenter_Api/Controllers/HomeController.cs

@@ -165,8 +165,20 @@ namespace RMYY_CallCenter_Api.Controllers
165 165
             return Content(obj.ToJson());
166 166
         }
167 167
 
168
+        public ActionResult DingTalkGetDeUserInfoByUserid(string userid)
169
+        {
170
+            return Content(DingTalkHelper.GetUserInfoByUserId(userid));
171
+        }
172
+        public ActionResult DingTalkGetDeptlist()
173
+        {
174
+            return Content(DingTalkHelper.GetDeptlist());
175
+        }
168 176
 
169
-
177
+        
178
+        public ActionResult DingTalkGetUserIdsByDeptId(double deptid)
179
+        {
180
+            return Content(DingTalkHelper.GetUserIdsByDeptId(deptid));
181
+        }
170 182
 
171 183
     }
172 184
 }