Kaynağa Gözat

异常处理返回错误信息

CrazyIter 4 yıl önce
ebeveyn
işleme
66cf6eb354

+ 39 - 0
TEAMModelOS.Service/Models/SchoolInfo/Paper.cs

@@ -34,27 +34,66 @@ namespace TEAMModelOS.Service.Models
         /// 试卷的基本信息
         /// </summary>
         public string url { get; set; }
+        /// <summary>
+        /// 题目信息
+        /// </summary>
         public List<ItemInfo> item { get; set; }
+        /// <summary>
+        /// 科目
+        /// </summary>
         public string subjectCode { get; set; }
+        /// <summary>
+        /// 学段
+        /// </summary>
         public string periodCode { get; set; }
+        /// <summary>
+        /// 年级
+        /// </summary>
         public List<string> gradeCode { get; set; }
+
+        /// <summary>
+        /// 试卷名称
+        /// </summary>
         public string name { get; set; }
+        /// <summary>
+        /// 题目总数
+        /// </summary>
         public int itemCount { get; set; }
+        /// <summary>
+        /// 题目难度
+        /// </summary>
         public double level { get; set; }
+        /// <summary>
+        /// 总分
+        /// </summary>
         public double score { get; set; }
         /// <summary>
         /// type:{
         ///     pointkey:[num1,num2....]
         /// }
+        /// 题型的分数占比
         /// </summary>
+      
         public Dictionary<string, ScoreCount> typeScore { get; set; }
+        /// <summary>
+        /// 题目难度分数占比
+        /// </summary>
         public Dictionary<string, ScoreCount> levelScore { get; set; }
+        /// <summary>
+        /// 知识点分数占比
+        /// </summary>
         public Dictionary<string, ScoreItem> pointScore { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
         public long createTime { get; set; }
         /// <summary>
         /// 正确答案
         /// </summary>
         public List<Answer> answers { get; set; }
+        /// <summary>
+        /// 阅卷规则
+        /// </summary>
         public MarkConfig markConfig { get; set; }
 
     }

+ 61 - 0
TEAMModelOS.Service/TEAMModelOS.Model.xml

@@ -546,11 +546,67 @@
             试卷的基本信息
             </summary>
         </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.item">
+            <summary>
+            题目信息
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.subjectCode">
+            <summary>
+            科目
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.periodCode">
+            <summary>
+            学段
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.gradeCode">
+            <summary>
+            年级
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.name">
+            <summary>
+            试卷名称
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.itemCount">
+            <summary>
+            题目总数
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.level">
+            <summary>
+            题目难度
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.score">
+            <summary>
+            总分
+            </summary>
+        </member>
         <member name="P:TEAMModelOS.Service.Models.Paper.typeScore">
             <summary>
             type:{
                 pointkey:[num1,num2....]
             }
+            题型的分数占比
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.levelScore">
+            <summary>
+            题目难度分数占比
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.pointScore">
+            <summary>
+            知识点分数占比
+            </summary>
+        </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.createTime">
+            <summary>
+            创建时间
             </summary>
         </member>
         <member name="P:TEAMModelOS.Service.Models.Paper.answers">
@@ -558,6 +614,11 @@
             正确答案
             </summary>
         </member>
+        <member name="P:TEAMModelOS.Service.Models.Paper.markConfig">
+            <summary>
+            阅卷规则
+            </summary>
+        </member>
         <member name="T:TEAMModelOS.Service.Models.MarkConfig">
             <summary>
             阅卷规则

+ 1 - 1
TEAMModelOS/Controllers/Core/BlobController.cs

@@ -73,7 +73,7 @@ namespace TEAMModelOS.Controllers.Core
                 return responseBuilder.Data(await azureBlobDBRepository.GetBlobSasUriRead(ContainerName, BlobName)).build();
             }
             else {
-                throw new BizException("文件名错误", ResponseCode.PARAMS_ERROR);
+                return responseBuilder.Error(ResponseCode.PARAMS_ERROR,"文件名错误").build();
             };
         }
 

+ 2 - 2
TEAMModelOS/Controllers/Core/FileController.cs

@@ -179,7 +179,7 @@ namespace TEAMModelOS.Controllers
                 return responseBuilder.Data(SAS).build();
             }
             else {
-                throw new BizException("文件名错误", ResponseCode.PARAMS_ERROR);
+                return responseBuilder.Error(ResponseCode.PARAMS_ERROR, "文件名错误").build();
             };
         }
 
