From f3a271298e2c2377c7978617cb4f010043951caf Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 24 May 2023 10:34:54 +0800 Subject: [PATCH] =?UTF-8?q?feat(work):=20=E9=9A=8F=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CgibinOAMeetingRoomAddRequest.cs | 26 ++++++++++++++++++- .../CgibinOAMeetingRoomEditRequest.cs | 13 +++++++++- .../CgibinOAMeetingRoomListResponse.cs | 26 ++++++++++++++++++- .../CgibinOAMeetingRoomAddRequest.json | 8 ++++-- .../CgibinOAMeetingRoomEditRequest.json | 8 ++++-- .../CgibinOAMeetingRoomListResponse.json | 8 ++++-- 6 files changed, 80 insertions(+), 9 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.cs index 87d9a9c5..962b0c54 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.Work.Models { @@ -25,6 +25,23 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models [System.Text.Json.Serialization.JsonPropertyName("latitude")] public double Latitude { get; set; } } + + public class Range + { + /// + /// 获取或设置使用范围的成员 UserId 列表。 + /// + [Newtonsoft.Json.JsonProperty("user_list")] + [System.Text.Json.Serialization.JsonPropertyName("user_list")] + public IList? UserIdList { get; set; } + + /// + /// 获取或设置使用范围的部门 ID 列表。 + /// + [Newtonsoft.Json.JsonProperty("department_list")] + [System.Text.Json.Serialization.JsonPropertyName("department_list")] + public IList? DepartmentId { get; set; } + } } /// @@ -69,6 +86,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models [System.Text.Json.Serialization.JsonPropertyName("coordinate")] public Types.Coordinate? Coordinate { get; set; } + /// + /// 获取或设置使用范围信息。 + /// + [Newtonsoft.Json.JsonProperty("range")] + [System.Text.Json.Serialization.JsonPropertyName("range")] + public Types.Range? Range { get; set; } + /// /// 获取或设置会议室支持的设备 ID 列表。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomEditRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomEditRequest.cs index 6e5efe8e..a477ba7d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomEditRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomEditRequest.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.Work.Models { @@ -12,6 +12,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models public class Coordinate : CgibinOAMeetingRoomAddRequest.Types.Coordinate { } + + public class Range : CgibinOAMeetingRoomAddRequest.Types.Range + { + } } /// @@ -63,6 +67,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models [System.Text.Json.Serialization.JsonPropertyName("coordinate")] public Types.Coordinate? Coordinate { get; set; } + /// + /// 获取或设置使用范围信息。 + /// + [Newtonsoft.Json.JsonProperty("range")] + [System.Text.Json.Serialization.JsonPropertyName("range")] + public Types.Range? Range { get; set; } + /// /// 获取或设置会议室支持的设备 ID 列表。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.cs index 74fea2b6..2de58b60 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Models +namespace SKIT.FlurlHttpClient.Wechat.Work.Models { /// /// 表示 [POST] /cgi-bin/oa/meetingroom/list 接口的响应。 @@ -14,6 +14,23 @@ public class Coordinate : CgibinOAMeetingRoomAddRequest.Types.Coordinate { } + + public class Range + { + /// + /// 获取或设置使用范围的成员 UserId 列表。 + /// + [Newtonsoft.Json.JsonProperty("user_list")] + [System.Text.Json.Serialization.JsonPropertyName("user_list")] + public string[]? UserIdList { get; set; } + + /// + /// 获取或设置使用范围的部门 ID 列表。 + /// + [Newtonsoft.Json.JsonProperty("department_list")] + [System.Text.Json.Serialization.JsonPropertyName("department_list")] + public long[]? DepartmentId { get; set; } + } } /// @@ -65,6 +82,13 @@ [System.Text.Json.Serialization.JsonPropertyName("coordinate")] public Types.Coordinate? Coordinate { get; set; } + /// + /// 获取或设置使用范围信息。 + /// + [Newtonsoft.Json.JsonProperty("range")] + [System.Text.Json.Serialization.JsonPropertyName("range")] + public Types.Range? Range { get; set; } + /// /// 获取或设置会议室支持的设备 ID 列表。 /// diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.json index 875fe2f3..174c3b8c 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.json @@ -1,12 +1,16 @@ -{ +{ "name": "18F-会议室", "capacity": 10, "city": "深圳", "building": "腾讯大厦", "floor": "18F", - "equipment": [1, 2, 3], + "equipment": [ 1, 2, 3 ], "coordinate": { "latitude": "22.540503", "longitude": "113.934528" + }, + "range": { + "user_list": [ "zhangsan", "lisi" ], + "department_list": [ 1 ] } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomEditRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomEditRequest.json index cec9adac..a3089cb8 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomEditRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomEditRequest.json @@ -1,13 +1,17 @@ -{ +{ "meetingroom_id": 2, "name": "18F-会议室", "capacity": 10, "city": "深圳", "building": "腾讯大厦", "floor": "18F", - "equipment": [1, 2, 3], + "equipment": [ 1, 2, 3 ], "coordinate": { "latitude": "22.540503", "longitude": "113.934528" + }, + "range": { + "user_list": [ "zhangsan", "lisi" ], + "department_list": [ 1 ] } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.json index f511abe8..927b1939 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.json @@ -1,4 +1,4 @@ -{ +{ "errcode": 0, "errmsg": "ok", "meetingroom_list": [ @@ -9,11 +9,15 @@ "city": "深圳", "building": "腾讯大厦", "floor": "18F", - "equipment": [1, 2, 3], + "equipment": [ 1, 2, 3 ], "coordinate": { "latitude": "22.540503", "longitude": "113.934528" }, + "range": { + "user_list": [ "zhangsan", "lisi" ], + "department_list": [ 1 ] + }, "need_approval": 1 }, {