update

TEAMModelBI/Controllers/BINormal/AbilityTaskMgmtController.cs

@@ -10,7 +10,7 @@ using TEAMModelOS.Models;
 using Microsoft.Extensions.Options;
 using System.Text.Json;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using System.Text;
 using TEAMModelBI.Filter;
 using TEAMModelOS.SDK.Services;

TEAMModelBI/Controllers/BINormal/BatchAreaController.cs

@@ -11,7 +11,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models;
 using Microsoft.Azure.Cosmos;
 using System.Text.Json;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using Azure.Messaging.ServiceBus;
 using TEAMModelOS.SDK.Extension;

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -32,7 +32,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service.BI;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 

TEAMModelBI/Controllers/BITest/TestController.cs

@@ -24,7 +24,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Models.Table;
 

TEAMModelBI/Controllers/Census/LessonSticsController.cs

@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.DI;
 using Microsoft.Extensions.Options;
 using Microsoft.Azure.Cosmos;
 using System.Text.Json;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models;
 using TEAMModelBI.Models;
 using TEAMModelOS.SDK.Extension;

TEAMModelBI/Controllers/RepairApi/InitialAreaController.cs

@@ -17,7 +17,7 @@ using TEAMModelOS.SDK.Models;
 using Microsoft.Azure.Cosmos;
 using System;
 using System.Collections.Generic;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using System.Linq;
 using Pipelines.Sockets.Unofficial.Arenas;
 using TEAMModelBI.Models;

TEAMModelOS.Extension/HTEX.DataETL/Controllers/LessonRecordController.cs

@@ -21,7 +21,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Helper.Common.FileHelper;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.OpenEntity;
 using static TEAMModelOS.SDK.Models.Service.SystemService;
 

TEAMModelOS.Extension/HTEX.Lib/ETL/Lesson/LessonETLService.cs

@@ -27,7 +27,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.OpenEntity;
 using TEAMModelOS.SDK.Models.Dtos;
 using static TEAMModelOS.SDK.Models.ThirdService;

TEAMModelOS.Extension/IES.Exam/IES.ExamServer/Controllers/ManageController.cs

@@ -1,6 +1,31 @@
-namespace IES.ExamServer.Controllers
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Configuration;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+namespace IES.ExamServer.Controllers
 {
-    public class ManageController
+    [ApiController]
+    [Route("manage")]
+    public class ManageController:BaseController
     {
+        private readonly IConfiguration _configuration;
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly IMemoryCache _memoryCache;
+        private readonly ILogger<ManageController> _logger;
+        public ManageController(ILogger<ManageController> logger, IConfiguration configuration, IHttpClientFactory httpClientFactory, IMemoryCache memoryCache)
+        {
+            _logger = logger;
+            _configuration=configuration;
+            _httpClientFactory=httpClientFactory;
+            _memoryCache=memoryCache;
+        }
+        [HttpPost("download-package")]
+        public async Task<IActionResult> DownloadPackage(JsonNode json) 
+        {
+            return Ok();
+        }
     }
 }

TEAMModelOS.Extension/IES.Exam/IES.ExamServer/Services/IndexService.cs

@@ -18,8 +18,9 @@ namespace IES.ExamServer.Services
             string hostName = $"{Environment.UserName}-{Dns.GetHostName()}";
             string os = RuntimeInformation.OSDescription;
             //获取当前客户端的服务端口
-          
-            ServerDevice device = new ServerDevice { name =hostName, os= os,region=region,remote=remote };
+            string currentUserName = Environment.UserName;
+           
+            ServerDevice device = new ServerDevice { name =hostName, userName=currentUserName, os= os,region=region,remote=remote };
             int CpuCoreCount = 0;
             long MenemorySize = 0;
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -50,13 +51,50 @@ namespace IES.ExamServer.Services
                         }
                     }
                 }
+                if (Environment.Is64BitOperatingSystem)
+                {
+                    device.bit="64";
+                }
+                else
+                {
+                    device.bit="32";
+                }
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Name, MaxClockSpeed FROM Win32_Processor");
+                foreach (ManagementObject mo in searcher.Get())
+                {
+                    string? cpuName = mo["Name"].ToString();
+                    string? clockSpeed = mo["MaxClockSpeed"].ToString();
+                    //Console.WriteLine($"CPU 名称: {cpuName}");
+                    //Console.WriteLine($"CPU 主频: {clockSpeed} MHz");
+                    device.cpuInfos.Add(new CPUInfo { name = cpuName, hz = clockSpeed });
+                }
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
                 //int processorCount = Environment.ProcessorCount;
                 // Console.WriteLine("CPU 核心数: " + processorCount);
