Skip to content

Q
queryPlatform
Commit 8011008c by tangzhongyang
Options

queryPlatform2.0

parent 94acbadf
Showing with 515 additions and 563 deletions
api/.editorconfig 0 → 100644
[*.cs]
# Default severity for analyzer diagnostics with category 'Style'
dotnet_analyzer_diagnostic.category-Style.severity = none
# Default severity for all analyzer diagnostics
dotnet_analyzer_diagnostic.severity = none
api/Health.Api/Controllers/ResourceController.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Caching.Memory;
using Health.Api.Infrastructure;
//using Health.Api.Infrastructure.Models;
using Health.Api.Infrastructure.Modules;
using Health.Api.Infrastructure.Queries;
using Health.Api.Infrastructure.Request;
using Health.Infra;
namespace Health.Api.Controllers
{
[Authorize]
[Route("api/resource")]
[ApiController]
public class ResourceController : ControllerBase
{
private readonly IMemoryCache _cache;
private readonly ResourceQueries resourceQueries;
public ResourceController(
IMemoryCache cache,
ResourceQueries resourceQueries)
{
this._cache = cache;
this.resourceQueries = resourceQueries;
}
/// <summary>
/// 查询当月项目
/// </summary>
/// <param name="source"> </param>
/// <returns></returns>
[HttpGet("ItemQuery")]
[AllowAnonymous]
public IEnumerable<dynamic> ItemQuery( )
{
var ItemQueryList = resourceQueries.ItemQuery( );
return ItemQueryList;
}
/// <summary>
/// 取消正在查询项目
/// </summary>
/// <param name="id">id </param>
/// <returns></returns>
[HttpPost("CancelProject")]
[AllowAnonymous]
public bool CancelProject(int id)
{
bool ItemQueryList = resourceQueries.CancelProject(id);
return ItemQueryList;
}
/// <summary>
/// 查询项目报告
/// </summary>
/// <param name="source">药品 疾病 同查 全部 </param>
/// <returns></returns>
[HttpPost("ProjectReport")]
[AllowAnonymous]
public (IEnumerable<dynamic> yearDistribution, IEnumerable<dynamic> regionalDistribution ,string queryCriteria,string title) ProjectReport([FromBody] SYS_Cs sYS_Cs)
{
return resourceQueries.ProjectReport(sYS_Cs.id, sYS_Cs.MEDIC_AREA, sYS_Cs.item_name, sYS_Cs.GENERIC_NAME, sYS_Cs.PROJECT_NAME, sYS_Cs.icd, sYS_Cs.DISEASE_NAME);
}
/// <summary>
/// 查询流水库表
/// </summary>
/// <returns></returns>
[HttpPost("QueryFlowDatabase")]
[AllowAnonymous]
public IEnumerable<dynamic> QueryFlowDatabase()
{
return resourceQueries.QueryFlowDatabase();
}
/// <summary>
/// 查询药品产地
/// </summary>
/// <returns></returns>
[HttpPost("ShowMEDIC_AREA")]
[AllowAnonymous]
public (IEnumerable<dynamic>, IEnumerable<dynamic>) ShowMEDIC_AREA(int id, int paseIndex)
{
return resourceQueries.ShowMEDIC_AREA(id, paseIndex);
}
/// <summary>
/// 查询名称产地
/// </summary>
/// <returns></returns>
[HttpPost("ShowITEM_NAME")]
[AllowAnonymous]
public (IEnumerable<dynamic>, IEnumerable<dynamic>) ShowITEM_NAME(int id, int paseIndex)
{
return resourceQueries.ShowITEM_NAME(id, paseIndex);
}
/// <summary>
/// 建立流水库表
/// </summary>
/// <returns></returns>
[HttpPost("EstablishFlowDatabaseTable")]
[AllowAnonymous]
public bool EstablishFlowDatabaseTable([FromBody] SYS_EstablishFlowDatabaseTable sYS_EstablishFlows)
{
return resourceQueries.EstablishFlowDatabaseTable(sYS_EstablishFlows.tableName, sYS_EstablishFlows.sql, sYS_EstablishFlows.id, sYS_EstablishFlows.remarks); ;
}
/// <summary>
/// 建立流水库
/// </summary>
/// <returns></returns>
[HttpPost("CreateAFlow_Library")]
[AllowAnonymous]
public bool CreateAFlow_Library(string DatabaseName,int indexs)
{
return resourceQueries.CreateAFlow_Library(DatabaseName,indexs);
}
/// <summary>
/// 查询日志
/// </summary>
/// <returns></returns>
[HttpPost("ShowLog")]
[AllowAnonymous]
public (IEnumerable<dynamic>, IEnumerable<dynamic>) ShowLog(int indexs, int paseIndex, string type)
{
return resourceQueries.ShowLog(indexs,paseIndex,type);
}
/// <summary>
/// 拉取流水库数据
/// </summary>
/// <returns></returns>
[HttpPost("PullData")]
[AllowAnonymous]
public void PullData(int indexs,string DatabaseName,string tableName)
{
resourceQueries.PullData(indexs, DatabaseName, tableName, "PUB_PATIENT");
//拉取登记
resourceQueries.PullData(indexs, DatabaseName, tableName, "OUT_REG_INFO");
resourceQueries.PullData(indexs, DatabaseName, tableName, "INPAT_REG_INFO");
//拉取诊断
resourceQueries.PullData(indexs, DatabaseName, tableName, "OUT_DIAG");
resourceQueries.PullData(indexs, DatabaseName, tableName, "INPAT_DIAG");
resourceQueries.PullData(indexs, DatabaseName, tableName, "OPS_INFO");
resourceQueries.PullData(indexs, DatabaseName, tableName, "ASSAY_REPORT");
resourceQueries.PullData(indexs, DatabaseName, tableName, "EXEC_REPORT");
resourceQueries.PullData1(indexs, DatabaseName, tableName, "OUT_PRES");
resourceQueries.PullData1(indexs, DatabaseName, tableName, "OUT_FEE");
resourceQueries.PullData1(indexs, DatabaseName, tableName, "INPAT_ORDER");
resourceQueries.PullData1(indexs, DatabaseName, tableName, "INPAT_FEE");
}
}
}
api/Health.Api/Infrastructure/Models/SYS_Cs.cs deleted 100644 → 0
namespace Health.Api.Infrastructure.Modules
{
public class SYS_Cs
{
public int id { get; set; }
public string MEDIC_AREA { get; set; }
public string item_name { get; set; }
public string GENERIC_NAME { get; set; }
public string PROJECT_NAME { get; set; }
public string DISEASE_NAME { get; set; }
public string icd { get; set; }
}
public class SYS_EstablishFlowDatabaseTable
{
public int id { get; set; }
public string tableName { get; set; }
public string sql { get; set; }
public string remarks { get; set; }
}
}
api/Health.Api/Infrastructure/Models/SYS_Hospital.cs deleted 100644 → 0
namespace Health.Api.Infrastructure.Modules
{
public class SYS_Hospital
{
public int ID { get; set; }
public string HosName { get; set; }
public string ExecOpenLink { get; set; }
public string ExecDatabase { get; set; }
public string DataLoginName { get; set; }
public string DataPassword { get; set; }
}
public class 服务器
{
public string 服务器ip { get; set; }
public string 数据库账号 { get; set; }
public string 数据库密码 { get; set; }
}
public class hosid
{
public int id { get; set; }
}
public class jcid
{
public int COUNT1 { get; set; }
public int COUNT2 { get; set; }
}
public class SYS_Drugquery
{
/// <summary>
/// 1 命中查询 2其他查询
/// </summary>
public int type1_2 { get; set; }
/// <summary>
/// ICD编码
/// </summary>
public string[] icd { get; set; }
/// <summary>
/// 疾病名称
/// </summary>
public string[] diseaseName { get; set; }
/// <summary>
/// 药品
/// </summary>
public string[] drugName { get; set; }
/// <summary>
/// 材料费
/// </summary>
public string[] materialName { get; set; }
/// <summary>
/// 项目，名称
/// </summary>
public string peojectName { get; set; }
}
}
api/health.Api/Controllers/AnalysisController.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Caching.Memory;
using Health.Api.Infrastructure;
//using Health.Api.Infrastructure.Models;
using Health.Api.Infrastructure.Modules;
using Health.Api.Infrastructure.Queries;
using Health.Api.Infrastructure.Request;
using Health.Infra;
namespace Health.Api.Controllers
{
[Authorize]
[Route("api/resource")]
[ApiController]
public class AnalysisController : Controller
{
private readonly AnalysisQueries _aQueries;
private readonly IMemoryCache _cache;
public AnalysisController(IMemoryCache cache,AnalysisQueries aQueries)
{
this._cache = cache;
this._aQueries = aQueries;
}
/// <summary>
/// 医院展示
/// </summary>
/// <returns></returns>
[HttpPost("HosListInquire")]
[AllowAnonymous]
public (IEnumerable<dynamic>, IEnumerable<dynamic>) HosListInquire(int paseIndex, string hos_name, int hos_id)
{
return _aQueries.HosListInquire(paseIndex, hos_name, hos_id);
}
/// <summary>
/// 数据解析
/// </summary>
/// <returns></returns>
[HttpPost("ParseInquire")]
[AllowAnonymous]
public void ParseInquire(string zxr, int hosid)
{
int id = _aQueries.JX_SCJXJL(hosid, zxr);//1.生成解析记录
_aQueries.JX_GXID(id, hosid);//更新reg_id，master_index
_aQueries.JX_DIC_DIAG(id, hosid);//更新标准库里DIC_DIAG_SUMMARY里的标准字段
_aQueries.JX_DIC_FEE(id, hosid);//新建费用查询字典表
_aQueries.JX_ADD_DA_Disease(id, hosid);//未匹配上的诊断导入到DA_Disease表中
_aQueries.JX_DIC_DRUG_ATC(id, hosid);//匹配更新标准库 DIC_DRUG_ATC的标准字段
_aQueries.JX_ADD_DA_Drug(id, hosid);//未匹配上的导入 [dbo].[DA_Drug] 做处理
//对导入的药品跑权重
_aQueries.JX_DRUG_DATA_QZ(id, hosid);
//对导入的诊断做处理，剔除无效字符
_aQueries.JX_DA_DIAGNOSIS_DATA(id, hosid);
//新导入的诊断跑权重,生成标准科室，标准一级诊断，标准二级诊断
_aQueries.JX_DIAGNOSIS_DATA_QZ(id, hosid);
}
}
}
api/health.Api/Controllers/DrugqueryController.cs deleted 100644 → 0
using Health.Api.Infrastructure.Modules;
using Health.Api.Infrastructure.Queries;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Data.SqlClient;
using Microsoft.Extensions.Caching.Memory;
using System.Data.Common;
namespace Health.Api.Controllers
{
public class DrugqueryController : Controller
{
private readonly IMemoryCache _cache;
private readonly ResourceQueries resourceQueries;
private readonly DrugqueryQueries drugqueryQueries;
public DrugqueryController(
IMemoryCache cache,
ResourceQueries resourceQueries,
DrugqueryQueries drugqueryQueries)
{
this._cache = cache;
this.resourceQueries = resourceQueries;
this.drugqueryQueries = drugqueryQueries;
}
/// <summary>
/// 查询病人疾病信息和药品信息//type1=疾病//type2药品
/// </summary>
/// <param name="sYS_Drugquery"></param>
[HttpPost("Drugquery")]
[AllowAnonymous]
public void Drugquery(SYS_Drugquery sYS_Drugquery)
{
int type = 0;
if ((sYS_Drugquery.icd!=null || sYS_Drugquery.diseaseName!=null) && sYS_Drugquery.drugName==null && sYS_Drugquery.materialName==null)
{
type = 1;//1疾病
int num =drugqueryQueries.SqlAdd(sYS_Drugquery, type);
drugqueryQueries.Diseasequery(type, sYS_Drugquery.type1_2, sYS_Drugquery.icd,sYS_Drugquery.diseaseName,num);
}
else if (sYS_Drugquery.drugName!=null && sYS_Drugquery.diseaseName == null && sYS_Drugquery.icd == null && sYS_Drugquery.materialName == null)
{
type = 2;//2药品
int num = drugqueryQueries.SqlAdd(sYS_Drugquery, type);
drugqueryQueries.Drugquery(type, sYS_Drugquery.type1_2, sYS_Drugquery.drugName,num);
}
else if(sYS_Drugquery.materialName!=null && sYS_Drugquery.diseaseName==null && sYS_Drugquery.icd == null && sYS_Drugquery.drugName == null)
{
type = 3;//3材料
int num = drugqueryQueries.SqlAdd(sYS_Drugquery, type);
drugqueryQueries.Drugquery(type, sYS_Drugquery.type1_2, sYS_Drugquery.materialName,num);
}
else
{
throw new DomainException("只能单类型查询！！");
}
}
}
}
api/health.Api/Controllers/HomeController.cs deleted 100644 → 0
using Microsoft.AspNetCore.Mvc;
namespace Health.Api.Controllers
{
public class HomeController : Controller
{
public IActionResult Index()
{
return View();
}
}
}
api/health.Api/Infrastructure/Queries/HomeQueries.cs deleted 100644 → 0
namespace Health.Api.Infrastructure.Queries
{
public class HomeQueries
{
private readonly string _configConnectionString;
//private List<Common> a;
bool state = true;
public HomeQueries( string configConnectionString)
{
_configConnectionString = configConnectionString;
}
}
}
api/Health.Api/Controllers/AccountController.cs → api/queryPlaform.Api/Controllers/AccountController.cs
using Health.Api.Infrastructure; using Microsoft.AspNetCore.Authorization;
using Health.Api.Infrastructure.Queries;
using Health.Api.Infrastructure.Request;
using Health.Infra;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using QueryPlatform.Api.Infrastructure;
using QueryPlatform.Api.Infrastructure.Queries;
using QueryPlatform.Api.Infrastructure.Request;
using QueryPlatform.Infra;
using System; using System;
using System.Net; using System.Net;
using System.Security.Claims; using System.Security.Claims;
namespace Health.Api.Controllers namespace QueryPlatform.Api.Controllers
{ {
[Authorize] [Authorize]
[Route("api/account")] [Route("api/account")]
...@@ -20,16 +20,12 @@ public class AccountController : ControllerBase ...@@ -20,16 +20,12 @@ public class AccountController : ControllerBase
private readonly UserQueries _userQueries; private readonly UserQueries _userQueries;
private readonly JwtOption _jwtOption; private readonly JwtOption _jwtOption;
public AccountController( public AccountController(IUserIdentity identity, IOptions<JwtOption> options, UserQueries userQueries)
IUserIdentity identity,
IOptions<JwtOption> options,
UserQueries userQueries)
{ {
_identity = identity; _identity = identity;
_userQueries = userQueries; _userQueries = userQueries;
_jwtOption = options.Value; _jwtOption = options.Value;
} }
/// <summary> /// <summary>
/// 登录授权 /// 登录授权
/// </summary> /// </summary>
...@@ -58,14 +54,13 @@ public ActionResult Login([FromBody] LoginRequest request) ...@@ -58,14 +54,13 @@ public ActionResult Login([FromBody] LoginRequest request)
var claims = new[] var claims = new[]
{ {
new Claim(ClaimTypes.Sid, user.ID.ToString()), new Claim(ClaimTypes.Sid, user.id.ToString()),
new Claim(ClaimTypes.Surname, user.RealName), new Claim(ClaimTypes.Surname, user.RealName),
new Claim(ClaimTypes.Name, user.Login), new Claim(ClaimTypes.Name, user.Login),
}; };
var jwt = new JwtToken(_jwtOption).GenerateToken(claims); var jwt = new JwtToken(_jwtOption).GenerateToken(claims);
return Ok(jwt); return Ok(jwt);
} }
/// <summary> /// <summary>
/// 刷新登录JWT TOKEN /// 刷新登录JWT TOKEN
/// </summary> /// </summary>
......
api/queryPlaform.Api/Controllers/AnalysisController.cs 0 → 100644
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Caching.Memory;
using QueryPlatform.Api.Infrastructure.Modules;
using QueryPlatform.Api.Infrastructure.Queries;
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
namespace QueryPlatform.Api.Controllers
{
[Authorize]
[Route("api/resource")]
[ApiController]
public class AnalysisController : Controller
{
private readonly AnalysisQueries _aQueries;
private readonly HomeQueries _homeQueries;
private readonly IMemoryCache _cache;
public AnalysisController(IMemoryCache cache, AnalysisQueries aQueries, HomeQueries homeQueries)
{
_cache = cache;
_homeQueries = homeQueries;
_aQueries = aQueries;
}
/// <summary>
/// 医院展示
/// </summary>
/// <returns></returns>
[HttpPost("HosListInquire")]
[AllowAnonymous]
public (IEnumerable<dynamic>, IEnumerable<dynamic>) HosListInquire(int paseIndex, string hos_name, int? hos_id)
{
return _aQueries.HosListInquire(paseIndex, hos_name, hos_id);
}
/// <summary>
/// 数据解析
/// </summary>
/// <returns></returns>
private static SemaphoreSlim semaphore = new SemaphoreSlim(1, 1);
[HttpPost("ParseInquire")]
[AllowAnonymous]
public async Task ParseInquireAsync(Sys_cs sys_)
{
int id = _aQueries.JX_SCJXJL(sys_.hosid, sys_.zxr);//1.生成解析记录
_aQueries.updateztZ(id, sys_.hosid, "等待执行");
await semaphore.WaitAsync();
try
{
if (sys_.num <= 1)
{
_aQueries.updateztZ(id, sys_.hosid, "--1更新reg_id，master_index");
_aQueries.JX_GXID(id, sys_.hosid);//1更新reg_id，master_index
}
if (sys_.num <= 2)
{
_aQueries.updateztZ(id, sys_.hosid, "--2更新标准库里DIC_DIAG_SUMMARY里的标准字段");
_aQueries.JX_DIC_DIAG(id, sys_.hosid);//2更新标准库里DIC_DIAG_SUMMARY里的标准字段
}
if (sys_.num <= 3)
{
_aQueries.updateztZ(id, sys_.hosid, "--3新建费用查询字典表");
_aQueries.JX_DIC_FEE(id, sys_.hosid);//3新建费用查询字典表
}
if (sys_.num <= 4)
{
_aQueries.updateztZ(id, sys_.hosid, "--4未匹配上的诊断导入到DA_Disease表中");
_aQueries.JX_ADD_DA_Disease(id, sys_.hosid);//4未匹配上的诊断导入到DA_Disease表中
}
if (sys_.num <= 5)
{
_aQueries.updateztZ(id, sys_.hosid, "--5匹配更新标准库 DIC_DRUG_ATC的标准字段");
_aQueries.JX_DIC_DRUG_ATC(id, sys_.hosid);//5匹配更新标准库 DIC_DRUG_ATC的标准字段
}
if (sys_.num <= 6)
{
_aQueries.updateztZ(id, sys_.hosid, "--6未匹配上的导入 [dbo].[DA_Drug] 做处理");
_aQueries.JX_ADD_DA_Drug(id, sys_.hosid);//6未匹配上的导入 [dbo].[DA_Drug] 做处理
}
if (sys_.num <= 7)
{
_aQueries.updateztZ(id, sys_.hosid, "--7对导入的药品跑权重");
_aQueries.JX_DRUG_DATA_QZ(id, sys_.hosid);//7对导入的药品跑权重
}
if (sys_.num <= 8)
{
_aQueries.updateztZ(id, sys_.hosid, "--8对导入的诊断做处理，剔除无效字符");
_aQueries.JX_DA_DIAGNOSIS_DATA(id, sys_.hosid);//8对导入的诊断做处理，剔除无效字符
}
if (sys_.num <= 9)
{
_aQueries.updateztZ(id, sys_.hosid, "--9新导入的诊断跑权重,生成标准科室，标准一级诊断，标准二级诊断");
_aQueries.JX_DIAGNOSIS_DATA_QZ(sys_.hosid);//9新导入的诊断跑权重,生成标准科室，标准一级诊断，标准二级诊断
}
if (sys_.num <= 10)
{
_aQueries.updateztZ(id, sys_.hosid, "--10更新DIC_DIAG_GATHER里的标准字段");
_aQueries.JX_REMATCH_DIAG(id, sys_.hosid);//10更新DIC_DIAG_GATHER里的标准字段
}
if (sys_.num <= 11)
{
_aQueries.updateztZ(id, sys_.hosid, "--11更新标准库里DIC_DIAG_SUMMARY里的标准字段");
_aQueries.JX_DIC_DIAG(id, sys_.hosid);//11更新标准库里DIC_DIAG_SUMMARY里的标准字段
}
if (sys_.num <= 12)
{
_aQueries.updateztZ(id, sys_.hosid, "--12调用函数更新out_reg_info标准诊断");
_aQueries.JX_UPDATE_REG_INFO(id, sys_.hosid);//12调用函数更新out_reg_info标准诊断
}
if (sys_.num <= 13)
{
_aQueries.updateztZ(id, sys_.hosid, "--13医保（1--插入card_type表,2--更改SOURCE ,3--修改登记表i_card_type）");
_aQueries.JX_REMOVE_CARD_TYPE(id, sys_.hosid);//13医保（1--插入card_type表,2--更改SOURCE ,3--修改登记表i_card_type）
}
if (sys_.num <= 14)
{
_aQueries.updateztZ(id, sys_.hosid, "--14费用分类");
_aQueries.JX_INSERT_CATEGORY(id, sys_.hosid);//14费用分类
}
if (sys_.num <= 15)
{
_aQueries.updateztZ(id, sys_.hosid, "执行完成");//15解析结束
}
_homeQueries.SendMail("医院解析提醒", @$"医院编号：{sys_.hosid} 解析结束！请前去确认是否需要费用分类。", sys_.zxr);
}
catch (Exception ex)
{
_homeQueries.SendMail("医院解析提醒", @$"医院编号：{sys_.hosid} 解析失败！错误日志：{ex}", sys_.zxr);
_aQueries.updateztZ(id, sys_.hosid, "执行失败");//解析结束
throw;
}
finally
{
semaphore.Release();
}
}
/// <summary>
/// 下拉框
/// </summary>
/// <returns></returns>
[HttpPost("JxLx")]
[AllowAnonymous]
public IEnumerable<dynamic> JxLx()
{
return _aQueries.JxLx();
}
}
}
api/queryPlaform.Api/Controllers/IUserIdentity.cs 0 → 100644
namespace QueryPlatform.Api.Controllers
{
//internal interface IUserIdentity
//{
//}
}
\ No newline at end of file
api/Health.Api/Controllers/UserController.cs → api/queryPlaform.Api/Controllers/UserController.cs
using Health.Api.Infrastructure.Modules; using Microsoft.AspNetCore.Mvc;
using Health.Api.Infrastructure.Queries; using QueryPlatform.Api.Infrastructure.Modules;
using Health.Api.Infrastructure.Request; using QueryPlatform.Api.Infrastructure.Queries;
using Health.Infra; using QueryPlatform.Api.Infrastructure.Request;
using Microsoft.AspNetCore.Mvc; using QueryPlatform.Infra;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
namespace Health.Api.Controllers namespace QueryPlatform.Api.Controllers
{ {
[Route("api/user")] [Route("api/user")]
[ApiController] [ApiController]
...@@ -16,17 +16,12 @@ public class UserController : ControllerBase ...@@ -16,17 +16,12 @@ public class UserController : ControllerBase
private readonly UserStorage _userStorage; private readonly UserStorage _userStorage;
private readonly UserQueries _userQueries; private readonly UserQueries _userQueries;
public UserController( public UserController(IUserIdentity identity, UserStorage userStorage, UserQueries userQueries)
IUserIdentity identity,
UserStorage userStorage,
UserQueries userQueries)
{ {
_identity = identity; _identity = identity;
_userStorage = userStorage; _userStorage = userStorage;
_userQueries = userQueries; _userQueries = userQueries;
} }
/// <summary> /// <summary>
/// 用户信息 /// 用户信息
/// </summary> /// </summary>
...@@ -41,7 +36,6 @@ public ActionResult Info() ...@@ -41,7 +36,6 @@ public ActionResult Info()
return Ok(user); return Ok(user);
} }
/// <summary> /// <summary>
/// 用户修改 /// 用户修改
/// </summary> /// </summary>
...@@ -66,7 +60,6 @@ public IActionResult Update(UserRequest request) ...@@ -66,7 +60,6 @@ public IActionResult Update(UserRequest request)
_userStorage.Update(request); _userStorage.Update(request);
return Ok(); return Ok();
} }
/// <summary> /// <summary>
/// 查询用户列表 /// 查询用户列表
/// </summary> /// </summary>
...@@ -78,7 +71,6 @@ public IActionResult Get(string realname) ...@@ -78,7 +71,6 @@ public IActionResult Get(string realname)
var users = _userQueries.GetUsers(realname); var users = _userQueries.GetUsers(realname);
return Ok(users); return Ok(users);
} }
/// <summary> /// <summary>
/// 新增用户 /// 新增用户
/// </summary> /// </summary>
...@@ -95,7 +87,6 @@ public IActionResult Post(UserRequest request) ...@@ -95,7 +87,6 @@ public IActionResult Post(UserRequest request)
return Ok(user); return Ok(user);
} }
/// <summary> /// <summary>
/// 删除 /// 删除
/// </summary> /// </summary>
......
api/queryPlaform.Api/GlobalSuppressions.cs 0 → 100644
// This file is used by Code Analysis to malongain SuppressMessage
// attributes that are applied to this project.
// Project-level suppressions either have no target or are given
// a specific target and scoped to a namespace, type, member, etc.
using System.Diagnostics.CodeAnalysis;
[assembly: SuppressMessage("Style", "IDE0058:永远不会使用表达式值", Justification = "<挂起>", Scope = "member", Target = "~M:QueryPlatform.Api.Startup.Configure(Microsoft.AspNetCore.Builder.IApplicationBuilder,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)")]
api/Health.Api/Infrastructure/ApiResponse.cs → api/queryPlaform.Api/Infrastructure/ApiResponse.cs
using Health.Infra; using QueryPlatform.Infra;
using System.ComponentModel; using System.ComponentModel;
namespace Health.Api namespace QueryPlatform.Api
{ {
public class ApiResponse<TEntity> public class ApiResponse<TEntity>
where TEntity : class, new() where TEntity : class, new()
...@@ -96,12 +96,13 @@ public enum ResponseType ...@@ -96,12 +96,13 @@ public enum ResponseType
/// 内部错误 /// 内部错误
/// </summary> /// </summary>
[Description("内部错误")] [Description("内部错误")]
InternalServerError = 500, longernalServerError = 500,
/// <summary> /// <summary>
/// 不支持请求 /// 不支持请求
/// </summary> /// </summary>
[Description("不支持请求")] [Description("不支持请求")]
NotImplemented = 501, NotImplemented = 501,
Fail = 502,
} }
} }
api/Health.Api/Infrastructure/AutofacModules/QueriesModule.cs → api/queryPlaform.Api/Infrastructure/AutofacModules/QueriesModule.cs
using Autofac; using Autofac;
using Health.Api.Infrastructure.Queries;
using Health.Api.Infrastructure.Queues;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Health.Api.Infrastructure.Queries; using QueryPlatform.Api.Infrastructure.Queries;
using QueryPlatform.Api.Infrastructure.Queues;
namespace Health.Api.Infrastructure.AutofacModules namespace QueryPlatform.Api.Infrastructure.AutofacModules
{ {
public class QueriesModule : Autofac.Module public class QueriesModule : Autofac.Module
{ {
...@@ -27,19 +26,14 @@ protected override void Load(ContainerBuilder builder) ...@@ -27,19 +26,14 @@ protected override void Load(ContainerBuilder builder)
var Connection158 = configuration["ConnectionStrings:Connection158"]; var Connection158 = configuration["ConnectionStrings:Connection158"];
builder.RegisterType<HubNotificationQueue>().SingleInstance(); builder.RegisterType<HubNotificationQueue>().SingleInstance();
builder.Register(c => new UserStorage(configConnectionString)).InstancePerLifetimeScope(); builder.Register(c => new UserStorage(configConnectionString)).InstancePerLifetimeScope();
builder.Register(c => new UserQueries(configConnectionString)).InstancePerLifetimeScope(); builder.Register(c => new UserQueries(configConnectionString)).InstancePerLifetimeScope();
builder.Register(c => new ResourceQueries(Connection156, configConnectionString)).InstancePerLifetimeScope();
builder.Register(c => new ResourceQueries(Connection156, configConnectionString,Connection151,Connection152,Connection153,Connection154,Connection155,Connection158)).InstancePerLifetimeScope(); builder.Register(c => new DrugqueryQueries(Connection156, configConnectionString)).InstancePerLifetimeScope();
builder.Register(c => new DrugqueryQueries(Connection156, configConnectionString )).InstancePerLifetimeScope();
builder.Register(c => new HomeQueries(configConnectionString)).InstancePerLifetimeScope(); builder.Register(c => new HomeQueries(configConnectionString)).InstancePerLifetimeScope();
builder.Register(c => new AnalysisQueries(Connection156, configConnectionString)).InstancePerLifetimeScope();
builder.Register(c => new AnalysisQueries(Connection156, configConnectionString )).InstancePerLifetimeScope();
} }
} }
} }
\ No newline at end of file
api/Health.Api/Infrastructure/Context/SearchContext.cs → api/queryPlaform.Api/Infrastructure/Context/SearchContext.cs
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace Health.Api namespace QueryPlatform.Api
{ {
public class SearchContext : DbContext public class SearchContext : DbContext
{ {
......
api/Health.Api/Infrastructure/Domain/FileFormat.cs → api/queryPlaform.Api/Infrastructure/Domain/FileFormat.cs
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
using System.IO.Compression; using System.IO.Compression;
using System.Linq; using System.Linq;
namespace Health.Api.Infrastructure.Domain namespace QueryPlatform.Api.Infrastructure.Domain
{ {
public class SearchPathInfo public class SearchPathInfo
{ {
......
api/Health.Api/Infrastructure/Enums/DiseaseType.cs → api/queryPlaform.Api/Infrastructure/Enums/DiseaseType.cs
using System.ComponentModel; using System.ComponentModel;
namespace Health.Api.Infrastructure.Enums namespace QueryPlatform.Api.Infrastructure.Enums
{ {
public enum DiseaseType public enum DiseaseType
{ {
......
api/Health.Api/Infrastructure/Filters/ArgumentsActionFilter.cs → api/queryPlaform.Api/Infrastructure/Filters/ArgumentsActionFilter.cs
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace Health.Api.Infrastructure.Filters namespace QueryPlatform.Api.Infrastructure.Filters
{ {
public class ArgumentsActionFilter : IActionFilter public class ArgumentsActionFilter : IActionFilter
{ {
......
api/Health.Api/Infrastructure/Filters/HttpGlobalExceptionFilter.cs → api/queryPlaform.Api/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
using System.Linq; using System.Linq;
using System.Net; using System.Net;
namespace Health.Api.Infrastructure.Filters namespace QueryPlatform.Api.Infrastructure.Filters
{ {
public class HttpGlobalExceptionFilter : IExceptionFilter public class HttpGlobalExceptionFilter : IExceptionFilter
{ {
...@@ -63,7 +63,7 @@ public void OnException(ExceptionContext context) ...@@ -63,7 +63,7 @@ public void OnException(ExceptionContext context)
} }
else else
{ {
var result = new InternalServerErrorResponse var result = new longernalServerErrorResponse
{ {
Status = Status.Failed, Status = Status.Failed,
Message = "请求发生一个未知错误，请参考错误信息。", Message = "请求发生一个未知错误，请参考错误信息。",
......
api/Health.Api/Infrastructure/Filters/ValidateModelFilter.cs → api/queryPlaform.Api/Infrastructure/Filters/ValidateModelFilter.cs
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
using System.Linq; using System.Linq;
using System.Net; using System.Net;
namespace Health.Api.Infrastructure.Filters namespace QueryPlatform.Api.Infrastructure.Filters
{ {
public class ValidateModelFilter : IResultFilter public class ValidateModelFilter : IResultFilter
{ {
......
api/Health.Api/Infrastructure/HealthCheck.cs → api/queryPlaform.Api/Infrastructure/HealthCheck.cs
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
using System.Text.Json; using System.Text.Json;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Health.Api namespace QueryPlatform.Api.Infrastructure
{ {
public class HealthCheck public class QueryPlatformCheck
{ {
public static Task WriteResponse(HttpContext context, HealthReport result) public static Task WriteResponse(HttpContext context, HealthReport result)
{ {
......
api/Health.Api/Infrastructure/Hubs/NotificationHub.cs → api/queryPlaform.Api/Infrastructure/Hubs/NotificationHub.cs
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
using System.Security.Claims; using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Health.Api.Infrastructure.Hubs namespace QueryPlatform.Api.Infrastructure.Hubs
{ {
[Authorize] [Authorize]
public class NotificationHub : Hub public class NotificationHub : Hub
......
api/queryPlaform.Api/Infrastructure/Job.cs 0 → 100644
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using QueryPlatform.Api.Infrastructure.Queries;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace Test.Web.Host.Model
{
public class Job : BackgroundService
{
private readonly DrugqueryQueries _drugqueryQueries;
private readonly HomeQueries _homeQueries;
private readonly ILogger<Job> _logger;
public Job(ILogger<Job> logger, DrugqueryQueries drugqueryQueries, HomeQueries homeQueries)
{
_logger = logger;
_drugqueryQueries = drugqueryQueries;
_homeQueries = homeQueries;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
while (!stoppingToken.IsCancellationRequested)
{
await new TaskFactory().StartNew(() =>
{
try
{
var day = DateTime.Now.Day;
var time = DateTime.Now.ToString("HH:mm:ss");
if (day == 8 && time == "09:39:01")
{
// _drugqueryQueries.定时执行();
_homeQueries.SendMail("定时任务", "人群检索表 化验检查检索表合并成功");
}
}
catch (Exception e)
{
_homeQueries.SendMail("定时任务", "人群检索表 化验检查检索表合并失败。 错误日志：" + e.ToString());
throw;
}
Thread.Sleep(1 * 1000);
});
}
}
}
}
\ No newline at end of file
api/Health.Api/Infrastructure/JsonHelper.cs → api/queryPlaform.Api/Infrastructure/JsonHelper.cs
using Health.Infra; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using QueryPlatform.Infra;
namespace Health.Api.Infrastructure namespace QueryPlatform.Api.Infrastructure
{ {
public class JsonHelper : IJsonConverter public class JsonHelper : IJsonConverter
{ {
...@@ -11,12 +12,30 @@ public class JsonHelper : IJsonConverter ...@@ -11,12 +12,30 @@ public class JsonHelper : IJsonConverter
public JsonHelper(IOptions<MvcNewtonsoftJsonOptions> options) public JsonHelper(IOptions<MvcNewtonsoftJsonOptions> options)
{ {
IsoDateTimeConverter datetimeConverter = new IsoDateTimeConverterContent
{
DateTimeFormat = "yyyy-MM-dd HH:mm:ss"
};
_serializerSettings = new JsonSerializerSettings
{
MissingMemberHandling = MissingMemberHandling.Ignore,
NullValueHandling = NullValueHandling.Ignore,
ReferenceLoopHandling = ReferenceLoopHandling.Ignore
};
_serializerSettings.Converters.Add(datetimeConverter);
_serializerSettings.ContractResolver = new LowercaseContractResolver();
_serializerSettings = options.Value.SerializerSettings; _serializerSettings = options.Value.SerializerSettings;
} }
public T Deserialize<T>(string json) //public static T Deserialize<T>(string json)
{ //{
return JsonConvert.DeserializeObject<T>(json, _serializerSettings); // return JsonConvert.DeserializeObject<T>(json);
} //}
/// <summary>
/// 将指定的 JSON 数据反序列化成指定对象。
/// </summary>
/// <typeparam name="T">对象类型。</typeparam>
/// <param name="json">JSON 数据。</param>
/// <returns></returns>
public string Serialize(object @object) public string Serialize(object @object)
{ {
......
api/Health.Api/Infrastructure/Middlewares/DecodeResponseMiddleware.cs → api/queryPlaform.Api/Infrastructure/Middlewares/DecodeResponseMiddleware.cs
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Health.Api.Infrastructure.Middlewares namespace QueryPlatform.Api.Infrastructure.Middlewares
{ {
/// <summary> /// <summary>
/// 解码中间件 /// 解码中间件
......
api/Health.Api/Infrastructure/Middlewares/DoubleRequestMiddleware.cs → api/queryPlaform.Api/Infrastructure/Middlewares/DoubleRequestMiddleware.cs
using EasyCaching.Core; using EasyCaching.Core;
using Health.Infra;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Newtonsoft.Json; using Newtonsoft.Json;
using QueryPlatform.Infra;
using System; using System;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Health.Api.Infrastructure.Middlewares namespace QueryPlatform.Api.Infrastructure.Middlewares
{ {
/// <summary> /// <summary>
/// 解码中间件 /// 解码中间件
......
api/Health.Api/Infrastructure/Models/SYS_USER.cs → api/queryPlaform.Api/Infrastructure/Models/SYS_USER.cs
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Health.Api.Infrastructure.Modules namespace QueryPlatform.Api.Infrastructure.Modules
{ {
[Table("SYS_USER")] [Table("SYS_USER")]
public class SYS_USER public class SYS_USER
{ {
[Key] [Key]
public long ID { get; set; } public int id { get; set; }
public DateTime CreateDate { get; set; } public DateTime CreateDate { get; set; }
public string RealName { get; set; } public string RealName { get; set; }
public string Login { get; set; } public string Login { get; set; }
...@@ -25,4 +25,19 @@ public class SYS_USER ...@@ -25,4 +25,19 @@ public class SYS_USER
public bool IsDelete { get; set; } public bool IsDelete { get; set; }
public bool IsDisable { get; set; } public bool IsDisable { get; set; }
} }
[Table("Mailboxs")]
public class Mailboxs
{
public string mailbox { get; set; }
public string password { get; set; }
public long type { get; set; }
public string UserName { get; set; }
public string UserNames { get; set; }
public string jurisdiction { get; set; }
}
public class user
{
public string UserName { get; set; }
}
} }
api/Health.Api/Infrastructure/Notification.cs → api/queryPlaform.Api/Infrastructure/Notification.cs
using System; using System;
namespace Health.Api.Infrastructure namespace QueryPlatform.Api.Infrastructure
{ {
public class Notification public class Notification
{ {
public Notification(int userId, string method, PushContent body) public Notification(long userId, string method, PushContent body)
{ {
UserId = userId; UserId = userId;
Method = method; Method = method;
Body = body; Body = body;
} }
public int UserId { get; set; } public long UserId { get; set; }
public string Method { get; set; } public string Method { get; set; }
public PushContent Body { get; set; } public PushContent Body { get; set; }
......
api/Health.Api/Infrastructure/Page.cs → api/queryPlaform.Api/Infrastructure/Page.cs
using System.Collections.Generic; using System.Collections.Generic;
namespace Health.Api.Infrastructure namespace QueryPlatform.Api.Infrastructure
{ {
public class Page public class Page
{ {
public Page() : this(1, 30) { } public Page() : this(1, 30) { }
public Page(int index) : this(index, 30) { } public Page(long index) : this(index, 30) { }
public Page(int index, int size) public Page(long index, long size)
{ {
Index = index; Index = index;
Size = size; Size = size;
...@@ -16,29 +16,29 @@ public Page(int index, int size) ...@@ -16,29 +16,29 @@ public Page(int index, int size)
/// <summary> /// <summary>
/// 页码 /// 页码
/// </summary> /// </summary>
public int Index { get; set; } public long Index { get; set; }
/// <summary> /// <summary>
/// 页行数 默认30 /// 页行数 默认30
/// </summary> /// </summary>
public int Size { get; set; } public long Size { get; set; }
} }
public class Page<TEntity> : Page public class Page<TEntity> : Page
{ {
public Page(int total, IEnumerable<TEntity> data) public Page(long total, IEnumerable<TEntity> data)
{ {
Total = total; Total = total;
Data = data; Data = data;
} }
public Page(int index, int size, int total, IEnumerable<TEntity> data) public Page(long index, long size, long total, IEnumerable<TEntity> data)
: base(index, size) : base(index, size)
{ {
Total = total; Total = total;
Data = data; Data = data;
} }
public int Total { get; set; } public long Total { get; set; }
public IEnumerable<TEntity> Data { get; set; } public IEnumerable<TEntity> Data { get; set; }
} }
} }
api/Health.Api/Infrastructure/Queries/UserQueries.cs → api/queryPlaform.Api/Infrastructure/Queries/UserQueries.cs
using Dapper; using Dapper;
using Dapper.Contrib.Extensions; using Dapper.Contrib.Extensions;
using Health.Api.Infrastructure.Modules;
using Microsoft.Data.SqlClient; using Microsoft.Data.SqlClient;
using QueryPlatform.Api.Infrastructure.Modules;
using StackExchange.Profiling; using StackExchange.Profiling;
using StackExchange.Profiling.Data; using StackExchange.Profiling.Data;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data.Common; using System.Data.Common;
namespace Health.Api.Infrastructure.Queries namespace QueryPlatform.Api.Infrastructure.Queries
{ {
public class UserQueries public class UserQueries
{ {
private readonly string _connectionString; private readonly string _connectionString;
public UserQueries(string connectionString) public UserQueries(string connectionString)
{ {
_connectionString = connectionString; _connectionString = connectionString;
} }
public SYS_USER GetUserByAccount(string account, int id) public SYS_USER GetUserByAccount(string account, int id)
{ {
using (DbConnection connection = new ProfiledDbConnection(new SqlConnection(_connectionString), MiniProfiler.Current)) using (DbConnection connection = new ProfiledDbConnection(new SqlConnection(_connectionString), MiniProfiler.Current))
...@@ -25,7 +23,6 @@ public SYS_USER GetUserByAccount(string account, int id) ...@@ -25,7 +23,6 @@ public SYS_USER GetUserByAccount(string account, int id)
return connection.QueryFirstOrDefault<SYS_USER>("SELECT * FROM SYS_USER WHERE LOGIN=@account AND IsDelete=0 and id <>" + id, new { account }); return connection.QueryFirstOrDefault<SYS_USER>("SELECT * FROM SYS_USER WHERE LOGIN=@account AND IsDelete=0 and id <>" + id, new { account });
} }
} }
public IEnumerable<SYS_USER> GetUsers(string realname) public IEnumerable<SYS_USER> GetUsers(string realname)
{ {
using (DbConnection connection = new ProfiledDbConnection(new SqlConnection(_connectionString), MiniProfiler.Current)) using (DbConnection connection = new ProfiledDbConnection(new SqlConnection(_connectionString), MiniProfiler.Current))
...@@ -33,9 +30,6 @@ public IEnumerable<SYS_USER> GetUsers(string realname) ...@@ -33,9 +30,6 @@ public IEnumerable<SYS_USER> GetUsers(string realname)
return connection.Query<SYS_USER>("SELECT * FROM SYS_USER WHERE isdelete=0 and realname like '%" + realname + "%'"); return connection.Query<SYS_USER>("SELECT * FROM SYS_USER WHERE isdelete=0 and realname like '%" + realname + "%'");
} }
} }
public SYS_USER GetUserById(int userId) public SYS_USER GetUserById(int userId)
{ {
using (DbConnection connection = new ProfiledDbConnection(new SqlConnection(_connectionString), MiniProfiler.Current)) using (DbConnection connection = new ProfiledDbConnection(new SqlConnection(_connectionString), MiniProfiler.Current))
......
api/Health.Api/Infrastructure/Queries/UserStorage.cs → api/queryPlaform.Api/Infrastructure/Queries/UserStorage.cs
using Dapper.Contrib.Extensions; using Dapper.Contrib.Extensions;
using Health.Api.Infrastructure.Modules;
using Health.Api.Infrastructure.Request;
using Microsoft.Data.SqlClient; using Microsoft.Data.SqlClient;
using QueryPlatform.Api.Infrastructure.Modules;
using QueryPlatform.Api.Infrastructure.Request;
using StackExchange.Profiling; using StackExchange.Profiling;
using StackExchange.Profiling.Data; using StackExchange.Profiling.Data;
using System; using System;
using System.Data.Common; using System.Data.Common;
namespace Health.Api.Infrastructure.Queries namespace QueryPlatform.Api.Infrastructure.Queries
{ {
public class UserStorage public class UserStorage
{ {
...@@ -32,7 +32,7 @@ public SYS_USER Add(UserRequest request) ...@@ -32,7 +32,7 @@ public SYS_USER Add(UserRequest request)
IsDelete = false, IsDelete = false,
}; };
user.ID = connection.Insert(user); user.id = (int)connection.Insert(user);
return user; return user;
} }
...@@ -40,10 +40,7 @@ public SYS_USER Add(UserRequest request) ...@@ -40,10 +40,7 @@ public SYS_USER Add(UserRequest request)
/// <summary> /// <summary>
/// 修改密码 /// 修改密码
/// </summary> /// </summary>
/// <param name="userId"></param>
/// <param name="oldPassword"></param>
/// <param name="newPassword"></param>
/// <returns></returns> /// <returns></returns>
public SYS_USER Update(UserRequest request) public SYS_USER Update(UserRequest request)
{ {
...@@ -72,7 +69,7 @@ public SYS_USER Update(UserRequest request) ...@@ -72,7 +69,7 @@ public SYS_USER Update(UserRequest request)
/// <param name="delete"></param> /// <param name="delete"></param>
/// <param name="reset"></param> /// <param name="reset"></param>
/// <returns></returns> /// <returns></returns>
public SYS_USER Update(int userId, bool? delete = null, bool? reset = null, bool? disable = null) public SYS_USER Update(long userId, bool? delete = null, bool? reset = null, bool? disable = null)
{ {
using (DbConnection connection = new ProfiledDbConnection(new SqlConnection(_connectionString), MiniProfiler.Current)) using (DbConnection connection = new ProfiledDbConnection(new SqlConnection(_connectionString), MiniProfiler.Current))
{ {
......
api/Health.Api/Infrastructure/Queues/HubNotificationQueue.cs → api/queryPlaform.Api/Infrastructure/Queues/HubNotificationQueue.cs
using Health.Api.Infrastructure.Hubs; using Microsoft.AspNetCore.SignalR;
using Health.Infra;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using QueryPlatform.Api.Infrastructure.Hubs;
using QueryPlatform.Infra;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Health.Api.Infrastructure.Queues namespace QueryPlatform.Api.Infrastructure.Queues
{ {
public class HubNotificationQueue public class HubNotificationQueue
......
api/Health.Api/Infrastructure/Request/LoginRequest.cs → api/queryPlaform.Api/Infrastructure/Request/LoginRequest.cs
namespace Health.Api.Infrastructure.Request namespace QueryPlatform.Api.Infrastructure.Request
{ {
public class LoginRequest public class LoginRequest
{ {
......
api/Health.Api/Infrastructure/Request/PasswordRequest.cs → api/queryPlaform.Api/Infrastructure/Request/PasswordRequest.cs
namespace Health.Api.Infrastructure.Request namespace QueryPlatform.Api.Infrastructure.Request
{ {
public class PasswordRequest public class PasswordRequest
{ {
......
api/Health.Api/Infrastructure/Request/UserRequest.cs → api/queryPlaform.Api/Infrastructure/Request/UserRequest.cs
namespace Health.Api.Infrastructure.Request namespace QueryPlatform.Api.Infrastructure.Request
{ {
public class UserRequest public class UserRequest
{ {
......
api/Health.Api/Infrastructure/UserIdentity.cs → api/queryPlaform.Api/Infrastructure/UserIdentity.cs
using Health.Infra; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http;
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
using QueryPlatform.Infra;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IdentityModel.Tokens.Jwt; using System.IdentityModel.Tokens.Jwt;
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
using System.Security.Claims; using System.Security.Claims;
using System.Text; using System.Text;
namespace Health.Api.Infrastructure namespace QueryPlatform.Api.Infrastructure
{ {
public class JwtOption public class JwtOption
{ {
......
api/Health.Api/Program.cs → api/queryPlaform.Api/Program.cs
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
using System; using System;
using System.IO; using System.IO;
namespace Health.Api namespace QueryPlatform.Api
{ {
public class Program public class Program
{ {
......
api/queryPlaform.Api/Properties/PublishProfiles/FolderProfile1.pubxml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<DeleteExistingFiles>False</DeleteExistingFiles>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
\ No newline at end of file
api/queryPlaform.Api/Properties/PublishProfiles/FolderProfile2.pubxml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<DeleteExistingFiles>true</DeleteExistingFiles>
<ExcludeApp_Data>false</ExcludeApp_Data>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\Release\netcoreapp3.1\publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>netcoreapp3.1</TargetFramework>
<ProjectGuid>7d7e81d8-76ac-4b16-9f93-b4689bbc423e</ProjectGuid>
<SelfContained>false</SelfContained>
</PropertyGroup>
</Project>
\ No newline at end of file
api/queryPlaform.Api/Properties/PublishProfiles/FolderProfile3.pubxml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<DeleteExistingFiles>False</DeleteExistingFiles>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\Release\netcoreapp3.1\publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
\ No newline at end of file
api/Health.Api/Properties/launchSettings.json → api/queryPlaform.Api/Properties/launchSettings.json
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"ASPNETCORE_ENVIRONMENT": "Localhost" "ASPNETCORE_ENVIRONMENT": "Localhost"
} }
}, },
"Health.Api": { "QueryPlatform.Api": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"launchUrl": "swagger", "launchUrl": "swagger",
......
api/Health.Api/QueryPlatform.Api.csproj → api/queryPlaform.Api/QueryPlatform.Api.csproj
...@@ -6,11 +6,18 @@ ...@@ -6,11 +6,18 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>..\Health.Api\wwwroot\Health.Api.xml</DocumentationFile> <DocumentationFile>..\queryPlaform.Api\wwwroot\QueryPlatform.Api.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn> <NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Infrastructure\Dtos\**" />
<Content Remove="Infrastructure\Dtos\**" />
<EmbeddedResource Remove="Infrastructure\Dtos\**" />
<None Remove="Infrastructure\Dtos\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Infrastructure\Models\INPAT_DIAG.cs" /> <Compile Remove="Infrastructure\Models\INPAT_DIAG.cs" />
<Compile Remove="Infrastructure\Models\INPAT_FEE.cs" /> <Compile Remove="Infrastructure\Models\INPAT_FEE.cs" />
<Compile Remove="Infrastructure\Models\INPAT_ORDER.cs" /> <Compile Remove="Infrastructure\Models\INPAT_ORDER.cs" />
...@@ -31,22 +38,43 @@ ...@@ -31,22 +38,43 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\.editorconfig" Link=".editorconfig" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DinkToPdf" Version="1.0.8" />
<PackageReference Include="IronPdf" Version="2023.5.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.38" />
<PackageReference Include="CsvHelper" Version="15.0.8" /> <PackageReference Include="CsvHelper" Version="15.0.8" />
<PackageReference Include="Dapper" Version="2.0.35" /> <PackageReference Include="Dapper" Version="2.0.35" />
<PackageReference Include="Dapper.Contrib" Version="2.0.35" /> <PackageReference Include="Dapper.Contrib" Version="2.0.35" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
<PackageReference Include="DocXCore" Version="1.0.10" />
<PackageReference Include="EasyCaching.InMemory" Version="0.9.0" /> <PackageReference Include="EasyCaching.InMemory" Version="0.9.0" />
<PackageReference Include="EPPlus" Version="4.5.3.2" /> <PackageReference Include="EPPlus" Version="4.5.3.2" />
<PackageReference Include="MediatR" Version="8.1.0" /> <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.1.0" /> <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
<PackageReference Include="IKVM" Version="8.4.5" />
<PackageReference Include="iTextSharp.LGPLv2.Core" Version="3.3.5" />
<PackageReference Include="MediatR" Version="8.1.0" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.38" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.7" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" />
<PackageReference Include="Microsoft.Office.Interop.Word" Version="15.0.4797.1004" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.1" /> <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.1" />
<PackageReference Include="Autofac" Version="5.2.0" /> <PackageReference Include="Autofac" Version="5.2.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="FluentValidation" Version="9.2.0" /> <PackageReference Include="FluentValidation" Version="9.2.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="9.2.0" /> <PackageReference Include="FluentValidation.AspNetCore" Version="9.2.0" />
<PackageReference Include="Npgsql" Version="5.0.13" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.3" />
<PackageReference Include="NPoco" Version="5.7.0" />
<PackageReference Include="NPOI" Version="2.6.0" />
<PackageReference Include="PuppeteerSharp" Version="10.0.0" />
<PackageReference Include="Serilog" Version="2.9.0" /> <PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" /> <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" /> <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
...@@ -54,18 +82,16 @@ ...@@ -54,18 +82,16 @@
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.6.3" /> <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.6.3" />
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" /> <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
<PackageReference Include="Wkhtmltopdf.NetCore" Version="3.0.2" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Health.Infra\QueryPlatform.Infra.csproj" /> <ProjectReference Include="..\queryPlaform.Infra\QueryPlatform.Infra.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Infrastructure\Dtos\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Update="wwwroot\Health.Api.xml"> <Content Update="wwwroot\QueryPlatform.Api.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
......
api/queryPlaform.Api/Spire/Doc/DocumentSettings.cs 0 → 100644
namespace Spire.Doc
{
internal class DocumentSettings
{
}
}
\ No newline at end of file
api/Health.Api/Startup.cs → api/queryPlaform.Api/Startup.cs
using Autofac; using Autofac;
using FluentValidation.AspNetCore; using FluentValidation.AspNetCore;
using Health.Api.Infrastructure;
using Health.Api.Infrastructure.AutofacModules;
using Health.Api.Infrastructure.Filters;
using Health.Api.Infrastructure.Hubs;
using Health.Infra;
using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Diagnostics.HealthChecks; using Microsoft.AspNetCore.Diagnostics.HealthChecks;
...@@ -20,6 +15,11 @@ ...@@ -20,6 +15,11 @@
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using Newtonsoft.Json; using Newtonsoft.Json;
using QueryPlatform.Api.Infrastructure;
using QueryPlatform.Api.Infrastructure.AutofacModules;
using QueryPlatform.Api.Infrastructure.Filters;
using QueryPlatform.Api.Infrastructure.Hubs;
using QueryPlatform.Infra;
using System; using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Health.Api namespace QueryPlatform.Api
{ {
public class Startup public class Startup
{ {
...@@ -72,6 +72,7 @@ public void ConfigureServices(IServiceCollection services) ...@@ -72,6 +72,7 @@ public void ConfigureServices(IServiceCollection services)
.AddCustomJwtAuthentication(Configuration); .AddCustomJwtAuthentication(Configuration);
services.Configure<JwtOption>(Configuration.GetSection("JwtAuthorization")); services.Configure<JwtOption>(Configuration.GetSection("JwtAuthorization"));
//services.AddTransient<Microsoft.Extensions.Hosting.IHostedService, Job>();
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
...@@ -89,8 +90,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) ...@@ -89,8 +90,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
app.UseSwagger(); app.UseSwagger();
app.UseSwaggerUI(c => app.UseSwaggerUI(c =>
{ {
var swaggerEndpoint = Configuration.GetValue("SwaggerEndpoint", ""); var swaggerEndpolong = Configuration.GetValue("SwaggerEndpolong", "");
c.SwaggerEndpoint($"{swaggerEndpoint}/swagger/v1/swagger.json", "v1"); c.SwaggerEndpoint($"{swaggerEndpolong}/swagger/v1/swagger.json", "v1");
c.IndexStream = () => GetType().GetTypeInfo().Assembly.GetManifestResourceStream("QueryPlatform.Api.index.html"); c.IndexStream = () => GetType().GetTypeInfo().Assembly.GetManifestResourceStream("QueryPlatform.Api.index.html");
}); });
app.UseMiniProfiler(); app.UseMiniProfiler();
...@@ -107,14 +108,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) ...@@ -107,14 +108,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization(); app.UseAuthorization();
app.UseEndpoints(endpoints => app.UseEndpoints(endpolongs =>
{ {
endpoints.MapHealthChecks("/QueryPlatform", new HealthCheckOptions endpolongs.MapHealthChecks("/QueryPlatform", new HealthCheckOptions
{ {
ResponseWriter = HealthCheck.WriteResponse ResponseWriter = QueryPlatformCheck.WriteResponse
}); });
endpoints.MapControllers(); endpolongs.MapControllers();
endpoints.MapHub<NotificationHub>("/api/hubs/notification"); endpolongs.MapHub<NotificationHub>("/api/hubs/notification");
}); });
} }
} }
...@@ -221,7 +222,7 @@ public static IServiceCollection AddCustomSwagger(this IServiceCollection servic ...@@ -221,7 +222,7 @@ public static IServiceCollection AddCustomSwagger(this IServiceCollection servic
{ {
options.ResolveConflictingActions(apiDescriptions => apiDescriptions.First()); options.ResolveConflictingActions(apiDescriptions => apiDescriptions.First());
options.SwaggerDoc("v1", new OpenApiInfo { Version = "v1.1.0", Title = "API DOCUMENT" }); options.SwaggerDoc("v1", new OpenApiInfo { Version = "v1.1.0", Title = "API DOCUMENT" });
string[] xmls = new string[] { "Health.Api.xml" }; string[] xmls = new string[] { "QueryPlatform.Api.xml" };
foreach (var xml in xmls) foreach (var xml in xmls)
{ {
var xmlPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", xml); var xmlPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", xml);
...@@ -246,6 +247,11 @@ public static IServiceCollection AddCustomDbContext(this IServiceCollection serv ...@@ -246,6 +247,11 @@ public static IServiceCollection AddCustomDbContext(this IServiceCollection serv
// options.UseSqlServer(connectionString); // options.UseSqlServer(connectionString);
//}); //});
//services.AddDbContext<SearchContext>(options =>
//{
// options.UseNpgsql( )
// .UseLowerCaseNamingConvention();
//});
return services; return services;
} }
} }
......
api/Health.Api/appsettings.json → api/queryPlaform.Api/appsettings.json
...@@ -20,7 +20,10 @@ ...@@ -20,7 +20,10 @@
"Connection154": "Server=192.168.18.154;Database=DB_SV_Data_Config;User ID=sa;Password=Suvalue2016;Trusted_Connection=False;", "Connection154": "Server=192.168.18.154;Database=DB_SV_Data_Config;User ID=sa;Password=Suvalue2016;Trusted_Connection=False;",
"Connection155": "Server=192.168.18.155;Database=DB_SV_Data_Config;User ID=sa;Password=Suvalue2016;Trusted_Connection=False;", "Connection155": "Server=192.168.18.155;Database=DB_SV_Data_Config;User ID=sa;Password=Suvalue2016;Trusted_Connection=False;",
"Connection156": "Server=192.168.18.156;Database=DB_SV_Data_Config;User ID=sa;Password=srv@Ashersa;Trusted_Connection=False;", "Connection156": "Server=192.168.18.156;Database=DB_SV_Data_Config;User ID=sa;Password=srv@Ashersa;Trusted_Connection=False;",
"Connection158": "Server=192.168.18.158;Database=DB_SV_Data_Config;User ID=sa;Password=Suvalue2016;Trusted_Connection=False;" "Connection158": "Server=192.168.18.158;Database=DB_SV_Data_Config;User ID=sa;Password=Suvalue2016;Trusted_Connection=False;",
"pg":"Host=192.168.18.185;Port=5432;Username=postgres;Password=Suvalue2016;Database=db_QueryPlatformcare_drgs;"
} }
} }
api/Health.Infra/ApiResponse.cs → api/queryPlaform.Infra/ApiResponse.cs
...@@ -11,16 +11,13 @@ public enum Status ...@@ -11,16 +11,13 @@ public enum Status
public abstract class ApiResponse public abstract class ApiResponse
{ {
public ApiResponse() { } public ApiResponse() { }
public ApiResponse(Status status) public ApiResponse(Status status)
: this() : this()
{ {
Status = status; Status = status;
} }
public Status Status { get; set; } public Status Status { get; set; }
} }
public class UnauthorizedResponse : ApiResponse public class UnauthorizedResponse : ApiResponse
{ {
public UnauthorizedResponse() public UnauthorizedResponse()
...@@ -31,7 +28,6 @@ public UnauthorizedResponse() ...@@ -31,7 +28,6 @@ public UnauthorizedResponse()
public string Message { get; set; } public string Message { get; set; }
} }
public class ParameterErrorResponse : ApiResponse public class ParameterErrorResponse : ApiResponse
{ {
public ParameterErrorResponse() public ParameterErrorResponse()
...@@ -46,10 +42,9 @@ public ParameterErrorResponse() ...@@ -46,10 +42,9 @@ public ParameterErrorResponse()
public string Instance { get; set; } public string Instance { get; set; }
} }
public class longernalServerErrorResponse : ApiResponse
public class InternalServerErrorResponse : ApiResponse
{ {
public InternalServerErrorResponse() public longernalServerErrorResponse()
{ {
Status = Status.TokenInvalid; Status = Status.TokenInvalid;
Message = "Token无效"; Message = "Token无效";
...@@ -67,7 +62,6 @@ public class DomainErrorResponse : ApiResponse ...@@ -67,7 +62,6 @@ public class DomainErrorResponse : ApiResponse
public string Instance { get; set; } public string Instance { get; set; }
} }
public class OkResponse : ApiResponse public class OkResponse : ApiResponse
{ {
public OkResponse(object data) public OkResponse(object data)
......
api/Health.Infra/EnumHelper.cs → api/queryPlaform.Infra/EnumHelper.cs
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
using System.ComponentModel; using System.ComponentModel;
using System.Reflection; using System.Reflection;
namespace Health.Infra namespace QueryPlatform.Infra
{ {
public class EnumItem public class EnumItem
{ {
......
api/Health.Infra/Extensions/Extensions.String.cs → api/queryPlaform.Infra/Extensions/Extensions.String.cs
...@@ -40,11 +40,11 @@ public static string[] SplitRemoveEmpty(this string text, params string[] separa ...@@ -40,11 +40,11 @@ public static string[] SplitRemoveEmpty(this string text, params string[] separa
} }
/// <summary> /// <summary>
/// 转换Int32数组 /// 转换long32数组
/// </summary> /// </summary>
/// <param name="array"></param> /// <param name="array"></param>
/// <returns></returns> /// <returns></returns>
public static int[] ToInt32Arrary(this string[] array) public static int[] Tolong32Arrary(this string[] array)
{ {
return Array.ConvertAll(array, t => Convert.ToInt32(t)); return Array.ConvertAll(array, t => Convert.ToInt32(t));
} }
......
api/Health.Infra/IJsonConverter.cs → api/queryPlaform.Infra/IJsonConverter.cs
namespace Health.Infra namespace QueryPlatform.Infra
{ {
public interface IJsonConverter public interface IJsonConverter
{ {
...@@ -14,6 +14,6 @@ public interface IJsonConverter ...@@ -14,6 +14,6 @@ public interface IJsonConverter
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
/// <param name="json"></param> /// <param name="json"></param>
/// <returns></returns> /// <returns></returns>
T Deserialize<T>(string json); //static T Deserialize<T>(string json);
} }
} }
api/Health.Infra/IUserIdentity.cs → api/queryPlaform.Infra/IUserIdentity.cs
using System.Collections.Generic; using System.Collections.Generic;
using System.Security.Claims; using System.Security.Claims;
namespace Health.Infra namespace QueryPlatform.Infra
{ {
public interface IUserIdentity public interface IUserIdentity
{ {
......
api/Health.Infra/JsonSerializerConverter.cs → api/queryPlaform.Infra/JsonSerializerConverter.cs
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using System; using System;
using System.Globalization;
namespace Health.Infra namespace QueryPlatform.Infra
{ {
public class IsoDateTimeConverterContent : IsoDateTimeConverter public class IsoDateTimeConverterContent : IsoDateTimeConverter
{ {
...@@ -24,9 +25,39 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s ...@@ -24,9 +25,39 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
base.WriteJson(writer, value, serializer); base.WriteJson(writer, value, serializer);
} }
//public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
//{
// return base.ReadJson(reader, objectType, existingValue, serializer);
//}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{ {
return base.ReadJson(reader, objectType, existingValue, serializer); if (string.IsNullOrWhiteSpace(reader.Value?.ToString())) return null;
var formats = new string[]
{
"yyyyMMddHHmmss",
"yyyyMMddHHmmss",
"yyyy-MM-dd HH:mm:ss",
"yyyy-MM-dd H:mm:ss",
"yyyy年MM月dd日 HH时mm分ss秒" ,
"yyyyMdHHmmss",
"yyyy年M月d日 H时mm分ss秒",
"yyyy.M.d H:mm:ss",
"yyyy.MM.dd HH:mm:ss",
"yyyy-MM-dd",
"yyyyMMdd",
"yyyy/MM/dd",
"yyyy/M/d",
"yyyy-MM",
"yyyy/MM",
"yyyy/M",
};
DateTime.TryParseExact(reader.Value?.ToString(), formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime now1);
return now1;
//return base.ReadJson(reader, objectType, existingValue, serializer);
} }
} }
public class LowercaseContractResolver : DefaultContractResolver public class LowercaseContractResolver : DefaultContractResolver
......
api/Health.Infra/Md5Util.cs → api/queryPlaform.Infra/Md5Util.cs
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
namespace Health.Infra namespace QueryPlatform.Infra
{ {
public class Md5Util public class Md5Util
{ {
......
api/Health.Infra/ReportData.cs → api/queryPlaform.Infra/ReportData.cs
...@@ -17,7 +17,7 @@ public ReportData(string title) ...@@ -17,7 +17,7 @@ public ReportData(string title)
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> ChartType { get; set; } public Nullable<long> ChartType { get; set; }
/// <summary> /// <summary>
/// 报表标题 /// 报表标题
...@@ -72,7 +72,7 @@ public ReportData(string title) ...@@ -72,7 +72,7 @@ public ReportData(string title)
/// <summary> /// <summary>
/// 1表示需要进行小于百分2的类型进行合并 /// 1表示需要进行小于百分2的类型进行合并
/// </summary> /// </summary>
public Nullable<int> DataType { get; set; } public Nullable<long> DataType { get; set; }
/// <summary> /// <summary>
/// 图标value过滤执值 /// 图标value过滤执值
......
api/health.sln → api/queryPlaform.sln
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.30517.126 VisualStudioVersion = 17.1.32210.238
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryPlatform.Api", "Health.Api\QueryPlatform.Api.csproj", "{7D7E81D8-76AC-4B16-9F93-B4689BBC423E}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryPlatform.Api", "queryPlaform.Api\QueryPlatform.Api.csproj", "{371A1028-3269-4BAC-89DF-F11F00259306}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryPlatform.Infra", "Health.Infra\QueryPlatform.Infra.csproj", "{A4750395-66B7-4F21-B87B-6B67F5F598BF}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryPlatform.Infra", "queryPlaform.Infra\QueryPlatform.Infra.csproj", "{DEEDEA96-9A13-48D7-A9E6-E1A9E6F95656}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
...@@ -13,14 +13,14 @@ Global ...@@ -13,14 +13,14 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7D7E81D8-76AC-4B16-9F93-B4689BBC423E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {371A1028-3269-4BAC-89DF-F11F00259306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D7E81D8-76AC-4B16-9F93-B4689BBC423E}.Debug|Any CPU.Build.0 = Debug|Any CPU {371A1028-3269-4BAC-89DF-F11F00259306}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D7E81D8-76AC-4B16-9F93-B4689BBC423E}.Release|Any CPU.ActiveCfg = Release|Any CPU {371A1028-3269-4BAC-89DF-F11F00259306}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D7E81D8-76AC-4B16-9F93-B4689BBC423E}.Release|Any CPU.Build.0 = Release|Any CPU {371A1028-3269-4BAC-89DF-F11F00259306}.Release|Any CPU.Build.0 = Release|Any CPU
{A4750395-66B7-4F21-B87B-6B67F5F598BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DEEDEA96-9A13-48D7-A9E6-E1A9E6F95656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4750395-66B7-4F21-B87B-6B67F5F598BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEEDEA96-9A13-48D7-A9E6-E1A9E6F95656}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4750395-66B7-4F21-B87B-6B67F5F598BF}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEEDEA96-9A13-48D7-A9E6-E1A9E6F95656}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4750395-66B7-4F21-B87B-6B67F5F598BF}.Release|Any CPU.Build.0 = Release|Any CPU {DEEDEA96-9A13-48D7-A9E6-E1A9E6F95656}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment