1

TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -15,6 +15,8 @@ using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Helper.Security.ShaHash;
 using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.Service.Models;
+using TEAMModelOS.SDK.Helper.Network.HttpHelper;
+using TEAMModelOS.Service.Analysis.Implements;
 
 namespace TEAMModelOS.Controllers.Analysis
 {
@@ -543,7 +545,7 @@ namespace TEAMModelOS.Controllers.Analysis
         }
         public async Task<List<Dictionary<string, dynamic>>> FindPointAnalysisRedis(Dictionary<string, object> dict, string method)
         {
-             //JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+             //ResponseBuilder builder = ResponseBuilder.custom();
             List<Dictionary<string, dynamic>> scatterAnalysis = new List<Dictionary<string, dynamic>>();
             //Dictionary<string, object> scatterAnalysis = new Dictionary<string, object>();
             List<ExamResult> exams = new List<ExamResult>();
@@ -976,7 +978,7 @@ namespace TEAMModelOS.Controllers.Analysis
 
         public async Task<Dictionary<string, dynamic>> FindKnowledgePointRedis(Dictionary<string, object> dict, string method)
         {
-            //JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            //ResponseBuilder builder = ResponseBuilder.custom();
             dict.TryGetValue("subjectCode", out object subjectCode);
             dict.TryGetValue("schoolCode", out object schoolCode);
             dict.TryGetValue("code", out object code);
@@ -1520,9 +1522,11 @@ namespace TEAMModelOS.Controllers.Analysis
         }
 
         [HttpPost("FindExamPaper")]
-        public async Task<BaseJosnRPCResponse> FindExamPaper(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindExamPaper(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            request.@params.TryGetValue("subjectCode", out object subjectCode);
+            request.@params.TryGetValue("code", out object code);
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (RedisHelper.Instance != null)
             {
 
@@ -1535,7 +1539,7 @@ namespace TEAMModelOS.Controllers.Analysis
              {
                  List<Paper> info = await FindExamPaperRedis(request.@params, request.method);
                  builder.Data(info);
-             }*/
+             }
             if (RedisHelper.Exists(CacheCosmosPrefix + ""))
             {
                 List<Paper> info = RedisHelper.HGet<List<Paper>>(CacheCosmosPrefix + "paperInfo" + subjectCode.ToString(), ShaHashHelper.GetSHA1(code.ToString()));
@@ -1570,9 +1574,11 @@ namespace TEAMModelOS.Controllers.Analysis
             }
         }
         [HttpPost("FindExamAnswer")]
-        public async Task<BaseJosnRPCResponse> FindExamAnswer(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindExamAnswer(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            request.@params.TryGetValue("subjectCode", out object subjectCode);
+            request.@params.TryGetValue("code", out object code);
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (RedisHelper.Instance != null)
             {
 
@@ -1585,7 +1591,7 @@ namespace TEAMModelOS.Controllers.Analysis
                         {
                             List<ExamAnswer> info = await FindExamAnswerRedis(request.@params, request.method);
                             builder.Data(info);
-                        }*/
+                        }
             if (RedisHelper.Exists(CacheCosmosPrefix + ""))
             {
                 List<ExamAnswer> info = RedisHelper.HGet<List<ExamAnswer>>(CacheCosmosPrefix + "examAnswer" + subjectCode.ToString(), ShaHashHelper.GetSHA1(code.ToString()));

TEAMModelOS/Controllers/Analysis/ChangeController.cs

@@ -9,14 +9,12 @@ using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelOS.Helper.Common.FileHelper;
 using TEAMModelOS.SDK;
+using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper.JsonPath;
 using TEAMModelOS.SDK.Module.AzureBlob.Container;
-using TEAMModelOS.SDK.Module.AzureBlob.Interfaces;
-using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
-using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 using TEAMModelOS.Service.Models;
 
 namespace TEAMModelOS.Controllers.Analysis
@@ -39,7 +37,7 @@ namespace TEAMModelOS.Controllers.Analysis
 
 
         [HttpGet("SaveObjectAdas")]
-        public async Task<BaseJosnRPCResponse> SaveObjectAdasAsync(string identity)
+        public async Task<BaseResponse> SaveObjectAdasAsync(string identity)
 
         {
             // 获取系统路径
@@ -312,7 +310,7 @@ namespace TEAMModelOS.Controllers.Analysis
             simple.point = points;
             simple.result = StuPoint;
             simple.subjectCode = paper.subjectCode;
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             Dictionary<string, object> keyValues = new Dictionary<string, object> {
                 { "schoolInfo",sc},
                 { "classInfo",classrooms},

TEAMModelOS/Controllers/School/ClassStudentController.cs

@@ -116,7 +116,7 @@ namespace TEAMModelOS.Controllers
         ///// <param name="request"></param>
         ///// <returns></returns>
         //[HttpPost("addStudent")]
-        //public async Task<BaseJosnRPCResponse> addStudent(JosnRPCRequest<List<ClassStudent>> request)
+        //public async Task<BaseResponse> addStudent(JosnRPCRequest<List<ClassStudent>> request)
         //{
         //    JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();