@@ -203,7 +203,7 @@ namespace TEAMModelOS.Controllers
                 return responseBuilder.Data(SAS).build();
             }
             else {
-                throw new BizException("文件名错误", ResponseCode.PARAMS_ERROR);
+                return responseBuilder.Error(ResponseCode.PARAMS_ERROR, "文件名错误").build();
             };
         }
 

+ 9 - 18
TEAMModelOS/Controllers/Exam/ExamController.cs

@@ -119,12 +119,12 @@ namespace TEAMModelOS.Controllers
                 }
                 else
                 {
-                    throw new BizException("请在作答时间段内提交答案!", ResponseCode.FAILED);
+                    return builder.Error(ResponseCode.FAILED, "请在作答时间段内提交答案!").build();
                 }
             }
             else
             {
-                throw new BizException("考试不存在!", ResponseCode.DATA_EXIST);
+                return builder.Error(ResponseCode.DATA_EXIST, "考试不存在!").build();
             }
         }
 
@@ -144,26 +144,17 @@ namespace TEAMModelOS.Controllers
                 List<ExamInfo> exams = await cosmosDBV3Repository.FindByDict<ExamInfo>(new Dictionary<string, object> { { "id", request.@params[0].examCode } });
                 if (exams.IsNotEmpty())
                 {
-                    //ExamInfo examInfo = exams[0];
-                    ////提交答案时间必须是状态已发布,且时间在起止时间内
-                    //if (examInfo.startTime <= new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds() && examInfo.status == 200 &&
-                    //   examInfo.endTime >= new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds())
-                    //{
-                      
-                    //}
-                    //else
-                    //{
-                    //    throw new BizException("请在作答时间段内提交答案!", ResponseCode.FAILED);
-                    //}
+                    
                     return builder.Data(await cosmosDBV3Repository.SaveOrUpdateAll(request.@params)).build();
                 }
                 else
                 {
-                    throw new BizException("考试不存在!", ResponseCode.DATA_EXIST);
+                    return builder.Error(ResponseCode.DATA_EXIST, "考试不存在!").build();
+                    
                 }
             }
             else {
-                throw new BizException("作答数据为空!", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "作答数据为空!").build();
             }
         }
         /// <summary>
@@ -188,11 +179,11 @@ namespace TEAMModelOS.Controllers
                 }
                 else
                 {
-                    throw new BizException("请在作答时间段内提交答案!", ResponseCode.FAILED);
+                    return builder.Error(ResponseCode.FAILED, "请在作答时间段内提交答案!").build();
                 }
             }
             else {
-                throw new BizException("考试不存在!", ResponseCode.DATA_EXIST);
+                return builder.Error(ResponseCode.DATA_EXIST, "考试不存在!").build();
             }
         }
 
@@ -220,7 +211,7 @@ namespace TEAMModelOS.Controllers
                     return builder.Data(examRecords).Extend(new Dictionary<string, object> { { "props", props } }).build();
                 }
                 else {
-                    throw new BizException("参数错误",ResponseCode.PARAMS_ERROR);
+                    return builder.Error(ResponseCode.PARAMS_ERROR, "参数错误!").build();
                 }
             }
         }

+ 1 - 1
TEAMModelOS/Controllers/Exam/ImportExerciseController.cs

@@ -56,7 +56,7 @@ namespace TEAMModelOS.Controllers
             JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
             if (!FileType.GetExtention(file.FileName).ToLower().Equals("docx"))
             {
-                throw new BizException("type is not docx", ResponseCode.FAILED);
+                return responseBuilder.Error(ResponseCode.FAILED, "type is not docx!").build();
             }
            Dictionary<string, object> model = await importExerciseService.UploadWord(file);
 

+ 2 - 2
TEAMModelOS/Controllers/School/ClassRoomController.cs

@@ -38,7 +38,7 @@ namespace TEAMModelOS.Controllers
             {
                 List<int> sc = await cosmosrepository.FindCountByDict<Classroom>(new Dictionary<string, object> { { "classroomCode", request.@params.classroomCode } });
                 if (sc.IsNotEmpty() && sc[0]>0) {
-                    throw new  BizException("班级代码已经存在!",ResponseCode.DATA_EXIST);
+                    return builder.Error(ResponseCode.DATA_EXIST, "班级代码已经存在!").build();
                 }
                 request.@params.id = request.@params.classroomCode;
                 await cosmosrepository.SaveOrUpdate<Classroom>(request.@params);
@@ -86,7 +86,7 @@ namespace TEAMModelOS.Controllers
                 }
             }
             else {
-                throw new BizException("参数未定义!");
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数未定义!").build(); 
             }
             return builder.build();
         }