-                string[] cpu_lines = File.ReadAllLines("/proc/cpuinfo");
-                CpuCoreCount= cpu_lines.Count(line => line.StartsWith("processor", StringComparison.OrdinalIgnoreCase));
+                try {
+                    string cpuInfo = File.ReadAllText("/proc/cpuinfo");
+                    string[] cpu_lines = cpuInfo.Split('\n');
+                   
+                    CpuCoreCount= cpu_lines.Count(line => line.StartsWith("processor", StringComparison.OrdinalIgnoreCase));
+                    string? cpuNameLine = cpuInfo.Split('\n').FirstOrDefault(line => line.StartsWith("model name"));
+                    string? clockSpeedLine = cpuInfo.Split('\n').FirstOrDefault(line => line.StartsWith("cpu MHz"));
+                    string cpuName = string.Empty;
+                    string clockSpeed = string.Empty;
+                    if (cpuNameLine!= null)
+                    {
+                          cpuName = cpuNameLine.Split(':').Last().Trim();
+                    }
+                    if (clockSpeedLine!= null)
+                    {
+                         clockSpeed = clockSpeedLine.Split(':').Last().Trim();
+                    }
+                    device.cpuInfos.Add(new CPUInfo { name = cpuName, hz = clockSpeed });
+                } catch (Exception ex)
+                {
+                    
+                }
                 string[] mem_lines = File.ReadAllLines("/proc/meminfo");
                 var match = mem_lines.FirstOrDefault(line => line.StartsWith("MemTotal:"));
                 if (match != null)
@@ -70,38 +108,101 @@ namespace IES.ExamServer.Services
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                using (var process = new Process())
+                try {
+                    using (var process = new Process())
+                    {
+                        process.StartInfo.FileName = "/usr/sbin/sysctl";
+                        process.StartInfo.Arguments = "-n hw.ncpu";
+                        process.StartInfo.RedirectStandardOutput = true;
+                        process.StartInfo.UseShellExecute = false;
+                        process.Start();
+                        string output = process.StandardOutput.ReadToEnd().Trim();
+                        int coreCount;
+                        if (int.TryParse(output, out coreCount))
+                        {
+                            CpuCoreCount= coreCount;
+                        }
+                    }
+                }
+                catch (Exception ex) { }
+               try
                 {
-                    process.StartInfo.FileName = "/usr/sbin/sysctl";
-                    process.StartInfo.Arguments = "-n hw.ncpu";
-                    process.StartInfo.RedirectStandardOutput = true;
-                    process.StartInfo.UseShellExecute = false;
-                    process.Start();
-                    string output = process.StandardOutput.ReadToEnd().Trim();
-                    int coreCount;
-                    if (int.TryParse(output, out coreCount))
+                    using (var process = new Process())
                     {
-                        CpuCoreCount= coreCount;
+                        process.StartInfo.FileName = "/usr/sbin/sysctl";
+                        process.StartInfo.Arguments = "-n hw.memsize";
+                        process.StartInfo.RedirectStandardOutput = true;
+                        process.StartInfo.UseShellExecute = false;
+                        process.Start();
+                        string output = process.StandardOutput.ReadToEnd().Trim();
+                        long memorySize;
+                        if (long.TryParse(output, out memorySize))
+                        {
+                            MenemorySize=  memorySize;
+                        }
                     }
                 }
-                using (var process = new Process())
+                catch (Exception ex) { }
+                try
                 {
-                    process.StartInfo.FileName = "/usr/sbin/sysctl";
-                    process.StartInfo.Arguments = "-n hw.memsize";
-                    process.StartInfo.RedirectStandardOutput = true;
-                    process.StartInfo.UseShellExecute = false;
-                    process.Start();
-                    string output = process.StandardOutput.ReadToEnd().Trim();
-                    long memorySize;
-                    if (long.TryParse(output, out memorySize))
+                    using (var process = new Process())
                     {
-                        MenemorySize=  memorySize;
+
+
+                        process.StartInfo.FileName = "/usr/sbin/sysctl";
+                        process.StartInfo.Arguments = "-n machdep.cpu.brand_string";
+                        process.StartInfo.RedirectStandardOutput = true;
+                        process.StartInfo.UseShellExecute = false;
+                        process.Start();
+                        string cpuName = process.StandardOutput.ReadToEnd().Trim();
+
+                        process.StartInfo.FileName = "/usr/sbin/sysctl";
+                        process.StartInfo.Arguments = "-n hw.cpu.frequency";
+                        process.StartInfo.RedirectStandardOutput = true;
+                        process.StartInfo.UseShellExecute = false;
+                        process.Start();
+                        string clockSpeed = process.StandardOutput.ReadToEnd().Trim();
+                        //Console.WriteLine($"CPU 名称: {cpuName}");
+                        //Console.WriteLine($"CPU 主频: {clockSpeed} Hz");
+                        device.cpuInfos.Add(new CPUInfo { name = cpuName, hz = clockSpeed });
                     }
                 }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"出现错误: {ex.Message}");
+                }
+                if (Environment.Is64BitOperatingSystem)
+                {
+                    device.bit="64";
+                }
+                else
+                {
+                    device.bit="32";
+                }
+            }
+            if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
+            {
+                device.arch="ARM64";
             }
