zhouj1203@hotmail.com пре 4 година
родитељ
комит
ce5febe55b

+ 4 - 4
TEAMModelOS.SDK/Helper/Common/StringHelper/StringHelper.cs

@@ -117,11 +117,11 @@ namespace TEAMModelOS.SDK.Helper.Common.StringHelper
             result = tmpstr.Remove(endindex);
             return result;
         }
-        public static double[] ListTodouble(List<int> list)
+        public static double[] ListTodouble(List<double> list)
         {
             Double[] doubles = new Double[list.Count];
             int k = 0;
-            foreach (int p in list)
+            foreach (double p in list)
             {
                 doubles[k] = p;
                 k++;
@@ -138,11 +138,11 @@ namespace TEAMModelOS.SDK.Helper.Common.StringHelper
             }
             return result;
         }
-        public static double[,] ListToDouble(List<List<int>> list)
+        public static double[,] ListToDouble(List<List<double>> list)
         {
             int itemCount = 0;
             //int stuCount = list.Count;
-            foreach (List<int> p in list)
+            foreach (List<double> p in list)
             {
                 if (p.Count != 0)
                 {

+ 4 - 4
TEAMModelOS.Service/Models/SchoolInfo/ExamResult.cs

@@ -22,18 +22,18 @@ namespace TEAMModelOS.Service.Models
         public ExamResult()
         {
             classes = new List<Dictionary<string, int[]>>();
-            result = new List<List<int>>();
+            result = new List<List<double>>();
             ids = new List<string>();
-            point = new List<int>();
+            point = new List<double>();
         }
         public string id { get; set; }
         public string name { get; set; }
         public string time { get; set; }
         public string subjectCode { get; set; }
         public List<Dictionary<string, int[]>> classes { get; set; }
-        public List<List<int>> result { get; set; }
+        public List<List<double>> result { get; set; }
         public List<string> ids { get; set; }
-        public List<int> point { get; set; }
+        public List<double> point { get; set; }
      
         public string schoolCode { get; set; }
         public string paperCode { get; set; }

+ 9 - 9
TEAMModelOS.Service/Services/Analysis/Implements/AchievementService.cs

@@ -18,7 +18,7 @@ namespace TEAMModelOS.Service.Analysis.Implements
             _cosmosrepository = cosmosDBRepository;
         }
         //处理各个班级均分分析
-        public Dictionary<string, object> GetAverage(List<ExamResult> exams, List<string> gav, List<string> cav, List<List<int>> subSum, List<Student> students)
+        public Dictionary<string, object> GetAverage(List<ExamResult> exams, List<string> gav, List<string> cav, List<List<double>> subSum, List<Student> students)
         {
             Dictionary<string, object> Average = new Dictionary<string, object>();
             List<List<string>> classAverage = new List<List<string>>();
@@ -76,7 +76,7 @@ namespace TEAMModelOS.Service.Analysis.Implements
                 
         }
 
-        public List<Dictionary<string, object>> GetPR(List<ExamResult> exams, List<List<int>> subSum,List<Student> students)
+        public List<Dictionary<string, object>> GetPR(List<ExamResult> exams, List<List<double>> subSum,List<Student> students)
         {
             // 计算公式 PR=100- (100*R-50)/N
             List<Dictionary<string, object>> subPR = new List<Dictionary<string, object>>();
@@ -123,7 +123,7 @@ namespace TEAMModelOS.Service.Analysis.Implements
                         //初始化班级平均分
                         double points = 0;
                         //初始化班级总分
-                        int classPoint = 0;
+                        double classPoint = 0;
                         foreach (string key in c.Keys)
                         {
                             classList.Add(key);
@@ -235,17 +235,17 @@ namespace TEAMModelOS.Service.Analysis.Implements
                 Dictionary<string, object> dataAll = new Dictionary<string, object>();
                 dataAll.Add("name", "Total");
                 dataAll.Add("keys",keys);
-                List<int> stuAll = new List<int>();
-                List<int> sortGradePoint = new List<int>();
+                List<double> stuAll = new List<double>();
+                List<double> sortGradePoint = new List<double>();
                 Dictionary<string, object> classInfo = new Dictionary<string, object>();
                 List<List<List<string>>> GradePR = new List<List<List<string>>>();
                 int m = 0;
                 int p = 0;
                 List<string> allClassAverages = new List<string>();
                 Dictionary<string, object> classAllData = new Dictionary<string, object>();
-                foreach (List<int> classPoint in subSum)
+                foreach (List<double> classPoint in subSum)
                 {
-                    List<int> sortClassPoint = new List<int>();
+                    List<double> sortClassPoint = new List<double>();
                     int n = 1;
                     //初始化缺考人数
                     int people = 0;
@@ -279,7 +279,7 @@ namespace TEAMModelOS.Service.Analysis.Implements
                     classAllData.Add(className[p], allClassAverage.ToString("0.00"));
                     //allClassAverages.Add(allClassAverage.ToString("0.00"));
                     GradePR.Add(classStuInfo);
-                    sortClassPoint.Sort(delegate (int s1, int s2) { return s2.CompareTo(s1); });
+                    sortClassPoint.Sort(delegate (double s1, double s2) { return s2.CompareTo(s1); });
                     foreach (List<string> stuIn in classStuInfo) {
                         int index = sortClassPoint.IndexOf(int.Parse(stuIn[2]));
                         stuIn[3] = (index + 1).ToString();
@@ -296,7 +296,7 @@ namespace TEAMModelOS.Service.Analysis.Implements
                     }
                     p++;
                 }
-                sortGradePoint.Sort(delegate (int s1, int s2) { return s2.CompareTo(s1); });
+                sortGradePoint.Sort(delegate (double s1, double s2) { return s2.CompareTo(s1); });
                 double allGradeAverage = sortGradePoint.Sum() / sortGradePoint.Count();
                 foreach (List<List<string>> gradeInfo in GradePR)
                 {

+ 2 - 2
TEAMModelOS.Service/Services/Analysis/Interfaces/IAchievementService.cs

@@ -6,8 +6,8 @@ namespace TEAMModelOS.Service.Analysis.Interfaces
 {
     public interface IAchievementService : IBusinessService
     {
-        List<Dictionary<string, object>> GetPR(List<ExamResult> exams, List<List<int>> subSum,List<Student> students);
-        Dictionary<string, object> GetAverage(List<ExamResult> exams,List<string> gav, List<string> cav, List<List<int>> subSum, List<Student> students);
+        List<Dictionary<string, object>> GetPR(List<ExamResult> exams, List<List<double>> subSum,List<Student> students);
+        Dictionary<string, object> GetAverage(List<ExamResult> exams,List<string> gav, List<string> cav, List<List<double>> subSum, List<Student> students);
         List<List<string>> ReName(List<List<string>> datas, List<string> ids,
         List<Dictionary<string, int[]>> classToName, List<Student> students);
 

+ 20 - 20
TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -118,7 +118,7 @@ namespace TEAMModelOS.Controllers.Analysis
             List<string> arrSubject = new List<string>();
             List<string> keys = new List<string>();
             List<string> person = new List<string>();
-            List<List<int>> subSum = new List<List<int>>();
+            List<List<double>> subSum = new List<List<double>>();
             List<string> gAverage = new List<string>();
             List<string> cAverage = new List<string>();
             Dictionary<string, object> AclassAverage = new Dictionary<string, object>();
@@ -143,7 +143,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     {
                         if (exams[0].classes[cls].TryGetValue(exams[0].classes[cls].Keys.ToArray<string>()[0], out int[] index))
                         {
-                            List<int> stuScore = new List<int>();
+                            List<double> stuScore = new List<double>();
                             int stdLen = index[1] - index[0] + 1;
 
                             for (int i = 0; i < stdLen; i++)
@@ -156,7 +156,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 }
                 int xx = 0;
                 //初始化总分
-                int sumPoint = 0;
+                double sumPoint = 0;
                 int sumperson = exams[0].ids.Count;
                 for (int i = 0; i < exams[0].ids.Count; i++)
                 {
@@ -193,7 +193,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     subjects.Add(e.subjectCode);
                     List<string> ClassAverage = new List<string>();
                     //计算试卷总分
-                    int sum = e.point.Sum();
+                    double sum = e.point.Sum();
                     //及格分数
                     double passRate = sum * 0.6;
                     int gradeCount = 0;
@@ -209,7 +209,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     {
                         List<List<string>> classPRL = new List<List<string>>();
                         //初始化班级总分
-                        int classPoint = 0;
+                        double classPoint = 0;
                         //初始化班级缺考人数
                         int classCount = 0;
                         //初始化班级平均分
@@ -230,7 +230,7 @@ namespace TEAMModelOS.Controllers.Analysis
                             for (int i = value[0]; i <= value[1]; i++)
                             {
                                 //初始化学生单科个人得分
-                                int stuPoints = e.result[i].Sum();
+                                double stuPoints = e.result[i].Sum();
                                 //Console.WriteLine("xx: "+xx+" classIndex:" + classIndex + ",i:" + i + " value[0]:" + value[0]+ " value[0]:" + value[1]);
 
                                 subSum[classIndex][i - value[0]] = stuPoints + subSum[classIndex][i - value[0]];
@@ -384,7 +384,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 //记录各个班级进线率占比
                 List<string> persent = new List<string>();
                 int m = 0;
-                foreach (List<int> points in subSum)
+                foreach (List<double> points in subSum)
                 {
                     List<string> detail = new List<string>();
                     keyLine.ForEach(x =>
@@ -432,7 +432,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     "gradeRank"
                 };
                 int n = 0;
-                foreach (List<int> points in subSum)
+                foreach (List<double> points in subSum)
                 {
                     double sum = 0;
                     List<string> classInfo = new List<string>();
@@ -1018,8 +1018,8 @@ namespace TEAMModelOS.Controllers.Analysis
             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>();
-            List<List<int>> result = new List<List<int>>();
+            List<double> point = new List<double>();
+            List<List<double>> result = new List<List<double>>();
             List<Dictionary<string, int[]>> classes = new List<Dictionary<string, int[]>>();
             List<string> ids = new List<string>();
             //string Type = "";
@@ -1055,9 +1055,9 @@ namespace TEAMModelOS.Controllers.Analysis
 
             double Qnum = 0;
             //确定高分组 低分组人数
-            List<List<int>> re = exams[0].result;
+            List<List<double>> re = exams[0].result;
             List<double> resultSum = new List<double>();
-            foreach (List<int> data in re)
+            foreach (List<double> data in re)
             {
                 resultSum.Add(data.Sum());
             }
@@ -1115,7 +1115,7 @@ namespace TEAMModelOS.Controllers.Analysis
             //初始化年级总分
             double total = 0;
             //处理年级单个知识点得分率
-            foreach (List<int> grade in result)
+            foreach (List<double> grade in result)
             {
                 total += grade.Sum();
             }
@@ -1727,7 +1727,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     //获取进线人数
                     iPersons = stuCount * 0.4;
                     //
-                    List<List<int>> subSum = new List<List<int>>();
+                    List<List<double>> subSum = new List<List<double>>();
                     if (simples.IsEmpty()) continue;
                     double weight = 0.5;
                     weightSum += weight;
@@ -1736,7 +1736,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     {
                         if (simples[0].classes[cls].TryGetValue(simples[0].classes[cls].Keys.ToArray<string>()[0], out int[] indexs))
                         {
-                            List<int> stuScore = new List<int>();
+                            List<double> stuScore = new List<double>();
                             int stdLen = indexs[1] - indexs[0] + 1;
 
                             for (int i = 0; i < stdLen; i++)
@@ -1756,7 +1756,7 @@ namespace TEAMModelOS.Controllers.Analysis
                         subjects.Add(s.subjectCode);
                         subjectList.Add(s.subjectCode);
                         //计算试卷总分
-                        int sum = s.point.Sum();
+                        double sum = s.point.Sum();
                         //int stuSum = 0;
                         int classIndex = 0;
                         List<string> ClassAverage = new List<string>();
@@ -1767,7 +1767,7 @@ namespace TEAMModelOS.Controllers.Analysis
                             List<List<string>> classPRL = new List<List<string>>();
 
                             //初始化班级总分
-                            int classPoint = 0;
+                            double classPoint = 0;
                             //初始化班级缺考人数
                             int classCount = 0;
                             //初始化班级平均得分率
@@ -1787,7 +1787,7 @@ namespace TEAMModelOS.Controllers.Analysis
                                 for (int i = value[0]; i <= value[1]; i++)
                                 {
                                     //初始化学生单科个人得分
-                                    int stuPoints = s.result[i].Sum();
+                                    double stuPoints = s.result[i].Sum();
 
                                     subSum[classIndex][i - value[0]] = stuPoints + subSum[classIndex][i - value[0]];
 
@@ -1825,7 +1825,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     //初始化进线分数
                     int ipoint = 0;
                     List<int> AllPoints = new List<int>();
-                    foreach (List<int> points in subSum)
+                    foreach (List<double> points in subSum)
                     {
                         foreach (int po in points)
                         {
@@ -1847,7 +1847,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     ipoint = AllPoints[int.Parse(ip)];
                     int m = 0;
                     List<List<string>> KeyLine = new List<List<string>>();
-                    foreach (List<int> points in subSum)
+                    foreach (List<double> points in subSum)
                     {
                         List<string> detail = new List<string>();
                         double sum = points.Count;

+ 318 - 0
TEAMModelOS/Controllers/Analysis/ChangeController.cs

@@ -0,0 +1,318 @@
+using DocumentFormat.OpenXml.Office2010.ExcelAc;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using TEAMModelOS.Helper.Common.FileHelper;
+using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
+using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
+using TEAMModelOS.SDK.Helper.Common.JsonHelper.JsonPath;
+using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
+using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
+using TEAMModelOS.Service.Models;
+
+namespace TEAMModelOS.Controllers.Analysis
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class ChangeController : Controller
+    {
+
+        private readonly IWebHostEnvironment _hostingEnvironment;
+        public IAzureCosmosDBV3Repository _cosmosrepository;
+        public ChangeController(IWebHostEnvironment hostingEnvironment, IAzureCosmosDBV3Repository cosmosDBRepository)
+        {
+            _hostingEnvironment = hostingEnvironment;
+            _cosmosrepository = cosmosDBRepository;
+        }
+
+
+
+        [HttpGet("SaveObjectAdas")]
+        public BaseJosnRPCResponse SaveObjectAdas(string identity)
+
+        {
+            // 获取系统路径
+            string contentRootPath = _hostingEnvironment.ContentRootPath;
+            identity = "IES/20200716";
+            //string query = "$.info";
+            //int countClasses = 0; 
+            //string queryClass = "$member.1.item_answer[*]";
+            string query = "$.exercises[*]";
+            string queryInfo = "$.info";
+            string queryPoint = "$.testpaper.items[*]";
+            string querySchoolInfo = "$.exercises[0].info";
+            string data = FileTool.getJson(contentRootPath, identity);
+            data = FileTool.UnicodeToString(data);
+            JObject parsedJson = JObject.Parse(data);
+            JsonPathContext context = new JsonPathContext
+            { ValueSystem = new JsonNetValueSystem() };
+            //解析试卷作答详情
+            List<dynamic> papers = context.SelectNodes(parsedJson,
+            query).Select(node => node.Value).ToList();
+            //解析试卷基本信息
+            List<dynamic> info = context.SelectNodes(parsedJson,
+            queryInfo).Select(node => node.Value).ToList();
+            //解析题库信息
+            List<dynamic> Itempoint = context.SelectNodes(parsedJson,
+            queryPoint).Select(node => node.Value).ToList();
+            //解析学校信息
+            List<dynamic> SchoolInfo = context.SelectNodes(parsedJson,
+           querySchoolInfo).Select(node => node.Value).ToList();
+
+            int m = 0;
+            //人数总和
+            int Count = 0;
+            //起始坐标
+            int Strat = 0;
+            // 初始化学生人数
+            int Stus = 0;
+            ExamResult simple = new ExamResult();
+            ExamAnswer examAnswer = new ExamAnswer();
+            
+            List<Student> students = new List<Student>();
+            List<Classroom> classrooms = new List<Classroom>();
+            //List<ExamAnswer> examAnswers = new List<ExamAnswer>();
+            List<List<List<int>>> ClassPoint = new List<List<List<int>>>();
+            List<List<double>> StuPoint = new List<List<double>>();
+            List<string> StuIds = new List<string>();
+            List<List<string>> stuAnswers = new List<List<string>>();
+            List<Dictionary<string, int[]>> Classes = new List<Dictionary<string, int[]>>();
+            Dictionary<object, object> ListInfo = new Dictionary<object, object>();
+            List<double> points = new List<double>();
+            //配分数组
+            Paper paper = new Paper();
+            List<ItemInfo> items = new List<ItemInfo>();
+            int k = 0;
+            Itempoint.ForEach(p =>
+            {
+                string pt = p.point;
+                string OpenTracing = p+"";                
+                JObject jArray = JObject.Parse(OpenTracing);
+                string queryOptions = "$.options[*]";
+                List<dynamic> itemOption = context.SelectNodes(jArray,
+                queryOptions).Select(node => node.Value).ToList();
+                List<CodeValue> codeValues = new List<CodeValue> ();
+                itemOption.ToList<dynamic>().ForEach(i =>
+                {
+                    CodeValue code = new CodeValue
+                    {
+                        code = i.data,
+                        value = i.type
+                    };
+                    codeValues.Add(code);
+                });
+                //题序
+                string order = p.itemindex;
+                string ans = p.answer;
+                string knowlege = p.idx_desc;
+                ItemInfo item = new ItemInfo
+                {
+                    question = p.content,
+                    score = double.Parse(pt),
+                    answer = new List<string> {
+                          ans
+                          },
+                    type = p.type,
+                    order = int.Parse(order),
+                    //level = p.edu_goal,                            
+                    option = codeValues,
+                    points = new List<string> {
+                        knowlege
+                    }
+
+
+                };
+                items.Add(item);
+                k++;
+                points.Add(double.Parse(pt.Trim()));
+            });
+            //处理试卷信息
+            paper.item = items;
+            paper.subjectCode = "Subject_Math";
+            //基本信息
+            info.ForEach(e => {
+                simple.name = e.test_name;
+                simple.time = e.test_date;
+                paper.name = e.test_name;
+            });
+           
+
+            School sc = null;
+            ExamInfo examInfo = null;
+            SchoolInfo.ForEach(s => {
+                string count = s.stucount;
+                string st = s.ex_time;
+                string ed = s.ex_endtime;
+                DateTime.TryParse(st, out DateTime tt);
+                DateTime.TryParse(ed, out DateTime etime);
+                long time = DateTimeHelper.ToUnixTimestamp(tt);
+                long edtime = DateTimeHelper.ToUnixTimestamp(etime);
+                sc = new School
+                {
+                    schoolCode = "88924E4C-F00D-4A1D-B2C3-234F930F29D4",
+                    schoolName = s.school_name,
+                    period = new List<Period> { new Period {periodName = "小学" , periodCode = "c3e1e95a-561e-fabf-cce3-3a564782e443",grades= new List<Grade> {
+                    new Grade { gradeName = "四年级" ,gradeCode = "4"} } } }
+                };
+                //考试基本信息
+                examInfo = new ExamInfo
+                {
+                    id = System.Guid.NewGuid().ToString(),
+                    code = "88924E4C-F00D-4A1D-B2C3-234F930F29D4",
+                    name = s.ex_name,
+                    type = s.ex_type,
+                    startTime = time,
+                    endTime = edtime,                    
+                    stuCount = int.Parse(count),
+                    conditions = new Condition { 
+                        period = "c3e1e95a-561e-fabf-cce3-3a564782e443",
+                        grade = s.grade_name,
+                        semester = s.semester,
+                        subject = new List<string> { "Subject_Math" }
+                    }
+                };
+            });
+            papers.ForEach(x =>
+            {
+
+                //var c = papers[i].member;
+                string stu = x.info.stucount;
+                int k = int.Parse(stu);
+                string key = x.info.class_name;
+                string schoolName = x.info.school_name;
+                Classroom classInfo = new Classroom
+                {
+                    id = System.Guid.NewGuid().ToString(),
+                    classroomName = key,
+                    //classroomType = schoolName,
+                    studentCount = k,
+                    classroomCode = "qcs"
+                };
+                classrooms.Add(classInfo);
+                Classroom classInfoOfStudent = new Classroom
+                {
+                    classroomName = key,
+                    //schoolCode = schoolName,
+                    //studentCount = k,
+                    classroomCode = "qcs"
+                };
+                Dictionary<string, int[]> map = new Dictionary<string, int[]>();
+                int[] Range = new int[2];
+                //处理学生作答数据
+                
+                
+                for (int j = 0; j < 22; j++)
+                {
+                    Student stus = new Student
+                    {
+                        type = 2,
+                        //schoolCode = schoolName
+                    };
+                    string men = x.members[j] + "";
+                    JObject jArray = JObject.Parse(men);
+                    string queryClass = "$.item_answers[*]";
+                    string queryStu = "$.info";
+                    List<string> ans = new List<string>();
+                    List<dynamic> answers = context.SelectNodes(jArray,
+                    queryClass).Select(node => node.Value).ToList();
+                    //学生ID集合
+                    List<dynamic> studentIds = context.SelectNodes(jArray,
+                    queryStu).Select(node => node.Value).ToList();
+                    List<double> point = new List<double>();                    
+                    if (answers.Count == 0)
+                    {
+                        StuIds.Add("0");
+                        k++;
+                    }
+                    else
+                    {
+                        //处理学生信息
+                        studentIds.ToList<dynamic>().ForEach(s =>
+                        {
+
+                            string id = s.student_id;
+                            //id = System.Guid.NewGuid().ToString();
+                            stus.id = id.Trim();
+                            stus.name = s.name;
+                            stus.studentId = id.Trim();                           
+                            string sno = s.seatno;
+                            if (sno.Equals(""))
+                            {
+                                stus.seatNo = 0;
+                            } else {
+                                stus.seatNo = int.Parse(sno);
+                            }
+                            
+                            //stus.classroom = classInfoOfStudent;
+                            StuIds.Add(id.Trim());
+                        });
+                        students.Add(stus);
+                    }
+
+                    answers.ToList<dynamic>().ForEach(p =>
+                    {
+                        string pt = p.real_point;
+                        string ansContent = p.ans_content;
+                        if (ans.Equals(""))
+                        {
+                            ansContent = "无";
+                        }                       
+                        ans.Add(ansContent);
+                        point.Add(double.Parse(pt.Trim()));
+                    });
+                    stuAnswers.Add(ans);
+                    StuPoint.Add(point);
+                    Stus++;
+                }
+                //每次人数累加得到实际总人数
+                Count += Stus;
+                if (m == 0)
+                {
+                    Strat = Stus;
+                    Range[0] = 0;
+                    Range[1] = Stus - 1;
+                }
+                else
+                {
+                    Range[0] = Count - Stus;
+                    Range[1] = Count - 1;
+                }
+
+                map.Add(key, Range);
+                Classes.Add(map);
+                m++;
+                //初始化每个班级人数
+                Stus = 0;
+
+                //ClassPoint.Add(StuPoint);
+            });
+            examAnswer.answer = stuAnswers;
+            examAnswer.code = examInfo.id;
+            paper.code = examInfo.id;
+            simple.code = examInfo.id;
+            simple.classes = Classes;
+            simple.ids = StuIds;
+            simple.point = points;
+            simple.result = StuPoint;
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            //_examInfoService.SaveToCosmos(simple);
+            //_cosmosrepository.Save(sc);
+            /*_cosmosrepository.Save(simple);
+            _cosmosrepository.Save(examAnswer);
+            _cosmosrepository.Save(examInfo);*/
+            //_cosmosrepository.SaveAll(classrooms);
+            //_cosmosrepository.SaveOrUpdateAll(students);
+            //_examInfoService.SaveListToCosmos(students);
+
+
+            return builder.Data(sc).build();
+            //return builder.build();
+        }
+
+
+
+    }
+}

+ 1 - 1
TEAMModelOS/Controllers/Analysis/FileTool.cs

@@ -21,7 +21,7 @@ namespace TEAMModelOS.Helper.Common.FileHelper
                 String path = contentRootPath + "/JsonFile/" + name + ".json";
                 //获取正在占用的文件
                 FileStream fs = new FileStream(path, System.IO.FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-                StreamReader sr = new StreamReader(fs, System.Text.Encoding.ASCII);
+                StreamReader sr = new StreamReader(fs, System.Text.Encoding.UTF8);
                 String line;
                 StringBuilder builder = new StringBuilder();
                 while ((line = sr.ReadLine()) != null)

Разлика између датотеке није приказан због своје велике величине
+ 1429 - 0
TEAMModelOS/JsonFile/IES/20200716.json