+ 20 - 13
TEAMModelOS/Controllers/School/ClassStudentController.cs

@@ -37,14 +37,14 @@ namespace TEAMModelOS.Controllers
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             // 班级编码
             if (request.@params.TryGetValue("classroomCode", out object classroomCode)
-                ///学校编码
+                 ///学校编码
                  && request.@params.TryGetValue("schoolCode", out object schoolCode)
                 )
             {
-                List<ClassStudent> classroomStudents = await _cosmos.FindByDict<ClassStudent>(new Dictionary<string, object> { { "id", classroomCode }});
+                List<ClassStudent> classroomStudents = await _cosmos.FindByDict<ClassStudent>(new Dictionary<string, object> { { "id", classroomCode } });
                 List<Student> students = await _cosmos.FindByDict<Student>(
                     new Dictionary<string, object>() { { "classroomCode", classroomCode }, { "code", schoolCode } },
-                    new List<string> { "id","name","code", "seatNo", "studentId", "classroomCode" });
+                    new List<string> { "id", "name", "code", "seatNo", "studentId", "classroomCode" });
                 List<dynamic> stus = new List<dynamic>();
                 List<ClassStudent> newClassStudents = new List<ClassStudent>();
                 ///新增的学生
@@ -52,7 +52,7 @@ namespace TEAMModelOS.Controllers
                 {
                     students.ForEach(x =>
                     {
-                        if (!classroomStudents.Select(m=>m.code).Contains(x.studentId))
+                        if (!classroomStudents.Select(m => m.code).Contains(x.studentId))
                         {
                             newClassStudents.Add(new ClassStudent() { id = x.classroomCode, code = x.studentId });
                         }
@@ -60,33 +60,40 @@ namespace TEAMModelOS.Controllers
                         stus.Add(stu);
                     });
                 }
-                 ///反射已存在的id信息
+                ///反射已存在的id信息
                 if (classroomStudents.IsNotEmpty())
                 {
                     ///处理冗余的id查询
                     List<string> ids = new List<string>();
-                    classroomStudents.ForEach(x=> {
-                        if (!students.Select(m => m.studentId).Contains(x.code)) {
+                    classroomStudents.ForEach(x =>
+                    {
+                        if (!students.Select(m => m.studentId).Contains(x.code))
+                        {
                             ids.Add(x.code);
                         }
                     });
                     var sts = await _cosmos.FindByDict<Student>(new Dictionary<string, object>() { { "studentId", ids.ToArray() } });
-                    if(sts.IsNotEmpty())
+                    if (sts.IsNotEmpty())
                     {
-                        sts.ForEach(x => {
+                        sts.ForEach(x =>
+                        {
                             var stu = new { x.id, x.name, x.code, x.seatNo, x.studentId, x.classroomCode };
                             stus.Add(stu);
                         });
                     }
-                   
+
                 }
                 //保存新增学生
-                if (newClassStudents.IsNotEmpty()) {
-                    classroomStudents.AddRange( await _cosmos.SaveOrUpdateAll(newClassStudents));
+                if (newClassStudents.IsNotEmpty())
+                {
+                    classroomStudents.AddRange(await _cosmos.SaveOrUpdateAll(newClassStudents));
                 }
                 return builder.Data(classroomStudents).Extend(new Dictionary<string, object> { { "students", stus }, { "count", stus.Count } }).build();
             }
-            else { throw new BizException("参数异常classroomCode,code", ResponseCode.PARAMS_ERROR); }
+            else
+            {
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常classroomCode,code!").build();
+            }
         }
 
         /// <summary>

+ 1 - 1
TEAMModelOS/Controllers/School/CourseController.cs

@@ -40,7 +40,7 @@ namespace TEAMModelOS.Controllers
             if (string.IsNullOrEmpty(request.@params.id)) {
                 List<int> count =await _cosmos.FindCountByDict<Course>(new Dictionary<string, object> { { "courseCode", request.@params.courseCode },{ "code",request.@params.code} });
                 if (count.IsNotEmpty() && count[0] > 0) {
-                    throw new BizException("课程编码已经存在!",ResponseCode.DATA_EXIST);
+                    return builder.Error(ResponseCode.DATA_EXIST, "课程编码已经存在!").build();
                 }
                 request.@params.id = request.@params.code.Replace("#", "") +"-"+ request.@params.courseCode;
             }

+ 3 - 3
TEAMModelOS/Controllers/School/SchoolController.cs

@@ -37,7 +37,7 @@ namespace TEAMModelOS.Controllers
                 List<School> schools = await _cosmosrepository.FindByDict<School>(new Dictionary<string, object> { { "code", request.@params.schoolCode } });
                 if (schools.IsNotEmpty())
                 {
-                    throw new BizException("学校编码已存在!", ResponseCode.DATA_EXIST);
+                    return builder.Error(ResponseCode.DATA_EXIST, "学校编码已存在!").build();
                 }
                 request.@params.code = request.@params.schoolCode;
                 request.@params.id = request.@params.schoolCode;
@@ -46,7 +46,7 @@ namespace TEAMModelOS.Controllers
                 List<School> schools = await _cosmosrepository.FindByDict<School>(new Dictionary<string, object> { { "id", request.@params.id } });
                 if (schools.IsEmpty())
                 {
-                    throw new BizException("id不存在,不能更新!", ResponseCode.PARAMS_ERROR);
+                    return builder.Error(ResponseCode.PARAMS_ERROR, "id不存在,不能更新").build();
                 }
             }
             if (request.@params.id.Equals(request.@params.code) && request.@params.id.Equals(request.@params.schoolCode))
@@ -55,7 +55,7 @@ namespace TEAMModelOS.Controllers
                 return builder.Data(datas).build();
             }
             else {
-                throw new BizException("id,code,schoolCode必须相同!", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "id,code,schoolCode必须相同!").build();
             }
             
         }

+ 1 - 1
TEAMModelOS/Controllers/Student/StudentController.cs

@@ -72,7 +72,7 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("code  is null !", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "code  is null !").build();
                 
             }
         }

