整理Code

TEAMModelFunction/MonitorCosmosDB.cs

@@ -73,7 +73,7 @@ namespace TEAMModelFunction
                                 {
                                     case "pending":
                                         var message = new ServiceBusMessage(new { id = input.Id, progress = "going", code = code }.ToJsonString());
-                                        message.Properties.Add("name", "Exam");
+                                        message.ApplicationProperties.Add("name", "Exam");
                                         if (records.Count > 0)
                                         {
                                             await _serviceBus.GetServiceBusClient().cancelMessage("active-task", records[0].sequenceNumber);
@@ -140,7 +140,7 @@ namespace TEAMModelFunction
                                                 }
                                             }
                                             var messageEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = code }.ToJsonString());
-                                            messageEnd.Properties.Add("name", "Exam");
+                                            messageEnd.ApplicationProperties.Add("name", "Exam");
                                             if (records.Count > 0)
                                             {
                                                 long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync("active-task", messageEnd, DateTimeOffset.FromUnixTimeMilliseconds(etime));
@@ -237,7 +237,7 @@ namespace TEAMModelFunction
                                 {
                                     case "pending":
                                         var messageVote = new ServiceBusMessage(new { id = input.Id, progress = "going", code = code }.ToJsonString());
-                                        messageVote.Properties.Add("name", "Vote");
+                                        messageVote.ApplicationProperties.Add("name", "Vote");
                                         if (voteRecords.Count > 0)
                                         {
                                             long start = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync("active-task", messageVote, DateTimeOffset.FromUnixTimeMilliseconds(stime));
@@ -262,7 +262,7 @@ namespace TEAMModelFunction
                                         break;
                                     case "going":
                                         var messageVoteEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = code }.ToJsonString());
-                                        messageVoteEnd.Properties.Add("name", "Vote");
+                                        messageVoteEnd.ApplicationProperties.Add("name", "Vote");
                                         if (voteRecords.Count > 0)
                                         {
                                             long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync("active-task", messageVoteEnd, DateTimeOffset.FromUnixTimeMilliseconds(etime));
@@ -297,7 +297,7 @@ namespace TEAMModelFunction
                                 {
                                     case "pending":
                                         var messageSurvey = new ServiceBusMessage(new { id = input.Id, progress = "going", code = code }.ToJsonString());
-                                        messageSurvey.Properties.Add("name", "Survey");
+                                        messageSurvey.ApplicationProperties.Add("name", "Survey");
                                         if (changeRecords.Count > 0)
                                         {
                                             await _serviceBus.GetServiceBusClient().cancelMessage("active-task", changeRecords[0].sequenceNumber);
@@ -322,7 +322,7 @@ namespace TEAMModelFunction
                                         break;
                                     case "going":
                                         var messageSurveyEnd = new ServiceBusMessage(new { id = input.Id, progress = "finish", code = code }.ToJsonString());
-                                        messageSurveyEnd.Properties.Add("name", "Survey");
+                                        messageSurveyEnd.ApplicationProperties.Add("name", "Survey");
                                         if (changeRecords.Count > 0)
                                         {
                                             long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync("active-task", messageSurveyEnd, DateTimeOffset.FromUnixTimeMilliseconds(etime));

TEAMModelFunction/model/Classroom.cs

@@ -1,5 +1,4 @@
 using Azure.Cosmos;
-using ProtoBuf;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

TEAMModelFunction/model/Survey.cs

@@ -1,4 +1,3 @@
-using ProtoBuf;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

TEAMModelFunction/model/Vote.cs

@@ -1,4 +1,3 @@
-using ProtoBuf;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

TEAMModelGrpc/Models/SchoolInfo/Classroom.cs

@@ -0,0 +1,84 @@
+using Azure.Cosmos;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using TEAMModelOS.Models.StudentInfo;
+using TEAMModelOS.Models.TeacherInfo;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    [CosmosDB(Database = "TEAMModelOS", Name = "School")]
+    public class Classroom:ID
+    {
+        public string pk { get; set; }
+        public   int? ttl { get; set; }
+        public Classroom()
+        {
+            //point = new Point();
+            students = new List<StudentSimple>();
+            teacher = new Teachers();
+        }
+
+        [JsonPropertyName("id")]
+        public string id { get; set; }
+        /*        [ProtoMember(3)]
+                [Required(ErrorMessage = "{0} 必须填写")]
+                public string classroomCode { get; set; }*/
+        //教室坐标
+        //[ProtoMember(4)]
+        //public Point point { get; set; }
+        public float x { get; set; }
+        //[ProtoMember(2)]
+        public float y { get; set; }
+        public string name { get; set; }
+        public Teachers teacher { get; set; }
+        public string periodId { get; set; }
+        public string gradeId { get; set; }
+        public string sn { get; set; }
+        /*[ProtoMember(10)]
+        public int studentCount { get; set; }*/
+        public List<StudentSimple> students { get; set; }
+        /// <summary>
+        /// TBL IRS 类型区分
+        /// </summary>
+        public string style { get; set; }
+        public int status { get; set; } = 1;
+        /// <summary>
+        /// </summary>
+        /*[ProtoMember(13)]
+        [Required(ErrorMessage = "{0} 必须填写，请设置个人教室还是学校教室")]
+        public int type { get; set; } = 1;*/
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+        /// <summary>
+        /// 教室属性，普通 /专设的教室
+        /// </summary>
+        public string openType { get; set; }
+        public string scope { get; set; }
+        public string no { get; set; }
+    }
+}
+
+public class Point
+{
+    public float x { get; set; }
+    public float y { get; set; }
+}
+public class StudentSimple
+{
+
+    public string id { get; set; }
+
+    public string  name { get; set; }
+
+    public string no { get; set; }
+
+    public string groupId { get; set; }
+    public string groupName { get; set; }
+}

TEAMModelGrpc/Models/SchoolInfo/Course.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.Models;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    /// <summary>
+    /// 课程
+    /// </summary>
+    [CosmosDB(Database = "TEAMModelOS", Name = "School")]
+    public class Course : ID
+    {
+        public Course()
+        {
+            period = new PeriodSimple();
+            subject = new SubjectSimple();
+            teachers = new List<Teachers>();
+        }
+        /// <summary>
+        /// 课程id
+        /// </summary>
+        public string id { get; set; }
+        public int? ttl { get; set; }
+        public string pk { get; set; }
+        /// <summary>
+        /// 学校编码  或醍摩豆ID
+        /// </summary>
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string name { get; set; }
+        /// <summary>
+        /// 课程编码
+        /// </summary>
+       /* [Required(ErrorMessage = "{0} 必须填写")]
+        public string courseCode { get; set; }*/
+        ///// <summary>
+        ///// 学期编码
+        ///// </summary>
+        //public string semesterCode { get; set; }
+        /// <summary>
+        /// 科目编码
+        /// </summary>
+        public SubjectSimple subject { get; set; }
+        /// <summary>
+        /// 学段编码
+        /// </summary>
+        public PeriodSimple period { get; set; }
+        /// <summary>
+        /// 任课教师范围
+        /// </summary>
+        public List<Teachers> teachers { get; set; }
+        public string scope { get; set; }
+        public string notice { get; set; }
+
+    }
+    public class PeriodSimple
+    {
+
+        public string id { get; set; }
+        public string name { get; set; }
+    }
+    public class SubjectSimple
+    {
+
+        public string id { get; set; }
+        public string name { get; set; }
+    }
+    public class Teachers
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/CourseManagement.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.Models;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    /// <summary>
+    /// 课程
+    /// </summary>
+    [CosmosDB(Database = "TEAMModelOS", Name = "School")]
+    public class CourseManagement : ID
+    {
+        public CourseManagement()
+        {
+            courses = new List<CourseSimple>();
+            teacher = new Teachers();
+        }
+        /// <summary>
+        /// 班级id
+        /// </summary>
+        public string id { get; set; }
+        public int? ttl { get; set; }
+        public string pk { get; set; }
+        [PartitionKey]
+        public string code { get; set; }
+        public string name { get; set; }
+        public List<CourseSimple> courses { get; set; }
+        public Teachers teacher { get; set; }
+        public string scope { get; set; }
+        
+    }
+
+    public class CourseSimple {
+        public CourseSimple() {
+            course = new Courses();
+            teachers = new List<Teachers>();
+        }
+        public Courses course { get; set; }
+        public List<Teachers> teachers { get; set; }
+    }
+    public class Courses { 
+        public string id { get; set; }
+        public string name { get; set; }
+        public string scope { get; set; }
+        public string notice { get; set; }
+
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/ExamAnswer.cs

@@ -0,0 +1,31 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    /// <summary>
+    /// 考生作答信息
+    /// </summary>
+    [CosmosDB(Database = "TEAMModelOS", Name = "School")]
+    public class ExamAnswer :ID
+    {
+       // [PartitionKey(name = "ExamAnswer")]
+        public string pk { get; set; }
+        public int? ttl { get; set; } 
+        public ExamAnswer()
+        {
+            answer = new List<List<string>>();
+        }
+        [JsonProperty(PropertyName = "id")]
+        public string id { get; set; } 
+        public List<List<string>> answer { get; set; }
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/ExamInfo.cs

@@ -0,0 +1,131 @@
+using DocumentFormat.OpenXml.Bibliography;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using System.Text.Json.Serialization;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    /// <summary>
+    /// 考试基础信息
+    /// </summary>
+    [CosmosDB(Database = "TEAMModelOS", Name = "School")]
+    public class ExamInfo :ID
+    {
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+    
+        public string pk { get; set; }
+        public int? ttl { get; set; } 
+        public ExamInfo() {
+            period = new PeriodSimple();
+            grades = new List<Grade>();
+            subjects = new List<ExamSubject>();
+            papers = new List<PaperSimple>();
+            targetClassIds = new List<string>();
+        }
+        [JsonProperty(PropertyName = "id")]
+        public string id { get; set; }
+
+        public string name { get; set; }
+        public string school { get; set; }
+        public string creatorId { get; set; }
+        public int stuCount { get; set; }
+/*        //实际考试人数
+        public int realCount { get; set; }
+        //平均分
+        public double piont { get; set; }*/
+        //指标
+        //public double index { get; set; }
+        public long createTime { get; set; }
+        public long updateTime { get; set; }
+        //public string examCode { get; set; }
+
+        /// <summary>
+        /// 施测起始时间
+        /// </summary>
+        public long startTime { get; set; }
+        /// <summary>
+        /// 施测结束时间
+        /// </summary>
+        public long endTime { get; set; }
+        /// <summary>
+        /// 施测对象
+        /// </summary>
+       // public List<string> target { get; set; }
+        /// <summary>
+        /// 发布
+        /// </summary>
+        public string publish { get; set; }
+
+        public int status { get; set; }
+        public int year { get; set; }
+        public string range { get; set; }
+        public string source { get; set; }
+        public List<string> targetClassIds { get; set; }
+        public List<PaperSimple> papers { get; set; }
+        ///考试类型 段考 stage  联考 union 平常考 normal 其他 other
+        /// </summary>
+        public string type { get; set; }
+        public PeriodSimple period { get; set; }
+        public List<Grade> grades { get; set; }
+        public List<ExamSubject> subjects { get; set; }
+        //public long sequenceNumber { get; set; }
+        //public Condition conditions { get; set; }
+        public List<string> blobUrl { get; set; }
+        public string progress { get; set; }
+        public string scope { get; set; }
+        public Custom examType { get; set; }
+        /// <summary>
+        /// 所有试卷阅卷状态
+        /// </summary>
+        //public List<int> marks { get; set; }
+    }
+    public class Custom {
+        public string id { get; set; }
+        public string name { get; set; }
+    }
+    public class ExamSubject
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+        public int classCount { get; set; }
+
+
+    }
+    public class PaperSimple { 
+        public string id { get; set; }
+        public string code { get; set; }
+        public string name { get; set; }
+        public string blob { get; set; }
+        public string scope { get; set; }
+        public int multipleRule { get; set; }
+        //该试卷配分情况
+        public List<double> point { get; set; }
+        public List<List<string>> answers { get; set; }
+    }
+    /*public class Condition
+    {
+        public string period { get; set; }
+        public string grade { get; set; }
+        public string semester { get; set; }
+        /// <summary>
+        /// 评测范围 class 班级测验，年级测验 grade , 区级测验 distric
+        /// </summary>
+        public string range { get; set; }
+        /// <summary>
+        /// feedBackType ==>>source 评测来源 考试阅卷 marking ,互动课堂 teach ,线上评测 exam ，手动录入import
+        /// </summary>
+        public string source { get; set; }
+        /// <summary>
+        /// 科目
+        /// </summary>
+        public List<string> subject { get; set; }
+    }*/
+
+}

TEAMModelGrpc/Models/SchoolInfo/ExamResult.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    /// <summary>
+    /// 考试成绩信息
+    /// </summary>
+    [CosmosDB(Database = "TEAMModelOS", Name = "School")]
+    public  class ExamResult:ID
+    {
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+        // [PartitionKey(name = "ExamResult")]
+        public string pk { get; set; }
+        public int? ttl { get; set; } 
+        public ExamResult()
+        {
+            classes = new List<ClassRange>();
+            studentScores = new List<List<double>>();
+            studentIds = new List<string>();
+            point = new List<double>();
+        }
+        public string id { get; set; }
+        public string name { get; set; }
+        public string time { get; set; }
+        public string subjectId { get; set; }
+        public List<ClassRange> classes { get; set; }
+        public List<List<double>> studentScores { get; set; }
+        public List<string> studentIds { get; set; }
+        public List<double> point { get; set; }
+     
+        public string schoolId { get; set; }
+        public PaperSimple paper { get; set; }
+        public string scope { get; set; }
+        public string examId { get; set; }
+        public string school { get; set; }
+        public int year { get; set; }
+    }
+    public class ClassRange {
+
+        public string id { get; set; }
+        public string name { get; set; }
+        public List<int> range { get; set; }
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/Inner/Answer.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    public class Answer
+    {
+        /// <summary>
+        /// 答案序号
+        /// </summary>
+        public int num { get; set; }
+        /// <summary>
+        /// 题目序号对应多个答案序号
+        /// </summary>
+        public int group { get; set; }
+        /// <summary>
+        /// 类型 Single单选，Multiple多选，Judge判断，Complete填空，Subjective问答，
+        /// </summary>
+        public string type { get; set; }
+        /// <summary>
+        /// 答案内容  多选 
+        /// </summary>
+        public List<string> ans { get; set; }
+        /// <summary>
+        /// 分值
+        /// </summary>
+        public double? score { get; set; } = null;
+        /// <summary>
+        /// 是否批改 0未批改 1已经批改
+        /// </summary>
+        public int mark { get; set; } = 0;
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/Inner/Campus.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    public class Campus
+    {
+        public string name { get; set; }
+        public string id { get; set; }
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/Inner/Grade.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    public class Grade
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/Inner/Period.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    public class Period
+    {
+        public Period()
+        {
+            grades = new List<Grade>();
+            subjects = new List<Subject>();
+            semesters = new List<Semester>();
+            analysis = new Analysis();
+        }
+        public List<Grade> grades { get; set; }
+        public List<Subject> subjects { get; set; }
+        public List<Semester> semesters { get; set; }
+        public string name { get; set; }
+        public string id { get; set; }
+        public int gradeCount { get; set; }
+        public int semesterCount { get; set; }
+        public int subjectCount { get; set; }
+        //保存校区编码
+        public string campusId { get; set; }
+        public Analysis analysis { get; set; }
+    }
+    public class Analysis
+    {
+        public List<ExamSimple> type { get; set; }
+        public int income { get; set; }
+        public int eugenics { get; set; }
+        public int touch { get; set; }
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/Inner/Semester.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    public class Semester
+    {
+        public string name { get; set; }
+        public string count { get; set; }
+        public int month { get; set; }
+        public int day { get; set; }
+        public string id { get; set; }
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/Inner/Subject.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    public class Subject
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+        
+
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/Paper.cs

@@ -0,0 +1,141 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using TEAMModelOS.Models.CommonInfo;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    /// <summary>
+    /// 试卷信息
+    /// </summary>
+    [CosmosDB(Database = "TEAMModelOS", Name = "School")]
+    public class Paper : ID
+    {
+        
+        /// <summary>
+        ///  学校编码，个人编码，考试编码
+        /// </summary>
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+        public string pk { get; set; }
+        public int? ttl { get; set; }
+        public Paper()
+        {
+            //item = new List<ItemInfo>();
+            scoring = new List<MarkConfig>();
+        }
+
+        [JsonProperty(PropertyName = "id")]
+        public string id { get; set; }
+        /// <summary>
+        /// 试卷的基本信息
+        /// </summary>
+        public string blob { get; set; }
+        /// <summary>
+        /*/// 题目信息
+        /// </summary>
+        public List<ItemInfo> item { get; set; }*/
+        /// <summary>
+        /// 科目
+        /// </summary>
+        public string subjectId { get; set; }
+        public string subjectName { get; set; }
+        /// <summary>
+        /// 学段
+        /// </summary>
+        public string periodId { get; set; }
+        /// <summary>
+        /// 年级
+        /// </summary>
+        public List<string> gradeIds { get; set; }
+
+        /// <summary>
+        /// 试卷名称
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 引用次数
+        /// </summary>
+        public int useCount { get; set; }
+        /// <summary>
+       /* /// 题目难度
+        /// </summary>
+        public double level { get; set; }*/
+        /// <summary>
+        /// 总分
+        /// </summary>
+        public double score { get; set; }
+        public string scope { get; set; }
+        public int multipleRule { get; set; }
+        /// <summary>
+        /// type:{
+        ///     pointkey:[num1,num2....]
+        /// }
+        /// 题型的分数占比
+        /// </summary>
+     /* 
+        public Dictionary<string, ScoreCount> typeScore { get; set; }
+        /// <summary>
+        /// 题目难度分数占比
+        /// </summary>
+        public Dictionary<string, ScoreCount> levelScore { get; set; }
+        /// <summary>
+        /// 知识点分数占比
+        /// </summary>
+        public Dictionary<string, ScoreItem> pointScore { get; set; }*/
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public long createTime { get; set; }
+        /*  /// <summary>
+          /// 正确答案
+          /// </summary>
+          public List<Answer> answers { get; set; }*/
+        /// <summary>
+        /// 阅卷规则
+        /// </summary>
+        public List<MarkConfig> scoring { get; set; }
+        /// <summary>
+       /* /// 题目集合
+        /// </summary>
+        public List<string> itemids { get; set; }*/
+    }
+    /// <summary>
+    /// 阅卷规则
+    /// </summary>
+    public class MarkConfig
+    {
+        /// <summary>
+        /// 作答
+        /// </summary>
+        public List<string> ans { get; set; }
+        /// <summary>
+        /// 题目类型
+        /// </summary>
+        public string type { get; set; }
+        /// <summary>
+        /// 多选漏选指定得分
+        /// </summary>
+        public double? score { get; set; } = 0;
+    }
+    /*
+    public class ScoreItem
+    {
+        public ScoreItem()
+        {
+          item = new List<int>();
+        }
+        public double score { get; set; }
+        public List<int> item { get; set; }
+    }
+    public class ScoreCount{
+         
+        public double score { get; set; }
+        public int count { get; set; }
+    }*/
+}

TEAMModelGrpc/Models/SchoolInfo/School.cs

@@ -0,0 +1,77 @@
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using System.Text.Json.Serialization;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    [CosmosDB(Database = "TEAMModelOS", Name = "School")]
+    public class School:ID
+    {
+      //  [PartitionKey(name = "School")]
+        public string pk { get; set; }
+        public int? ttl { get; set; } = null;
+        public School()
+        {
+            timeZone = new TimeZone();
+            period = new List<Period>();
+        }
+        
+        public string id { get; set; }
+        //[Required(ErrorMessage = "{0} 必须填写")]
+        public string schoolCode { get; set; }
+       // [PartitionKey]
+        //public string areaCode { get; set; }
+        public string name { get; set; }
+        public List<Period> period { get; set; }
+        public List<Campus> campuses { get; set; }
+        [PartitionKey]
+        //[Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+        public string region { get; set; }
+        public string province { get; set; }
+        public string city { get; set; }
+        public int size { get; set; }
+
+        /// <summary>
+        /// 课程计划表
+        /// </summary>
+        public List<TimeTable> timetable { get; set; }
+        public string address{ get; set; }
+        public string picture { get; set; }
+
+        public TimeZone timeZone { get; set; }
+        
+    }
+
+    public class TimeTable { 
+        public string label { get; set; }
+        public string time { get; set; }
+        public string type { get; set; }
+        public Dictionary<string , object> weeklies { get; set; }
+    }
+
+    public class ExamSimple
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+        //public List<SmallType> type {get;set;}
+    }
+    public class SmallType {
+        public string id { get; set; }
+        public string name { get; set; }
+    }
+    /// <summary>
+    /// 时区
+    /// </summary>
+    public class TimeZone
+    {
+        public string label { get; set; } = null;
+        public string value { get; set; } = null;
+
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/SchoolTeacher.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    public class SchoolTeacher : TeacherBase
+    {
+        public string job { get; set; }
+        public List<string> roles { get; set; }
+        public List<string> permissions { get; set; }
+        public string status { get; set; }
+        public long createTime { get; set; }
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/Survey.cs

@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using TEAMModelOS.Models.CommonInfo;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    /// <summary>
+    /// 问卷调查
+    /// </summary>
+    [CosmosDB(Database = "TEAMModelOS",Name = "School")]
+    public class Survey : ID
+    {
+        public Survey() {
+            questions = new List<Questions>();
+            classes = new List<Classes>();
+        }
+        public string id { get; set; }
+        public int? ttl { get; set; }
+        public string pk { get; set; }
+        /// <summary>
+        /// 学校编码 或者醍摩豆ID
+        /// </summary>
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+        public string name { get; set; }   //测试问卷名称', // 问卷名称
+        public string description { get; set; }   //测试问卷描述', // 问卷描述
+        //public string type { get; set; }   //normal', // 问卷类型
+        public string school { get; set; }
+        public string creatorId { get; set; }
+        public int year { get; set; }
+        public string progress { get; set; }
+        public List<Questions> questions { get; set; }
+        public List<string> targetClassIds { get; set; }
+        public int stuCount { get; set; }
+        public int status { get; set; } // 问卷状态（100：待发布 200：已发布 300：已结束）
+        /// <summary>
+        /// 发布对象
+        /// </summary>
+        //[ProtoMember(4)]
+        //public List<Target> target { get; set; }
+
+        /// <summary>
+        /// 发布模式 0 立即发布 1 定时
+        /// </summary>
+        public string publishModel { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public long startTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public long endTime { get; set; }
+        public long createTime { get; set; } // 问卷发布时间
+        public List<Classes> classes { get; set; }
+
+        //public long sequenceNumber { get; set; }
+
+        public string url { get; set; }
+        public string scope { get; set; }
+
+    }
+    /*public class Item {
+        public string stem { get; set; }
+        /// <summary>
+        ///  Complete Single Multiple Subjective， Judge判断
+        /// </summary>
+        //public string type { get; set; }
+        public bool required { get; set; }
+        public int order { get; set; }
+        public string description { get; set; } = null;
+        public List<CodeValue> options { get; set; }
+        public List<CodeVal> result { get; set; }
+    }*/
+     public class Questions { 
+        public string qid { get; set; }
+        public string question { get; set; }
+        public List<Options> option { get; set; }
+        public string type { get; set; }
+        public QuestionResult result { get; set; }
+
+    }
+    public class Options { 
+        public string code { get; set; }
+        public string value { get; set; }
+        public Result result { get; set; }
+    }
+    public class QuestionResult
+    {
+        public double finish { get; set; }
+        public double finishRate { get; set; }
+    }
+    public class Result { 
+        public double count { get; set; }
+        public double rate { get; set; }
+    }
+    public class Classes { 
+        public string code { get; set; }
+        public string id { get; set; }
+        public string name { get; set; }
+        public string scope { get; set; }
+        public Result result { get; set; }
+        public List<StudentInfo> students { get; set; }
+        public List<AnswerRate> answers { get; set; }
+    }
+    public class AnswerRate {
+        public string qid { get; set; }
+        public double answerRate { get; set; }
+        public List<Options> option { get; set; }
+    }
+    public class StudentInfo {
+        public string id { get; set; }
+        public string name { get; set; }
+        public long finishTime { get; set; }
+        public List<AnswerInfo> answers { get; set; }
+        public ResultInfo result { get; set; }
+    }
+    public class ResultInfo
+    {
+        public double answerRate { get; set; }
+    }
+    public class AnswerInfo { 
+        public string qid { get; set; }
+        public string answer { get; set; }
+    }
+    /*public class CodeVal{
+        public string code { get; set; }
+        public int value { get; set; }
+    }*/
+}

TEAMModelGrpc/Models/SchoolInfo/Table/SchoolSetting.cs

@@ -0,0 +1,26 @@
+using Microsoft.Azure.Cosmos.Table;
+using Newtonsoft.Json;
+using System.Text.Json.Serialization;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    /// <summary>
+    /// 權限總表
+    /// </summary>
+    [TableName(Name = "SchoolSetting")]
+    public class Authority : TableEntity
+    {
+        public Authority() { }
+        public Authority(string id)
+        {
+            this.PartitionKey = "authority";
+            this.RowKey = id;
+        }
+        public string Mode { get; set; }
+        public string Category { get; set; }
+        public string Path { get; set; }
+        public string Discription { get; set; }
+        public bool Root { get; set; }
+    }
+}

TEAMModelGrpc/Models/SchoolInfo/Vote.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using TEAMModelOS.Models.CommonInfo;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.SchoolInfo
+{
+    /// <summary>
+    /// 投票
+    /// </summary>
+    [CosmosDB(Database = "TEAMModelOS", Name = "School")]
+    public class Vote : ID
+    {
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+        public string pk { get; set; }
+
+        public Vote()
+        {
+            options = new List<OptionsVote>();
+
+        }
+
+        public string id { get; set; }
+        /// <summary>
+        /// 投票名称
+        /// </summary>
+        public string name { get; set; }
+        public string school { get; set; }
+        public string creatorId { get; set; }
+        public int year { get; set; }
+        public string progress { get; set; }
+        public List<OptionsVote> options { get; set; }
+        public bool secret { get; set; }
+        public int selectMax { get; set; }
+        public int stuCount { get; set; }
+        public string scope { get; set; }
+        public List<string> targetClassIds { get; set; }
+        /// <summary>
+        /// 发布模式 0 立即发布 1 定时
+        /// </summary>
+        public string publishModel { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public long startTime { get; set; }
+        public long createTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public long endTime { get; set; }
+
+
+        /// <summary>
+        /// 投票描述
+        /// </summary>
+        public string description { get; set; }
+
+
+/*        /// <summary>
+        /// 投票附件
+        /// </summary>
+        [ProtoMember(9)]
+        public List<ProcessRes> resource { get; set; }
+*/
+
+        /// <summary>
+        /// 状态 （100：待发布 200：已发布 300：已结束）
+        /// </summary>
+        public int status { get; set; }
+
+
+/*        /// <summary>
+        /// 模式
+        /// </summary>
+        [ProtoMember(11)]
+        public List<string> other { get; set; }*/
+
+/*
+        public string url { get; set; }
+
+        /// <summary>
+        /// 选项
+        /// </summary>
+        [ProtoMember(12)]
+        public List<Option> option { get; set; }*/
+
+        public int? ttl { get; set; }
+
+        //public long sequenceNumber { get; set; }
+    }
+    public class OptionsVote { 
+        public string code { get; set; }
+        public string value { get; set; }
+    }
+}

TEAMModelGrpc/Models/StudentInfo/ClassStudent.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.StudentInfo
+{
+    [CosmosDB(Database = "TEAMModelOS", Name = "Student", Cache = false)]
+    public class ClassStudent : ID
+    {
+        public string pk { get; set; }
+        public ClassStudent() {
+          //  studentId = new List<string>();
+        }
+        public int? ttl { get; set; } 
+        /// <summary>
+        ///班级id classroomCode
+        /// </summary>
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string id { get; set; } //classroomCode
+
+        /// <summary>
+        /// 学生id
+        /// </summary>
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+
+    }
+}

TEAMModelGrpc/Models/StudentInfo/ExamRecord.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.DI;
+
+namespace TEAMModelOS.Models.StudentInfo
+{
+    [CosmosDB(Database = "TEAMModelOS", Name = "Student")]
+    public class ExamRecord : ID
+    {
+        public int? ttl { get; set; }
+        public string pk { get; set; }
+        /// <summary>
+        /// 试卷id
+        /// </summary>
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string id { get; set; }
+        /// <summary>
+        /// 学生id
+        /// </summary>
+        [PartitionKey]
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string code { get; set; }
+        /// <summary>
+        /// 考试code
+        /// </summary>
+        [Required(ErrorMessage = "{0} 必须填写")]
+        public string examCode { get; set; }
+        /// <summary>
+        /// 0 未作答，白卷，  1已作答
+        /// </summary>
+        [Required(ErrorMessage = "参考状态必须填写")]
+        public int status { get; set; }
+        public List<Answer> answers{ get; set; }
+        /// <summary>
+        /// 阅卷状态 0 未阅卷，1未完成阅卷，2完成阅卷
+        /// </summary>
+        public int mark { get; set; } = 0;
+        /// <summary>
+        /// 总分
+        /// </summary>
+        public double? score { get; set; } = 0;
+    }
+}