添加注释，修改接口内容

performance/Performance.Api/Controllers/ExtractController.cs

@@ -118,14 +118,24 @@ ExtractPreConfigService preConfigService
 
         #region 医院数据库配置
 
+        /// <summary>
+        /// 医院数据库配置列表
+        /// </summary>
+        /// <param name="hospitalId"></param>
+        /// <returns></returns>
         [HttpGet("hospital/config/{hospitalId}")]
-        public ApiResponse<List<HospitalConfigResponse>> GetHospitalConfig([FromRoute] int hospitalId)
+        public ApiResponse<List<sys_hospitalconfig>> GetHospitalConfig([FromRoute] int hospitalId)
         {
-            if (hospitalId == 0) return new ApiResponse<List<HospitalConfigResponse>>(ResponseType.ParameterError, "参数错误");
+            if (hospitalId == 0) return new ApiResponse<List<sys_hospitalconfig>>(ResponseType.ParameterError, "参数错误");
             var list = _preConfigService.GetHospitalConfig(hospitalId);
-            return new ApiResponse<List<HospitalConfigResponse>>(ResponseType.OK, list);
+            return new ApiResponse<List<sys_hospitalconfig>>(ResponseType.OK, list);
         }
 
+        /// <summary>
+        /// 创建医院数据库配置
+        /// </summary>
+        /// <param name="hospitalconfig"></param>
+        /// <returns></returns>
         [HttpPost("hospital/config/create")]
         public ApiResponse CreateHospitalConfig([FromBody] sys_hospitalconfig hospitalconfig)
         {
@@ -136,6 +146,11 @@ public ApiResponse CreateHospitalConfig([FromBody] sys_hospitalconfig hospitalco
                 : new ApiResponse(ResponseType.Fail, "添加失败");
         }
 
+        /// <summary>
+        /// 修改医院数据库配置
+        /// </summary>
+        /// <param name="hospitalconfig"></param>
+        /// <returns></returns>
         [HttpPost("hospital/config/update")]
         public ApiResponse UpdateHospitalConfig([FromBody] sys_hospitalconfig hospitalconfig)
         {
@@ -146,30 +161,45 @@ public ApiResponse UpdateHospitalConfig([FromBody] sys_hospitalconfig hospitalco
                 : new ApiResponse(ResponseType.Fail, "添加失败");
         }
 
-        [HttpPost("hospital/config/{hospitalId}")]
-        public ApiResponse DeleteHospitalConfig([FromRoute] int hospitalId)
+        /// <summary>
+        /// 删除医院数据库配置
+        /// </summary>
+        /// <param name="hospitalconfigId"></param>
+        /// <returns></returns>
+        [HttpPost("hospital/config/{hospitalconfigId}")]
+        public ApiResponse DeleteHospitalConfig([FromRoute] int hospitalconfigId)
         {
-            if (hospitalId == 0) return new ApiResponse(ResponseType.ParameterError, "参数错误");
-            var flag = _preConfigService.DeleteHospitalConfig(hospitalId);
+            if (hospitalconfigId == 0) return new ApiResponse(ResponseType.ParameterError, "参数错误");
+            var flag = _preConfigService.DeleteHospitalConfig(hospitalconfigId);
             return flag
                 ? new ApiResponse(ResponseType.OK, "添加成功")
                 : new ApiResponse(ResponseType.Fail, "添加失败");
         }
 
-        [HttpPost("hospital/connection/{hospitalId}")]
-        public ApiResponse TestConnectionCleared([FromRoute] int hospitalId)
+        /// <summary>
+        /// 测试连接
+        /// </summary>
+        /// <param name="hospitalconfigId"></param>
+        /// <returns></returns>
+        [HttpPost("hospital/connection/{hospitalconfigId}")]
+        public ApiResponse TestConnectionCleared([FromRoute] int hospitalconfigId)
         {
-            if (hospitalId == 0) return new ApiResponse(ResponseType.ParameterError, "参数错误");
-            var flag = _preConfigService.TestConnectionCleared(hospitalId);
+            if (hospitalconfigId == 0) return new ApiResponse(ResponseType.ParameterError, "参数错误");
+            var flag = _preConfigService.TestConnectionCleared(hospitalconfigId);
             return flag
                 ? new ApiResponse(ResponseType.OK, "连接成功")
-                : new ApiResponse(ResponseType.Fail, "连接成功");
+                : new ApiResponse(ResponseType.Fail, "连接失败");
         }
 
         #endregion
 
         #region 提取script配置
 
+        /// <summary>
+        /// 数据提取信息列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
         [HttpGet("type")]
         public ApiResponse GetExtractTypeAndScript([FromBody] ExTypeRequest request)
         {
@@ -178,6 +208,12 @@ public ApiResponse GetExtractTypeAndScript([FromBody] ExTypeRequest request)
             return new ApiResponse(ResponseType.OK, list);
         }
 
+        /// <summary>
+        /// 数据提取详情
+        /// </summary>
+        /// <param name="typeId"></param>
+        /// <param name="scriptId"></param>
+        /// <returns></returns>
         [HttpGet("type/{typeId}/{scriptId}")]
         public ApiResponse GetExtractTypeAndScriptById([FromRoute] int typeId, int scriptId)
         {
@@ -186,6 +222,12 @@ public ApiResponse GetExtractTypeAndScriptById([FromRoute] int typeId, int scrip
             return new ApiResponse(ResponseType.OK, data);
         }
 
+        /// <summary>
+        /// 删除提取Sql
+        /// </summary>
+        /// <param name="typeId"></param>
+        /// <param name="scriptId"></param>
+        /// <returns></returns>
         [HttpPost("type/{typeId}/{scriptId}")]
         public ApiResponse DeleteExtractTypeAndScript([FromRoute] int typeId, int scriptId)
         {
@@ -196,16 +238,27 @@ public ApiResponse DeleteExtractTypeAndScript([FromRoute] int typeId, int script
                 : new ApiResponse(ResponseType.Fail, "删除失败");
         }
 
+        /// <summary>
+        /// 修改提取信息
+        /// </summary>
+        /// <param name="typeId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
         [HttpPost("type/{typeId}/edit")]
         public ApiResponse EditExtractTypeAndScript([FromRoute] int typeId, [FromBody] ExtractConfigResponse request)
         {
             if (typeId == 0) return new ApiResponse(ResponseType.ParameterError, "参数错误");
             var flag = _preConfigService.EditExtractTypeAndScript(typeId, request);
             return flag
-                ? new ApiResponse(ResponseType.OK, "编辑成功")
-                : new ApiResponse(ResponseType.Fail, "编辑失败");
+                ? new ApiResponse(ResponseType.OK, "操作成功")
+                : new ApiResponse(ResponseType.Fail, "操作失败");
         }
 
+        /// <summary>
+        /// 检查Sql执行时间
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
         [HttpPost("type/{typeId}/querytime")]
         public ApiResponse CheckExecsqlConsumeTime([FromBody] ConsumeTimeRequest request)
         {
@@ -218,6 +271,10 @@ public ApiResponse CheckExecsqlConsumeTime([FromBody] ConsumeTimeRequest request
 
         #region 字典
 
+        /// <summary>
+        /// 数据库类型
+        /// </summary>
+        /// <returns></returns>
         [HttpGet("database")]
         public ApiResponse<List<TitleValue<int>>> GetDatatypes()
         {
@@ -225,6 +282,10 @@ public ApiResponse<List<TitleValue<int>>> GetDatatypes()
             return new ApiResponse<List<TitleValue<int>>>(ResponseType.OK, list);
         }
 
+        /// <summary>
+        /// 来源类型
+        /// </summary>
+        /// <returns></returns>
         [HttpGet("sheettype")]
         public ApiResponse<List<TitleValue<int>>> GetSheettypes()
         {
@@ -232,6 +293,11 @@ public ApiResponse<List<TitleValue<int>>> GetSheettypes()
             return new ApiResponse<List<TitleValue<int>>>(ResponseType.OK, list);
         }
 
+        /// <summary>
+        /// 绩效提取类型
+        /// </summary>
+        /// <param name="hospitalId"></param>
+        /// <returns></returns>
         [HttpGet("type/{hospitalId}")]
         public ApiResponse<List<TitleValue<int>>> GetExTypes([FromRoute] int hospitalId)
         {
@@ -239,6 +305,11 @@ public ApiResponse<List<TitleValue<int>>> GetExTypes([FromRoute] int hospitalId)
             return new ApiResponse<List<TitleValue<int>>>(ResponseType.OK, list);
         }
 
+        /// <summary>
+        /// 医院数据库连接配置
+        /// </summary>
+        /// <param name="hospitalId"></param>
+        /// <returns></returns>
         [HttpGet("config/{hospitalId}")]
         public ApiResponse<List<TitleValue<int>>> GetConfigs([FromRoute] int hospitalId)
         {

performance/Performance.Api/appsettings.Localhost.json

@@ -8,7 +8,7 @@
   },
   "AppConnection": {
     //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
-    "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_intro;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
   },

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -1347,6 +1347,67 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ExtractController.GetHospitalConfig(System.Int32)">
+            <summary>
+            医院数据库配置列表
+            </summary>
+            <param name="hospitalId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ExtractController.CreateHospitalConfig(Performance.EntityModels.sys_hospitalconfig)">
+            <summary>
+            创建医院数据库配置
+            </summary>
+            <param name="hospitalconfig"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ExtractController.UpdateHospitalConfig(Performance.EntityModels.sys_hospitalconfig)">
+            <summary>
+            修改医院数据库配置
+            </summary>
+            <param name="hospitalconfig"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ExtractController.DeleteHospitalConfig(System.Int32)">
+            <summary>
+            删除医院数据库配置
+            </summary>
+            <param name="hospitalconfigId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ExtractController.TestConnectionCleared(System.Int32)">
+            <summary>
+            测试连接
+            </summary>
+            <param name="hospitalconfigId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ExtractController.GetDatatypes">
+            <summary>
+            数据库类型
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ExtractController.GetSheettypes">
+            <summary>
+            来源类型
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ExtractController.GetExTypes(System.Int32)">
+            <summary>
+            绩效提取类型
+            </summary>
+            <param name="hospitalId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ExtractController.GetConfigs(System.Int32)">
+            <summary>
+            医院数据库连接配置
+            </summary>
+            <param name="hospitalId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.GuaranteeController.Guarantee(Performance.DtoModels.GuaranteeRequest)">
             <summary>
             保底绩效配置列表

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -3659,7 +3659,7 @@
             是否执行通过
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ex_script.ErrorMessage">
+        <member name="P:Performance.EntityModels.ex_script.Description">
             <summary>
             执行错误信息
             </summary>

performance/Performance.DtoModels/Response/HospitalConfigResponse.cs

-namespace Performance.DtoModels
-{
-    public class HospitalConfigResponse
-    {
-        public int Id { get; set; }
-
-        public string ConfigName { get; set; }
-
-        public string DbSource { get; set; }
-
-        public string DbName { get; set; }
-
-        public string DbUser { get; set; }
-
-        public string DbPassword { get; set; }
-
-        public string DataBaseType { get; set; }
-
-        public string IsConnectioned { get; set; }
-    }
-}

performance/Performance.EntityModels/Entity/ex_script.cs

@@ -48,7 +48,7 @@ public class ex_script
         /// <summary>
         /// 执行错误信息
         /// </summary>
-        public string ErrorMessage { get; set; }
+        public string Description { get; set; }
 
         /// <summary>
         /// 语句执行完成所需时间

performance/Performance.Services/ExtractExcelService/ExtractPreConfigService.cs

@@ -52,24 +52,14 @@ public class ExtractPreConfigService : IAutoInjection
 
         #region HospitalConfig
 
-        public List<HospitalConfigResponse> GetHospitalConfig(int hospitalId)
+        public List<sys_hospitalconfig> GetHospitalConfig(int hospitalId)
         {
             var hospital = hospitalRepository.GetEntity(w => w.ID == hospitalId);
             if (hospital == null) throw new PerformanceException("医院信息错误");
 
             var data = hospitalconfigRepository.GetEntities(w => w.HospitalId == hospitalId);
             var dic = GetDatatypes();
-            return data?.Select(t => new HospitalConfigResponse
-            {
-                Id = t.Id,
-                ConfigName = t.ConfigName,
-                DbSource = t.DbSource,
-                DbName = t.DbName,
-                DbUser = t.DbUser,
-                DbPassword = t.DbPassword,
-                DataBaseType = dic.FirstOrDefault(w => w.Value == t.DataBaseType)?.Title,
-                IsConnectioned = t.IsConnectioned ? "成功" : "失败"
-            }).ToList();
+            return data;
         }
 
         public bool CreateHospitalConfig(sys_hospitalconfig hospitalconfig)
@@ -88,9 +78,13 @@ public bool CreateHospitalConfig(sys_hospitalconfig hospitalconfig)
             if (hospital == null) throw new PerformanceException("医院信息错误");
 
             var config = hospitalconfigRepository.GetEntity(w => w.ConfigName == hospitalconfig.ConfigName);
-            if (config == null) throw new PerformanceException("连接名称重复");
+            if (config != null) throw new PerformanceException("连接名称重复");
+
+            var result = hospitalconfigRepository.Add(hospitalconfig);
+            if (result)
+                TestConnectionCleared(hospitalconfig.Id);
 
-            return hospitalconfigRepository.Add(hospitalconfig);
+            return result;
         }
 
         public bool UpdateHospitalConfig(sys_hospitalconfig hospitalconfig)
@@ -103,8 +97,8 @@ public bool UpdateHospitalConfig(sys_hospitalconfig hospitalconfig)
             if (!databases.Select(t => t.Value).Contains(hospitalconfig.DataBaseType))
                 throw new PerformanceException("数据库类型错误");
 
-            var config = hospitalconfigRepository.GetEntity(w => w.ConfigName == hospitalconfig.ConfigName);
-            if (config == null) throw new PerformanceException("连接名称重复");
+            var config = hospitalconfigRepository.GetEntity(w => w.ConfigName == hospitalconfig.ConfigName && w.Id != hospitalconfig.Id);
+            if (config != null) throw new PerformanceException("连接名称重复");
 
             var entity = hospitalconfigRepository.GetEntity(w => w.Id == hospitalconfig.Id);
             if (entity == null) throw new PerformanceException("医院配置信息为空");
@@ -337,7 +331,7 @@ public decimal CheckExecsqlConsumeTime(ConsumeTimeRequest request)
                 if (script == null) throw new PerformanceException("");
 
                 script.IsExecSuccess = 0;
-                script.ErrorMessage = ex.Message;
+                script.Description = ex.Message;
             }
 
             exscriptRepository.Update(script);