Merge branch 'develop3.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0-tmd

TEAMModelFunction/CourseServiceBus.cs

@@ -0,0 +1,50 @@
+using Microsoft.Azure.WebJobs;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelFunction
+{
+    public class CourseServiceBus
+    {
+        private readonly AzureCosmosFactory _azureCosmos;
+        private readonly DingDing _dingDing;
+        public CourseServiceBus(AzureCosmosFactory azureCosmos, DingDing dingDing)
+        {
+            _azureCosmos = azureCosmos;
+            _dingDing = dingDing;
+        }
+        /// <summary>
+        /// 完善课程变更
+        /// </summary>
+        /// <data msg>
+        /// "ids":["s111","t111"]//学生
+        /// "opt":"join/leave",//状态
+        /// "no":"CLASS001"//教室编号
+        /// "source":1/2  //学生名单数据来源 1是不同学校的学生账号，2是扫码加入的醍摩豆ID
+        /// </data>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        [FunctionName("Course")]
+        public async Task StuList([ServiceBusTrigger("active-task", "course", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        {
+            try
+            {
+                // await _dingDing.SendBotMsg($"ServiceBus,Blob(){msg}", GroupNames.醍摩豆服務運維群組);
+                var jsonMsg = JsonDocument.Parse(msg);
+                if (jsonMsg.RootElement.TryGetProperty("name", out JsonElement name) && name.ValueKind == JsonValueKind.String)
+                {
+
+                }
+            }
+            catch (Exception ex)
+            {
+                await _dingDing.SendBotMsg($"ServiceBus,Blob()\n{ex.Message}{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
+            }
+        }
+
+    }
+}

TEAMModelFunction/StuListServiceBus.cs

@@ -1,51 +0,0 @@
-using Microsoft.Azure.WebJobs;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using TEAMModelOS.SDK.DI;
-
-namespace TEAMModelFunction
-{
-    public class StuListServiceBus
-    {
-        private readonly AzureCosmosFactory _azureCosmos;
-        private readonly DingDing _dingDing;
-        delegate void DoActivityTarget(string ids, string opt, string no, string source);
-        public StuListServiceBus(AzureCosmosFactory azureCosmos, DingDing dingDing)
-        {
-            _azureCosmos = azureCosmos;
-            _dingDing = dingDing;
-        }
-        /// <summary>
-        /// 完善学生名单变更影响的活动
-        /// </summary>
-        /// <data msg>
-        /// "ids":["s111","t111"]//学生
-        /// "opt":"join/leave",//状态
-        /// "no":"CLASS001"//教室编号
-        /// "source":1/2  //学生名单数据来源 1是不同学校的学生账号，2是扫码加入的醍摩豆ID
-        /// </data>
-        /// <param name="msg"></param>
-        /// <returns></returns>
-        //[FunctionName("StuList")]
-        //public async Task StuList([ServiceBusTrigger("active-task", "stulist", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
-        //{
-        //    try
-        //    {
-        //        // await _dingDing.SendBotMsg($"ServiceBus,Blob(){msg}", GroupNames.醍摩豆服務運維群組);
-        //        var jsonMsg = JsonDocument.Parse(msg);
-        //        if (jsonMsg.RootElement.TryGetProperty("name", out JsonElement name) && name.ValueKind == JsonValueKind.String)
-        //        {
-                    
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        await _dingDing.SendBotMsg($"ServiceBus,Blob()\n{ex.Message}{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
-        //    }
-        //}
-       
-    }
-}

TEAMModelOS.SDK/Models/Cosmos/Common/Vote.cs

@@ -27,7 +27,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 学校编码或教师tmdid
         /// </summary>
-        [Required(ErrorMessage = "owner 必须设置")]
+        [Required(ErrorMessage = "school 必须设置")]
         public string school { get; set; }
         /// <summary>
         /// 投票名称

TEAMModelOS.SDK/Models/Cosmos/School/Course.cs

@@ -49,6 +49,17 @@ namespace TEAMModelOS.SDK.Models
         public List<Schedule> schedule { get; set; }
         //public List<Customize> classes { get; set; }
         public string no { get; set; }
+        ///新增字段
+        /// <summary>
+        /// 创建者的id 
+        /// </summary>
+        [Required(ErrorMessage = "creatorId 必须设置")]
+        public string creatorId { get; set; }
+        /// <summary>
+        /// 学校编码或教师tmdid
+        /// </summary>
+        [Required(ErrorMessage = "school 必须设置")]
+        public string school { get; set; }
 
     }
 

TEAMModelOS/ClientApp/src/view/newcourse/MyCourse.vue

@@ -1094,7 +1094,9 @@ export default {
                             id: this.$tools.guid(),
                             code: this.$store.state.userInfo.TEAMModelId,
                             schedule: [],
-                            scope: 'private'
+                            scope: 'private',
+                            // school: this.$store.state.userInfo.schoolCode,
+                            creatorId: this.$store.state.userInfo.schoolCode
                         }
                     }
                     this.$api.courseMgmt.saveOrUpdateCourse(requestData).then(

TEAMModelOS/ClientApp/src/view/newcourse/NewCusMgt.vue

@@ -1314,6 +1314,8 @@ export default {
                     this.courseBaseInfo.code = this.$store.state.userInfo.schoolCode
                     this.courseBaseInfo.id = this.courseBaseInfo.id || this.$tools.guid()
                     this.courseBaseInfo.scope = this.courseBaseInfo.scope || 'school'
+                    this.courseBaseInfo.school = this.$store.state.userInfo.schoolCode
+                    this.courseBaseInfo.creatorId = this.$store.state.userInfo.schoolCode
                     this.$api.courseMgmt.saveOrUpdateCourse({
                         course: this.courseBaseInfo,
                         option: option,

TEAMModelOS/Controllers/School/StudentCommonController.cs

@@ -44,6 +44,7 @@ namespace TEAMModelOS.Controllers
         ///分页Token    ?"continuationToken":Undefined/null/"[{\"token\":\"+RID:~omxMAP3ipcSEEwAAAAAAAA==#RT:2#TRC:20#ISV:2#IEO:65551#QCF:1#FPC:AYQTAAAAAAAAiRMAAAAAAAA=\",\"range\":{\"min\":\"\",\"max\":\"FF\"}}]"
         /// 当前状态    ?"progress":Undefined/null/"" 表示两种状态都要查询/ "going"/"finish" 表示查询进行中/ 或者已完成 学生端只能查询正在进行或已经结束 going 已发布|finish 已结束  
         /// </param>
+        /// 
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("stu-activity")]