+            else if (RuntimeInformation.ProcessArchitecture == Architecture.Arm)
+            {
+                device.arch="ARM32";
+            }
+            else if (RuntimeInformation.ProcessArchitecture == Architecture.X64)
 
+            {
+                device.arch="X64";
+            }
+            else if (RuntimeInformation.ProcessArchitecture == Architecture.X86) 
+            {
+                device.arch="X86";
+            }
+            else
+            {
+                device.arch=$"未知（{device.arch}）";
+            }
             //Console.WriteLine("CPU 核心数: " + CpuCoreCount+",RAM 大小："+MenemorySize);
-            
+
             device.cpu=CpuCoreCount;
             device.ram=MenemorySize;
             var nics = NetworkInterface.GetAllNetworkInterfaces();
@@ -277,6 +378,7 @@ namespace IES.ExamServer.Services
         /// 设备id
         /// </summary>
         public string? deviceId { get; set; }
+        public string? userName {  get; set; }
         /// <summary>
         /// 机器名
         /// </summary>
@@ -286,9 +388,19 @@ namespace IES.ExamServer.Services
         /// </summary>
         public string? os { get; set; }
         /// <summary>
+        /// 操作系统位数 64位/32位
+        /// </summary>
+        public string? bit {  get; set; }
+        /// <summary>
+        /// 操作系统指令架构 x86/x64, arm arm64 其他
+        /// </summary>
+        public  string? arch { get; set; }
+        /// <summary>
         /// CPU核心数量
         /// </summary>
-        public int cpu { get; set; } 
+        public int cpu { get; set; }
+
+        public List<CPUInfo> cpuInfos { get; set; } = new List<CPUInfo>();
         /// <summary>
         /// 内存大小
         /// </summary>
@@ -310,6 +422,11 @@ namespace IES.ExamServer.Services
         /// </summary>
         public List<Network> networks { get; set; } = new List<Network>();
     }
+    public class CPUInfo 
+    {
+        public string? name { get; set; }
+        public string? hz { get; set; }
+    }
     public class Network
     {
         public string? name { get; set; }

TEAMModelOS.Extension/IES.ExamLib/Models/EvaluationCommon.cs

@@ -83,8 +83,17 @@ namespace IES.ExamServer.Models
         public string? examId { get; set; }
         public string? id { get; set; }
         public string? name { get; set; }
-        public  int paperCount {  get; set; }
-        public List<string> paperIds { get; set; } = new List<string>();
+        public List<SubjectExamPaper> papers { get; set; } = new List<SubjectExamPaper>();
+
+    }
+    public class SubjectExamPaper 
+    {
+        public string? paperId { get; set; }
+        public string? paperName { get; set; }
+        public string? blob { get; set; }
+        public string? subjectId { get; set; }
+        public string? paperHash {  get; set; }
+
     }
     public class EvaluationExam 
     {
@@ -156,5 +165,67 @@ namespace IES.ExamServer.Models
         /// </summary>
         public List<int> field { get; set; } = new List<int>();
     }
+    public class BlobHashInfo 
+    {
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string? path { get; set; }
+        /// <summary>
+        /// 文件大小
+        /// </summary>
+        public long size {  get; set; }
+        /// <summary>
+        /// 文件哈希
+        /// </summary>
+        public string? hash {  get; set; }
+        /// <summary>
+        /// 文件最后修改时间
+        /// </summary>
+        public long last { get; set; }
+
+    }
 
+    /// <summary>
+    /// 操作记录
+    /// </summary>
+    public class OperationRecord 
+    {
+        /// <summary>
+        /// 记录id
+        /// </summary>
+        public string? id {  get; set; }
+        /// <summary>
+        /// 评测id
+        /// </summary>
+        public string? examId { get; set; }
+        /// <summary>
+        /// 评测名称
+        /// </summary>
+        public string? examName { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public string? optTime { get; set; }
+        /// <summary>
+        /// 操作类型,开启重复作答,开启考前倒计时,开启作答倒计时,强制结束作答,
+        /// </summary>
+        public string? optType { get; set; }
+        /// <summary>
+        /// 操作前值
+        /// </summary>
+        public string? optPerval { get; set; }
+        /// <summary>
+        /// 操作后值
+        /// </summary>
+        public string? optAftval { get; set; }
+        /// <summary>
+        /// 操作用户
+        /// </summary>
+        public string? optUser{ get; set; }
+        /// <summary>
+        /// 设备id
+        /// </summary>
+        public string? deviceId {  get; set; }
+    }
 }

TEAMModelOS.Function/CosmosDBTriggers/TriggerArt.cs

@@ -11,7 +11,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK;
 using Microsoft.Azure.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 using TEAMModelOS.Function;
 using static TEAMModelOS.SDK.Models.Cosmos.Student.StudentAnalysis;

TEAMModelOS.Function/CosmosDBTriggers/TriggerCorrect.cs

@@ -6,7 +6,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
  
 using TEAMModelOS.Function;
 

TEAMModelOS.Function/CosmosDBTriggers/TriggerExam.cs

