调整Teacher

TEAMModelGrpc/Services/HomeWorkService.cs

@@ -51,12 +51,12 @@ namespace TEAMModelGrpc.Services
                             fromId = homeWorkCommentDto.fromId,
                             score = homeWorkCommentDto.score
                         };
-                        homeWorkStudents[0].studentComments.Add(homeWorkComment);
+                        homeWorkStudents[0].stuCmt.Add(homeWorkComment);
                     }
                     else
                     {
                         //回复评论
-                        foreach (StudentComment comment in homeWorkStudents[0].studentComments)
+                        foreach (StudentComment comment in homeWorkStudents[0].stuCmt)
                         {
                             if (comment.commentid == homeWorkCommentDto.commentid)
                             {
@@ -101,7 +101,7 @@ namespace TEAMModelGrpc.Services
                     TEAMModelId = homeWorkCommentDto.TEAMModelId
                 };
 
-                homeWorkStudents[0].teacherComments = homeWorkComment;
+                homeWorkStudents[0].tchCmt = homeWorkComment;
                 data = await _cosmos.SaveOrUpdate(homeWorkStudents[0]);
 
             }
@@ -116,12 +116,12 @@ namespace TEAMModelGrpc.Services
         /// <param name="responseStream"></param>
         /// <param name="context"></param>
         /// <returns></returns>
-        public async System.Threading.Tasks.Task FindTeacherComments(Dict dict, IServerStreamWriter<Comments> responseStream, ServerCallContext context) 
+        public async System.Threading.Tasks.Task FindTeacherComments(Dict dict, IServerStreamWriter<Comment> responseStream, ServerCallContext context) 
         {
             Dictionary<string, object> keyValuePairs = dict.ToDict();
-            List<Comments> teacherComments = new List<Comments>();
+            List<Comment> teacherComments = new List<Comment>();
             if (keyValuePairs.IsNotEmpty()) {
-                teacherComments = await _cosmos.FindByDict<Comments>(keyValuePairs);
+                teacherComments = await _cosmos.FindByDict<Comment>(keyValuePairs);
                 if (teacherComments.IsNotEmpty()) {
                     teacherComments.ForEach(x=> { 
                         responseStream.WriteAsync(x);

TEAMModelGrpc/TEAMModelOS.GRPC.xml

@@ -308,11 +308,12 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:TEAMModelGrpc.Services.HomeWorkService.FindTeacherComments(TEAMModelGrpc.Models.Dict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.Comments},Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.HomeWorkService.FindTeacherComments(TEAMModelGrpc.Models.Dict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.Comment},Grpc.Core.ServerCallContext)">
             <summary>
             查询教师评语罐头
             </summary>
             <param name="dict"></param>
+            <param name="responseStream"></param>
             <param name="context"></param>
             <returns></returns>
         </member>

TEAMModelOS.Service/Models/StudentInfo/HomeworkRecord.cs

@@ -24,10 +24,10 @@ namespace TEAMModelOS.Service.Models
         public int? ttl { get; set; }
         public HomeworkRecord() {
             content = new List<HomeWorkContent>();
-            studentComments = new List<StudentComment>();
+            stuCmt = new List<StudentComment>();
             classroom = new ClassroomItem();
-            nativeroom = new ClassroomItem();
-            teacherComments = new HomeWorkComment();
+           // nativeroom = new ClassroomItem();
+            tchCmt = new HomeWorkComment();
         }
         /// <summary>
         /// 作业活动id
@@ -51,23 +51,23 @@ namespace TEAMModelOS.Service.Models
         [ProtoMember(5)]
         public ClassroomItem classroom { get; set; }
 
-        /// <summary>
-        /// 原生班级
-        /// </summary>
-        [ProtoMember(6)]
-        public ClassroomItem nativeroom{ get; set; }
+        ///// <summary>
+        ///// 原生班级
+        ///// </summary>
+        //[ProtoMember(6)]
+        //public ClassroomItem nativeroom{ get; set; }
 
         /// <summary>
         /// 是否提交
         /// </summary>
         [ProtoMember(8)]
-        public bool submissionBool { get; set; } = false;
+        public bool submit { get; set; } = false;
 
         /// <summary>
         /// 提交时间
         /// </summary>
         [ProtoMember(9)]
-        public long submissionTime { get; set; }
+        public long submitTime { get; set; }
 
         /// <summary>
         /// 分数
@@ -86,14 +86,14 @@ namespace TEAMModelOS.Service.Models
         /// 作业评论 （同学互评）
         /// </summary>
         [ProtoMember(12)]
-        public List<StudentComment> studentComments { get; set; }
+        public List<StudentComment> stuCmt { get; set; }
 
 
         /// <summary>
         /// 教师评语
         /// </summary>
         [ProtoMember(13)]
-        public HomeWorkComment teacherComments { get; set; }
+        public HomeWorkComment tchCmt { get; set; }
     }
     [ProtoContract]
     public class ClassroomItem {

TEAMModelOS.Service/Models/TeacherInfo/Comment.cs

@@ -0,0 +1,39 @@
+using ProtoBuf;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
+
+namespace TEAMModelOS.Service.Models
+{
+
+    /// <summary>
+    /// 教师评语罐头
+    /// </summary>
+    [ProtoContract]
+    [CosmosDB(RU = 400, Name = "Teacher")]
+    public class Comment : ID
+    {
+        /// <summary>
+        ///  醍摩豆id
+        /// </summary>
+        [PartitionKey]
+        public string code { get; set; }
+        public string pk { get; set; }
+        public Comment(){
+            comment = new List<string>();
+        }
+
+        [ProtoMember(1)]
+        public string id { get; set; }
+
+        /// <summary>
+        /// 评语
+        /// </summary>
+        [ProtoMember(2)]
+        public List<string> comment { get; set; }
+     
+        public int? ttl { get; set; }
+    }
+}

TEAMModelOS.Service/Models/TeacherInfo/Comments.cs

@@ -1,61 +0,0 @@
-using ProtoBuf;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
-
-namespace TEAMModelOS.Service.Models
-{
-    [ProtoContract]
-    [CosmosDB(RU = 400, Name = "Teacher")]
-    public class Comments : ID
-    {
-        [PartitionKey]
-        public string code { get; set; }
-        public string pk { get; set; }
-        public Comments(){
-            comment = new List<Comment>();
-        }
-
-        [ProtoMember(1)]
-        public string id { get; set; }
-
-        /// <summary>
-        /// 评语
-        /// </summary>
-        [ProtoMember(2)]
-        public List<Comment> comment { get; set; }
-
-        /// <summary>
-        /// 醍摩豆id 或者学生id
-        /// </summary>
-      //  [PartitionKey]
-        [ProtoMember(3)]
-        public string TEAMModelId { get; set; }
-        public int? ttl { get; set; }
-
-        [ProtoContract]
-        public class Comment 
-        {
-            /// <summary>
-            /// 评语
-            /// </summary>
-            [ProtoMember(1)]
-            public string comment { get; set; }
-
-            /// <summary>
-            /// 评论时间
-            /// </summary>
-            [ProtoMember(2)]
-            public long createTime { get; set; } = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
-
-            [ProtoMember(3)]
-            public string id { get; set; }
-
-            [ProtoMember(4)]
-            public int order { get; set; }
-
-        }
-    }
-}

TEAMModelOS.Service/Models/TeacherInfo/SchoolUser.cs

@@ -10,7 +10,7 @@ using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 namespace TEAMModelOS.Service.Models
 {
     [CosmosDB(RU = 400, Name = "Teacher")]
-    public class SchoolUser:ID
+    public class Teacher:ID
     {
         public string id { get; set; }
         public string schoolCode { get; set; }

TEAMModelOS.Service/TEAMModelOS.Model.xml

@@ -645,17 +645,12 @@
             上课班级
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.HomeworkRecord.nativeroom">
-            <summary>
-            原生班级
-            </summary>
-        </member>
-        <member name="P:TEAMModelOS.Service.Models.HomeworkRecord.submissionBool">
+        <member name="P:TEAMModelOS.Service.Models.HomeworkRecord.submit">
             <summary>
             是否提交
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.HomeworkRecord.submissionTime">
+        <member name="P:TEAMModelOS.Service.Models.HomeworkRecord.submitTime">
             <summary>
             提交时间
             </summary>
@@ -670,12 +665,12 @@
             作业内容
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.HomeworkRecord.studentComments">
+        <member name="P:TEAMModelOS.Service.Models.HomeworkRecord.stuCmt">
             <summary>
             作业评论 （同学互评）
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.HomeworkRecord.teacherComments">
+        <member name="P:TEAMModelOS.Service.Models.HomeworkRecord.tchCmt">
             <summary>
             教师评语
             </summary>
@@ -862,26 +857,21 @@
             选项
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.Comments.comment">
+        <member name="T:TEAMModelOS.Service.Models.Comment">
             <summary>
-            评语
+            教师评语罐头
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.Comments.TEAMModelId">
+        <member name="P:TEAMModelOS.Service.Models.Comment.code">
             <summary>
-            醍摩豆id 或者学生id
+             醍摩豆id
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.Comments.Comment.comment">
+        <member name="P:TEAMModelOS.Service.Models.Comment.comment">
             <summary>
             评语
             </summary>
         </member>
-        <member name="P:TEAMModelOS.Service.Models.Comments.Comment.createTime">
-            <summary>
-            评论时间
-            </summary>
-        </member>
         <member name="P:TEAMModelOS.Service.Models.CoursePlan.code">
             <summary>
             教师  TEAMModelId

TEAMModelOS/Controllers/Courses/CourseController.cs

@@ -27,7 +27,7 @@ namespace TEAMModelOS.Controllers
         }
 
         /// <summary>
-        /// 批量更新保存课程
+        /// 更新保存课程
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>

TEAMModelOS/Controllers/Learn/HomeWorkController.cs

@@ -122,7 +122,6 @@ namespace TEAMModelOS.Controllers.Learn
             {
                 //根据作业发布对象查找到每一个具体学生生成关联关系表 HomeWorkStudent
                 List<Target> targets = request.@params.homeWork.target;
-                List<ClassStudent> Classrooms = new List<ClassStudent>();
                 List<HomeworkRecord> homeWorkStudents = new List<HomeworkRecord>();
                 foreach (Target target in targets)
                 {
@@ -156,9 +155,8 @@ namespace TEAMModelOS.Controllers.Learn
                         if (student.IsNotEmpty())
                         {
                             homeWorkStudents1.name = student[0].name;
-                            homeWorkStudents1.code = student[0].TEAMModelId;
-                            homeWorkStudents1.nativeroom.code = student[0].classroomCode;
-                            //homeWorkStudents1.nativeroomCode.code = student
+                            homeWorkStudents1.code = student[0].studentId;
+                          //  homeWorkStudents1.nativeroom.code = student[0].classroomCode;
                         }
                     }
                     await _cosmos.SaveOrUpdateAll<HomeworkRecord>(homeWorkStudents);
@@ -167,30 +165,30 @@ namespace TEAMModelOS.Controllers.Learn
             return builder.Data(homeWork).build();
         }
 
-        private void TimerWork<T>(long startTime,Dictionary<string, object> dict) where T : ID
-        {
-            System.Timers.Timer aTimer = new System.Timers.Timer();
-            // Create a timer with a two second interval.
-
-            long time = Math.Abs(startTime - new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds());
-            aTimer = new System.Timers.Timer(time);
-            // Hook up the Elapsed event for the timer. 
-            aTimer.Elapsed += async (sender, e) => await OnTimedEventAsync<T>(_cosmos, dict);
-            aTimer.AutoReset = false;
-            aTimer.Enabled = true;
-        }
+        //private void TimerWork<T>(long startTime,Dictionary<string, object> dict) where T : ID
+        //{
+        //    System.Timers.Timer aTimer = new System.Timers.Timer();
+        //    // Create a timer with a two second interval.
+
+        //    long time = Math.Abs(startTime - new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds());
+        //    aTimer = new System.Timers.Timer(time);
+        //    // Hook up the Elapsed event for the timer. 
+        //    aTimer.Elapsed += async (sender, e) => await OnTimedEventAsync<T>(_cosmos, dict);
+        //    aTimer.AutoReset = false;
+        //    aTimer.Enabled = true;
+        //}
 
-        private static async System.Threading.Tasks.Task OnTimedEventAsync<T>(IAzureCosmosDBV3Repository _cosmos,Dictionary<string, object> dict)where T:ID
-        {
-            List<T> homeWorks = await _cosmos.FindByDict<T>(dict);
-            if (homeWorks.IsNotEmpty()) {
-                PropertyInfo propertyInfo = homeWorks[0].GetType().GetProperty("state");
-                for (int i = 0; i < homeWorks.Count; i++)
-                    propertyInfo.SetValue(homeWorks[i], 200);
-                await _cosmos.SaveOrUpdateAll<T>(homeWorks);
+        //private static async System.Threading.Tasks.Task OnTimedEventAsync<T>(IAzureCosmosDBV3Repository _cosmos,Dictionary<string, object> dict)where T:ID
+        //{
+        //    List<T> homeWorks = await _cosmos.FindByDict<T>(dict);
+        //    if (homeWorks.IsNotEmpty()) {
+        //        PropertyInfo propertyInfo = homeWorks[0].GetType().GetProperty("state");
+        //        for (int i = 0; i < homeWorks.Count; i++)
+        //            propertyInfo.SetValue(homeWorks[i], 200);
+        //        await _cosmos.SaveOrUpdateAll<T>(homeWorks);
 
-            }
-        }
+        //    }
+        //}
 
         /// <summary>
         /// 新增或修改学生作业关联表
@@ -227,14 +225,13 @@ namespace TEAMModelOS.Controllers.Learn
                     {
                         HomeworkFindDto homeWorkFindDto = new HomeworkFindDto();
                         List<string> pro = new List<string>();
-                        pro.Add("submissionBool");
+                        pro.Add("submit");
                         List<HomeworkRecord> homeWorkStudents = await _cosmos.FindByDict<HomeworkRecord>(dict: new Dictionary<string, object> { { "code", homeWork.id } }, propertys: pro);
                         int sub = 0;
                         Dictionary<string, object> dict = new Dictionary<string, object>();
-                        homeWorkStudents.GroupBy(x => x.submissionBool).ToList().ForEach(x => { if (x.Key) { sub = x.Count(); } });
+                        homeWorkStudents.GroupBy(x => x.submit).ToList().ForEach(x => { if (x.Key) { sub = x.Count(); } });
                         dict.Add("Sum", homeWorkStudents.Count);
                         dict.Add("Finish", sub);
-                       
                         homeWorkFindDto = homeWork.ToJson().FromJson<HomeworkFindDto>();
                         homeWorkFindDto.statistics = dict;
                         homeWorkFindDtos.Add(homeWorkFindDto);
@@ -315,8 +312,8 @@ namespace TEAMModelOS.Controllers.Learn
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        [HttpPost("TeacherScoring")]
-        public async Task<BaseJosnRPCResponse> TeacherScoring(JosnRPCRequest<HomeworkScoringDto> request)
+        [HttpPost("tchScore")]
+        public async Task<BaseJosnRPCResponse> TchScore(JosnRPCRequest<HomeworkScoringDto> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             List<HomeworkRecord> homeWorkStudents = await _cosmos.FindByDict<HomeworkRecord>(new Dictionary<string, object> { { "id", request.@params.id }, { "code", request.@params.homeWorkId } });
@@ -332,7 +329,7 @@ namespace TEAMModelOS.Controllers.Learn
                     TEAMModelId = request.@params.TEAMModelId
                 };
 
-                homeWorkStudents[0].teacherComments = homeWorkComment;
+                homeWorkStudents[0].tchCmt = homeWorkComment;
                 data = await _cosmos.SaveOrUpdate(homeWorkStudents[0]);
             }
             return builder.Data(data).build();
@@ -371,8 +368,8 @@ namespace TEAMModelOS.Controllers.Learn
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        [HttpPost("StudentScoring")]
-        public async Task<BaseJosnRPCResponse> StudentScoring(JosnRPCRequest<HomeworkCommentDto> request)
+        [HttpPost("stuScore")]
+        public async Task<BaseJosnRPCResponse> StuScore(JosnRPCRequest<HomeworkCommentDto> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             List<HomeworkRecord> homeWorkStudents = await _cosmos.FindByDict<HomeworkRecord>(new Dictionary<string, object> { { "id", request.@params.id }, { "code", request.@params.homeWorkId } });
@@ -398,12 +395,12 @@ namespace TEAMModelOS.Controllers.Learn
                         };
 
 
-                        homeWorkStudents[0].studentComments.Add(homeWorkComment);
+                        homeWorkStudents[0].stuCmt.Add(homeWorkComment);
                     }
                     else
                     {
                         //回复评论
-                        foreach (StudentComment comment in homeWorkStudents[0].studentComments)
+                        foreach (StudentComment comment in homeWorkStudents[0].stuCmt)
                         {
                             if (comment.commentid == request.@params.commentid)
                             {
@@ -430,124 +427,6 @@ namespace TEAMModelOS.Controllers.Learn
         }
 
 
-        /// <summary>
-        /// 保存教师评语快捷回复
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [HttpPost("upsertComments")]
-        public async Task<BaseJosnRPCResponse> UpsertComments(JosnRPCRequest<TeacherCommentsDto> request)
-        {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            List<Comments> teacherComments1 = await _cosmos.FindByDict<Comments>(new Dictionary<string, object> { { "TEAMModelId", request.@params.TEAMModelId } });
-            if (teacherComments1.IsEmpty()) {
-                teacherComments1 = new List<Comments>();
-                Comments teacher = new Comments();
-                teacher.id = Guid.NewGuid().ToString();
-                teacher.TEAMModelId = request.@params.TEAMModelId;
-                teacherComments1.Add(teacher);
-            }
-
-            foreach (Comments item in teacherComments1) {
-                Comments.Comment comment = new Comments.Comment();
-                comment.comment = request.@params.comment;
-                //comment.createTime = new DateTimeOffset(DateTime.Now).ToUnixTimeMilliseconds();
-                comment.id = CreateRandomCode(6); 
-                item.comment.Add(comment);
-            }
-            List<Comments> teacherComments = await _cosmos.SaveOrUpdateAll(teacherComments1);
-            if (teacherComments.IsNotEmpty()) builder.Data(teacherComments);
-
-            return builder.build();
-        }
-   
-        /// <summary>
-        /// 查询教师评语罐头
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [HttpPost("findComments")]
-        public async Task<BaseJosnRPCResponse> findComments(JosnRPCRequest<Dictionary<string, object>> request)
-        {
-            // request.@params.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            List<Comments> data = new List<Comments>();
-            if (request.@params.Keys.Count > 0)
-            {
-                data = await _cosmos.FindByDict<Comments>(request.@params);
-            }
-            else
-            {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
-            }
-            return builder.Data(data.OrderBy(m => m.comment.OrderBy(c => c.order))).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
-        }
-        /// <summary>
-        /// 删除教师评语罐头
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [HttpPost("deleteComments")]
-        public async Task<BaseJosnRPCResponse> DeleteComments(JosnRPCRequest<Dictionary<string, object>> request)
-        {
-            // request.@params.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            List<Comments> data = new List<Comments>();
-            if (request.@params.Keys.Count > 0)
-            {
-                request.@params.TryGetValue("TEAMModelId", out object TEAMModelId);
-                request.@params.TryGetValue("id", out object id);
-                data = await _cosmos.FindByDict<Comments>(new Dictionary<string, object> { { "TEAMModelId", TEAMModelId.ToString() } });
-                foreach (Comments teacherComments in  data) {
-                    List<Comments.Comment> comment = new List<Comments.Comment>();
-                    comment.AddRange(teacherComments.comment);
-                    comment.AddRange(teacherComments.comment);
-                    comment.ForEach(x =>
-                    {
-                        if (x.id.Equals(id + "")) {
-                            teacherComments.comment.Remove(x);
-                        }
-                    });
-                }
-                data = await _cosmos.SaveOrUpdateAll<Comments>(data);
-
-            }
-            else
-            {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
-            }
-            return builder.Data(data).build();
-        }
-
-
-        /// <summary>
-        /// 生成随机数
-        /// </summary>
-        /// <param name="codeCount"></param>
-        /// <returns></returns>
-        public string CreateRandomCode(int codeCount)  //生成随机数
-        {
-            string allChar = "1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,G,H,I,J,K,L,M,N,P,Q,R,S,T,U,V,W,X,Y,Z";//没有0O
-            string[] allCharArray = allChar.Split(',');
-            string randomCode = "";
-            int temp = -1;
-            Random rand = new Random();
-            for (int i = 0; i < codeCount; i++)
-            {
-                if (temp != -1)
-                {
-                    rand = new Random(i * temp * ((int)DateTime.Now.Ticks));
-                }
-                int t = rand.Next(34);
-                if (temp != -1 && temp == t)
-                {
-                    return CreateRandomCode(codeCount);
-                }
-                temp = t;
-                randomCode += allCharArray[t];
-            }
-            return randomCode;
-        }
 
     }
 }

TEAMModelOS/Controllers/Teacher/CommentController.cs

@@ -0,0 +1,111 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using TEAMModelOS.Models;
+using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
+using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
+using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
+using TEAMModelOS.Service.Models;
+
+namespace TEAMModelOS.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class CommentController :BaseController
+    {
+        private readonly IAzureCosmosDBV3Repository _cosmos;
+        public CommentController(IAzureCosmosDBV3Repository _cosmosDBV3Repository)
+        {
+            _cosmos = _cosmosDBV3Repository;
+        }
+
+        /// <summary>
+        /// 保存教师评语快捷回复
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("upsertComments")]
+        public async Task<BaseJosnRPCResponse> UpsertComments(JosnRPCRequest<TeacherCommentsDto> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            List<Comment> comments = await _cosmos.FindByDict<Comment>(new Dictionary<string, object> { { "code", request.@params.TEAMModelId },{ "id",typeof(Comment).Name} });
+            if (comments.IsEmpty())
+            {
+                comments = new List<Comment>();
+                Comment teacher = new Comment();
+                teacher.id = typeof(Comment).Name;
+                teacher.code = request.@params.TEAMModelId;
+                comments.Add(teacher);
+            }
+            builder.Data(await _cosmos.SaveOrUpdateAll(comments));
+
+            return builder.build();
+        }
+
+        /// <summary>
+        /// 查询教师评语罐头
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("findComments")]
+        public async Task<BaseJosnRPCResponse> findComments(JosnRPCRequest<Dictionary<string, object>> request)
+        {
+            // request.@params.TryAdd("PartitionKey", request.lang);
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            List<Comment> data = new List<Comment>();
+            if (request.@params.Keys.Count > 0)
+            {
+                data = await _cosmos.FindByDict<Comment>(request.@params);
+            }
+            else
+            {
+                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+            }
+            return builder.Data(null).build();
+        }
+        /// <summary>
+        /// 删除教师评语罐头
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("deleteComments")]
+        public async Task<BaseJosnRPCResponse> DeleteComments(JosnRPCRequest<Dictionary<string, object>> request)
+        {
+            // request.@params.TryAdd("PartitionKey", request.lang);
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            List<Comment> data = new List<Comment>();
+            if (request.@params.Keys.Count > 0)
+            {
+                request.@params.TryGetValue("TEAMModelId", out object TEAMModelId);
+                request.@params.TryGetValue("id", out object id);
+                data = await _cosmos.FindByDict<Comment>(new Dictionary<string, object> { { "TEAMModelId", TEAMModelId.ToString() } });
+                foreach (Comment teacherComments in data)
+                {
+                    //List<Comment.Comment> comment = new List<Comment.Comment>();
+                    //comment.AddRange(teacherComments.comment);
+                    //comment.AddRange(teacherComments.comment);
+                    //comment.ForEach(x =>
+                    //{
+                    //    if (x.id.Equals(id + ""))
+                    //    {
+                    //        teacherComments.comment.Remove(x);
+                    //    }
+                    //});
+                }
+                data = await _cosmos.SaveOrUpdateAll<Comment>(data);
+
+            }
+            else
+            {
+                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+            }
+            return builder.Data(data).build();
+        }
+
+         
+    }
+}

TEAMModelOS/Controllers/Core/SchoolUserController.cs

@@ -39,7 +39,7 @@ namespace TEAMModelOS.Controllers
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             request.@params.TryGetValue("code", out object partitionKey);
-            List<SchoolUser> su = await _cosmosrepository.FindByDict<SchoolUser>(request.@params);
+            List<Teacher> su = await _cosmosrepository.FindByDict<Teacher>(request.@params);
             return builder.Data(su).build();
         }
 
