linyang
/
24Hour.Service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

app查询预约信息接口调整，视频举报查询接口调整，登录返回参数新增

master
liujiaqiang 2 years ago
parent
3312cc37e8
commit
f3b0e9d9fe
10 changed files with 78 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      24Hour/Controllers/Common/CommonController.cs
  2. 2
      24Hour/Controllers/Common/RemoteController.cs
  3. 11
      24Hour/Controllers/Common/VideoController.cs
  4. 2
      24Hour/Controllers/Common/WebSocketController.cs
  5. 11
      24Hour/Controllers/LoginController.cs
  6. 12
      24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230620/20.log
  7. 12
      24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230621/11.log
  8. 8
      Elight.Entity/AppMode/App_LawyerServicesModel.cs
  9. 8
      Elight.Logic/Model/App_LawyerServicesInput.cs
  10. 2
      Elight.Logic/Model/Commonpage.cs

46
24Hour/Controllers/Common/CommonController.cs
Unescape View File

@ -235,6 +235,7 @@ namespace _24Hour.Controllers.Common
ettime = "",
creationtime = q.creationtime,
receptionuser = q.receptionuser,
receive= q.receptionuser,
username = userda?.name,
notes = q.notes
});
@ -266,7 +267,8 @@ namespace _24Hour.Controllers.Common
creationtime = q.creationtime,
receptionuser = q.meetwitId,
username = q.meetwitname,
notes=q.notes,
receive = q.meetwitId,
notes =q.notes,
appurl=q.appurl
});
});
@ -297,13 +299,13 @@ namespace _24Hour.Controllers.Common
creationtime = q.creationtime,
receptionuser = q.meetwitId,
username = q.meetwitname,
receive = q.meetwitId,
notes = q.notes,
appurl = ""
});
});
//分页查询--如有预约类型--reservationId可筛选预约类型,预约信息Id--可筛选预约信息
list = list.WhereIF(Commondata.reservationId.NotNull(),x=>x.daId== Commondata.reservationId)
.WhereIF(Commondata.Id.NotNull(), x => x.Id == Commondata.Id)
list = list.WhereIF(Commondata.matter.NotNull(),x=>x.matter.Contains(Commondata.matter)|| x.title.Contains(Commondata.matter) || x.name.Contains(Commondata.matter) || x.objectstr.Contains(Commondata.matter))
.Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList();
result.IsSucceed = true;
result.result = list.ToList().OrderByDescending(q => q.creationtime).ToList();
@ -357,6 +359,7 @@ namespace _24Hour.Controllers.Common
ettime = "",
creationtime = q.creationtime,
receptionuser = q.receptionuser,
receive = q.createuserId,
username = userda?.name,
notes = q.notes
});
@ -387,6 +390,7 @@ namespace _24Hour.Controllers.Common
creationtime = q.creationtime,
receptionuser = q.meetwitId,
username = q.meetwitname,
receive = q.createuserId,
notes = q.notes,
appurl = q.appurl
});
@ -416,6 +420,7 @@ namespace _24Hour.Controllers.Common
ettime = q.ettime,
creationtime = q.creationtime,
receptionuser = q.meetwitId,
receive = q.createuserId,
username = q.meetwitname,
notes = q.notes,
appurl = ""
@ -442,7 +447,7 @@ namespace _24Hour.Controllers.Common
// username = q.createusername
// });
//});
list = list.WhereIF(Commondata.matter.NotNull(), q => q.matter.Contains(Commondata.matter) || q.objectstr.Contains(Commondata.matter)).Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList();
list = list.WhereIF(Commondata.matter.NotNull(), x => x.matter.Contains(Commondata.matter) || x.title.Contains(Commondata.matter) || x.name.Contains(Commondata.matter) || x.objectstr.Contains(Commondata.matter)).Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList();
result.IsSucceed = true;
result.result = list.ToList().OrderByDescending(q => q.creationtime).ToList();
@ -475,6 +480,7 @@ namespace _24Hour.Controllers.Common
if (Lawyerbol.Count() > 0)
{
Lawyerbol.FirstOrDefault().receptionuser = userId;
Lawyerbol.FirstOrDefault().receptionusername = username;
_db.BeginTran();
var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync();
_db.CommitTran();
@ -485,20 +491,6 @@ namespace _24Hour.Controllers.Common
result.result = "修改成功";
}
}
//听证服务
var Hearingbol = await _db.Queryable<App_HearingModel>().Where(q => q.Id == Id).ToListAsync();
if (Hearingbol.Count() > 0)
{
Hearingbol.FirstOrDefault().receptionuser = userId;
_db.BeginTran();
var num = await _db.Updateable(Hearingbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync();
_db.CommitTran();
if (num > 0)
{
result.IsSucceed = true;
result.result = "修改成功";
}
}
//远程会见
var RemoteModelbol = await _db.Queryable<App_RemoteModel>().Where(q => q.Id == Id).ToListAsync();
if (RemoteModelbol.Count() > 0)
@ -556,10 +548,12 @@ namespace _24Hour.Controllers.Common
var list = new List<dynamic>();
//获取工作台信息
var Stagingdata = await _db.Queryable<StagingModel>().Where(q => q.IsDelete == 0).ToArrayAsync();
//获取律师服务预约记录
//获取律师服务预约记录--判断单位，查询不同数据信息
var Lawyerdata = await _db.Queryable<App_LawyerServicesModel>()
.WhereIF(Commondata.state!=null, x => x.state == Commondata.state)
.Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToArrayAsync();
.WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id)
.WhereIF(!Commondata.unitId.NotNull(), x => x.receptionuser == _userdata.Id)
.Where(q => q.IsDeleted == 0).ToArrayAsync();
Lawyerdata.ToList().ForEach(q =>
{
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -578,10 +572,12 @@ namespace _24Hour.Controllers.Common
creationtime = q.creationtime
});
});
//获取远程会见预约记录
//获取远程会见预约记录--判断单位，查询不同数据信息
var Remotedata = await _db.Queryable<App_RemoteModel>()
.WhereIF(Commondata.state!=null, x => x.state == Commondata.state)
.Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToArrayAsync();
.WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id)
.WhereIF(!Commondata.unitId.NotNull(), x => x.meetwitId == _userdata.Id)
.Where(q => q.IsDeleted == 0).ToArrayAsync();
Remotedata.ToList().ForEach(q =>
{
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -600,10 +596,12 @@ namespace _24Hour.Controllers.Common
creationtime = q.creationtime
});
});
//获取远程接待预约记录
//获取远程接待预约记录--判断单位，查询不同数据信息
var Receptiondata = await _db.Queryable<App_ReceptionModel>()
.WhereIF(Commondata.state!=null, x => x.state == Commondata.state)
.Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToArrayAsync();
.WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id)
.WhereIF(!Commondata.unitId.NotNull(), x => x.meetwitId == _userdata.Id)
.Where(q => q.IsDeleted == 0).ToArrayAsync();
Receptiondata.ToList().ForEach(q =>
{
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();

2
24Hour/Controllers/Common/RemoteController.cs
Unescape View File

@ -281,7 +281,7 @@ namespace _24Hour.Controllers.Common
/// <param name="meetwitId">办理人Id</param>
/// <param name="meetwitname">办理人名称</param>
/// <returns></returns>
[HttpGet]
[HttpPost]
[Route("UpdateRemotestate")]
public async Task<Result> UpdateRemotestate(App_Remoteput Remoteput)
{

11
24Hour/Controllers/Common/VideoController.cs
Unescape View File

@ -2,6 +2,7 @@
using Elight.Logic;
using Elight.Utility;
using Elight.Utility.Code;
using javax.xml.crypto;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
@ -43,18 +44,20 @@ namespace _24Hour.Controllers.Common
[Route("QueryVideolist")]
public async Task<Result> QueryVideolist(App_VideoInput Videodata)
{
RefAsync<int> totalNumber = 0;//总数据
var Videolist = new List<dynamic>();
//查询视频举报记录
var list = await _db.Queryable<App_VideoModel>()
.WhereIF(Videodata.reporting != null, q => q.reporting.Contains(Videodata.reporting))
.WhereIF(Videodata.anonymous != null, q => q.anonymous == Videodata.anonymous)
.WhereIF(Videodata.state != null, q => q.state == Videodata.state)
.WhereIF(Videodata.StartTime != null && Videodata.EndTime != null, q => q.creationtime >= Videodata.StartTime && q.creationtime < Videodata.EndTime.Value.AddDays(1))
.Where(q => q.IsDeleted == 0 && q.unitId == _userdata.unitCode).ToPageListAsync(Videodata.PageIndex, Videodata.PageSize);
.Where(q => q.IsDeleted == 0 && q.unitId == _userdata.unitCode).ToPageListAsync(Videodata.PageIndex, Videodata.PageSize, totalNumber);
Videodata.RowsCount = totalNumber;
list.OrderByDescending(q => q.creationtime).ToList().ForEach(q =>
{
Videolist.Add(new
{
Id = q.Id,
name = q.anonymous == 0 ? "匿名" : q.createusername,
reporting = q.reporting,
videofile = q.videofile,
@ -65,7 +68,7 @@ namespace _24Hour.Controllers.Common
});
});
result.IsSucceed = true;
result.result = Videolist;
result.result =new { Paging = Videodata, Data = Videolist };
return result;
}
/// <summary>
@ -215,7 +218,7 @@ namespace _24Hour.Controllers.Common
var Video = await _db.Queryable<App_VideoModel>().Where(q => q.Id == Id).ToArrayAsync();
if (Video.Any())
{
Video.FirstOrDefault().state = 1;
Video.FirstOrDefault().state = state;
_db.BeginTran();
var num = await _db.Updateable(Video.FirstOrDefault()).UpdateColumns(it => new { it.state}).ExecuteCommandAsync();
_db.CommitTran();

2
24Hour/Controllers/Common/WebSocketController.cs
Unescape View File

@ -267,7 +267,7 @@ namespace _24Hour.Controllers.Common
{
userzx.Add(_userdata.Id, "1");
}
//判断接收人是否在线，
//判断接收人检察官是否在线，
if (_userdata.usertype == 1 && userzx.ContainsKey(Senddata.recipient))
{
result.IsSucceed = false;

11
24Hour/Controllers/LoginController.cs
Unescape View File

@ -6,6 +6,7 @@ using Elight.Utility.Code;
using Elight.Utility.Encrypt;
using Elight.Utility.Extensions;
using Elight.Utility.logs;
using java.security;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
@ -94,11 +95,13 @@ namespace _24Hour.Controllers
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 = "",
department = "",
token = tokenString
@ -173,13 +176,13 @@ namespace _24Hour.Controllers
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,
unitCode = "",
department = "",
identity = date.identity,
token = tokenString
};
#endregion
@ -313,13 +316,13 @@ namespace _24Hour.Controllers
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,
unitCode = "",
department = "",
identity = date.identity,
token = tokenString
};
#endregion

12
24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230620/20.log
Unescape View File

@ -0,0 +1,12 @@
日志时间:2023-06-20 20:23:30
************************Exception Start********************************
Exception Remark：添加数据库日志信息_WriteSysLog_1 发生异常
Exception Date:2023/6/20 20:23:30
Exception Type:MySqlConnector.MySqlException
Exception Message:Data too long for column 'OperatingManual' at row 1
Exception Source:SqlSugar
Exception StackTrace: at SqlSugar.AdoProvider.ExecuteCommand(String sql, SugarParameter[] parameters)
at SqlSugar.InsertableProvider`1.ExecuteCommand()
at Elight.Logic.WriteSysLog.WriteSysLogadd(String operationType, String content, Result result, SqlSugarClient _db, String opeCasDepAccCas) in E:\Code\24Hour.Service\Elight.Logic\WriteSysLog.cs:line 52
************************Exception End************************************

12
24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230621/11.log
Unescape View File

@ -0,0 +1,12 @@
日志时间:2023-06-21 11:44:41
************************Exception Start********************************
Exception Remark：添加数据库日志信息_WriteSysLog_1 发生异常
Exception Date:2023/6/21 11:44:41
Exception Type:MySqlConnector.MySqlException
Exception Message:Data too long for column 'OperatingManual' at row 1
Exception Source:SqlSugar
Exception StackTrace: at SqlSugar.AdoProvider.ExecuteCommand(String sql, SugarParameter[] parameters)
at SqlSugar.InsertableProvider`1.ExecuteCommand()
at Elight.Logic.WriteSysLog.WriteSysLogadd(String operationType, String content, Result result, SqlSugarClient _db, String opeCasDepAccCas) in E:\Code\24Hour.Service\Elight.Logic\WriteSysLog.cs:line 52
************************Exception End************************************

8
Elight.Entity/AppMode/App_LawyerServicesModel.cs
Unescape View File

@ -61,11 +61,17 @@ namespace Elight.Entity
public string? objectstr { get; set; }
/// <summary>
/// 接待人
/// 接待人Id
/// </summary>
[DataMember]
public string? receptionuser { get; set; }
/// <summary>
/// 接待人名称
/// </summary>
[DataMember]
public string? receptionusername { get; set; }
/// <summary>
/// 备注
/// </summary>

8
Elight.Logic/Model/App_LawyerServicesInput.cs
Unescape View File

@ -60,11 +60,17 @@ namespace Elight.Logic
public string? objectstr { get; set; }
/// <summary>
/// 接待人
/// 接待人Id
/// </summary>
[DataMember]
public string? receptionuser { get; set; }
/// <summary>
/// 接待人名称
/// </summary>
[DataMember]
public string? receptionusername { get; set; }
/// <summary>
/// 备注
/// </summary>

2
Elight.Logic/Model/Commonpage.cs
Unescape View File

@ -17,6 +17,8 @@ namespace Elight.Logic
[DataMember]
public string? Id { get; set; }
[DataMember]
public string? unitId { get; set; }
/// <summary>
/// 开始时间
/// </summary>

Write Preview
Loading…
Cancel
Save