Browse Source

返回错误处理异常

CrazyIter 5 years ago
parent
commit
058338ecc8

+ 4 - 2
TEAMModelGrpc/Services/BlobSASService.cs

@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelGrpc.Models;
+using TEAMModelOS;
+using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK.Module.AzureBlob.Interfaces;
 
 namespace TEAMModelGrpc.Services
@@ -52,8 +54,8 @@ namespace TEAMModelGrpc.Services
                 string SAS = _azureBlobDBRepository.GetBlobSasUriRead(ContainerName, BlobName);
                 return new BlobSASDto { Url = SAS };
             }
-            else throw new Exception();
-            //return responseBuilder.Error(false, ResponseCode.PARAMS_ERROR, "文件名错误").build();
+            else throw new BizException("文件名错误", ResponseCode.PARAMS_ERROR);
+           
 
         }
 

+ 1 - 1
TEAMModelOS.Service/Services/Syllabus/Implement/SyllabusService.cs

@@ -132,7 +132,7 @@ namespace TEAMModelOS.Service.Services.Syllabus.Implement
             else
             {
                 throw new BizException("保存失败", ResponseCode.FAILED);
-                //return builder.Error(false, ResponseCode.FAILED, "保存失败").build();
+               
             }
 
             return syllabuses;

+ 9 - 3
TEAMModelOS/Controllers/Core/FileController.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.Context.Constant.Common;
+using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
@@ -172,11 +173,14 @@ namespace TEAMModelOS.Controllers.Syllabus
             JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
             string BlobName = azureBlobSASDto.@params;
             bool flg = IsBlobName(BlobName);
-            if (flg) {
+            if (flg)
+            {
                 string SAS = _azureBlobDBRepository.GetBlobSasUri(BlobName);
                 return responseBuilder.Data(SAS).build();
             }
-           else return responseBuilder.Error(false,ResponseCode.PARAMS_ERROR, "文件名错误").build();
+            else {
+                throw new BizException("文件名错误", ResponseCode.PARAMS_ERROR);
+            };
         }
 
         /// <summary>
@@ -198,7 +202,9 @@ namespace TEAMModelOS.Controllers.Syllabus
                 string SAS = _azureBlobDBRepository.GetBlobSasUriRead(ContainerName, BlobName);
                 return responseBuilder.Data(SAS).build();
             }
-           else return responseBuilder.Error(false, ResponseCode.PARAMS_ERROR,"文件名错误").build();
+            else {
+                throw new BizException("文件名错误", ResponseCode.PARAMS_ERROR);
+            };
         }
 
 

+ 3 - 2
TEAMModelOS/Controllers/Core/LoginController.cs

@@ -57,12 +57,13 @@ namespace TEAMModelOS.Controllers.Core
                 }
                 else
                 {
-                    responseBuilder.Error(false, ResponseCode.FAILED, "ticket error!");
+                    throw new BizException("ticket error!", ResponseCode.FAILED);
+                  
                 }
             }
             else
             {
-                responseBuilder.Error(false, ResponseCode.FAILED, "ticket error!");
+                throw new BizException("ticket error!", ResponseCode.FAILED);
             }
             return responseBuilder.build();
         }

+ 3 - 1
TEAMModelOS/Controllers/Core/StudentController.cs

@@ -15,6 +15,7 @@ using TEAMModelOS.SDK.Extension.SnowFlake;
 using TEAMModelOS.SDK.Helper.Security.TmdCrypt;
 using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 using TEAMModelOS.SDK.Helper.Common.ValidateHelper;
+using TEAMModelOS.SDK.Context.Exception;
 
 namespace TEAMModelOS.Controllers.Syllabus
 {
@@ -64,7 +65,8 @@ namespace TEAMModelOS.Controllers.Syllabus
             }
             else
             {
-                return builder.Error("schoolCode  is null !").build();
+                throw new BizException("schoolCode  is null !", ResponseCode.PARAMS_ERROR);
+                
             }
         }
         [HttpPost("SaveAllStudent")]

+ 6 - 3
TEAMModelOS/Controllers/Courses/CourseController.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
@@ -31,7 +32,9 @@ namespace TEAMModelOS.Controllers.Courses
             List<Course> courses = request.@params;
             List<Course> response = await _cosmos.SaveOrUpdateAll<Course>(courses);
             if (response.Count > 0) builder.Data(response).Extend(new Dictionary<string, object> { { "count", response.Count } });
-            else builder.Error(false, ResponseCode.FAILED, "失败");
+            else {
+                throw new BizException("失败", ResponseCode.FAILED);
+            };
             return builder.build();
         }
 
@@ -47,7 +50,7 @@ namespace TEAMModelOS.Controllers.Courses
             }
             else
             {
-                builder.Error(false, ResponseCode.PARAMS_ERROR, "参数异常");
+                throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -66,7 +69,7 @@ namespace TEAMModelOS.Controllers.Courses
             }
             else
             {
-                builder.Error(false, ResponseCode.FAILED, "删除失败");
+                throw new BizException("删除失败", ResponseCode.FAILED);
             }
             return builder.build();
         }

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

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.Context.Constant.Common;
+using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.Service.Model.PowerPoint;
@@ -56,7 +57,7 @@ namespace TEAMModelOS.Controllers.Exam
             JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
             if (!FileType.GetExtention(file.FileName).ToLower().Equals("docx"))
             {
-                return responseBuilder.Error("type is not docx").build();
+                throw new BizException("type is not docx", ResponseCode.FAILED);
             }
            Dictionary<string, object> model = await importExerciseService.UploadWord(file);
 

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

