Browse Source

分配任务添加审核状态、原因、确定日期

master
林杨 2 years ago
parent
commit
4657ddddad
  1. 85
      24Hour/Controllers/Common/CommonController.cs
  2. 5
      24Hour/Controllers/Common/LawyerservicesController.cs
  3. 252
      24Hour/Controllers/LoginController.cs
  4. 1
      24Hour/Controllers/system/SystemControllerController.cs
  5. 40
      Elight.Entity/SystemModel/UpdateuserDto.cs

85
24Hour/Controllers/Common/CommonController.cs

@ -1,4 +1,5 @@
using Elight.Entity; using Elight.Entity;
using Elight.Entity.SystemModel;
using Elight.Logic; using Elight.Logic;
using Elight.Utility; using Elight.Utility;
using Elight.Utility.Code; using Elight.Utility.Code;
@ -1117,32 +1118,73 @@ namespace _24Hour.Controllers.Common
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("Updateuser")] [Route("Updateuser")]
public async Task<Result> Updateuser(string? Id, string? userId, string? username) public async Task<Result> Updateuser(UpdateuserDto dto)
{ {
try try
{ {
if (dto== null)
{
result.IsSucceed = false;
result.result = "接受参数失败";
return result;
}
if (string.IsNullOrEmpty(dto.Id))
{
result.IsSucceed = false;
result.result = "编号不能为空";
return result;
}
if (string.IsNullOrEmpty(dto.userId))
{
result.IsSucceed = false;
result.result = "用户编号不能为空";
return result;
}
if (dto.time== null)
{
result.IsSucceed = false;
result.result = "确认时间不能为空";
return result;
}
if (dto.state==false && string.IsNullOrEmpty(dto.reason))
{
result.IsSucceed = false;
result.result = "拒绝原因不能为空";
return result;
}
//律师服务 //律师服务
var Lawyerbol = await _db.Queryable<App_LawyerServicesModel>().Where(q => q.Id == Id).ToListAsync(); var Lawyerbol = await _db.Queryable<App_LawyerServicesModel>().Where(q => q.Id == dto.Id).ToListAsync();
if (Lawyerbol.Count() > 0) if (Lawyerbol.Count() > 0)
{ {
Lawyerbol.FirstOrDefault().receptionuser = userId; Lawyerbol.FirstOrDefault().receptionuser =dto.userId;
Lawyerbol.FirstOrDefault().receptionusername = username; Lawyerbol.FirstOrDefault().receptionusername = dto.username;
Lawyerbol.FirstOrDefault().acceptancetime =dto.time;
Lawyerbol.FirstOrDefault().reason =dto.reason;
Lawyerbol.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync(); var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
{ {
_SocketCon.system(userId); _SocketCon.system(dto.userId);
result.IsSucceed = true; result.IsSucceed = true;
result.result = "修改成功"; result.result = "修改成功";
} }
} }
//远程会见 //远程会见
var RemoteModelbol = await _db.Queryable<App_RemoteModel>().Where(q => q.Id == Id).ToListAsync(); var RemoteModelbol = await _db.Queryable<App_RemoteModel>().Where(q => q.Id == dto.Id).ToListAsync();
if (RemoteModelbol.Count() > 0) if (RemoteModelbol.Count() > 0)
{ {
RemoteModelbol.FirstOrDefault().meetwitId = userId; RemoteModelbol.FirstOrDefault().meetwitId = dto.userId;
RemoteModelbol.FirstOrDefault().meetwitname = username; RemoteModelbol.FirstOrDefault().meetwitname =dto.username;
RemoteModelbol.FirstOrDefault().acceptancetime =dto.time;
RemoteModelbol.FirstOrDefault().reason =dto.reason;
RemoteModelbol.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(RemoteModelbol.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync(); var num = await _db.Updateable(RemoteModelbol.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
@ -1154,11 +1196,14 @@ namespace _24Hour.Controllers.Common
} }
//获取远程接待预约记录 //获取远程接待预约记录
var Receptiondata = await _db.Queryable<App_ReceptionModel>() var Receptiondata = await _db.Queryable<App_ReceptionModel>()
.Where(q => q.Id== Id).ToArrayAsync(); .Where(q => q.Id== dto.Id).ToArrayAsync();
if (Receptiondata.Count() > 0) if (Receptiondata.Count() > 0)
{ {
Receptiondata.FirstOrDefault().meetwitId = userId; Receptiondata.FirstOrDefault().meetwitId = dto.userId;
Receptiondata.FirstOrDefault().meetwitname = username; Receptiondata.FirstOrDefault().meetwitname =dto.username;
Receptiondata.FirstOrDefault().acceptancetime =dto.time;
Receptiondata.FirstOrDefault().reason =dto.reason;
Receptiondata.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(Receptiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync(); var num = await _db.Updateable(Receptiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
@ -1170,11 +1215,14 @@ namespace _24Hour.Controllers.Common
} }
//获取认罪认罚预约记录 //获取认罪认罚预约记录
var Confessiondata = await _db.Queryable<App_ConfessionModel>() var Confessiondata = await _db.Queryable<App_ConfessionModel>()
.Where(q => q.Id == Id).ToArrayAsync(); .Where(q => q.Id == dto.Id).ToArrayAsync();
if (Confessiondata.Count() > 0) if (Confessiondata.Count() > 0)
{ {
Confessiondata.FirstOrDefault().meetwitId = userId; Confessiondata.FirstOrDefault().meetwitId = dto.userId;
Confessiondata.FirstOrDefault().meetwitname = username; Confessiondata.FirstOrDefault().meetwitname = dto.username;
Confessiondata.FirstOrDefault().acceptancetime =dto.time;
Confessiondata.FirstOrDefault().reason =dto.reason;
Confessiondata.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(Confessiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync(); var num = await _db.Updateable(Confessiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
@ -1186,11 +1234,14 @@ namespace _24Hour.Controllers.Common
} }
//获取听证预约记录 //获取听证预约记录
var Hearingdata = await _db.Queryable<App_HearingModel>() var Hearingdata = await _db.Queryable<App_HearingModel>()
.Where(q => q.Id == Id).ToArrayAsync(); .Where(q => q.Id == dto.Id).ToArrayAsync();
if (Hearingdata.Count() > 0) if (Hearingdata.Count() > 0)
{ {
Hearingdata.FirstOrDefault().receptionuser = userId; Hearingdata.FirstOrDefault().receptionuser = dto.userId;
Hearingdata.FirstOrDefault().receptionusername = username; Hearingdata.FirstOrDefault().receptionusername = dto.username;
Hearingdata.FirstOrDefault().acceptancetime =dto.time;
Hearingdata.FirstOrDefault().reason =dto.reason;
Hearingdata.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(Hearingdata.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername }).ExecuteCommandAsync(); var num = await _db.Updateable(Hearingdata.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();

5
24Hour/Controllers/Common/LawyerservicesController.cs

@ -7,6 +7,7 @@ using Elight.Utility.logs;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SqlSugar; using SqlSugar;
using System.Net.WebSockets;
using static java.security.cert.CertPathValidatorException; using static java.security.cert.CertPathValidatorException;
namespace _24Hour.Controllers.Common namespace _24Hour.Controllers.Common
@ -18,7 +19,8 @@ namespace _24Hour.Controllers.Common
[ApiController] [ApiController]
[Route("api/Lawyer")] [Route("api/Lawyer")]
public class LawyerservicesController : Controller public class LawyerservicesController : Controller
{ {
private static Dictionary<string, WebSocket> CONNECT_POOL = new Dictionary<string, WebSocket>();//用户连接池
#region Identity #region Identity
private readonly SqlSugarClient _db;//数据库 private readonly SqlSugarClient _db;//数据库
private readonly WriteSysLog _logs;//操作日志 private readonly WriteSysLog _logs;//操作日志
@ -107,6 +109,7 @@ namespace _24Hour.Controllers.Common
result.IsSucceed = true; result.IsSucceed = true;
result.result = "添加成功"; result.result = "添加成功";
} }
} }
catch (System.Exception ex) catch (System.Exception ex)
{ {

252
24Hour/Controllers/LoginController.cs

@ -1,4 +1,5 @@
using _24Hour.Model; using _24Hour.Model;
using com.sun.org.apache.bcel.@internal.generic;
using com.sun.xml.@internal.ws.api.model; using com.sun.xml.@internal.ws.api.model;
using Elight.Entity; using Elight.Entity;
using Elight.Logic; using Elight.Logic;
@ -54,81 +55,55 @@ namespace _24Hour.Controllers
try try
{ {
var Passmd5 = Md5.Encrypt32(login.Password).ToLower(); var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone && x.IsDeleted==0).FirstAsync(); var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone && x.IsDeleted==0).FirstAsync();
if (model == null) if (date == null)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = "账号不存在,请先注册!"; ret.Message = "账号不存在,请先注册!";
return ret; return ret;
} }
var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0&&q.usertype==0 && q.isdeactivate == 0 && q.phone == login.phone&&q.Password== Passmd5).FirstAsync(); if (Passmd5 != date.Password)
if (date != null) {
{ ret.IsSucceed = false;
if (Passmd5 != date.Password) ret.Message = "账号或者密码错误!";
{ return ret;
ret.IsSucceed = false; }
ret.Message = "账号或者密码错误!";
return ret; #region jwt生成token
} var tokenHandler = new JwtSecurityTokenHandler();
//else if (date.usertype == 1 && date.audit == null) var claims = new Claim[]
//{ {
// ret.IsSucceed = false; new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
// ret.Message = "账号审核中!"; };
// return ret;
//} var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value));
//else if (date.usertype == 1 && date.audit == 1) var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
//{ //Token
// ret.IsSucceed = false; var jwttoken = new JwtSecurityToken(
// ret.Message = $"账号审核未通过,原因:{date.describe}!"; issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value,
// return ret; audience: _configuration.GetSection("JwtConfiguration:Audience").Value,
//} claims: claims,
//else if (date.usertype == 0 && date.becurrent == 0) notBefore: DateTime.Now,
//{ expires: DateTime.Now.AddDays(1),
// ret.IsSucceed = false; signingCredentials: signingCredentials
// ret.Message = $"账号无法登录,请联系管理员!"; );
// return ret; //var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
//} var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
#region jwt生成token ret.IsSucceed=true;
var tokenHandler = new JwtSecurityTokenHandler(); ret.result = new
var claims = new Claim[] {
{ Id = date.Id,
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)), name = date.name,
}; sex = date.sex,
phone = date.phone,
var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value)); photo = date.photo,
var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); duties = date.duties,
//Token identity = date.identity,
var jwttoken = new JwtSecurityToken( unitCode = date.unitCode,
issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value, department = date.department,
audience: _configuration.GetSection("JwtConfiguration:Audience").Value, token = tokenString
claims: claims, };
notBefore: DateTime.Now, #endregion
expires: DateTime.Now.AddDays(1),
signingCredentials: signingCredentials
);
//var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
ret.result = new
{
Id = date.Id,
name = date.name,
sex = date.sex,
phone = date.phone,
photo = date.photo,
duties = date.duties,
identity = date.identity,
unitCode = date.unitCode,
department = date.department,
token = tokenString
};
#endregion
ret.IsSucceed = true;
}
else
{
ret.IsSucceed = false;
ret.Message = "账号不存在!";
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -152,82 +127,73 @@ namespace _24Hour.Controllers
try try
{ {
var Passmd5 = Md5.Encrypt32(login.Password).ToLower(); var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone && x.IsDeleted==0).FirstAsync(); var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone && x.IsDeleted==0).FirstAsync();
if (model == null) if (date == null)
{ {
ret.IsSucceed = false; ret.IsSucceed = false;
ret.Message = "账号不存在,请先注册!"; ret.Message = "账号不存在,请先注册!";
return ret; return ret;
} }
var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.phone == login.phone && q.Password == Passmd5).FirstAsync(); if (Passmd5 != date.Password)
if (date != null) {
{ ret.IsSucceed = false;
if (Passmd5 != date.Password) ret.Message = "账号或密码错误!";
{ return ret;
ret.IsSucceed = false; }
ret.Message = "账号或密码错误!"; //else if (date.usertype == 1 && date.audit == null)
return ret; //{
} // ret.IsSucceed = false;
//else if (date.usertype == 1 && date.audit == null) // ret.Message = "账号审核中!";
//{ // return ret;
// ret.IsSucceed = false; //}
// ret.Message = "账号审核中!"; //else if (date.usertype == 1 && date.audit == 1)
// return ret; //{
//} // ret.IsSucceed = false;
//else if (date.usertype == 1 && date.audit == 1) // ret.Message = $"账号审核未通过,原因:{date.describe}!";
//{ // return ret;
// ret.IsSucceed = false; //}
// ret.Message = $"账号审核未通过,原因:{date.describe}!"; else if (date.usertype == 0 && date.becurrent == 1)
// return ret; {
//} ret.IsSucceed = false;
else if (date.usertype == 0 && date.becurrent == 1) ret.Message = $"账号未授权无法登录,请联系管理员!";
{ return ret;
ret.IsSucceed = false; }
ret.Message = $"账号未授权无法登录,请联系管理员!"; #region jwt生成token
return ret; var tokenHandler = new JwtSecurityTokenHandler();
} var claims = new Claim[]
#region jwt生成token {
var tokenHandler = new JwtSecurityTokenHandler(); new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
var claims = new Claim[] };
{
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)), var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value));
}; var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
//Token
var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value)); var jwttoken = new JwtSecurityToken(
var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value,
//Token audience: _configuration.GetSection("JwtConfiguration:Audience").Value,
var jwttoken = new JwtSecurityToken( claims: claims,
issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value, notBefore: DateTime.Now,
audience: _configuration.GetSection("JwtConfiguration:Audience").Value, expires: DateTime.Now.AddDays(1),
claims: claims, signingCredentials: signingCredentials
notBefore: DateTime.Now, );
expires: DateTime.Now.AddDays(1), //var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
signingCredentials: signingCredentials var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
); ret.result = new
//var token = new JwtSecurityTokenHandler().CreateToken(jwttoken); {
var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken); Id = date.Id,
ret.result = new name = date.name,
{ sex = date.sex,
Id = date.Id, phone = date.phone,
name = date.name, photo = date.photo,
sex = date.sex, duties = date.duties,
phone = date.phone, identity = date.identity,
photo = date.photo, usertype = date.usertype,
duties = date.duties, unitCode = date.unitCode,
identity = date.identity, department = "",
usertype = date.usertype, token = tokenString
unitCode = date.unitCode, };
department = "", #endregion
token = tokenString ret.IsSucceed = true;
};
#endregion
ret.IsSucceed = true;
}
else
{
ret.IsSucceed = false;
ret.Message = "账号或者密码错误!";
}
} }
catch (Exception ex) catch (Exception ex)
{ {

1
24Hour/Controllers/system/SystemControllerController.cs

@ -885,6 +885,7 @@ namespace _24Hour.Controllers.system
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("QueryDepart")] [Route("QueryDepart")]
[AllowAnonymous]
public async Task<Result> QueryDepart(string unitId) public async Task<Result> QueryDepart(string unitId)
{ {
var totalCount = 0; var totalCount = 0;

40
Elight.Entity/SystemModel/UpdateuserDto.cs

@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Elight.Entity.SystemModel
{
public class UpdateuserDto
{
/// <summary>
/// 数据编号
/// </summary>
public string? Id { get; set; }
/// <summary>
/// 用户编号
/// </summary>
public string? userId { get; set; }
/// <summary>
/// 用户名称
/// </summary>
public string? username { get; set; }
/// <summary>
/// true 同意,false 拒绝
/// </summary>
public bool? state { get; set; }
/// <summary>
/// 原因
/// </summary>
public string? reason { get; set; }
/// <summary>
/// 选择时间
/// </summary>
public DateTime? time { get; set; }
}
}
Loading…
Cancel
Save