@@ -62,12 +62,12 @@ namespace TEAMModelOS.Controllers
                 { "id",  ids},
                 { "joinStatus",  1}
             };
-            List<SchoolUser> suListResponse = new List<SchoolUser>(); //返回值
-            List<SchoolUser> suList = await _cosmosrepository.FindByDict<SchoolUser>(userDict);
+            List<Teacher> suListResponse = new List<Teacher>(); //返回值
+            List<Teacher> suList = await _cosmosrepository.FindByDict<Teacher>(userDict);
             //設定權限
             if (suList.Count > 0)
             {
-                foreach (SchoolUser su in suList)
+                foreach (Teacher su in suList)
                 {
                     su.authority = authList;
                     suListResponse.Add(su);
@@ -92,11 +92,11 @@ namespace TEAMModelOS.Controllers
                 { "schoolCode",  schoolCode.ToString()},
                 { "id",  Ids}
             };
-            List<SchoolUser> suList = await _cosmosrepository.FindByDict<SchoolUser>(userDict);
+            List<Teacher> suList = await _cosmosrepository.FindByDict<Teacher>(userDict);
             //移除
             if (suList.Count > 0)
             {
-                foreach (SchoolUser su in suList)
+                foreach (Teacher su in suList)
                 {
                     await _cosmosrepository.DeleteAsync(su);
                 }

TEAMModelOS/Models/LoginResult.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using TEAMModelOS.SDK.Extension.JwtAuth.Models;
-
-namespace TEAMModelOS.Models
-{
-    public class LoginResult
-    {
-        public JwtResponse JwtToken { get; set; }
-        public bool CheckTicket { get; set; } = false;
-    }
-}

TEAMModelOS/Models/Option.cs

@@ -1,18 +0,0 @@
-using ProtoBuf;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace TEAMModelOS.Models
-{
-    [ProtoContract]
-    public class Option
-    {
-        [ProtoMember(1)]
-        public string code { get; set; }
-
-        [ProtoMember(2)]
-        public string value { get; set; }
-    }
-}

TEAMModelOS/Models/TicketInfo.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace TEAMModelOS.Models
-{
-    /// <summary>
-    /// 前端返回获取的醍摩豆ID登录基本信息及ticket
-    /// </summary>
-    public class TicketInfo
-    {
-        //[Required(ErrorMessage = "{0} 必须填写")]
-        public string Ticket { get; set; }
-        //[Required(ErrorMessage = "{0} 必须填写")]
-        public string Name { get; set; }
-        //[Required(ErrorMessage = "{0} 必须填写")]
-        public string Sign { get; set; }
-        // [Required(ErrorMessage = "{0} 必须填写")]
-        public string TEAMModelId { get; set; }
-        public string Token { get; set; }
-    }
-}