@@ -56,7 +56,7 @@ namespace TEAMModelOS.Controllers.Exam
             return builder.Data(await cosmosDBV3Repository.SaveOrUpdate(request.@params)).build();
         }
         /// <summary>
-        /// 手动挑题
+        //获取题目摘要信息
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>

+ 2 - 2
TEAMModelOS/Controllers/Learn/HomeWorkController.cs

@@ -250,7 +250,7 @@ namespace TEAMModelOS.Controllers.Learn
             else
             {
                 throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
-                //builder.Error(false,ResponseCode.PARAMS_ERROR,"参数异常");
+                
             }
             return builder.Data(homeWorkFindDtos).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -273,7 +273,7 @@ namespace TEAMModelOS.Controllers.Learn
             else
             {
                 throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
-                //builder.Error(false,ResponseCode.PARAMS_ERROR,"参数异常");
+                 
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }

+ 2 - 2
TEAMModelOS/Controllers/Learn/VoteController.cs

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

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

@@ -87,7 +87,8 @@ namespace TEAMModelOS.Controllers.Syllabus
             }
             else
             {
-                builder.Error("SubjectCode is null or empty!", "SubjectCode is null or empty!");
+                throw new BizException("SubjectCode is null or empty!", ResponseCode.PARAMS_ERROR);
+                 
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -128,7 +129,7 @@ namespace TEAMModelOS.Controllers.Syllabus
             }
             else
             {
-                builder.Error("SubjectCode is null or empty!", "SubjectCode is null or empty!");
+                throw new BizException("SubjectCode is null or empty!", ResponseCode.PARAMS_ERROR);
             }
             return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -235,7 +236,7 @@ namespace TEAMModelOS.Controllers.Syllabus
             else
             {
                 throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
-                //builder.Error(false,ResponseCode.PARAMS_ERROR,"参数异常");
+                 
             }
             return builder.Data(data.OrderBy(m => m.order)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -259,7 +260,7 @@ namespace TEAMModelOS.Controllers.Syllabus
             else
             {
                 throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
-                //builder.Error(false, ResponseCode.PARAMS_ERROR, "参数异常");
+               
             }
             return builder.Data(data.OrderBy(m => m.order)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
         }
@@ -280,7 +281,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                 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);
-                //builder.Error(false, ResponseCode.FAILED, "失败");
+               
             }
             return builder.build();
         }
@@ -326,18 +327,17 @@ namespace TEAMModelOS.Controllers.Syllabus
                 }
                 else {
                     throw new BizException("删除失败", ResponseCode.FAILED);
-                    //builder.Error(false, ResponseCode.FAILED, "删除失败");
+                    
                 }
 
             }
             else
             {
                 //throw new BizException("未找到对应删除数据", ResponseCode.NOT_FOUND);
-                //builder.Error(false, ResponseCode.NOT_FOUND, "未找到对应删除数据");
+               
             }
 
             return schoolBlocks;
         }
-
     }
 }

+ 11 - 23
TEAMModelOS/Controllers/Syllabus/ResourceController.cs

@@ -56,8 +56,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                     }
                 }
                 List<SyllabusResource> ts = await _cosmos.SaveOrUpdateAll(resource);
-                if (ts.Count > 0) builder.Data("保存或新增成功");
-                else builder.Error(false, ResponseCode.FAILED, "失败");
+                builder.Data("保存或新增成功");
             }
             return builder.build();
         }
@@ -84,7 +83,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                     throw new BizException("未找到对应数据", ResponseCode.DATA_EMPTY_NULL);
 
             }
-            else //return builder.Error(false,ResponseCode.PARAMS_ERROR,"参数为空").build();
+            else  
                 throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
         }
 
@@ -112,7 +111,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                     throw new BizException("未找到对应数据", ResponseCode.DATA_EMPTY_NULL);
 
             }
-            else //return builder.Error(false, ResponseCode.PARAMS_ERROR, "参数为空").build();
+            else 
                 throw new BizException("参数异常", ResponseCode.PARAMS_ERROR);
         }
 
@@ -175,25 +174,14 @@ namespace TEAMModelOS.Controllers.Syllabus
         [HttpPost("FindResourceReference")]
         public async Task<BaseJosnRPCResponse> FindResourceReference(JosnRPCRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            if (request.@params != null)
-            {
-                List<ResourceReference> data = new List<ResourceReference>();
-                data = await _table.FindListByDict<ResourceReference>(request.@params);
-                if (data.IsNotEmpty())
-                {
-                    return builder.Data(data.OrderBy(m => m.CreateTime)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
-
-                }
-                else return builder.Error(false, ResponseCode.DATA_EMPTY_NULL, "资源未找到").build();
-
-            }
-            else return builder.Error(false, ResponseCode.PARAMS_ERROR, "参数为空").build();
+        JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+             
+            List<ResourceReference> data = new List<ResourceReference>();
+            data = await _table.FindListByDict<ResourceReference>(request.@params);
+            
+            return builder.Data(data.OrderBy(m => m.CreateTime)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+ 
         }
-
-
+        
     }
-
-
-
 }