Skip to content

P
performance
Commit f24a58d2 by zry
Options

新增修改增加返回结果

parent 3161d240
Showing with 102 additions and 40 deletions
performance/Performance.Api/Controllers/AccountController.cs
......@@ -22,6 +22,7 @@ public class AccountController : Controller
private IMemoryCache _memoryCache;
private Application _options;
private ClaimService _claim;
private HospitalService _hospitalService;
public AccountController(UserService userService,
HospitalService hospitalService,
RoleService roleService,
......@@ -32,6 +33,7 @@ public class AccountController : Controller
_userService = userService;
_roleService = roleService;
_memoryCache = memoryCache;
_hospitalService = hospitalService;
_options = options.Value;
_claim = claim;
}
......@@ -49,9 +51,10 @@ public ApiResponse<UserIdentity> Login([FromBody]LoginRequest request)
var user = _userService.Login(request);
if (user == null)
return new ApiResponse<UserIdentity>(ResponseType.Fail, "用户不存在");
var roles = _roleService.GetUserRole(user.UserID);
if (roles != null && roles.Count > 0)
user.DefalutUrl = roles.First().DefaultUrl;
user.Hospital = _hospitalService.GetUserHopital(user.UserID);
user.Role = _roleService.GetUserRole(user.UserID);
user.IsHome = (user.Hospital != null && user.Hospital.Count > 1);
if (string.IsNullOrEmpty(user.Token))
user.Token = Guid.NewGuid().ToString("N");
......@@ -75,9 +78,8 @@ public ApiResponse<UserIdentity> Login([FromBody]LoginRequest request)
public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]UserRequest request)
{
var userid = _claim.At(request.Token).UserID;
if (!_userService.Insert(request, userid))
return new ApiResponse(ResponseType.Fail);
return new ApiResponse(ResponseType.OK);
var user = _userService.Insert(request, userid);
return new ApiResponse(ResponseType.OK, user);
}
/// <summary>
......@@ -89,9 +91,8 @@ public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]User
[HttpPost]
public ApiResponse Update([CustomizeValidator(RuleSet = "Update"), FromBody]UserRequest request)
{
if (!_userService.Update(request))
return new ApiResponse(ResponseType.Fail);
return new ApiResponse(ResponseType.OK);
var user = _userService.Update(request);
return new ApiResponse(ResponseType.OK, user);
}
/// <summary>
......
performance/Performance.Api/Controllers/AllotController.cs
......@@ -48,16 +48,16 @@ public ApiResponse List([FromBody]AllotRequest request)
[HttpPost]
public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]AllotRequest request)
{
bool result = _allotService.InsertAllot(request);
return new ApiResponse(ResponseType.OK);
var result = _allotService.InsertAllot(request);
return new ApiResponse(ResponseType.OK, result);
}
[Route("update")]
[HttpPost]
public ApiResponse Update([CustomizeValidator(RuleSet = "Update"), FromBody]AllotRequest request)
{
bool result = _allotService.UpdateAllot(request);
return new ApiResponse(ResponseType.OK);
var result = _allotService.UpdateAllot(request);
return new ApiResponse(ResponseType.OK, result);
}
[Route("delete")]
......
performance/Performance.Api/Controllers/HospitalController.cs
......@@ -16,7 +16,7 @@ public class HospitalController : Controller
{
private HospitalService _hospitalService;
private ClaimService _claim;
public HospitalController(HospitalService hospitalService,ClaimService claimService)
public HospitalController(HospitalService hospitalService, ClaimService claimService)
{
_hospitalService = hospitalService;
_claim = claimService;
......@@ -35,18 +35,16 @@ public ApiResponse<List<HospitalResponse>> GetHospitalList([FromBody]ApiRequest
public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]HospitalRequest request)
{
var userid = _claim.At(request.Token).UserID;
if (!_hospitalService.Insert(request, userid))
return new ApiResponse(ResponseType.Fail);
return new ApiResponse(ResponseType.OK);
var hospital = _hospitalService.Insert(request, userid);
return new ApiResponse(ResponseType.OK, hospital);
}
[Route("update")]
[HttpPost]
public ApiResponse Update([CustomizeValidator(RuleSet = "Update"), FromBody]HospitalRequest request)
{
if (!_hospitalService.Update(request))
return new ApiResponse(ResponseType.Fail);
return new ApiResponse(ResponseType.OK);
var hospital = _hospitalService.Update(request);
return new ApiResponse(ResponseType.OK, hospital);
}
[Route("delete")]
......
performance/Performance.Api/Controllers/RoleController.cs 0 → 100644
using FluentValidation.AspNetCore;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Options;
using Newtonsoft.Json.Linq;
using Performance.DtoModels;
using Performance.DtoModels.AppSettings;
using Performance.Infrastructure;
using Performance.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Performance.Api.Controllers
{
[Route("api/[controller]")]
public class RoleController : Controller
{
private RoleService _roleService;
public RoleController(RoleService roleService)
{
_roleService = roleService;
}
}
}
performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
......@@ -16,6 +16,12 @@ public AutoMapperConfigs()
CreateMap<sys_user, UserIdentity>()
.ForMember(dest => dest.UserID, opt => opt.MapFrom(src => src.ID));
//用户 响应
CreateMap<UserResponse, sys_user>()
.ForMember(dest => dest.ID, opt => opt.MapFrom(src => src.UserID));
CreateMap<sys_user, UserResponse>()
.ForMember(dest => dest.UserID, opt => opt.MapFrom(src => src.ID));
//用户新增/修改 请求
CreateMap<UserRequest, sys_user>();
CreateMap<sys_user, UserRequest>();
......
performance/Performance.DtoModels/Response/UserIdentity.cs
......@@ -15,6 +15,8 @@ public class UserIdentity
public string Mail { get; set; }
public string Mobile { get; set; }
public int States { get; set; }
public string DefalutUrl { get; set; }
public bool IsHome { get; set; }
public List<HospitalResponse> Hospital { get; set; }
public List<RoleResponse> Role { get; set; }
}
}
performance/Performance.DtoModels/Response/UserResponse.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class UserResponse
{
public int UserID { get; set; }
public DateTime CreateDate { get; set; }
public int CreateUser { get; set; }
public string RealName { get; set; }
public string Login { get; set; }
public string Mail { get; set; }
public string Mobile { get; set; }
public int States { get; set; }
}
}
performance/Performance.EntityModels/Entity/sys_role.cs
......@@ -31,11 +31,6 @@ public class sys_role
public string Remark { get; set; }
/// <summary>
///
/// </summary>
public string DefaultUrl { get; set; }
/// <summary>
/// 菜单状态 1 启用 2禁用
/// </summary>
public int States { get; set; }
......
performance/Performance.Services/AllotService.cs
......@@ -36,7 +36,7 @@ public List<AllotResponse> GetAllotList(int? hospitalId)
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public bool InsertAllot(AllotRequest request)
public AllotResponse InsertAllot(AllotRequest request)
{
var repAllot = _allotRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Year == request.Year && t.Month == request.Month);
if (repAllot != null && repAllot.Count() > 0)
......@@ -45,7 +45,10 @@ public bool InsertAllot(AllotRequest request)
var allot = Mapper.Map<sys_allot>(request);
allot.CreateDate = DateTime.Now;
allot.States = 0;
return _allotRepository.Add(allot);
if (!_allotRepository.Add(allot))
throw new PerformanceException("保存失败");
return Mapper.Map<AllotResponse>(allot);
}
/// <summary>
......@@ -53,7 +56,7 @@ public bool InsertAllot(AllotRequest request)
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public bool UpdateAllot(AllotRequest request)
public AllotResponse UpdateAllot(AllotRequest request)
{
var allot = _allotRepository.GetEntity(t => t.ID == request.ID);
if (allot == null)
......@@ -67,7 +70,10 @@ public bool UpdateAllot(AllotRequest request)
allot.HospitalId = request.HospitalId.Value;
allot.Year = request.Year;
allot.Month = request.Month;
return _allotRepository.Update(allot);
if (!_allotRepository.Update(allot))
throw new PerformanceException("保存失败");
return Mapper.Map<AllotResponse>(allot);
}
/// <summary>
......
performance/Performance.Services/HospitalService.cs
......@@ -57,7 +57,7 @@ public sys_hospital GetHopital(int hosid)
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public bool Insert(HospitalRequest request, int userid)
public HospitalResponse Insert(HospitalRequest request, int userid)
{
if (null != _hospitalRepository.GetEntity(t => t.HosName == request.HosName))
throw new PerformanceException("医院名称重复");
......@@ -66,7 +66,9 @@ public bool Insert(HospitalRequest request, int userid)
hospital.CreateUser = userid;
hospital.States = (int)States.Enabled;
return _hospitalRepository.Add(hospital);
if (!_hospitalRepository.Add(hospital))
throw new PerformanceException("保存失败");
return Mapper.Map<HospitalResponse>(hospital);
}
/// <summary>
......@@ -74,7 +76,7 @@ public bool Insert(HospitalRequest request, int userid)
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public bool Update(HospitalRequest request)
public HospitalResponse Update(HospitalRequest request)
{
var hospital = _hospitalRepository.GetEntity(t => t.ID == request.ID);
if (null == hospital)
......@@ -86,7 +88,9 @@ public bool Update(HospitalRequest request)
hospital.AreaCode = request.AreaCode;
hospital.States = request.States;
return _hospitalRepository.Update(hospital);
if (!_hospitalRepository.Update(hospital))
throw new PerformanceException("保存失败");
return Mapper.Map<HospitalResponse>(hospital);
}
/// <summary>
......
performance/Performance.Services/RoleService.cs
......@@ -26,7 +26,7 @@ public class RoleService : IAutoInjection
/// </summary>
/// <param name="userid"></param>
/// <returns></returns>
public List<sys_role> GetUserRole(int userid)
public List<RoleResponse> GetUserRole(int userid)
{
if (userid <= 0)
throw new PerformanceException($"userid：{userid} 错误");
......@@ -35,7 +35,9 @@ public List<sys_role> GetUserRole(int userid)
if (joinList == null && joinList.Count == 0)
return null;
return _roleRepository.GetEntities(t => joinList.Select(j => j.RoleID).Contains(t.ID)).ToList();
var roles = _roleRepository.GetEntities(t => joinList.Select(j => j.RoleID).Contains(t.ID)).ToList();
return Mapper.Map<List<RoleResponse>>(roles);
}
}
}
performance/Performance.Services/UserService.cs
......@@ -69,7 +69,7 @@ public UserIdentity Login(LoginRequest request)
/// 新增用户
/// </summary>
/// <param name="request"></param>
public bool Insert(UserRequest request, int userid)
public UserResponse Insert(UserRequest request, int userid)
{
if (null != _userRepository.GetEntity(t => t.Login == request.Login))
throw new PerformanceException("登录名重复");
......@@ -80,7 +80,9 @@ public bool Insert(UserRequest request, int userid)
user.CreateUser = userid;
user.States = (int)States.Enabled;
return _userRepository.Add(user);
if (!_userRepository.Add(user))
throw new PerformanceException("保存失败");
return Mapper.Map<UserResponse>(user);
}
/// <summary>
......@@ -120,7 +122,7 @@ public bool SetHospital(SetHospitalRequest request)
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public bool Update(UserRequest request)
public UserResponse Update(UserRequest request)
{
var user = _userRepository.GetEntity(t => t.ID == request.ID);
if (null == user)
......@@ -140,7 +142,9 @@ public bool Update(UserRequest request)
user.Mail = request.Mail;
user.States = request.States;
return _userRepository.Update(user);
if (!_userRepository.Update(user))
throw new PerformanceException("保存失败");
return Mapper.Map<UserResponse>(user);
}
}
}
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