diff --git a/.collaboration b/.collaboration index 7aeb54e3..94d0395b 100644 --- a/.collaboration +++ b/.collaboration @@ -2554,16 +2554,7 @@ }, { "ModuleName": "ServerCommandPrivate/钉钉事件处理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:29:05.4131401+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉事件处理.json" - ] + "ModuleType": 27 }, { "ModuleName": "Image/默认头像.png", @@ -2591,16 +2582,7 @@ }, { "ModuleName": "ServerCommandPrivate/创建项目视频会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:26:23.2263521+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目\\创建项目视频会议.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/获取业务配置", diff --git a/ServerCommands/钉钉/钉钉事件处理.json b/ServerCommands/钉钉/钉钉事件处理.json index 87b3ae94..b15ea57b 100644 --- a/ServerCommands/钉钉/钉钉事件处理.json +++ b/ServerCommands/钉钉/钉钉事件处理.json @@ -233,7 +233,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "7a226688-00e4-4013-8339-0053a99a21a1", + "GUID": "59ade27c-cd74-4899-a2bc-2dbb3db61215", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -244,7 +244,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "ed5f2f03-b830-4e87-8343-c2b85eba1076", + "GUID": "94586d2c-1555-4b9c-aaf7-6763163c83b3", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -255,7 +255,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "cff147ed-8f7a-434a-8260-ef9d2fc77d39", + "GUID": "53440c0c-8cec-4ce1-ab4b-a516e8c60aac", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -266,7 +266,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "4f454e97-2b2d-4fa5-9e75-3e541b7f3340", + "GUID": "9fb973e0-e14e-4ab8-a197-767bc2b1dea4", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -277,7 +277,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "26bc9da3-e05e-4c90-b6c8-46b1d40c1fe9", + "GUID": "fa8b72e9-4b1f-4f91-b3ff-e9c41417878c", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -304,7 +304,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "8d3faf1772944764b8a9732b806d49fd", + "ID": "f0f10f374f5c446b99ba6fb178caa1c2", "BreakpointIdentity": "578fc267-2d96-4fd0-9ebe-470948482fde" }, { @@ -478,7 +478,7 @@ } ] }, - "ID": "f89cd4ac-bafd-43d9-8dc4-85087f29bce6" + "ID": "31646ae1-075e-4065-b90c-d2ff27c5ac5f" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -499,7 +499,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "钉钉会议ID", - "GUID": "90738cc4-1d3a-46eb-a3f8-7046932d23c6" + "GUID": "99850cc6-5d6f-4aca-9592-297b063e365e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -512,7 +512,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议业务类型", - "GUID": "ace76b9e-4154-4f03-8c5c-332dc803a291" + "GUID": "8b655581-bdfb-45b4-a57a-3b2668d74045" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -525,7 +525,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议开始时间", - "GUID": "fe13a7cf-2168-4101-9113-9453bf911e50" + "GUID": "33b40e3a-aa3a-44e5-b655-9ffd3408d74e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -538,7 +538,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议持续时间", - "GUID": "fa513aae-871c-4531-adae-c5d991cab56f" + "GUID": "1e2da617-09d2-4a31-af5e-cfe5a7cc5c15" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -551,7 +551,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议状态", - "GUID": "8aafad0b-0709-46cb-a53b-2b2d80042395" + "GUID": "656bfee0-a62d-43f9-bf7d-4c50fad61be5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -564,7 +564,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "发起人", - "GUID": "85c7b5c4-132b-47c9-8b42-5ec31f4428cb" + "GUID": "44fb1bca-b9a6-457a-a76c-18527698d975" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -577,7 +577,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议标题", - "GUID": "d4fd75a1-3978-4b22-8d7e-c741d079b9c4" + "GUID": "56054e7d-4283-40f3-9f6c-4ac25a5dc57b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -590,7 +590,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "自动拉会", - "GUID": "bf9ce92a-1868-442c-a6cd-b641354d4281" + "GUID": "42f198bb-d15b-456e-96ba-5bdae9ce7e66" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -603,7 +603,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "开启云录制", - "GUID": "3e5f02d8-101d-4aec-bd3d-4d6429247472" + "GUID": "d20cab49-12ca-41ee-aeb6-75fc0bef4b39" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -616,7 +616,7 @@ } ] }, - "ID": "58d9c0a1-43d9-4640-9f32-8051b6852bc3" + "ID": "8e5f682a-da5d-44af-81e3-aed9f4a99511" } ] }, @@ -625,7 +625,7 @@ ] }, "Comments": "会议创建事件", - "ID": "557c5c10-dd85-42b4-b542-359c1e493f60" + "ID": "728e9f9f-4c09-403b-a597-6197f5ef3e52" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -887,7 +887,7 @@ } ] }, - "ID": "e94059f3-2606-43ee-8ed9-67233281d9f7" + "ID": "6a4eaa77-beaf-454c-a70c-d80a4474e6ef" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -902,7 +902,7 @@ } ] }, - "ID": "e90c154d-969f-4b55-9ace-874cdc7b80ab" + "ID": "76df59e7-781f-4b1b-a3fb-25679cbf1d1b" } ] }, @@ -957,7 +957,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议结束时间", - "GUID": "1196cd97-e510-41bd-85fc-b13035a2cd65" + "GUID": "58c30f10-6363-4820-96b1-8f8a22dd5f32" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -970,7 +970,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议持续时间", - "GUID": "9f07c82b-2277-4f3b-9a66-1011aebcb48a" + "GUID": "e1416d74-1d2e-455f-b63e-496f3eb7a5fe" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -983,7 +983,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议状态", - "GUID": "d98ad543-2f47-47c5-b8c2-f0881cedf518" + "GUID": "48d4c6e5-9f41-49cc-bc22-692e9ca25642" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -996,7 +996,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "参与人", - "GUID": "57d37734-9a7f-45b1-9d20-c470a39973a3" + "GUID": "c251c89c-c1be-405b-a93d-0013c8125075" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1009,7 +1009,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "关联钉钉会议ID", - "GUID": "510d0009-14df-47f9-adbd-4e2768807ce4" + "GUID": "7c589e9f-4d88-468e-861c-060e3e6150f7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1022,11 +1022,149 @@ } ] }, - "ID": "9adffffb-7f28-46aa-92e7-d271555e6600" + "ID": "851399e1-f70c-460e-91ff-ba8e017f2782" + }, + { + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "会议记录表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "钉钉会议ID", + "GUID": "56d022c0-80fc-43e4-9837-4e7cd16432d7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.conferenceId" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "会议业务类型", + "GUID": "48b072a6-b88b-44f3-a845-902bc5f03de0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.bizType" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "会议持续时间", + "GUID": "9de93e22-e350-4cdc-b6ed-36c93e590d24" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.confDuration" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "会议状态", + "GUID": "61f080d3-291e-4c1e-9865-c45c71608e8e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.status" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "发起人", + "GUID": "cbfb12ad-784b-4350-9769-70d0d14e3f3c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.creatorId" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "参与人", + "GUID": "e54e3143-9d74-4fbe-bfc3-217d1a0bda68" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参会人员UnionId" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "会议标题", + "GUID": "e3fc95be-d618-4ece-8c66-dc8315178f0c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.title" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "自动拉会", + "GUID": "a0a8b32c-7412-4345-bff4-8c5d58cbe980" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=业务配置.自动拉会" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "开启云录制", + "GUID": "b9fad93b-7218-43e0-8c43-978718b81c11" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.cloudRecordStatus" + } + } + ] + }, + "BreakpointIdentity": "bc133c84-2ce2-4d9f-98e2-ce908b28804c" + } + ] + }, + "ID": "cac60396-946a-4939-99ac-3df429eaabcb" } ] }, - "BreakpointIdentity": "4322b8d2-5d3d-4250-8483-a3f564ef16c3" + "BreakpointIdentity": "6b485882-56b2-40ee-9c5b-71fbbd6cdd76" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -1042,7 +1180,7 @@ } ] }, - "ID": "8e034266-af3a-4c43-89d5-4684b40f0041" + "ID": "e5ab0413-2fb3-4e02-9143-932f281656c1" } ] }, @@ -1050,7 +1188,7 @@ } ] }, - "ID": "0a827c1f-3acb-433e-9e0e-b067783abee1" + "ID": "066c7d53-e129-4639-b19a-cf8a07f036fb" } ] }, @@ -1059,7 +1197,7 @@ ] }, "Comments": "会议状态变更", - "ID": "05f2a6ec-395e-4cd3-9cf5-447dfd489069" + "ID": "ad6d1d6b-1cc9-4a43-bdc0-9fe945989e68" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1178,7 +1316,7 @@ } ] }, - "ID": "bc66798e-38e5-4cb1-bfa4-b6e26e3d6599" + "ID": "734c2811-fee1-4636-b5bc-74f6f31b6438" } ] }, @@ -1190,7 +1328,7 @@ } ] }, - "ID": "5ec6ff65-9cc8-4372-956c-3ed1c67d8f4d" + "ID": "cc9b45be-d493-4102-8b38-04d55440ff28" } ] }, diff --git a/ServerCommands/项目/创建项目视频会议.json b/ServerCommands/项目/创建项目视频会议.json index f210a432..d98feea3 100644 --- a/ServerCommands/项目/创建项目视频会议.json +++ b/ServerCommands/项目/创建项目视频会议.json @@ -69,7 +69,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "主持人UnionID", "ParameterValue": "%CurrentUser.DingTalkUnionID%", - "ID": "6b445242687942729b916487fcb24e3e", + "ID": "17ded6bb127c4f10a97aa42aaf20bdb5", "BreakpointIdentity": "fedb9d66-b60e-4f89-bf8f-f5b60abd91fe" }, { @@ -304,12 +304,29 @@ } ] }, - "ID": "ae566ddf-eb5b-4b2e-87fb-304ec22ccb9d" + "ID": "9b412800-09f5-4a8d-b485-957ef3ed016f" } ] }, "BreakpointIdentity": "894bb60f-e90c-440a-bd83-c0897166076b" }, + { + "$type": "DingTalkPlugin.Asyncsend, DingTalkPlugin", + "UserType": "UnionId", + "Userid_list": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=主持人UnionID" + }, + "MsgType": "text", + "Text_Content": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"Clue检测到您的会议时间已到，自动为您继续拉起会议！\"" + }, + "Action_card_Btn_Type": "0", + "Action_card_Btn_orientation": "1", + "Task_id": "钉钉消息任务ID", + "BreakpointIdentity": "ada0b64f-6786-4a3e-a1d7-f4fb9a8bdaa6" + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0",