@@ -19,7 +19,7 @@ using System.Text.Json.Nodes;
 using Newtonsoft.Json.Linq;
 using TEAMModelOS.SDK.Models.Cosmos.Student;
 using TEAMModelOS.Models.Dto;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using System.Net.Http;
 using Newtonsoft.Json;
 using System.Net;

TEAMModelOS.Function/CosmosDBTriggers/TriggerExamImport.cs

@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK;
 using Microsoft.Azure.Cosmos;
 using System.Net.Http;
-using TEAMModelOS.SDK.Models.Cosmos.School;
+using TEAMModelOS.SDK.Models.Cosmos    ;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.Function;

TEAMModelOS.Function/CosmosDBTriggers/TriggerExamLite.cs

@@ -12,7 +12,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.Function;
 

TEAMModelOS.Function/CosmosDBTriggers/TriggerHomework.cs

@@ -12,7 +12,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Models.Service.BI;
 using TEAMModelOS.Function;

TEAMModelOS.Function/CosmosDBTriggers/TriggerQuotaImport.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK;
 using Microsoft.Azure.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.School;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Extension;
 using Microsoft.OData.Edm;

TEAMModelOS.Function/CosmosDBTriggers/TriggerStudy.cs

@@ -13,7 +13,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Models.Service.BI;
 using TEAMModelOS.Function;

TEAMModelOS.Function/CosmosDBTriggers/TriggerSurvey.cs

@@ -14,8 +14,8 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
+using TEAMModelOS.SDK.Models.Cosmos;
+using TEAMModelOS.SDK.Models.Cosmos.Inner;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
 using TEAMModelOS.SDK.Models.Service;
 using Microsoft.Extensions.Configuration;

TEAMModelOS.Function/CosmosDBTriggers/TriggerVote.cs

@@ -12,8 +12,8 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
+using TEAMModelOS.SDK.Models.Cosmos;
+using TEAMModelOS.SDK.Models.Cosmos.Inner;
 using TEAMModelOS.SDK.Models.Service;
  
 using Microsoft.Extensions.Configuration;

TEAMModelOS.Function/IESServiceBusTrigger.cs

@@ -15,7 +15,7 @@ using TEAMModelOS.SDK.Models;
 using Microsoft.Azure.Cosmos;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using StackExchange.Redis;
 using static TEAMModelOS.SDK.StatisticsService;
 using Azure;

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

