From 26d068066c5e87a3f9f8385280c51422c677d07a Mon Sep 17 00:00:00 2001 From: liujiaqiang <1448951783@qq.com> Date: Thu, 15 Jun 2023 16:00:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E4=BD=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AD=97=E6=AE=B5=EF=BC=8C=E8=BF=9C=E7=A8=8B=E4=BC=9A?= =?UTF-8?q?=E8=A7=81=E8=A1=A8=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8Cmoel=E7=B1=BB=E5=8F=8A=E5=8A=9F=E8=83=BD=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E5=AE=9E=E6=97=B6=E9=80=9A=E8=AE=AFwebsockt?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/ReservationController.cs | 357 ++++++++++++++++++ .../Controllers/Common/WebSocketController.cs | 9 +- 24Hour/Controllers/LoginController.cs | 69 +++- .../system/SystemControllerController.cs | 42 --- .../logs/Logs/ExceptionLog/20230615/09.log | 24 ++ Elight.Entity/AppMode/App_DeviceModel.cs | 77 ++++ Elight.Entity/AppMode/App_RemoteModel.cs | 94 +++++ .../SystemModel/App_Sys_UnitModel.cs | 6 + Elight.Logic/Model/App_DeviceInput.cs | 57 +++ Elight.Logic/Model/App_RemoteInput.cs | 75 ++++ Elight.Logic/SystemModel/App_Sys_UnitInput.cs | 5 + Elight.Logic/SystemModel/App_Sys_UnitTree.cs | 6 + 12 files changed, 777 insertions(+), 44 deletions(-) create mode 100644 24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230615/09.log create mode 100644 Elight.Entity/AppMode/App_DeviceModel.cs create mode 100644 Elight.Entity/AppMode/App_RemoteModel.cs create mode 100644 Elight.Logic/Model/App_DeviceInput.cs create mode 100644 Elight.Logic/Model/App_RemoteInput.cs diff --git a/24Hour/Controllers/Common/ReservationController.cs b/24Hour/Controllers/Common/ReservationController.cs index 4c25f7e..3de0c86 100644 --- a/24Hour/Controllers/Common/ReservationController.cs +++ b/24Hour/Controllers/Common/ReservationController.cs @@ -199,5 +199,362 @@ namespace _24Hour.Controllers.Common return result; } #endregion + + #region 远程会见管理 + + /// + /// 根据当前登录人查询远程会见信息分页查询 + /// + /// + /// + [HttpPost] + [Route("QueryRemoteuser")] + public async Task QueryRemoteuser(App_RemoteInput Remotedata) + { + var Receptionlist = new List(); + //查询远程会见记录 + var list = await _db.Queryable() + .WhereIF(Remotedata.Code != null, q => q.Code.Contains(Remotedata.Code)) + .WhereIF(Remotedata.name != null, q => q.name.Contains(Remotedata.name)) + .WhereIF(Remotedata.meetwitname != null, q => q.meetwitname.Contains(Remotedata.meetwitname)) + .WhereIF(Remotedata.state != null, q => q.state == Remotedata.state) + .Where(q => q.IsDeleted == 0&&q.unitId==_userdata.unitCode).ToPageListAsync(Remotedata.PageIndex, Remotedata.PageSize); + var data = new QueryResult(Remotedata, list.OrderByDescending(q => q.creationtime).ToList()); + result.IsSucceed = true; + result.result = data; + return result; + } + + /// + /// 远程会见分页查询 + /// + /// + /// + [HttpPost] + [Route("QueryRemote")] + public async Task QueryRemote(App_RemoteInput Remotedata) + { + var Receptionlist = new List(); + //查询远程会见记录 + var list = await _db.Queryable() + .WhereIF(Remotedata.Code != null, q => q.Code.Contains(Remotedata.Code)) + .WhereIF(Remotedata.name != null, q => q.name.Contains(Remotedata.name)) + .WhereIF(Remotedata.meetwitname != null, q => q.meetwitname.Contains(Remotedata.meetwitname)) + .WhereIF(Remotedata.state != null, q => q.state == Remotedata.state) + .Where(q => q.IsDeleted == 0).ToPageListAsync(Remotedata.PageIndex, Remotedata.PageSize); + var data = new QueryResult(Remotedata, list.OrderByDescending(q => q.creationtime).ToList()); + result.IsSucceed = true; + result.result = data; + return result; + } + /// + /// 添加远程会见 + /// + /// + /// + [HttpPost] + [Route("AddRemote")] + public async Task AddRemote(App_RemoteModel Remotedata) + { + try + { + _db.BeginTran(); + Remotedata.Id = Guid.NewGuid().ToString(); + Remotedata.unitId = _userdata.unitCode.ToString(); + Remotedata.createuserId = _userdata.Id.ToString(); + Remotedata.createusername = _userdata.name; + var num = await _db.Insertable(Remotedata).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "添加成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("远程会见管理", "添加远程会见", result, _db); + return result; + } + + /// + /// 修改远程会见 + /// + /// + /// + [HttpPost] + [Route("UpdateRemote")] + public async Task UpdateRemote(App_RemoteModel Remotedata) + { + try + { + _db.BeginTran(); + var num = await _db.Updateable(Remotedata).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "修改成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("远程会见管理", "修改远程会见", result, _db); + return result; + } + + /// + /// 删除远程会见 + /// + /// + /// + [HttpPost] + [Route("DeleteRemote")] + public async Task DeleteRemote(CurrencyDelete Currency) + { + try + { + _db.BeginTran(); + var Receptionlist = await _db.Queryable().In(q => q.Id, Currency.id).ToListAsync(); + Receptionlist.ForEach(q => + { + q.IsDeleted = 1; + }); + var num = await _db.Updateable(Receptionlist).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "删除成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("远程会见管理", "删除远程会见", result, _db); + return result; + } + + + /// + /// 结束远程会见 + /// + /// + /// + [HttpPost] + [Route("UpdateRemote_state")] + public async Task UpdateRemote_state(CurrencyDelete Currency) + { + try + { + var Receptionlist = await _db.Queryable().Where(q => Currency.id.Contains(q.Id)).ToListAsync(); + Receptionlist.ForEach(q => { q.state = 1; }); + _db.BeginTran(); + var num = await _db.Updateable(Receptionlist).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "结束成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("远程会见管理", "结束远程会见", result, _db); + return result; + } + + + /// + /// 取消远程会见 + /// + /// + /// + [HttpPost] + [Route("Updatecancellation_state")] + public async Task Updatecancellation_state(CurrencyDelete Currency) + { + try + { + var Receptionlist = await _db.Queryable().Where(q => Currency.id.Contains(q.Id)).ToListAsync(); + Receptionlist.ForEach(q => { q.state = 2; }); + _db.BeginTran(); + var num = await _db.Updateable(Receptionlist).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "已取消"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("远程会见管理", "取消远程会见", result, _db); + return result; + } + #endregion + + #region 设备管理 + /// + /// 根据当前登录人查询设备信息分页查询 + /// + /// + /// + [HttpPost] + [Route("QueryDeviceuser")] + public async Task QueryDeviceuser(App_DeviceInput Devicedata) + { + var Receptionlist = new List(); + //查询远程会见记录 + var list = await _db.Queryable() + .WhereIF(Devicedata.deviceno != null, q => q.Code.Contains(Devicedata.deviceno)) + .WhereIF(Devicedata.name != null, q => q.name.Contains(Devicedata.name)) + .WhereIF(Devicedata.state != null, q => q.state == Devicedata.state) + .Where(q => q.IsDeleted == 0 && q.unitId == _userdata.unitCode).ToPageListAsync(Devicedata.PageIndex, Devicedata.PageSize); + var data = new QueryResult(Devicedata, list.OrderByDescending(q => q.creationtime).ToList()); + result.IsSucceed = true; + result.result = data; + return result; + } + + /// + /// 设备分页查询 + /// + /// + /// + [HttpPost] + [Route("QueryDevice")] + public async Task QueryDevice(App_DeviceInput Devicedata) + { + var Receptionlist = new List(); + //查询远程会见记录 + var list = await _db.Queryable() + .WhereIF(Devicedata.deviceno != null, q => q.deviceno.Contains(Devicedata.deviceno)) + .WhereIF(Devicedata.name != null, q => q.name.Contains(Devicedata.name)) + .WhereIF(Devicedata.state != null, q => q.state == Devicedata.state) + .Where(q => q.IsDeleted == 0).ToPageListAsync(Devicedata.PageIndex, Devicedata.PageSize); + var data = new QueryResult(Devicedata, list.OrderByDescending(q => q.creationtime).ToList()); + result.IsSucceed = true; + result.result = data; + return result; + } + /// + /// 添加设备 + /// + /// + /// + [HttpPost] + [Route("AddDevice")] + public async Task AddDevice(App_DeviceModel Devicedata) + { + try + { + _db.BeginTran(); + Devicedata.Id = Guid.NewGuid().ToString(); + Devicedata.unitId = _userdata.unitCode.ToString(); + Devicedata.createuserId = _userdata.Id.ToString(); + Devicedata.createusername = _userdata.name; + var num = await _db.Insertable(Devicedata).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "添加成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("远程会见管理", "添加远程会见", result, _db); + return result; + } + + /// + /// 修改设备 + /// + /// + /// + [HttpPost] + [Route("UpdateDevice")] + public async Task UpdateDevice(App_DeviceModel Devicedata) + { + try + { + _db.BeginTran(); + var num = await _db.Updateable(Devicedata).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "修改成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("远程会见管理", "修改远程会见", result, _db); + return result; + } + + /// + /// 删除设备 + /// + /// + /// + [HttpPost] + [Route("DeleteDevice")] + public async Task DeleteDevice(CurrencyDelete Currency) + { + try + { + _db.BeginTran(); + var Receptionlist = await _db.Queryable().In(q => q.Id, Currency.id).ToListAsync(); + Receptionlist.ForEach(q => + { + q.IsDeleted = 1; + }); + var num = await _db.Updateable(Receptionlist).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "删除成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("设备管理", "删除设备", result, _db); + return result; + } + #endregion } } diff --git a/24Hour/Controllers/Common/WebSocketController.cs b/24Hour/Controllers/Common/WebSocketController.cs index 3ed2834..648ab53 100644 --- a/24Hour/Controllers/Common/WebSocketController.cs +++ b/24Hour/Controllers/Common/WebSocketController.cs @@ -35,7 +35,7 @@ namespace _24Hour.Controllers.Common try { var socket = await HttpContext.WebSockets.AcceptWebSocketAsync(); - ProcessChat(socket); + await ProcessChat(socket); } catch (Exception ex) { @@ -62,9 +62,16 @@ namespace _24Hour.Controllers.Common { if (socket.State == WebSocketState.Open) { + ArraySegment buffer = new ArraySegment(new byte[2048]); + WebSocketReceiveResult result = await socket.ReceiveAsync(buffer, CancellationToken.None); + if (result.MessageType==WebSocketMessageType.Close) + { + await socket.CloseAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None); + } } else { + Console.WriteLine("断开连接"); break; } }//while end diff --git a/24Hour/Controllers/LoginController.cs b/24Hour/Controllers/LoginController.cs index 0bb7ba8..60e8241 100644 --- a/24Hour/Controllers/LoginController.cs +++ b/24Hour/Controllers/LoginController.cs @@ -1,7 +1,11 @@ using Elight.Entity; +using Elight.Logic; +using Elight.Logic.SystemModel; using Elight.Utility; using Elight.Utility.Code; using Elight.Utility.Encrypt; +using Elight.Utility.Extensions; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.IdentityModel.Tokens; @@ -24,12 +28,14 @@ namespace _24Hour.Controllers { private readonly IConfiguration _configuration; private readonly SqlSugarClient _db;//ݿ + private readonly WriteSysLog _logs;//־ private readonly ILogger _logger;//־ Result ret = new Result(); - public LoginController(ILogger logger, SqlSugarClient db, IConfiguration configuration) + public LoginController(ILogger logger, SqlSugarClient db, IConfiguration configuration, WriteSysLog logs) { _logger = logger; _db = db; + _logs = logs; _configuration = configuration; } [HttpPost] @@ -177,6 +183,67 @@ namespace _24Hour.Controllers } return ret; } + + /// + /// APPû + /// + /// + /// + [AllowAnonymous] + [HttpPost] + [Route("AddUser1")] + public async Task AddUser1(App_Sys_UserModel UserModel) + { + try + { + var data = await _db.Queryable().Where(q => q.phone == UserModel.phone).FirstAsync(); + if (data != null) + { + ret.IsSucceed = false; + ret.Message = "绰Ѵڣ"; + return ret; + } + _db.BeginTran(); + UserModel.Id = Guid.NewGuid().ToString(); + UserModel.usertype = 1; + //Ĭ + UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower(); + var num = await _db.Insertable(UserModel).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + ret.IsSucceed = true; + ret.result = "ӳɹ"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + ret.IsSucceed = false; + ret.Message = ex.Message; + } + _logs.WriteSysLogadd("û", "APPû", ret, _db); + return ret; + } + + /// + /// λlist + /// + /// + /// + [HttpPost] + [Route("QueryUnitlist")] + public async Task QueryUnitlist(App_Sys_UnitInput Unitdata) + { + var list = await _db.Queryable() + .WhereIF(!Unitdata.unitCode.IsNull(), q => q.unitCode.Contains(Unitdata.unitCode)) + .WhereIF(!Unitdata.unitname.IsNull(), q => q.unitname.Contains(Unitdata.unitname)) + .WhereIF(!Unitdata.unitjc.IsNull(), q => q.unitjc.Contains(Unitdata.unitjc)) + .Where(q => q.IsDelete == 0).ToListAsync(); + ret.IsSucceed = true; + ret.result = list; + return ret; + } } public class UserLogin { diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs index 4957b54..a487623 100644 --- a/24Hour/Controllers/system/SystemControllerController.cs +++ b/24Hour/Controllers/system/SystemControllerController.cs @@ -146,48 +146,6 @@ namespace _24Hour.Controllers.system return result; } - /// - /// APP添加用户 - /// - /// - /// - [AllowAnonymous] - [HttpPost] - [Route("AddUser1")] - public async Task AddUser1(App_Sys_UserModel UserModel) - { - try - { - var data = await _db.Queryable().Where(q => q.phone == UserModel.phone).FirstAsync(); - if (data != null) - { - result.IsSucceed = false; - result.Message = "电话号码已存在！"; - return result; - } - _db.BeginTran(); - UserModel.Id = Guid.NewGuid().ToString(); - UserModel.usertype = 1; - //默认密码 - UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower(); - var num = await _db.Insertable(UserModel).ExecuteCommandAsync(); - _db.CommitTran(); - if (num > 0) - { - result.IsSucceed = true; - result.result = "添加成功"; - } - } - catch (System.Exception ex) - { - _db.RollbackTran(); - result.IsSucceed = false; - result.Message = ex.Message; - } - _logs.WriteSysLogadd("用户管理", "添加APP端用户", result,_db); - return result; - } - /// /// 修改用户 /// diff --git a/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230615/09.log b/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230615/09.log new file mode 100644 index 0000000..79edc5e --- /dev/null +++ b/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230615/09.log @@ -0,0 +1,24 @@ +日志时间:2023-06-15 09:21:52 +************************Exception Start******************************** +Exception Remark：添加数据库日志信息_WriteSysLog_1 发生异常 +Exception Date:2023/6/15 9:21:52 +Exception Type:MySqlConnector.MySqlException +Exception Message:Unknown column 'SerialNumber' in 'field list' +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 51 +************************Exception End************************************ + +日志时间:2023-06-15 09:22:01 +************************Exception Start******************************** +Exception Remark：添加数据库日志信息_WriteSysLog_1 发生异常 +Exception Date:2023/6/15 9:22:01 +Exception Type:MySqlConnector.MySqlException +Exception Message:Unknown column 'SerialNumber' in 'field list' +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 51 +************************Exception End************************************ + diff --git a/Elight.Entity/AppMode/App_DeviceModel.cs b/Elight.Entity/AppMode/App_DeviceModel.cs new file mode 100644 index 0000000..9d2d7c3 --- /dev/null +++ b/Elight.Entity/AppMode/App_DeviceModel.cs @@ -0,0 +1,77 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + /// + /// 设备管理 + /// + [Serializable] + [DataContract] + [SugarTable("app_device")] + public class App_DeviceModel + { + [DataMember] + [SugarColumn(IsPrimaryKey = true)] + public string? Id { get; set; } + /// + /// 单位Id + /// + [DataMember] + public string? unitId { get; set; } + + /// + /// 设备编号 + /// + [DataMember] + public string? deviceno { get; set; } + + /// + /// 设备名称 + /// + [DataMember] + public string? name { get; set; } + + /// + /// 安放位置 + /// + [DataMember] + public string? position { get; set; } + + + /// + /// 备注 + /// + [DataMember] + public string? notes { get; set; } + + /// + /// 设备状态：0：正常，1：离线，2：故障 + /// + [DataMember] + public int? state { get; set; } + + [DataMember] + public string? createusername { get; set; } + + [DataMember] + public string? createuserId { get; set; } + + /// + /// 创建日期 + /// + [DataMember] + public DateTime? creationtime { get; set; } = DateTime.Now; + + /// + /// 是否删除：0：未删除、1：删除 + /// + [DataMember] + public int? IsDeleted { get; set; } = 0; + } +} diff --git a/Elight.Entity/AppMode/App_RemoteModel.cs b/Elight.Entity/AppMode/App_RemoteModel.cs new file mode 100644 index 0000000..fe27fcc --- /dev/null +++ b/Elight.Entity/AppMode/App_RemoteModel.cs @@ -0,0 +1,94 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + /// + /// 远程会见 + /// + [Serializable] + [DataContract] + [SugarTable("app_remote")] + public class App_RemoteModel + { + [DataMember] + [SugarColumn(IsPrimaryKey = true)] + public string? Id { get; set; } + /// + /// 单位Id + /// + [DataMember] + public string? unitId { get; set; } + + /// + /// 会议号 + /// + [DataMember] + public string? Code { get; set; } + + /// + /// 会议名称 + /// + [DataMember] + public string? name { get; set; } + + /// + /// 开始时间 + /// + [DataMember] + public DateTime? sttime { get; set; } + + /// + /// 结束时间 + /// + [DataMember] + public DateTime? ettime { get; set; } + + /// + /// 会见人Id + /// + [DataMember] + public string? meetwitId { get; set; } + + /// + /// 会见人 + /// + [DataMember] + public string? meetwitname { get; set; } + + /// + /// 备注 + /// + [DataMember] + public string? notes { get; set; } + + /// + /// 0:待开始，1已结束,2:会议取消 + /// + [DataMember] + public int? state { get; set; } + + [DataMember] + public string? createusername { get; set; } + + [DataMember] + public string? createuserId { get; set; } + + /// + /// 创建日期 + /// + [DataMember] + public DateTime? creationtime { get; set; } = DateTime.Now; + + /// + /// 是否删除：0：未删除、1：删除 + /// + [DataMember] + public int? IsDeleted { get; set; } = 0; + } +} diff --git a/Elight.Entity/SystemModel/App_Sys_UnitModel.cs b/Elight.Entity/SystemModel/App_Sys_UnitModel.cs index 273248e..d308163 100644 --- a/Elight.Entity/SystemModel/App_Sys_UnitModel.cs +++ b/Elight.Entity/SystemModel/App_Sys_UnitModel.cs @@ -42,6 +42,12 @@ namespace Elight.Entity [DataMember] public string? unitjc { get; set; } + /// + /// 单位经纬度 + /// + [DataMember] + public string? lalon { get; set; } + /// /// 是否删除 0否，1是 /// diff --git a/Elight.Logic/Model/App_DeviceInput.cs b/Elight.Logic/Model/App_DeviceInput.cs new file mode 100644 index 0000000..bba44c3 --- /dev/null +++ b/Elight.Logic/Model/App_DeviceInput.cs @@ -0,0 +1,57 @@ +using Elight.Utility.Code; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Logic +{ + /// + /// 设备管理 + /// + [DataContract] + public class App_DeviceInput : Paging + { + [DataMember] + public string? Id { get; set; } + /// + /// 单位Id + /// + [DataMember] + public string? unitId { get; set; } + + /// + /// 设备编号 + /// + [DataMember] + public string? deviceno { get; set; } + + /// + /// 设备名称 + /// + [DataMember] + public string? name { get; set; } + + /// + /// 安放位置 + /// + [DataMember] + public string? position { get; set; } + + + /// + /// 备注 + /// + [DataMember] + public string? notes { get; set; } + + /// + /// 设备状态：0：正常，1：离线，2：故障 + /// + [DataMember] + public int? state { get; set; } + } +} diff --git a/Elight.Logic/Model/App_RemoteInput.cs b/Elight.Logic/Model/App_RemoteInput.cs new file mode 100644 index 0000000..0600804 --- /dev/null +++ b/Elight.Logic/Model/App_RemoteInput.cs @@ -0,0 +1,75 @@ +using Elight.Utility.Code; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Logic +{ + /// + /// 远程会见 + /// + [DataContract] + public class App_RemoteInput : Paging + { + [DataMember] + public string? Id { get; set; } + + /// + /// 单位Id + /// + [DataMember] + public string? unitId { get; set; } + + /// + /// 会议号 + /// + [DataMember] + public string? Code { get; set; } + + /// + /// 会议名称 + /// + [DataMember] + public string? name { get; set; } + + /// + /// 开始时间 + /// + [DataMember] + public DateTime? sttime { get; set; } + + /// + /// 结束时间 + /// + [DataMember] + public DateTime? ettime { get; set; } + + /// + /// 会见人Id + /// + [DataMember] + public string? meetwitId { get; set; } + + /// + /// 会见人 + /// + [DataMember] + public string? meetwitname { get; set; } + + /// + /// 备注 + /// + [DataMember] + public string? notes { get; set; } + + /// + /// 0:待开始，1已结束,2:会议取消 + /// + [DataMember] + public int? state { get; set; } + } +} diff --git a/Elight.Logic/SystemModel/App_Sys_UnitInput.cs b/Elight.Logic/SystemModel/App_Sys_UnitInput.cs index a8f2554..eda34ff 100644 --- a/Elight.Logic/SystemModel/App_Sys_UnitInput.cs +++ b/Elight.Logic/SystemModel/App_Sys_UnitInput.cs @@ -38,6 +38,11 @@ namespace Elight.Logic.SystemModel /// [DataMember] public string? unitjc { get; set; } + /// + /// 单位经纬度 + /// + [DataMember] + public string? lalon { get; set; } } } diff --git a/Elight.Logic/SystemModel/App_Sys_UnitTree.cs b/Elight.Logic/SystemModel/App_Sys_UnitTree.cs index 7bb7e03..396227f 100644 --- a/Elight.Logic/SystemModel/App_Sys_UnitTree.cs +++ b/Elight.Logic/SystemModel/App_Sys_UnitTree.cs @@ -42,6 +42,12 @@ namespace Elight.Logic.SystemModel [DataMember] public string? unitjc { get; set; } + /// + /// 单位经纬度 + /// + [DataMember] + public string? lalon { get; set; } + /// /// 是否删除 0否，1是