+ 11 - 8
TEAMModelOS/Controllers/Syllabus/KnowledgeController.cs

@@ -87,7 +87,7 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("SubjectCode is null or empty!", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "SubjectCode is null or empty!").build();
                  
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
@@ -129,7 +129,7 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("SubjectCode is null or empty!", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "SubjectCode is null or empty!").build(); 
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -247,7 +247,7 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
                  
             }
             return builder.Data(data.OrderBy(m => m.order)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
@@ -271,7 +271,8 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
+                
                
             }
             return builder.Data(data.OrderBy(m => m.order)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
@@ -292,7 +293,9 @@ namespace TEAMModelOS.Controllers
             {
                 List<Knowledge> ts = await knowledgeService.SaveOrUpdateKnowledge(request.@params);
                 if (ts.Count > 0) builder.Data(ts).Extend(new Dictionary<string, object> { { "count", ts.Count } });
-                else throw new BizException("失败", ResponseCode.FAILED);
+                else {
+                    return builder.Error(ResponseCode.FAILED, "失败!").build();
+                };
                
             }
             return builder.build();
@@ -342,18 +345,18 @@ namespace TEAMModelOS.Controllers
                     }
                     else
                     {
-                        throw new BizException("删除失败", ResponseCode.FAILED);
+                          builder.Error(ResponseCode.FAILED, "删除失败!");
 
                     }
 
                 }
                 else
                 {
-                    //throw new BizException("未找到对应删除数据", ResponseCode.NOT_FOUND);
+                   
 
                 }
             }
-            else { throw new BizException("参数未定义", ResponseCode.FAILED); }
+            else { builder.Error(ResponseCode.PARAMS_ERROR, "参数未定义!"); }
             return schoolBlocks;
         }
 

+ 19 - 13
TEAMModelOS/Controllers/Syllabus/ResourceController.cs

@@ -66,15 +66,18 @@ namespace TEAMModelOS.Controllers
         {
             // request.@params.TryAdd("PartitionKey", request.lang);
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            if (request.@params.Keys.Count>0)
+            if (request.@params.Keys.Count > 0)
             {
                 List<Resource> data = new List<Resource>();
                 data = await _cosmos.FindByDict<Resource>(request.@params);
-                 
-                return builder.Data(data.OrderBy(m => m.createTime)).Extend(new Dictionary<string, object> { { "count", data.IsNotEmpty()? data.Count:0 } }).build();
+
+                return builder.Data(data.OrderBy(m => m.createTime)).Extend(new Dictionary<string, object> { { "count", data.IsNotEmpty() ? data.Count : 0 } }).build();
+            }
+            else {
+
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
             }
-            else  
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+              
         }
 
 
