From 55ba03d51a87535c3db32196c7dcc22f471bb4f7 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Sun, 8 Dec 2024 19:40:30 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E6=8F=90=E5=89=8D=E7=A6=BB=E4=BC=9A=E4=BA=BA=E5=91=98=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD","MessageType":2,"Modules":[{"State":1,"Type?= =?UTF-8?q?":27,"Name":"ServerCommandPrivate/=E9=92=89=E9=92=89=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86"},{"State":1,"Type":7,"Name":"Table?= =?UTF-8?q?/=E4=BC=9A=E8=AE=AE=E6=88=90=E5=91=98=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 22 +--- ServerCommands/钉钉/钉钉事件处理.json | 141 +++++++++++++++++--------- Tables/会议/会议成员记录表.json | 3 +- 3 files changed, 97 insertions(+), 69 deletions(-) diff --git a/.collaboration b/.collaboration index e7901941..bd69f999 100644 --- a/.collaboration +++ b/.collaboration @@ -2534,16 +2534,7 @@ }, { "ModuleName": "ServerCommandPrivate/钉钉事件处理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-08T19:28:59.438395+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉事件处理.json" - ] + "ModuleType": 27 }, { "ModuleName": "Image/默认头像.png", @@ -2703,16 +2694,7 @@ }, { "ModuleName": "Table/会议成员记录表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-08T19:18:40.2319855+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\会议\\会议成员记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "UserControlPage/会议成员展示", diff --git a/ServerCommands/钉钉/钉钉事件处理.json b/ServerCommands/钉钉/钉钉事件处理.json index a6a11854..15a1400e 100644 --- a/ServerCommands/钉钉/钉钉事件处理.json +++ b/ServerCommands/钉钉/钉钉事件处理.json @@ -93,7 +93,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=全局_业务配置" }, - "SampleJson": "{\r\n \"项目ID\": \"1\",\r\n \"版本ID\": \"1\",\r\n \"版本名\": \"Develop\",\r\n \"版本号\": \"1.0.0\",\r\n \"自动拉会\": {\r\n \"时间阈值\": 3600,\r\n \"最大次数\": 0\r\n }\r\n}", + "SampleJson": "{\r\n \"项目ID\": \"1\",\r\n \"版本ID\": \"1\",\r\n \"版本名\": \"Develop\",\r\n \"版本号\": \"1.0.0\",\r\n \"自动拉会\": {\r\n \"提前离会阈值\": 10,\r\n \"最大次数\": 0\r\n }\r\n}", "ToParameter": "业务配置", "BreakpointIdentity": "7d72da15-c842-468e-b35f-0534e3db85fb" }, @@ -290,7 +290,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=(会议状态事件体.openConfModel.startTime/1000/60/60/24)+DATE(1970,1,1)" }, - "ID": "cffd8499ca3d4ed9b9bf3d8b653ddfca", + "ID": "a67de616b000413fb05694008ee0f909", "BreakpointIdentity": "29272118-09f0-48d9-b2cf-052eab6a55b7" }, { @@ -300,9 +300,19 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=会议状态事件体.openConfModel.confDuration/1000" }, - "ID": "62aa37185c7649769fae73abd79a640f", + "ID": "b25210e053094da7979f8a1c493c7e85", "BreakpointIdentity": "f0c977f8-0e80-4d99-ad98-6b97538790d8" }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "计算会议结束时间", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=((会议状态事件体.openConfModel.startTime+会议状态事件体.openConfModel.confDuration)/1000/60/60/24)+DATE(1970,1,1)" + }, + "ID": "d0b6f6030903476d949f013a00ce1fb6", + "BreakpointIdentity": "a5039846-a06d-4810-afcb-2d44a7591d64" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "会议信息", @@ -428,7 +438,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "钉钉会议ID", - "GUID": "86c24384-6a07-4c80-9e10-861591d7b688" + "GUID": "8823e632-1e56-4372-974c-4d95024a63a8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -441,7 +451,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议类型", - "GUID": "ae935f53-94d6-4d36-a794-622b602bd8af" + "GUID": "a89a69d5-b0cc-4eeb-9cb1-4faf0247d704" }, "Value": "其他会议" }, @@ -451,7 +461,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议标题", - "GUID": "af68baf8-f91b-4dbb-b5a8-a93ffcc36c03" + "GUID": "3d79bb19-cdab-41bd-95d3-9e4a1d8500c1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -464,7 +474,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议开始时间", - "GUID": "8ef74e78-d39a-413f-a50b-8a23a64a12fa" + "GUID": "519010bf-11f9-403f-b4d6-a0ac97fbca82" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -477,7 +487,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议持续时间", - "GUID": "26e80d76-ea31-4332-a74a-d910f7874e90" + "GUID": "838f7334-afe9-426b-b207-478b81946943" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -490,7 +500,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "发起人用户名", - "GUID": "e123ecd6-a621-46d4-a2e1-4c1d9e18fe04" + "GUID": "2efa0ba5-8263-4b78-aba9-4e2696622869" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -503,7 +513,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "发起人", - "GUID": "829fcc35-7172-4502-bdd6-66063d01c131" + "GUID": "49a39216-463a-4c0a-8943-028466d662f5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -516,7 +526,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "自动拉会", - "GUID": "dfec1a55-ab2d-4f02-b113-9d6fcb1282a5" + "GUID": "cffcc52f-7c58-45a4-a12b-3606b4c68eb5" }, "Value": "1" }, @@ -526,7 +536,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "开启云录制", - "GUID": "be311bda-67f1-4d5b-886f-566a87599ae0" + "GUID": "82a611a5-6325-433a-b5e0-70240ae40ca2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -539,7 +549,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议状态", - "GUID": "e74a4045-ae7f-4f80-8c90-cd0e4c33b2a8" + "GUID": "0e42f5ce-e862-4582-ac8c-c4ad37e2b504" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -571,6 +581,17 @@ "CommandList": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "提前离会判定时间", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=计算会议结束时间-(业务配置.自动拉会.提前离会阈值/60/60/24)" + }, + "ID": "716147af67f34f69a9d0f0d39e387d0a", + "Comments": "将会议结束时间减去N秒，作为判定提前离会的时间条件", + "BreakpointIdentity": "a5039846-a06d-4810-afcb-2d44a7591d64" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "参与人列表", @@ -582,7 +603,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "b8b6e88f-725b-4344-8bc3-b4aa6456126b", + "GUID": "71271e95-6351-49d1-993c-b427898255de", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", @@ -594,20 +615,43 @@ ] }, "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "会议成员记录表", - "ColumnName": "钉钉会议ID", - "GUID": "47dd9e74-98ad-4a99-87dd-41825b58c310" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=会议状态事件体.openConfModel.conferenceId" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": { + "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", + "$values": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议成员记录表", + "ColumnName": "钉钉会议ID", + "GUID": "47dd9e74-98ad-4a99-87dd-41825b58c310" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议状态事件体.openConfModel.conferenceId" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议成员记录表", + "ColumnName": "离开时间", + "GUID": "b71fa729-ea3e-42ff-960a-14b3c90bc0ff" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=提前离会判定时间" + } + } + ] } } }, - "ID": "3d8f50c278f64447bbdedb3cc7e3a64f", + "ID": "0dfcd40408e84f0da7561615ff968927", + "Comments": "离会时间大于或等于会议结束时间的参会人员，再次邀请入会", "BreakpointIdentity": "6e06b305-59b2-42a7-a8f1-0559bfd8acc8" }, { @@ -767,7 +811,7 @@ } ] }, - "ID": "d95aff92-d4c3-4919-8f8b-0276b52c82d2" + "ID": "5de0a832-06a1-444a-9451-8c742c51b047" } ] }, @@ -781,7 +825,7 @@ } ] }, - "ID": "477a9a1d-7546-4ed8-a895-06a52b2d0751" + "ID": "9eaae3e6-4b51-4241-9ae7-aabb5ae2d186" } ] }, @@ -790,7 +834,7 @@ ] }, "Comments": "会议状态变更", - "ID": "0b409938-6360-46f7-acc2-61a9556a9bc1" + "ID": "d21728c0-3097-49e0-9587-92f8626f88cc" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -909,7 +953,7 @@ } ] }, - "ID": "37d4e980-c6ff-4554-ace2-b5e421ee8f98" + "ID": "4e9d3d69-220e-4765-89b8-163b984a7d62" } ] }, @@ -921,7 +965,7 @@ } ] }, - "ID": "c32a24c5-562b-4392-98dd-df8b36649fff" + "ID": "6cf386eb-a83a-4b00-93aa-44e176467377" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -956,7 +1000,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=会议成员变更事件体.changeScene" }, - "ID": "8316a1ad7fc943e5aa2284bf0eb56340", + "ID": "348a56f48bc047839f4f3db684958047", "BreakpointIdentity": "65348cf8-e3fa-41c3-bab3-945ab7fb308b" }, { @@ -984,7 +1028,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "4e6db874-d954-4024-a579-63845e9ef59b", + "GUID": "7445511d-38cd-4c5c-a249-f4f52b771a50", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "用户信息视图", @@ -1012,7 +1056,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "716055e066b44973bbc30b8167d7bc7c", + "ID": "6e7b7905dd3d4ce4b04540997fbd1e1c", "BreakpointIdentity": "53d2cf18-f2db-474b-b4f2-9777b9e0a00c" }, { @@ -1022,7 +1066,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(参与人员信息=\"\",\"\",参与人员信息.用户名)" }, - "ID": "5176f863b3cc418296b3f3de7105d656", + "ID": "f727fbaf3dc643d49fb08970fa5491bc", "BreakpointIdentity": "7374075a-7085-4dc0-a5ef-e9fda94b96e3" }, { @@ -1042,7 +1086,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=(Item.leaveTime/1000/60/60/24)+DATE(1970,1,1)" }, - "ID": "d35ec43a7856410bb355a21626599623", + "ID": "285100db4cc24448b87f35610e05168c", "BreakpointIdentity": "288a81ff-2389-4d42-a194-66726acf8c26" }, { @@ -1052,7 +1096,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=Item.duration/1000" }, - "ID": "446601e093234b98ba645748dee184b9", + "ID": "1f22b6f1ca974e0dae7dd71e389e53bd", "BreakpointIdentity": "4b0fe820-5747-4fc1-9a45-9808d1c829c4" }, { @@ -1104,7 +1148,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "钉钉会议ID", - "GUID": "71ce4656-c9ac-4b86-b7e4-89e14d237406" + "GUID": "c0165209-db38-4dc4-bb31-62c1ae59fc26" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1117,7 +1161,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "成员", - "GUID": "b242c1f8-082d-484d-9e3d-15f00d87c193" + "GUID": "7826d781-3680-4cf7-b52c-862b6370909b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1130,7 +1174,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "成员UnionId", - "GUID": "2065859a-7975-4e2b-8f73-48fcbe8d9bb8" + "GUID": "d0e9738b-dfcc-4612-862f-b7206bdcec6e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1143,7 +1187,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "设备类型", - "GUID": "d88c1976-30e3-4399-92b0-22a70dc086d9" + "GUID": "21f6df62-f7d3-4b9f-b5ab-0f27a0f8ed5b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1156,7 +1200,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "在会时长", - "GUID": "437f53a9-b22d-40df-8846-008b722b5b4d" + "GUID": "e0d4469b-452a-4e25-9904-6c5426a9612e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1169,7 +1213,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "入会时间", - "GUID": "85c1970a-305b-4159-874f-4d94249865af" + "GUID": "509c8398-b361-428d-b8a0-e3f865fc5bea" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1182,7 +1226,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "离开时间", - "GUID": "fe89db54-0af2-465c-b288-437b7f350f19" + "GUID": "f8f119b3-2da1-4e79-8a2a-1da8e7751c6a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1195,7 +1239,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "用户昵称", - "GUID": "cf49e6cc-aa58-482a-b978-4e6b904bf55f" + "GUID": "052115f6-a315-42c3-bed5-08757efdbaf4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1208,7 +1252,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "是否为主持人", - "GUID": "7f33d7f2-6e60-4554-9864-00a7ed5f49d2" + "GUID": "25da35ea-a459-4cf7-ac4e-da2165dd440c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1221,7 +1265,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议成员记录表", "ColumnName": "成员状态", - "GUID": "a0d3fb9b-2dee-4ed3-a8e7-b6aa7c8cb4fd" + "GUID": "14e4a30f-d6f7-4984-92b0-85d84421c523" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1230,6 +1274,7 @@ } ] }, + "Comments": "", "BreakpointIdentity": "a2a1635e-4707-41d9-ab0d-b5f2f8b51599" } ] @@ -1238,8 +1283,8 @@ } ] }, - "Comments": "视频会议成员状态变更", - "ID": "2fdcc079-03c7-4f0f-ab37-5e49d265d9ac" + "Comments": "视频会议成员状态变更\r\n1：初始化\r\n2：呼叫中\r\n3：活跃（在会）\r\n4：入会失败（拒接等）\r\n5：被踢\r\n6：离会", + "ID": "7334ac72-81c2-4d0a-82be-cefea30195fb" } ] }, diff --git a/Tables/会议/会议成员记录表.json b/Tables/会议/会议成员记录表.json index 8aeff4f0..282299f4 100644 --- a/Tables/会议/会议成员记录表.json +++ b/Tables/会议/会议成员记录表.json @@ -72,7 +72,8 @@ "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "成员状态", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Comment": "1：初始化\r\n2：呼叫中\r\n3：活跃（在会）\r\n4：入会失败（拒接等）\r\n5：被踢\r\n6：离会" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",