新增单位管理字段，远程会见表，设备管理，moel类及功能实现，实时通讯websockt调整

24Hour/Controllers/Common/ReservationController.cs

@@ -199,5 +199,362 @@ namespace _24Hour.Controllers.Common
             return result;
         }
         #endregion
+
+        #region 远程会见管理
+
+        /// <summary>
+        /// 根据当前登录人查询远程会见信息分页查询
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("QueryRemoteuser")]
+        public async Task<Result> QueryRemoteuser(App_RemoteInput Remotedata)
+        {
+            var Receptionlist = new List<App_RemoteModel>();
+            //查询远程会见记录
+            var list = await _db.Queryable<App_RemoteModel>()
+                .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<App_RemoteModel>(Remotedata, list.OrderByDescending(q => q.creationtime).ToList());
+            result.IsSucceed = true;
+            result.result = data;
+            return result;
+        }
+
+        /// <summary>
+        /// 远程会见分页查询
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("QueryRemote")]
+        public async Task<Result> QueryRemote(App_RemoteInput Remotedata)
+        {
+            var Receptionlist = new List<App_RemoteModel>();
+            //查询远程会见记录
+            var list = await _db.Queryable<App_RemoteModel>()
+                .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<App_RemoteModel>(Remotedata, list.OrderByDescending(q => q.creationtime).ToList());
+            result.IsSucceed = true;
+            result.result = data;
+            return result;
+        }
+        /// <summary>
+        /// 添加远程会见
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("AddRemote")]
+        public async Task<Result> 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;
+        }
+
+        /// <summary>
+        /// 修改远程会见
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("UpdateRemote")]
+        public async Task<Result> 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;
+        }
+
+        /// <summary>
+        /// 删除远程会见
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("DeleteRemote")]
+        public async Task<Result> DeleteRemote(CurrencyDelete Currency)
+        {
+            try
+            {
+                _db.BeginTran();
+                var Receptionlist = await _db.Queryable<App_RemoteModel>().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;
+        }
+
+
+        /// <summary>
+        /// 结束远程会见
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("UpdateRemote_state")]
+        public async Task<Result> UpdateRemote_state(CurrencyDelete Currency)
+        {
+            try
+            {
+                var Receptionlist = await _db.Queryable<App_RemoteModel>().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;
+        }
+
+
+        /// <summary>
+        /// 取消远程会见
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Updatecancellation_state")]
+        public async Task<Result> Updatecancellation_state(CurrencyDelete Currency)
+        {
+            try
+            {
+                var Receptionlist = await _db.Queryable<App_RemoteModel>().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 设备管理
+        /// <summary>
+        /// 根据当前登录人查询设备信息分页查询
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("QueryDeviceuser")]
+        public async Task<Result> QueryDeviceuser(App_DeviceInput Devicedata)
+        {
+            var Receptionlist = new List<App_RemoteModel>();
+            //查询远程会见记录
+            var list = await _db.Queryable<App_RemoteModel>()
+                .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<App_RemoteModel>(Devicedata, list.OrderByDescending(q => q.creationtime).ToList());
+            result.IsSucceed = true;
+            result.result = data;
+            return result;
+        }
+
+        /// <summary>
+        /// 设备分页查询
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("QueryDevice")]
+        public async Task<Result> QueryDevice(App_DeviceInput Devicedata)
+        {
+            var Receptionlist = new List<App_DeviceModel>();
+            //查询远程会见记录
+            var list = await _db.Queryable<App_DeviceModel>()
+                .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<App_DeviceModel>(Devicedata, list.OrderByDescending(q => q.creationtime).ToList());
+            result.IsSucceed = true;
+            result.result = data;
+            return result;
+        }
+        /// <summary>
+        /// 添加设备
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("AddDevice")]
+        public async Task<Result> 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;
+        }
+
+        /// <summary>
+        /// 修改设备
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("UpdateDevice")]
+        public async Task<Result> 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;
+        }
+
+        /// <summary>
+        /// 删除设备
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("DeleteDevice")]
+        public async Task<Result> DeleteDevice(CurrencyDelete Currency)
+        {
+            try
+            {
+                _db.BeginTran();
+                var Receptionlist = await _db.Queryable<App_DeviceModel>().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
     }
 }

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<byte> buffer = new ArraySegment<byte>(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

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<LoginController> _logger;//ÈÕÖ¾
         Result ret = new Result();
-        public LoginController(ILogger<LoginController> logger, SqlSugarClient db, IConfiguration configuration)
+        public LoginController(ILogger<LoginController> 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;
         }
+
+        /// <summary>
+        /// APP添加用户
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        [Route("AddUser1")]
+        public async Task<Result> AddUser1(App_Sys_UserModel UserModel)
+        {
+            try
+            {
+                var data = await _db.Queryable<App_Sys_UserModel>().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;
+        }
+
+        /// <summary>
+        /// 单位list集合
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("QueryUnitlist")]
+        public async Task<Result> QueryUnitlist(App_Sys_UnitInput Unitdata)
+        {
+            var list = await _db.Queryable<App_Sys_UnitModel>()
+                .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
     {

24Hour/Controllers/system/SystemControllerController.cs

@@ -146,48 +146,6 @@ namespace _24Hour.Controllers.system
             return result;
         }
 
-        /// <summary>
-        /// APP添加用户
-        /// </summary>
-        /// <param name="info"></param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        [HttpPost]
-        [Route("AddUser1")]
-        public async Task<Result> AddUser1(App_Sys_UserModel UserModel)
-        {
-            try
-            {
-                var data = await _db.Queryable<App_Sys_UserModel>().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;
-        }
-
         /// <summary>
         /// 修改用户
         /// </summary>

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************************************
+

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
+{
+    /// <summary>
+    /// 设备管理
+    /// </summary>
+    [Serializable]
+    [DataContract]
+    [SugarTable("app_device")]
+    public class App_DeviceModel
+    {
+        [DataMember]
+        [SugarColumn(IsPrimaryKey = true)]
+        public string? Id { get; set; }
+        /// <summary>
+        /// 单位Id
+        /// </summary>
+        [DataMember]
+        public string? unitId { get; set; }
+        
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        [DataMember]
+        public string? deviceno { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        [DataMember]
+        public string? name { get; set; }
+
+        /// <summary>
+        /// 安放位置
+        /// </summary>
+        [DataMember]
+        public string? position { get; set; }
+        
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [DataMember]
+        public string? notes { get; set; }
+
+        /// <summary>
+        /// 设备状态：0：正常，1：离线，2：故障
+        /// </summary>
+        [DataMember]
+        public int? state { get; set; }
+
+        [DataMember]
+        public string? createusername { get; set; }
+
+        [DataMember]
+        public string? createuserId { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        [DataMember]
+        public DateTime? creationtime { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 是否删除：0：未删除、1：删除
+        /// </summary>
+        [DataMember]
+        public int? IsDeleted { get; set; } = 0;
+    }
+}

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
+{
+    /// <summary>
+    /// 远程会见
+    /// </summary>
+    [Serializable]
+    [DataContract]
+    [SugarTable("app_remote")]
+    public class App_RemoteModel
+    {
+        [DataMember]
+        [SugarColumn(IsPrimaryKey = true)]
+        public string? Id { get; set; }
+        /// <summary>
+        /// 单位Id
+        /// </summary>
+        [DataMember]
+        public string? unitId { get; set; }
+        
+        /// <summary>
+        /// 会议号
+        /// </summary>
+        [DataMember]
+        public string? Code { get; set; }
+
+        /// <summary>
+        /// 会议名称
+        /// </summary>
+        [DataMember]
+        public string? name { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [DataMember]
+        public DateTime? sttime { get; set; }
+        
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [DataMember]
+        public DateTime? ettime { get; set; }
+
+        /// <summary>
+        /// 会见人Id
+        /// </summary>
+        [DataMember]
+        public string? meetwitId { get; set; }
+
+        /// <summary>
+        /// 会见人
+        /// </summary>
+        [DataMember]
+        public string? meetwitname { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [DataMember]
+        public string? notes { get; set; }
+
+        /// <summary>
+        /// 0:待开始，1已结束,2:会议取消
+        /// </summary>
+        [DataMember]
+        public int? state { get; set; }
+
+        [DataMember]
+        public string? createusername { get; set; }
+
+        [DataMember]
+        public string? createuserId { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        [DataMember]
+        public DateTime? creationtime { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 是否删除：0：未删除、1：删除
+        /// </summary>
+        [DataMember]
+        public int? IsDeleted { get; set; } = 0;
+    }
+}

Elight.Entity/SystemModel/App_Sys_UnitModel.cs

@@ -42,6 +42,12 @@ namespace Elight.Entity
         [DataMember]
         public string? unitjc { get; set; }
 
+        /// <summary>
+        /// 单位经纬度
+        /// </summary>
+        [DataMember]
+        public string? lalon { get; set; }
+
         /// <summary>
         /// 是否删除 0否，1是
         /// </summary>

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
+{
+    /// <summary>
+    /// 设备管理
+    /// </summary>
+    [DataContract]
+    public class App_DeviceInput : Paging
+    {
+        [DataMember]
+        public string? Id { get; set; }
+        /// <summary>
+        /// 单位Id
+        /// </summary>
+        [DataMember]
+        public string? unitId { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        [DataMember]
+        public string? deviceno { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        [DataMember]
+        public string? name { get; set; }
+
+        /// <summary>
+        /// 安放位置
+        /// </summary>
+        [DataMember]
+        public string? position { get; set; }
+
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [DataMember]
+        public string? notes { get; set; }
+
+        /// <summary>
+        /// 设备状态：0：正常，1：离线，2：故障
+        /// </summary>
+        [DataMember]
+        public int? state { get; set; }
+    }
+}

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
+{
+    /// <summary>
+    /// 远程会见
+    /// </summary>
+    [DataContract]
+    public class App_RemoteInput : Paging
+    {
+        [DataMember]
+        public string? Id { get; set; }
+
+        /// <summary>
+        /// 单位Id
+        /// </summary>
+        [DataMember]
+        public string? unitId { get; set; }
+
+        /// <summary>
+        /// 会议号
+        /// </summary>
+        [DataMember]
+        public string? Code { get; set; }
+
+        /// <summary>
+        /// 会议名称
+        /// </summary>
+        [DataMember]
+        public string? name { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [DataMember]
+        public DateTime? sttime { get; set; }
+        
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [DataMember]
+        public DateTime? ettime { get; set; }
+
+        /// <summary>
+        /// 会见人Id
+        /// </summary>
+        [DataMember]
+        public string? meetwitId { get; set; }
+
+        /// <summary>
+        /// 会见人
+        /// </summary>
+        [DataMember]
+        public string? meetwitname { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [DataMember]
+        public string? notes { get; set; }
+
+        /// <summary>
+        /// 0:待开始，1已结束,2:会议取消
+        /// </summary>
+        [DataMember]
+        public int? state { get; set; }
+    }
+}

Elight.Logic/SystemModel/App_Sys_UnitInput.cs

@@ -38,6 +38,11 @@ namespace Elight.Logic.SystemModel
         /// </summary>
         [DataMember]
         public string? unitjc { get; set; }
+        /// <summary>
+        /// 单位经纬度
+        /// </summary>
+        [DataMember]
+        public string? lalon { get; set; }
     }
 }
 

Elight.Logic/SystemModel/App_Sys_UnitTree.cs

@@ -42,6 +42,12 @@ namespace Elight.Logic.SystemModel
         [DataMember]
         public string? unitjc { get; set; }
 
+        /// <summary>
+        /// 单位经纬度
+        /// </summary>
+        [DataMember]
+        public string? lalon { get; set; }
+
 
         /// <summary>
         /// 是否删除 0否，1是