@@ -92,14 +95,14 @@ namespace TEAMModelOS.Controllers
             {
                 List<Resource> data = new List<Resource>();
                 data = await _cosmos.FindByIds<Resource>(request.@params);
-               
-                    return builder.Data(data.OrderBy(m => m.createTime)).Extend(new Dictionary<string, object> { { "count", data.IsNotEmpty() ? data.Count : 0 } }).build();
 
-               
+                return builder.Data(data.OrderBy(m => m.createTime)).Extend(new Dictionary<string, object> { { "count", data.IsNotEmpty() ? data.Count : 0 } }).build();
+
+
 
             }
-            else 
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+            else
+            { return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build(); }
         }
 
 
@@ -132,7 +135,7 @@ namespace TEAMModelOS.Controllers
 
         private async Task<List<T>> Delete<T>(JosnRPCRequest<Dictionary<string, object>> request, JsonRPCResponseBuilder builder)where T:ID
         {
-            if (request.@params.IsNotEmpty()&& request.@params.Keys.Count>0)
+            if (request.@params.IsNotEmpty() && request.@params.Keys.Count > 0)
             {
                 List<T> schoolBlocks = await _cosmos.FindByDict<T>(request.@params);
                 Type t = typeof(T);
@@ -141,10 +144,13 @@ namespace TEAMModelOS.Controllers
                     await _cosmos.DeleteAll<T>(schoolBlocks);
                     builder.Data("删除成功");
                 }
-                 
+
                 return schoolBlocks;
             }
-            else throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+            else {
+                  builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!");
+                return null;
+            }
 
         }
 

+ 2 - 8
TEAMModelOS/Controllers/Syllabus/SyllabusController.cs

@@ -85,16 +85,10 @@ namespace TEAMModelOS.Controllers
                 }
             }
             else {
-                throw new BizException("参数未定义");
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
             }
             
-            //else
-            //{
-            //    return builder.Data(null).build();
-            //    //throw new BizException("数据不存在", ResponseCode.DATA_EMPTY_NULL);
-            //}
-
-            //return builder.Data(flag).Extend(new Dictionary<string, object>() { { "deleteData", nodes } }).build();
+            
         }
 
        

+ 2 - 1
TEAMModelOS/Controllers/Syllabus/VolumeController.cs

@@ -125,7 +125,8 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("code is  null!");
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
+                
             }
             return builder.Data(volumes).build();
         }

+ 5 - 3
TEAMModelOS/Controllers/Task/HomeworkController.cs

@@ -237,7 +237,7 @@ namespace TEAMModelOS.Controllers.Learn
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
             }
             return builder.Data(homeWorkFindDtos).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -258,7 +258,7 @@ namespace TEAMModelOS.Controllers.Learn
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -348,7 +348,9 @@ namespace TEAMModelOS.Controllers.Learn
                 }
                 return builder.Data(data).build();
             }
-            else throw new BizException("未开放互评");
+            else {
+                return builder.Error(ResponseCode.FAILED, "未开放互评!").build();
+            } 
         }
     }
 }

+ 1 - 1
TEAMModelOS/Controllers/Task/LearnController.cs

@@ -67,7 +67,7 @@ namespace TEAMModelOS.Controllers.Learn
                 return builder.Data(tasks).build();
             }
             else {
-                throw new BizException("参数错误!",ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build(); 
             }
             
         }

+ 5 - 34
TEAMModelOS/Controllers/Task/SurveyController.cs

@@ -133,7 +133,7 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
 
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count },{ "props", props } }).build();
@@ -155,7 +155,7 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
 
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
@@ -182,7 +182,7 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("删除失败", ResponseCode.FAILED);
+                return builder.Error(ResponseCode.FAILED, "删除失败!").build();
             }
             return builder.build();
         }
@@ -230,7 +230,7 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -246,35 +246,6 @@ namespace TEAMModelOS.Controllers
             await azureCosmosDBV3Repository.SaveOrUpdateAll<SurveyRecord>(request.@params);
             return builder.Data(request.@params).build();
         }
