移除多余的代码

TEAMModelOS.Service/Models/Evaluation/Dtos/Own/DocInfoDto.cs

@@ -1,19 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-
-namespace TEAMModelOS.Model.Evaluation.Dtos.Own
-{
-    
-    public class DocInfoDto
-    {
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string DocUrl { get;set; }
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string Folder { get; set; }
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string ShaCode { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Dtos/Own/Evaluats.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TEAMModelOS.Model.Evaluation.Dtos.Own
-{
-    public class Evaluats
-    {
-        /// <summary>
-        /// 题库集合
-        /// </summary>
-        public string[] ItemIds { get; set; }
-        /// <summary>
-        /// 评测名称
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// 评测科目
-        /// </summary>
-        public string Subject { get; set; }
-        /// <summary>
-        /// 考试情景
-        /// </summary>
-        public string Scene { get; set; }
-        /// <summary>
-        /// 评测类型
-        /// </summary>
-        public string Type { get; set; }
-        /// <summary>
-        /// 评测对象
-        /// </summary>
-        public string Target { get; set; }
-        /// <summary>
-        /// 评测排定
-        /// </summary>
-        public string Schedule { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Dtos/Own/TestPaperDto.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TEAMModelOS.Model.Evaluation.Dtos.Own
-{
-    public class TestPaperDto
-    {
-        public string Name { get; set; }
-        public List<string> ItemId { get; set; }
-        public string SchoolCode { get; set; }
-        public string PeriodCode { get; set; }
-        public string GradeCode { get; set; }
-        public string ClassCode { get; set; }
-        public string SubjectCode { get; set; }
-        public string TeamodelId { get; set; }
-        public List<string> Point { get; set; }
-        public object Extend { get; set; }
-        public int State { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/AnswerInfo.cs

@@ -1,38 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.EvaluaTion.Models
-{
-    [TableSpace(Name = "Evaluation")]
-    
-    public class AnswerInfo : TableEntity
-    {
-        /// <summary>
-        /// 学号
-        /// </summary>
-        public string StudentId { get; set; }
-        /// <summary>
-        /// 考试ID
-        /// </summary>
-        public string ExNO { get; set; }
-
-        /// <summary>
-        /// 题序
-        /// </summary>
-        public string Index { get; set; }
-        /// <summary>
-        /// 作答选项
-        /// </summary>
-        public string Selection { get; set; }
-        /// <summary>
-        /// 得分
-        /// </summary>
-        public string Point { get; set; }
-        
-    }
-}
-

TEAMModelOS.Service/Models/Evaluation/Models/CosmosModels/Answer.cs

@@ -1,28 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
-{
-    [TableSpace(Name = "Evaluation")]
-    public class Answer
-    {
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; set; }
-        public string Number { get; set; }
-        [PartitionKey]
-        public string ExNO { get; set; }
-        public string StudentId { get; set; }
-        public string Index { get; set; }
-        public float Point { get; set; }
-        public string Detail { get; set; }
-        public string CourseCode { get; set; }
-        public string ClassCode { get; set; }
-        public string GradeCode { get; set; }
-        public string SchoolCode { get; set; }
-        public string ExamName { get; set; }
-
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/CosmosModels/AnswerDetail.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
-{
-    public class AnswerDetail
-    {
-        public string Index { get; set; }
-        public float Point { get; set; }
-        public string Detail { get; set; }
-
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/CosmosModels/Answers.cs

@@ -1,27 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
-{
-    public class Answers
-    {
-
-        public Answers() {
-            Detail = new List<AnswerDetail>();
-        }
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; set; }
-        [PartitionKey]
-        public string ExNO { get; set; }
-        public string StudentId { get; set; }
-        public string CourseCode { get; set; }
-        public string ClassCode { get; set; }
-        public string GradeCode { get; set; }
-        public string SchoolCode { get; set; }
-        public List<AnswerDetail> Detail { get; set; }
-
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/CosmosModels/BaseInfo.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
-{
-    [TableSpace(Name = "Evaluation")]
-    public class BaseInfo
-    {
-        [PartitionKey]
-        public string Type { get; set; }
-        public string Code { get; set; }
-        public string Name { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/CosmosModels/ClassIndex.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
-{
-    public class ClassIndex
-    {
-        public string ClassCode { get; set; }
-        public int[] IndexRange { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/CosmosModels/Exam.cs

@@ -1,20 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
-{
-    [TableSpace(Name = "Evaluation")]
-    public class Exam
-    {
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; set; }
-        [PartitionKey]
-        public string Number { get; set; }
-        public string Name { get; set; }
-        public string Time { get; set; }
-        public string SchoolName { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/CosmosModels/Exams.cs

@@ -1,21 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
-{
-    public class Exams
-    {
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; set; }
-        [PartitionKey]
-        public string ExNO { get; set; }
-        public string ExName { get; set; }
-        public string ExTime { get; set; }
-        public int AcademicYear { get; set; }
-        public int SOrder { get; set; }
-        public string Sub { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/CosmosModels/Subjects.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
-{
-    public class Subjects
-    {
-        public string Code { get; set; }
-        public string Name { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/Evaluating.cs

@@ -1,45 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Evaluation.Models
-{
-    [TableSpace(Name = "Evaluation")]
-    
-    public class Evaluating: TableEntity
-    {
-        /// <summary>
-        /// 题库集合
-        /// </summary>
-        public string[] ItemIds { get; set; }
-
-        /// <summary>
-        /// 评测名称
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// 评测科目
-        /// </summary>
-        public string Subject { get; set; }
-        /// <summary>
-        /// 考试情景
-        /// 
-        /// </summary>
-        public string Scene { get; set; }
-        /// <summary>
-        /// 评测类型
-        /// </summary>
-        public string Type { get; set; }
-        /// <summary>
-        /// 评测对象
-        /// </summary>
-        public string Target { get; set; }
-        /// <summary>
-        /// 评测排定
-        /// </summary>
-        public string Schedule { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/ExamInfo.cs

@@ -1,78 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.EvaluaTion.Models
-{
-    [TableSpace(Name = "Evaluation")]
-    
-    public class ExamInfo : TableEntity
-    {
-
-        /// <summary>
-        /// 考试唯一标识
-        /// </summary>
-        public string ExId { get; set; }
-        /// <summary>
-        /// 学校编码
-        /// </summary>
-        public string SchoolCode { get; set; }
-        /// <summary>
-        /// 学校名称
-        /// </summary>
-        public string SchoolName { get; set; }
-        /// <summary>
-        /// 班级编码
-        /// </summary>
-        public string ClassCode { get; set; }
-        /// <summary>
-        /// 班级名称
-        /// </summary>
-        public string ClassName { get; set; }
-        /// <summary>
-        /// 年级名称
-        /// </summary>
-        public string GradeName { get; set; }
-        /// <summary>
-        /// 学期年份
-        /// </summary>
-        public int AcademicYear { get; set; } = 0;
-        /// <summary>
-        /// 区别上下学期
-        /// </summary>
-        public int SOrder { get; set; }
-        /// <summary>
-        /// 考试名称
-        /// </summary>
-        public string ExName { get; set; }
-        public string ExTime { get; set; }
-        public string EndTime { get; set; }
-        /// <summary>
-        /// 科目名称
-        /// </summary>
-        public string CouseName { get; set; }
-        /// <summary>
-        /// 科目编码
-        /// </summary>
-        public string CouseCode { get; set; }
-        /// <summary>
-        /// 科目唯一标识
-        /// </summary>
-        public string CouseNO { get; set; }
-        public string StuCount { get; set; }
-        public string QNumber { get; set; }
-        /// <summary>
-        /// 校平均分
-        /// </summary>
-        public string SchoolAvgScore { get; set; }
-        /// <summary>
-        /// 班级平均分
-        /// </summary>
-        public string ClassAvgScore { get; set; }
-
-
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/Exscore.cs

@@ -1,23 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Evaluation.Models
-{
-    [TableSpace(Name = "Evaluation")]
-    
-    public class Exscore : TableEntity
-    {
-        public string StuId { get; set; }
-        public string ExNO { get; set; }
-        public int Score { get; set; }
-        public int AnsNum { get; set; }
-        public int TrueNum { get; set; }
-        public float TrueRate { get; set; }
-        public string SpendTime { get; set; }
-        public DateTimeOffset SubmitTime { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/ItemBank.cs

@@ -1,102 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.EvaluaTion.Models
-{
-    [TableSpace(Name = "Evaluation")]
-    
-    public class ItemBank : TableEntity
-    {
-        public string Id { get; set; }
-        /// <summary>
-        /// 题目
-        /// </summary>
-        public string Question { get; set; }
-        /// <summary>
-        /// 题目顺序 可移植到试卷库
-        /// </summary>
-        public string Index { get; set; }
-        /// <summary>
-        /// 题目类型
-        /// </summary>
-        public string Type { get; set; }
-        /// <summary>
-        /// 主客观类型
-        /// </summary>
-        public string Objective { get; set; }
-        /// <summary>
-        /// 分值 可移植到试卷库
-        /// </summary>
-        public string Point { get; set; }
-        /// <summary>
-        /// 选项
-        /// </summary>
-        public string Option { get; set; }
-        /// <summary>
-        /// 标准答案
-        /// </summary>
-        public string Answer { get; set; }
-        /// <summary>
-        /// 对应科目
-        /// </summary>
-        public string ConceptSubject { get; set; }
-        /// <summary>
-        /// 知识块
-        /// </summary>
-        public string ConceptArea { get; set; }
-        /// <summary>
-        /// 知识点
-        /// </summary>
-        /// 
-        public string Concept { get; set; }
-        /// <summary>
-        /// 详解
-        /// </summary>
-        public string Explain { get; set; }
-        /// <summary>
-        /// 难度
-        /// </summary>
-        public string Difficulty { get; set; }
-        /// <summary>
-        /// 重要性
-        /// </summary>
-        public string Importance { get; set; }
-        /// <summary>
-        /// 预计作答时间
-        /// </summary>
-        public string Time { get; set; }
-        /// <summary>
-        /// 使用计数
-        /// </summary>
-        public int UsageCount { get; set; }
-        /// <summary>
-        /// 复合题型ID
-        /// </summary>
-        public string Pid { get; set; }
-        /// </summary>
-        public string ResourceId { get; set; }
-        /// <summary>
-        /// 资源类型
-        /// </summary>
-        public int ResourceType { get; set; }
-        /// <summary>
-        /// 学校编码
-        /// </summary>
-        public string ResourceCode { get; set; }
-        public string ResourceName { get; set; }
-        /// <summary>
-        /// 科目编码
-        /// </summary>
-        public string SubjectCode { get; set; }
-        /// <summary>
-        /// 创建者
-        /// </summary>
-        public string Creator { get; set; }
-        public string CreatorCode { get; set; }
-
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/Option.cs

@@ -1,43 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.EvaluaTion.Models
-{
-
-    [TableSpace(Name = "Evaluation")]
-    
-    /// <summary>
-    /// 选项信息
-    /// </summary>
-    public class Option : TableEntity
-    {
-        /// <summary>
-        /// 选项编号
-        /// </summary>
-        public string Idex { get; set; }
-        /// <summary>
-        /// 选项内容
-        /// </summary>
-        public string Data { get; set; }
-        /// <summary>
-        /// 试题编号
-        /// </summary>
-        public string ItemId { get; set; }
-        /// <summary>
-        /// 试卷编号
-        /// </summary>
-        public string TpId { get; set; }
-        /// <summary>
-        /// 选择次数
-        /// </summary>
-        public int OptionNum { get; set; }
-        /// <summary>
-        /// 选择率
-        /// </summary>
-        public float OptionRate { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/Paper.cs

@@ -1,19 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.EvaluaTion.Models
-{
-    [TableSpace(Name = "Evaluation")]
-    
-    public class Paper: TableEntity
-    {
-        public string Id { get; set; }
-        public string Name { get; set; }
-        public string Count { get; set; }
-        public string Subject { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/QuestionBank.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TEAMModelOS.Model.EvaluaTion.Models
-{
-    public class QuestionBank
-    {
-        public string Source { set; get; }
-
-
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/TestPaper.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Evaluation.Models
-{
-    [TableSpace(Name = "Evaluation")]
-    public class TestPaper
-    {
-        [PartitionKey]
-        public string Name { get; set; }
-        /// <summary>
-        /// 题目ID
-        /// </summary>
-        public string ItemId { get; set; }
-        /// <summary>
-        /// 题序（试卷排版顺序）
-        /// </summary>
-        public string Index { get; set; }
-        public string SchoolCode { get; set; }
-        /// <summary>
-        /// 学段编码
-        /// </summary>
-        /// 
-        public string PeriodCode { get; set; }
-        public string GradeCode { get; set; }
-        public string ClassCode { get; set; }
-        public string SubjectCode { get; set; }
-        public string TeamodelId { get; set; }
-        /// <summary>
-        /// 是否公开
-        /// </summary>
-        public int State { get; set; } = 0;
-        /// <summary>
-        /// 动态字段部分
-        /// </summary>
-        public object Extends { get; set; }
-        /// <summary>
-        /// 分值或者配分
-        /// </summary>
-        public string Point { get; set; }
-    }
-}

TEAMModelOS.Service/Models/Evaluation/Models/UseItemBank.cs

@@ -1,103 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.EvaluaTion.Models
-{
-    [TableSpace(Name = "Evaluation")]
-    
-    public class UseItemBank : TableEntity
-    {
-        public string Id { get; set; }
-        /// <summary>
-        /// 题目
-        /// </summary>
-        public string Question { get; set; }
-        /// <summary>
-        /// 题目顺序 可移植到试卷库
-        /// </summary>
-        public string Index { get; set; }
-        /// <summary>
-        /// 题目类型
-        /// </summary>
-        public string Type { get; set; }
-        /// <summary>
-        /// 主客观类型
-        /// </summary>
-        public string Objective { get; set; }
-        /// <summary>
-        /// 分值 可移植到试卷库
-        /// </summary>
-        public string Point { get; set; }
-        /// <summary>
-        /// 选项
-        /// </summary>
-        public string Option { get; set; }
-        /// <summary>
-        /// 标准答案
-        /// </summary>
-        public string Answer { get; set; }
-        /// <summary>
-        /// 对应科目
-        /// </summary>
-        public string ConceptSubject { get; set; }
-        /// <summary>
-        /// 知识块
-        /// </summary>
-        public string ConceptArea { get; set; }
-        /// <summary>
-        /// 知识点
-        /// </summary>
-        /// 
-        public string Concept { get; set; }
-        /// <summary>
-        /// 详解
-        /// </summary>
-        public string Explain { get; set; }
-        /// <summary>
-        /// 难度
-        /// </summary>
-        public string Difficulty { get; set; }
-        /// <summary>
-        /// 重要性
-        /// </summary>
-        public string Importance { get; set; }
-        /// <summary>
-        /// 预计作答时间
-        /// </summary>
-        public string Time { get; set; }
-        /// <summary>
-        /// 使用计数
-        /// </summary>
-        public int UsageCount { get; set; }
-        //引用父类ID
-        public string Pid { get; set; }
-        /// <summary>
-        /// 数据源ID
-        /// </summary>
-        public string ResourceId { get; set; }
-        /// <summary>
-        /// 资源类型
-        /// </summary>
-        public string ResourceType { get; set; }
-        /// <summary>
-        /// 学校编码
-        /// </summary>
-        public string ResourceCode { get; set; }
-        public string ResourceName { get; set; }
-        /// <summary>
-        /// 科目编码
-        /// </summary>
-        public string SubjectCode { get; set; }
-        /// <summary>
-        /// 创建者
-        /// </summary>
-        public string Creator { get; set; }
-        public string CreatorCode { get; set; }
-
-
-    }
-}

TEAMModelOS.Service/Services/Evaluation/Implements/ExamInfoService.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using TEAMModelOS.Model.Evaluation.Models.CosmosModels; 
-using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
-using TEAMModelOS.Service.EvaluaTion.Interfaces;
-using TEAMModelOS.Service.Models.Core;
-using TEAMModelOS.Service.Models.Evaluation.Models.CosmosModels;
-
-namespace TEAMModelOS.Service.EvaluaTion.Implements
-{
-    public class ExamInfoService :  IExamInfoService
-    {
-
-        public IAzureCosmosDBRepository _cosmosrepository;
-        public ExamInfoService(IAzureCosmosDBRepository cosmosDBRepository)
-        {
-            _cosmosrepository = cosmosDBRepository;
-        }
-
-         
-
-        public async Task<SimpleExam> SaveToCosmos(SimpleExam simple)
-        {
-            await _cosmosrepository.Save(simple);
-            return simple;
-            //throw new NotImplementedException();
-        }
- 
-        public async Task<List<SimpleExam>> FindSimplExam(Dictionary<string, object> obj)
-        {
-            return await _cosmosrepository.FindByDict<SimpleExam>(obj);
-            
-        }
-        public async Task<List<ExamPaper>> FindExamPaper(Dictionary<string, object> obj)
-        {
-            return await _cosmosrepository.FindByDict<ExamPaper>(obj);
-
-        }
-
-        public async Task<List<Student>> SaveListToCosmos(List<Student> students)
-        {
-            await _cosmosrepository.SaveAll(students);
-            return students;
-        }
-
-        public async Task<List<Student>> FindStudents(Dictionary<string, object> obj)
-        {
-            return await _cosmosrepository.FindByDict<Student>(obj);
-        }
-    }
-
-}

TEAMModelOS.Service/Services/Evaluation/Implements/HtmlAnalyzeService.cs

@@ -9,19 +9,11 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using TEAMModelOS.Model.Evaluation.Dtos.Own;
-using TEAMModelOS.SDK.Context.Configuration;
-using TEAMModelOS.SDK.Context.Constant;
-using TEAMModelOS.SDK.Extension.SnowFlake;
+
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.FileHelper;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
 using TEAMModelOS.SDK.Helper.Security.ShaHash;
-using TEAMModelOS.SDK.Module.AzureBlob.Container;
-using TEAMModelOS.SDK.Module.AzureBlob.Interfaces;
-using TEAMModelOS.SDK.Module.AzureTable.Interfaces;
 using TEAMModelOS.Service.Models.Core;
 using TEAMModelOS.Service.Models.Evaluation.Dtos.Own;
 using TEAMModelOS.Service.Services.Evaluation.Interfaces;

TEAMModelOS.Service/Services/Evaluation/Implements/ImportExerciseService.cs

@@ -11,8 +11,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using TEAMModelOS.Model.Evaluation.Dtos.Own;
-using TEAMModelOS.SDK.Context.Configuration;
+
 using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.Extension.SnowFlake;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;

TEAMModelOS.Service/Services/Evaluation/Implements/TestPaperService.cs

@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using TEAMModelOS.Model.Evaluation.Dtos.Own;
-using TEAMModelOS.Model.Evaluation.Models;
-using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
-using TEAMModelOS.Service.Evaluation.Interfaces;
-
-namespace TEAMModelOS.Service.Evaluation.Implements
-{
-    public class TestPaperService : ITestPaperService
-    {
-        public IAzureCosmosDBRepository _cosmosrepository;
-
-        public TestPaperService(IAzureCosmosDBRepository cosmosDBRepository) {
-            _cosmosrepository = cosmosDBRepository;
-        }
-
-        public async Task<List<TestPaper>> FindPapersAsync(Dictionary<string, object> paper)
-        {
-            return await _cosmosrepository.FindByDict<TestPaper>(paper);
-        }
-
-        public async Task<TestPaper> Save(TestPaperDto dto)
-        {
-             
-                return null;
-             
-            
-        }
-
-    }
-}

TEAMModelOS.Service/Services/Evaluation/Interfaces/IExamInfoService.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using TEAMModelOS.Model.Evaluation.Models.CosmosModels; 
-using TEAMModelOS.SDK.Context.Configuration;
-using TEAMModelOS.Service.Models.Core;
-using TEAMModelOS.Service.Models.Evaluation.Models.CosmosModels;
-
-namespace TEAMModelOS.Service.EvaluaTion.Interfaces
-{
-    public interface IExamInfoService : IBusinessService
-    {
-        
-        Task<SimpleExam> SaveToCosmos(SimpleExam simple);
-        Task<List<Student>> SaveListToCosmos(List<Student> students);
-        Task<List<SimpleExam>> FindSimplExam(Dictionary<string, Object> paper);
-        Task<List<ExamPaper>> FindExamPaper(Dictionary<string, Object> paper);
-        Task<List<Student>> FindStudents(Dictionary<string, Object> paper);
-    }
-}

TEAMModelOS.Service/Services/Evaluation/Interfaces/IImportExerciseService.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using TEAMModelOS.Model.Evaluation.Dtos.Own;
+
 using TEAMModelOS.SDK.Context.Configuration;
 using TEAMModelOS.Service.Models.Evaluation.Dtos.Own;
 

TEAMModelOS.Service/Services/Evaluation/Interfaces/ITestPaperService.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using TEAMModelOS.Model.Evaluation.Dtos.Own;
-using TEAMModelOS.Model.Evaluation.Models;
-using TEAMModelOS.SDK.Context.Configuration;
-
-namespace TEAMModelOS.Service.Evaluation.Interfaces
-{
-    public interface ITestPaperService : IBusinessService
-    {
-        Task<TestPaper> Save(TestPaperDto dto);
-        Task<List<TestPaper>> FindPapersAsync(Dictionary<string, Object> paper);
-    }
-}

TEAMModelOS.Service/TEAMModelOS.Service.csproj

@@ -5,11 +5,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
+    <Compile Remove="Models\Evaluation\Dtos\Third\**" />
+    <EmbeddedResource Remove="Models\Evaluation\Dtos\Third\**" />
+    <None Remove="Models\Evaluation\Dtos\Third\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Models\Evaluation\Dtos\Third\" />
+    <ProjectReference Include="..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
   </ItemGroup>
 
 </Project>

TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -9,8 +9,10 @@ using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
+using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
+using TEAMModelOS.SDK.Module.AzureTable.Interfaces;
 using TEAMModelOS.Service.Analysis.Interfaces;
-using TEAMModelOS.Service.EvaluaTion.Interfaces;
+
 using TEAMModelOS.Service.Models.Core;
 using TEAMModelOS.Service.Models.Evaluation.Models.CosmosModels;
 
@@ -20,11 +22,12 @@ namespace TEAMModelOS.Controllers.Analysis
     [ApiController]
     public class AchievementController : Controller
     {
-        private readonly IExamInfoService examInfoService;
+
+        private readonly IAzureCosmosDBRepository azureCosmosDBRepository;
         private readonly IAchievementService achievementService;
-        public AchievementController(IExamInfoService _examInfoService, IAchievementService _achievementService)
+        public AchievementController(  IAchievementService _achievementService , IAzureCosmosDBRepository _azureCosmosDBRepository)
         {
-            examInfoService = _examInfoService;
+            azureCosmosDBRepository = _azureCosmosDBRepository;
             achievementService = _achievementService;
 
         }
@@ -33,12 +36,12 @@ namespace TEAMModelOS.Controllers.Analysis
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             Console.WriteLine(DateTimeOffset.Now.Second);
-            List<SimpleExam> exams = await examInfoService.FindSimplExam(request.@params);
+            List<SimpleExam> exams = await azureCosmosDBRepository.FindByDict<SimpleExam>(request.@params);
             Dictionary<string, object> stuMap = new Dictionary<string, object>
             {
                 { "schoolCode", "Habook" }
             };
-            List<Student> students = await examInfoService.FindStudents(stuMap);
+            List<Student> students = await azureCosmosDBRepository.FindByDict<Student> (stuMap);
             Console.WriteLine(DateTimeOffset.Now.Second);
             List<Dictionary<string, object>> examList = new List<Dictionary<string, object>>();
             HashSet<string> classList = new HashSet<string>();
@@ -445,12 +448,12 @@ namespace TEAMModelOS.Controllers.Analysis
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             List<Dictionary<string, object>> scatterAnalysis = new List<Dictionary<string, object>>();
             //Dictionary<string, object> scatterAnalysis = new Dictionary<string, object>();
-            List<SimpleExam> exams = await examInfoService.FindSimplExam(request.@params);
+            List<SimpleExam> exams = await azureCosmosDBRepository.FindByDict<SimpleExam>(request.@params);
             Dictionary<string, object> stuMap = new Dictionary<string, object>
             {
                 { "schoolCode", "Habook" }
             };
-            List<Student> students = await examInfoService.FindStudents(stuMap);
+            List<Student> students = await azureCosmosDBRepository.FindByDict<Student>(stuMap);
             List<string> key = new List<string>
             {
                 "name",
@@ -579,8 +582,8 @@ namespace TEAMModelOS.Controllers.Analysis
             HashSet<string> classList = new HashSet<string>();
             List<Dictionary<string, object>> exerciseScatter = new List<Dictionary<string, object>>();
             //Dictionary<string, object> scatterAnalysis = new Dictionary<string, object>();
-            List<SimpleExam> exams = await examInfoService.FindSimplExam(request.@params);
-            List<ExamPaper> paper = await examInfoService.FindExamPaper(request.@params);
+            List<SimpleExam> exams = await azureCosmosDBRepository.FindByDict<SimpleExam>(request.@params);
+            List<ExamPaper> paper = await azureCosmosDBRepository.FindByDict<ExamPaper>(request.@params);
             List<string> key = new List<string>
             {
                 "id",
@@ -777,13 +780,13 @@ namespace TEAMModelOS.Controllers.Analysis
         public async Task<BaseJosnRPCResponse> KnowledgePoint(JosnRPCRequest<Dictionary<string, object>> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            List<ExamPaper> paper = await examInfoService.FindExamPaper(request.@params);
-            List<SimpleExam> exams = await examInfoService.FindSimplExam(request.@params);
+            List<ExamPaper> paper = await azureCosmosDBRepository.FindByDict<ExamPaper>(request.@params);
+            List<SimpleExam> exams = await azureCosmosDBRepository.FindByDict<SimpleExam>(request.@params);
             Dictionary<string, object> stuMap = new Dictionary<string, object>
             {
                 { "schoolCode", "Habook" }
             };
-            List<Student> students = await examInfoService.FindStudents(stuMap);
+            List<Student> students = await azureCosmosDBRepository.FindByDict<Student>(stuMap);
             HashSet<string> knowledge = new HashSet<string>();
             HashSet<string> area = new HashSet<string>();
             List<int> point = new List<int>();

TEAMModelOS/Controllers/Analysis/ChangeController.cs

@@ -9,7 +9,6 @@ using TEAMModelOS.Model.Evaluation.Models.CosmosModels;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper.JsonPath;
 using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
-using TEAMModelOS.Service.EvaluaTion.Interfaces;
 using TEAMModelOS.Service.Models.Core;
 
 namespace TEAMModelOS.Controllers.Analysis
@@ -20,13 +19,11 @@ namespace TEAMModelOS.Controllers.Analysis
     {
        
         private readonly IWebHostEnvironment _hostingEnvironment;
-        private readonly IExamInfoService _examInfoService;
         public IAzureCosmosDBRepository _cosmosrepository;
-        public ChangeController(IWebHostEnvironment hostingEnvironment, IExamInfoService examInfoService, IAzureCosmosDBRepository cosmosDBRepository)
+        public ChangeController(IWebHostEnvironment hostingEnvironment,   IAzureCosmosDBRepository cosmosDBRepository)
         {
             _hostingEnvironment = hostingEnvironment;
             _cosmosrepository = cosmosDBRepository;
-            _examInfoService = examInfoService;
         }
 
 

TEAMModelOS/Controllers/Evaluation/EvaluationController.cs

@@ -1,62 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using TEAMModelOS.Controllers.Core;
-using TEAMModelOS.Model.Evaluation.Dtos.Own;
-using TEAMModelOS.Model.Evaluation.Models;
-using TEAMModelOS.Model.EvaluaTion.Models;
-using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
-using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
-using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
-using TEAMModelOS.Service.Evaluation.Interfaces;
-using TEAMModelOS.Service.EvaluaTion.Interfaces;
-
-namespace TEAMModelOS.Controllers.Evaluation
-{
-    [Route("api/[controller]")]
-    [ApiController]
-    ///[Authorize]
-    public class EvaluationController : BaseController
-    {
-        private readonly IEvaluatingService evaluatingService; 
- 
-        private readonly ITestPaperService testPaperService;
-        public EvaluationController(IEvaluatingService _evaluatingService,
-            ITestPaperService _testPaperService
-             ) {
-            evaluatingService = _evaluatingService;
-           
-            testPaperService = _testPaperService;
-            
-        }
-   
- 
-         
-        [HttpPost("testPaper")]
-        public async Task<BaseJosnRPCResponse> SaveOrUpdateTestPaper(JosnRPCRequest<TestPaperDto> request)
-        {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            TestPaper paper = await testPaperService.Save(request.@params);
-            return builder.Data(paper).build();
-
-        }
-        [HttpPost("FindTestPaper")]
-        public async Task<BaseJosnRPCResponse> FindTestPaper(JosnRPCRequest<Dictionary<string, object>> request)
-        {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            List<TestPaper> papers = await testPaperService.FindPapersAsync(request.@params);
-            if (papers.IsNotEmpty())
-            {
-
-                builder.Data(papers);
-            }
-            else builder.Data(new object[] { });
-            return builder.build();
-
-        }
-  
-    }
-}