@@ -6,7 +6,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     /// <summary>
     /// 艺术评测基础信息

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

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     public  class ArtExam : CosmosEntity
     {

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

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     public class ArtMusic : CosmosEntity
     {

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

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     public class ArtRecord : CosmosEntity
     {

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

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models
 {

TEAMModelOS.SDK/Models/Cosmos/Common/Inner/AbilityTaskTree.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models
 {

TEAMModelOS.SDK/Models/Cosmos/Common/Inner/CourseChange.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     public class CourseChange
     {

TEAMModelOS.SDK/Models/Cosmos/Common/Inner/SurveyRecord.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common.Inner
+namespace TEAMModelOS.SDK.Models.Cosmos.Inner
 {
     public  class SurveyRecord
     {

TEAMModelOS.SDK/Models/Cosmos/Common/Inner/SyllabusTree.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models
 {

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

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     /// <summary>
     /// CS IOT TeachingData (Redis)

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

@@ -6,7 +6,7 @@ using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     /// <summary>
     /// 儲存學習記錄blob的格式

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

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     public class LessonCount : CosmosEntity
     {

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

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     public class Scoring : CosmosEntity
     {

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

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Text;
 using System.Text.Json;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     /// <summary>
     /// 课纲节点父类

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

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     /// <summary>
     /*

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

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
      
 

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

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models
 {

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

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.Common
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     public class Volume: CosmosEntity
     { 

TEAMModelOS.SDK/Models/Cosmos/Normal/Ability.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models
 {

TEAMModelOS.SDK/Models/Cosmos/Normal/AbilityTask.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 namespace TEAMModelOS.SDK.Models
 {
     /// <summary>

TEAMModelOS.SDK/Models/Cosmos/Normal/EvaluationSyncInfo.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models.Cosmos.Normal
 {
@@ -60,6 +60,14 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Normal
 
         public long blobCount { get; set; }
         /// <summary>
+        /// 活动文件包哈希值
+        /// </summary>
+        public string blobHash { get; set; }
+       /// <summary>
+       /// 活动文件包哈希值(上次)
+       /// </summary>
+        public string blobLastHash { get; set; }
+        /// <summary>
         /// 活动页面代码文件生成最新时间戳
         /// </summary>
         public long webviewTime { get; set; }
@@ -88,10 +96,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Normal
         /// 使用MurmurHash3 生成简码  string s =  $"{MurmurHash3.Hash32(Guid.NewGuid().ToString())}";  十位数字
         /// </summary>
         public string shortCode { get; set; }
-        /// <summary>
-        /// 试卷文件包文件hash列表
-        /// </summary>
-        public string hashFile { get; set; }
+        
     }
     /// <summary>
     /// 活动客户端同步信息
@@ -132,44 +137,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Normal
         public string mobile { get; set; }
     }
 
-    public class ExamPaperFileHash
-    {
-        /// <summary>
-        /// 试卷大小
-        /// </summary>
-        public long size { get; set; }
-        /// <summary>
-        /// 试卷数量
-        /// </summary>
-        public long count { get; set; }
-        /// <summary>
-        /// 试卷里文件最后的更新时间戳
-        /// </summary>
-        public long lastTime { get; set; }
-    }
-    public class PaperFile
-    {
-        /// <summary>
-        /// 文件名
-        /// </summary>
-        public string name { get; set; }
-        /// <summary>
-        /// 文件路径
-        /// </summary>
-        public string path { get; set; }
-        /// <summary>
-        /// 文件hash值
-        /// </summary>
-        public string hash { get; set; }
-        /// <summary>
-        /// 文件后缀
-        /// </summary>
-        public string ext { get; set; }
-        /// <summary>
-        /// 文件大小
-        /// </summary>
-        public long size { get; set; }
-    }
+     
     /// <summary>
     /// 普通评测或者艺术评测的主体信息
     /// </summary>
@@ -186,5 +154,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Normal
         public List<ExamInfo> artExams { get; set; }=new List<ExamInfo>();
 
         public long updateTime { get; set; }
+
+        public School school { get; set; }
     }
 }

TEAMModelOS.SDK/Models/Cosmos/OpenEntity/OSyllabusTree.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models
 {

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.School
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
    
     public class VirtueImport : CosmosEntity {

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.School
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     public class IotStatisticsBase
     {

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

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Dtos;
 
 namespace TEAMModelOS.SDK.Models

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.School
+namespace TEAMModelOS.SDK.Models.Cosmos
 {
     /// <summary>
     /// 成績計算總覽

TEAMModelOS.SDK/Models/Cosmos/Student/OverallEducation.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models
 {

TEAMModelOS.SDK/Models/Cosmos/Teacher/Favorite.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models.Cosmos
 {

TEAMModelOS.SDK/Models/Cosmos/Teacher/TmidAnalysis.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models
 {

TEAMModelOS.SDK/Models/Service/ArtService.cs

@@ -10,7 +10,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using static TEAMModelOS.SDK.Models.ClassAnalysis;
 
 namespace TEAMModelOS.SDK.Models.Service

TEAMModelOS.SDK/Models/Service/BI/BIProdAnalysis.cs

@@ -13,7 +13,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models.Service.BI
 {

TEAMModelOS.SDK/Models/Service/Common/AbilityService.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 
 namespace TEAMModelOS.SDK.Services

TEAMModelOS.SDK/Models/Service/Common/ActivityStudentService.cs

@@ -7,7 +7,7 @@ using TEAMModelOS.SDK.Extension;
 using Microsoft.Azure.Cosmos;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
+using TEAMModelOS.SDK.Models.Cosmos.Inner;
 using StackExchange.Redis;
 using TEAMModelOS.Models;
 

TEAMModelOS.SDK/Models/Service/Common/SyllabusService.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Services
 {

TEAMModelOS.SDK/Models/Service/EvaluationSyncInfoService.cs

@@ -1,13 +1,17 @@
-using Microsoft.Azure.Cosmos;
+using Azure.Storage.Blobs.Models;
+using IES.ExamServer.Models;
+using Microsoft.Azure.Cosmos;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Normal;
+using TEAMModelOS.SDK.Models.Cosmos.Student;
 
 
 namespace TEAMModelOS.SDK.Models.Service
@@ -47,6 +51,7 @@ namespace TEAMModelOS.SDK.Models.Service
                     code="ActivitySyncInfo",
                 };
             }
+           
             switch (true) 
             {
                 case bool when (type == "Exam"):
@@ -56,10 +61,7 @@ namespace TEAMModelOS.SDK.Models.Service
                         if (response.IsSuccessStatusCode)
                         {
                             ExamInfo exam= JsonDocument.Parse(response.Content).RootElement.Deserialize<ExamInfo>();
-                            if (!string.IsNullOrWhiteSpace(evaluationSyncInfo.shortCode)) 
-                            {
-                                evaluationSyncInfo.shortCode = $"{MurmurHash3.Hash32(exam.id)}";
-                            }
+                            
                             evaluationSyncInfo.name=exam.name;
                             evaluationSyncInfo.subjects = exam.subjects?.Select(x=>new IES.ExamServer.Models.SubjectExam { id=x.id,name=x.name,examId=id}).ToList();
                             evaluationSyncInfo.dataTime= DateTimeOffset.Now.ToUnixTimeMilliseconds();
@@ -83,8 +85,7 @@ namespace TEAMModelOS.SDK.Models.Service
                                         id=subject.id,
                                         name=subject.name,
                                         examId=id,
-                                        paperCount= group.list.Count,
-                                        paperIds= group.list.Select(x => x.id).ToList()
+                                        papers= group.list.Select(x=>new SubjectExamPaper {paperId= x.id,subjectId=x.subjectId,paperName=x.name,blob=x.blob }).ToList(),
                                     } );
                                 }
                             }
@@ -98,7 +99,8 @@ namespace TEAMModelOS.SDK.Models.Service
                         if (response.IsSuccessStatusCode) 
                         {
                             ArtEvaluation art = JsonDocument.Parse(response.Content).RootElement.Deserialize<ArtEvaluation>();
-                            evaluationSyncInfo.subjects = art.subjects?.Select(x => new IES.ExamServer.Models.SubjectExam { id=x.id, name=x.name, examId=id }).ToList();
+                            
+                            // evaluationSyncInfo.subjects = art.subjects?.Select(x => new IES.ExamServer.Models.SubjectExam { id=x.id, name=x.name, examId=id }).ToList();
                             evaluationSyncInfo.name = art.name;
                             evaluationSyncInfo.dataTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
                             HashSet<string> grouplist = new HashSet<string>();
@@ -120,7 +122,22 @@ namespace TEAMModelOS.SDK.Models.Service
                             {
                                 if (!string.IsNullOrWhiteSpace(item.acId)) 
                                 {
-                                
+                                    var subject = art.subjects.Find(x => x.id.Equals(item.subject));
+                                    var examResponse=  await azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).ReadItemStreamAsync(item.acId, new PartitionKey($"Exam-{owner}"));
+
+                                    if (examResponse.IsSuccessStatusCode) 
+                                    {
+                                        ExamInfo exam = JsonDocument.Parse(examResponse.Content).RootElement.Deserialize<ExamInfo>() ;
+                                        var papers = exam.papers.FindAll(x => x.subjectId.Equals(item.subject));
+                                        evaluationSyncInfo.subjects.Add(new IES.ExamServer.Models.SubjectExam
+                                        {
+                                            id=item.subject,
+                                            name=subject.name,
+                                            examId=item.acId,
+                                            papers=papers?.Select(x => new SubjectExamPaper { paperId=x.id,paperName=x.name, blob=x.blob, subjectId=x.subjectId }).ToList(),
+                                        });
+                                    }
+                                   
                                 }
                             }
                         }
@@ -129,8 +146,70 @@ namespace TEAMModelOS.SDK.Models.Service
                 default:
                     break;
             }
-            var listInfo=  await  GroupListService.GetMemberByListids(_coreAPIHttpService, azureCosmos.GetCosmosClient(), _dingDing, evaluationSyncInfo.grouplist, schoolCode);
-            evaluationSyncInfo.studentCount =  listInfo.rmembers.Count();
+
+            if (evaluationSyncInfo.subjects.IsNotEmpty() && evaluationSyncInfo.grouplist.IsNotEmpty()) 
+            {
+                long blobTime =-1;
+                long blobSize = 0;
+                long blobCount = 0;
+                
+                if (!string.IsNullOrWhiteSpace(evaluationSyncInfo.shortCode))
+                {
+                    evaluationSyncInfo.shortCode = $"{MurmurHash3.Hash32(evaluationSyncInfo.id)}";
+                }
+                var listInfo = await GroupListService.GetMemberByListids(_coreAPIHttpService, azureCosmos.GetCosmosClient(), _dingDing, evaluationSyncInfo.grouplist, schoolCode);
+                evaluationSyncInfo.studentCount =  listInfo.rmembers.Count();
+                evaluationSyncInfo.paperCount =evaluationSyncInfo.subjects.Select(x => x.papers).Count();
+                var client = azureStorage.GetBlobContainerClient(owner);
+                foreach (var subject in evaluationSyncInfo.subjects)
+                {
+                    foreach (var paper in subject.papers)
+                    {
+                        List<BlobHashInfo> blobs = new List<BlobHashInfo>();
+                        try
+                        {
+                            await foreach (BlobItem blobItem in client.GetBlobsAsync(BlobTraits.None, BlobStates.None, paper.blob))
+                            {
+                                var lastModified = blobItem.Properties.LastModified;
+                                if (lastModified.HasValue)
+                                {
+                                    lastModified.Value.ToUnixTimeMilliseconds();
+                                }
+                                var hash = blobItem.Properties.ContentHash;
+                                var path = blobItem.Name;
+                                var size = blobItem.Properties.ContentLength;
+                                blobs.Add(new BlobHashInfo
+                                {
+                                    hash = Md5Hash.GetbyteToString(hash),
+                                    last = lastModified.HasValue ? lastModified.Value.ToUnixTimeMilliseconds() : 0,
+                                    path = path,
+                                    size = size.HasValue ? size.Value : 0
+                                });
+                            };
+                        }
+                        catch
+                        {
+
+                        }
+                        long lastTime = blobs.Max(x => x.last);
+                        blobTime= lastTime>blobTime?lastTime:blobTime;
+                        if (blobs.IsNotEmpty()) 
+                        {
+                            blobSize+=blobs.Sum(x => x.size);
+                            blobCount+=blobs.Count;
+                            var order = blobs.OrderBy(x => $"{x.path}-{x.hash}-{x.size}-{x.last}");
+                            string blobStr = string.Join(",", order.Select(x=> $"{x.path}-{x.hash}-{x.size}-{x.last}"));
+                            // 计算hash,校准路径,文件hash,文件大小,最后修改时间
+                            paper.paperHash= ShaHashHelper.GetSHA1(blobStr);
+                        }
+                    }
+                }
+                evaluationSyncInfo.blobTime = blobTime> evaluationSyncInfo.blobTime ? blobTime : evaluationSyncInfo.blobTime;
+                evaluationSyncInfo.blobSize = blobSize;
+                evaluationSyncInfo.blobCount = blobCount;
+                evaluationSyncInfo.blobLastHash = evaluationSyncInfo.blobHash;
+                evaluationSyncInfo.blobHash = ShaHashHelper.GetSHA1(string.Join("-", evaluationSyncInfo.subjects.SelectMany(x => x.papers).Select(x => x.paperHash)));
+            }
         }
     }
 }

TEAMModelOS.SDK/Models/Service/FixDataService.cs

@@ -8,7 +8,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.Models;
 using Azure.Storage.Blobs.Models;
 using DinkToPdf.Contracts;

TEAMModelOS.SDK/Models/Service/GenPDFService.cs

@@ -24,7 +24,7 @@ using System.Net.Http.Headers;
 using Azure.Storage.Sas;
 using TEAMModelOS.SDK.Models.Service;
 using Azure.Core;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using System.Configuration;
 using Google.Protobuf.WellKnownTypes;
 

TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -10,7 +10,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.SDK.Models.Service
 {

TEAMModelOS.SDK/Models/Service/SystemService.cs

@@ -26,7 +26,7 @@ using System.Configuration;
 using System.ServiceModel.Channels;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 using System.Threading;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 namespace TEAMModelOS.SDK.Models.Service
 {
     public static class SystemService

TEAMModelOS/Controllers/Analysis/ClassAnalysisController.cs

@@ -20,7 +20,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using System.Net;
 using System.Net.Http.Json;
 

TEAMModelOS/Controllers/Both/CourseController.cs

@@ -15,7 +15,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
 using System.Dynamic;
 using Azure;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Configuration;
 using TEAMModelOS.Filter;

TEAMModelOS/Controllers/Both/ScoreCalcController.cs

@@ -24,7 +24,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.School;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.Controllers

TEAMModelOS/Controllers/Both/ShareController.cs

@@ -18,7 +18,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Services;
 using static TEAMModelOS.Controllers.FixDataController;
 

TEAMModelOS/Controllers/Both/SheetConfigController.cs

@@ -13,7 +13,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.Models;
 using Microsoft.Extensions.Options;
 
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using Azure;
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.SDK.Services;

TEAMModelOS/Controllers/Both/SyllabusController.cs

@@ -12,7 +12,7 @@ using System.Text.Json;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using Microsoft.AspNetCore.Http;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using Microsoft.Azure.Cosmos;
 
 using Microsoft.Extensions.Options;

TEAMModelOS/Controllers/Both/VolumeController.cs

@@ -15,7 +15,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
  
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;

TEAMModelOS/Controllers/Client/AClassONEController.cs

@@ -32,7 +32,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Student;
 using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Services;

TEAMModelOS/Controllers/Client/HiScanController.cs

@@ -21,13 +21,13 @@ using TEAMModelOS.SDK.Models.Cosmos;
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
 using StackExchange.Redis;
-using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
+using TEAMModelOS.SDK.Models.Cosmos.Inner;
 using System.IO;
 using System.Dynamic;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Sas;
 using Lib.AspNetCore.ServerSentEvents;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
  
 using TEAMModelOS.SDK.Models.Service;
 

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -23,7 +23,7 @@ using TEAMModelOS.SDK.Models;
 using System.Dynamic;
  
 using StackExchange.Redis;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK;
 using Microsoft.Extensions.Configuration;
 using Azure.Messaging.ServiceBus;
@@ -32,7 +32,7 @@ using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.Models.Request;
 using Azure;
 using TEAMModelOS.Controllers.Both;
-using TEAMModelOS.SDK.Models.Cosmos.School;
+using TEAMModelOS.SDK.Models.Cosmos;
 using Azure.Storage.Blobs;
 using HtmlAgilityPack;
 using System.Diagnostics;

TEAMModelOS/Controllers/Common/AreaController.cs

@@ -31,7 +31,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Student;
 using TEAMModelOS.SDK.Models.Service;
 

TEAMModelOS/Controllers/Common/ArtClass.cs

@@ -40,7 +40,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Student;
 using Survey = TEAMModelOS.SDK.Models.Survey;
 

TEAMModelOS/Controllers/Common/ArtController.cs

@@ -18,7 +18,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Student;
 
 namespace TEAMModelOS.Controllers.Common

TEAMModelOS/Controllers/Common/CommonController.cs

@@ -18,7 +18,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.Controllers.Common

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -13,7 +13,7 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Table;
 using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Configuration;
@@ -28,7 +28,7 @@ using static TEAMModelOS.SDK.SchoolService;
 using Azure.Core;
 
 
-using Item = TEAMModelOS.SDK.Models.Cosmos.Common.Item;
+using Item = TEAMModelOS.SDK.Models.Cosmos.Item;
 
 
 using TEAMModelOS.SDK.Services;

TEAMModelOS/Controllers/Common/ExamLiteController.cs

@@ -16,7 +16,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.Controllers.Common

TEAMModelOS/Controllers/Common/SurveyController.cs

@@ -17,13 +17,13 @@ using TEAMModelOS.Models;
 using Microsoft.Extensions.Options;
 using TEAMModelOS.Filter;
 using Azure.Storage.Blobs.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
+using TEAMModelOS.SDK.Models.Cosmos.Inner;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
 using System.Net.Http;
 using TEAMModelOS.SDK.Models.Cosmos;
 using Azure.Messaging.ServiceBus;
 using Azure.Storage.Sas;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using Microsoft.Extensions.Configuration;
 using System.IO;
 using Microsoft.AspNetCore.Authorization;

TEAMModelOS/Controllers/Normal/AbilityTaskController.cs

@@ -15,9 +15,9 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
-using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
+using TEAMModelOS.SDK.Models.Cosmos.Inner;
  
 using TEAMModelOS.Filter;
 using System.ComponentModel.DataAnnotations;

TEAMModelOS/Controllers/Normal/AreaSettingController.cs

@@ -19,7 +19,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.Controllers

TEAMModelOS/Controllers/Normal/ArtSettingController.cs

@@ -22,7 +22,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 using TEAMModelOS.SDK.Models.Service;
 using Microsoft.Azure.Cosmos.Table;

TEAMModelOS/Controllers/OpenApi/Business/BizArtController.cs

@@ -13,7 +13,7 @@ using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Dtos;
 
 namespace TEAMModelOS.Controllers

TEAMModelOS/Controllers/OpenApi/Business/BizCustomizeController.cs

@@ -19,7 +19,7 @@ using System;
 using System.Text;
 using Azure.Core;
 
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 
 using TEAMModelOS.Controllers.Analysis;

TEAMModelOS/Controllers/OpenApi/Business/BizExamController.cs

@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using TEAMModelOS.Filter;
 using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Dtos;
 using TEAMModelOS.SDK.Models;
  

TEAMModelOS/Controllers/OpenApi/Business/BizSyllabusController.cs

@@ -15,7 +15,7 @@ using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Dtos;
 using TEAMModelOS.SDK.Services;
 

TEAMModelOS/Controllers/School/ArtReviewController.cs

@@ -21,7 +21,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 using Microsoft.AspNetCore.Authorization;
 

TEAMModelOS/Controllers/School/ClassController.cs

@@ -20,7 +20,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/School/CorrectController.cs

@@ -21,7 +21,7 @@ using TEAMModelOS.SDK.Models.Cosmos;
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
 using StackExchange.Redis;
-using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
+using TEAMModelOS.SDK.Models.Cosmos.Inner;
 
 using TEAMModelOS.SDK.Models.Service;
 using Microsoft.Extensions.Configuration;

TEAMModelOS/Controllers/School/ImportExamController.cs

@@ -16,7 +16,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension; 
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.School;
+using TEAMModelOS.SDK.Models.Cosmos;
 using Microsoft.Azure.Cosmos;
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/School/NoticeController.cs

@@ -22,7 +22,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 namespace TEAMModelOS.Controllers
 {
     [Route("school/notice")]

TEAMModelOS/Controllers/School/SchoolController.cs

@@ -30,7 +30,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
-using TEAMModelOS.SDK.Models.Cosmos.School;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service.BI;
 using static TEAMModelOS.SDK.Models.Teacher;
 using TEAMModelOS.SDK.Models.Table;

TEAMModelOS/Controllers/Student/OverallEducationController.cs

@@ -25,7 +25,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Services;
 using static TEAMModelOS.Controllers.OverallEducationController;

TEAMModelOS/Controllers/Student/StudentCommonController.cs

@@ -16,7 +16,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Services;
 using static TEAMModelOS.SDK.StudentService;

TEAMModelOS/Controllers/Teacher/FavoriteController.cs

@@ -13,7 +13,7 @@ using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Services;

TEAMModelOS/Controllers/Teacher/TeacherCommonController.cs

@@ -14,7 +14,7 @@ using TEAMModelOS.Filter;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Services;
 
 using TEAMModelOS.SDK;

TEAMModelOS/Controllers/XTest/BatchProcessController.cs

@@ -17,7 +17,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 
  

TEAMModelOS/Controllers/XTest/BusinessController.cs

@@ -17,7 +17,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using Azure.Storage.Blobs.Models;
 using Microsoft.AspNetCore.Authorization;
 

TEAMModelOS/Controllers/XTest/DataMigrationController.cs

@@ -17,7 +17,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Service;