-        ///// <summary>
-        ///// 学生提交问卷调查
-        ///// </summary>
-        ///// <param name="request"></param>
-        ///// <returns></returns>
-        //[HttpPost("action")]
-        //public async Task<BaseJosnRPCResponse> Action(JosnRPCRequest<SurveyDto> request)
-        //{
-        //    JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-        //    List<SurveyRecord> survey = await azureCosmosDBV3Repository.FindByDict<SurveyRecord>(new Dictionary<string, object> { { "id", request.@params.studentID }, { "id", request.@params.surveyWorkId } });
-        //    SurveyRecord response = new SurveyRecord();
-        //    if (survey.IsNotEmpty())
-        //    {
-        //        List<Survey> surveys = await azureCosmosDBV3Repository.FindByDict<Survey>(new Dictionary<string, object> { { "id", request.@params.surveyWorkId } });
-        //        List<Survey.Option> options2 = surveys[0].option;
-        //        bool flg = false;
-        //        options2.ForEach(x => { if (x.code == request.@params.option) flg = true; });
-
-        //        if (flg)
-        //        {
-        //            survey[0].option = request.@params.option;
-        //            survey[0].submitTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
-        //            survey[0].submit = true;
-        //            response = await azureCosmosDBV3Repository.SaveOrUpdate(survey[0]);
-
-        //        }
-        //        else throw new BizException($"该投票活动没有当前选项 { request.@params.option }", ResponseCode.FAILED);
-        //    }
-        //    return builder.Data(response).build();
-        //}
+         
     }
 }

+ 4 - 4
TEAMModelOS/Controllers/Task/VoteController.cs

@@ -137,8 +137,8 @@ namespace TEAMModelOS.Controllers.Learn
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
-               
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
+
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -164,7 +164,7 @@ namespace TEAMModelOS.Controllers.Learn
             }
             else
             {
-                throw new BizException("删除失败", ResponseCode.FAILED);
+                return builder.Error(ResponseCode.FAILED, "删除失败!").build();
             }
             return builder.build();
         }
@@ -229,7 +229,7 @@ namespace TEAMModelOS.Controllers.Learn
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
             }
             return builder.Data(options).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }

+ 1 - 1
TEAMModelOS/Controllers/Teacher/CommentController.cs

@@ -67,7 +67,7 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
+                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常!").build();
             }
             return builder.Data(data).build();
         }

+ 6 - 4
TEAMModelOS/Controllers/Teacher/SchoolUserController.cs

@@ -220,9 +220,10 @@ namespace TEAMModelOS.Controllers
         [HttpPost("AddSchoolUser")]
         public async Task<BaseJosnRPCResponse> AddSchoolUser(JosnRPCRequest<Dictionary<string, object>> request)
         {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             try
             {
-                JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+               
                 request.@params.TryGetValue("schoolCode", out object schoolCode);
                 request.@params.TryGetValue("userlist", out object userList);
                 List<SchoolUser> addUserlist = JsonConvert.DeserializeObject<List<SchoolUser>>(userList.ToString());
@@ -244,7 +245,7 @@ namespace TEAMModelOS.Controllers
             }
             catch (Exception e)
             {
-                throw new BizException(e.Message);
+                return builder.Error(ResponseCode.FAILED, e.StackTrace).build();
             }
         }
 
@@ -254,9 +255,10 @@ namespace TEAMModelOS.Controllers
         [HttpPost("AddSchoolUserSingle")]
         public async Task<BaseJosnRPCResponse> AddSchoolUserSingle(JosnRPCRequest<Dictionary<string, object>> request)
         {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             try
             {
-                JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+                
                 request.@params.TryGetValue("schoolCode", out object schoolCode);
                 request.@params.TryGetValue("userinfo", out object userinfo);
                 SchoolUser addUserinfo = JsonConvert.DeserializeObject<SchoolUser>(userinfo.ToString());
@@ -273,7 +275,7 @@ namespace TEAMModelOS.Controllers
             }
             catch (Exception e)
             {
-                throw new BizException(e.Message);
+                return builder.Error(ResponseCode.FAILED, e.StackTrace).build();
             }
         }
     }

+ 1 - 6
TEAMModelOS/Controllers/Test/TestController.cs

@@ -25,12 +25,7 @@ namespace TEAMModelOS.Controllers.Test
             this.azureCosmosDBRepository = azureCosmosDBRepository;
         }
 
-        [HttpGet]
-        public IActionResult Get()
-        {
-            throw new BizException("112", 2);
-        }
-
+        
  
  
     }