Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

SafeCampus.API/SafeCampus.Application/Manager/DeepelephManager/DeepelephManager.cs

@@ -2,21 +2,14 @@
 using System.Drawing.Imaging;
 using System.Net.WebSockets;
 using System.Text;
-using Dm;
-using Masuit.Tools.Systems;
 using MoYu.DataEncryption;
 using MoYu.RemoteRequest.Extensions;
-using MoYu.Templates;
-using NewLife.Caching;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
 using SafeCampus.Application.Services.Business.AttendanceService;
 using SafeCampus.Application.Services.Business.ClassRoomCallService;
 using SafeCampus.Application.Services.Business.Warn.Dto;
 using SafeCampus.Application.Services.Business.Warn.Service;
-using SafeCampus.Core.Utils.TXYSMS;
-using TencentCloud.Nlp.V20190408.Models;
 
 namespace SafeCampus.Application.Manager.DeepelephManager;
 /// <summary>
@@ -214,6 +207,23 @@ public class DeepelephManager : IDeepelephManager, IScoped
                         var body = json["body"];
                         if (body != null)
                         {
+                            var model = new WarnInfoDto
+                            {
+                                TenantCode = body["tenantCode"]?.ToString(),
+                                PoiId = body["poiId"]?.ToString(),
+                                AlarmId = body["alarmId"]?.ToString(),
+                                AlarmType = body["alarmType"]?.ToString(),
+                                //AlarmTypeDesc = dayEnum.GetDescription(),
+                                CameraId = body["cameraId"]?.ToString(),
+                                Tick = TimestampToDateTime(body["tick"].ToString()),
+                                SnapshotUrl = body["snapshotUrl"]?.ToString(),
+                                Rects = body["rects"]?.ToString(),
+                                Tags = body["tags"]?.ToString(),
+                                Extend = body["extend"]?.ToString(),
+                                //PersonType = personEnum.GetDescription(),
+                                WarnHand = 0,
+                               
+                            };
                             PersonType personEnum;
                             if (!Enum.TryParse(body["alarmType"].ToString(), out AlarmType dayEnum))
                             {
@@ -223,9 +233,42 @@ public class DeepelephManager : IDeepelephManager, IScoped
                             if (body["extend"] != null)
                             {
                                 var extend = JsonConvert.DeserializeObject<JObject>(body["extend"].ToString());
+                                model.PersonId = extend?["personId"]?.ToString();
+                                model.PersonSetId =extend?["personSetId"]?.ToString();
+                                model.ClothId =extend?["clothId"]?.ToString();
+                                model.ClothsSetId =extend?["clothsSetId"]?.ToString();
+                                model.Gender =extend?["genderScore"]?.ToString();
+                                model.TrackId =extend?["trackId"]?.ToString();
+                                model.SpeedLevel =extend?["speedLevel"]?.ToString();
+                                if (extend["clothSimilarity"] !=null)
+                                    model.ClothSimilarity = extend?["clothSimilarity"]?.ParseToFloat();
+                                if (extend["count"] != null)
+                                    model.Count = extend?["count"]?.ParseToInt();
+                                if (extend["duration"] != null)
+                                    model.Duration = extend?["duration"]?.ParseToInt();
+                                if (extend["faceSimilarity"] != null)
+                                    model.FaceSimilarity = extend?["faceSimilarity"]?.ParseToFloat();
+                                if (extend["maxAroundTracks"] != null)
+                                    model.MaxAroundTracks = extend?["maxAroundTracks"]?.ParseToInt();
+
+                                if (extend["genderScore"] != null)
+                                {
+                                    if ((float)extend["genderScore"][0] > 0.6)
+                                    {
+                                        model.Gender = "男性";
+                                    }
+                                    else if ((float)extend["genderScore"][1] > 0.6)
+                                    {
+                                        model.Gender = "女性";
+                                    }
+                                    else if ((float)extend["genderScore"][2] > 0.6)
+                                    {
+                                        model.Gender = "不确定";
+                                    }
+                                }
                                 if (extend["personType"] != null)
                                 {
-                                    if (!Enum.TryParse(body["extend"]?["personType"]?.ToString(), out personEnum))
+                                    if (!Enum.TryParse(extend?["personType"]?.ToString(), out personEnum))
                                     {
                                         personEnum = PersonType.unkonwn;
                                     }
@@ -240,25 +283,13 @@ public class DeepelephManager : IDeepelephManager, IScoped
                             {
                                 personEnum = PersonType.unkonwn;
                             }
-                            var model = new WarnInfoDto
-                            {
-                                TenantCode = body["tenantCode"]?.ToString(),
-                                PoiId = body["poiId"]?.ToString(),
-                                AlarmId = body["alarmId"]?.ToString(),
-                                AlarmType = body["alarmType"]?.ToString(),
-                                AlarmTypeDesc = dayEnum.GetDescription(),
-                                CameraId = body["cameraId"]?.ToString(),
-                                Tick = TimestampToDateTime(body["tick"].ToString()),
-                                SnapshotUrl = body["snapshotUrl"]?.ToString(),
-                                Rects = body["rects"]?.ToString(),
-                                Tags = body["tags"]?.ToString(),
-                                Extend = body["extend"]?.ToString(),
-                                PersonType = personEnum.GetDescription(),
-                                WarnHand = 0,
-                            };
+
+                            model.AlarmTypeDesc = dayEnum.GetDescription();
+                            model.PersonType = personEnum.GetDescription();
+
                             var signImg = Path.Combine(Directory.GetCurrentDirectory(), "Files", App.Configuration["AppInfo:AlarmImg"], model.AlarmId + ".jpg");
                             var steam = await model.SnapshotUrl.GetAsByteArrayAsync();
-                            model.SnapshotUrl = $"http://192.168.10.186:8003/Files/alarmImg/{model.AlarmId}.jpg";
+                            model.SnapshotUrl = $"/Files/{App.Configuration["AppInfo:AlarmImg"]}/{model.AlarmId}.jpg";
                             using (MemoryStream ms = new MemoryStream(steam))
                             {
                                 using (Bitmap bmp = new Bitmap(ms))
@@ -384,9 +415,9 @@ public class DeepelephManager : IDeepelephManager, IScoped
                                 CreateTime = DateTime.Now,
                                 TrackId = body["TrackId"]?.ToString()
                             };
-                            var signImg = Path.Combine(Directory.GetCurrentDirectory(), "Files", App.Configuration["AppInfo:AlarmImg"], model.EventId + ".jpg");
+                            var signImg = Path.Combine(Directory.GetCurrentDirectory(), "Files", App.Configuration["AppInfo:RoomCallImg"], model.EventId + ".jpg");
                             var steam = await model.SnapshotUrl.GetAsByteArrayAsync();
-                            model.SnapshotUrl = $"http://192.168.10.186:8003/Files/roomCallImg/{model.EventId}.jpg";
+                            model.SnapshotUrl = $"/Files/{App.Configuration["AppInfo:RoomCallImg"]}/{model.EventId}.jpg";
                             using (MemoryStream ms = new MemoryStream(steam))
                             {
                                 using (Bitmap bmp = new Bitmap(ms))
@@ -443,7 +474,10 @@ public class DeepelephManager : IDeepelephManager, IScoped
         }
         LogHelper.WriteToLog("点名webSocket已关闭");
     }
-
+    /// <summary>
+    /// 订阅无感考勤
+    /// </summary>
+    /// <returns></returns>
     public async Task SubscriberAttendance()
     {
         var setting = App.GetOptionsMonitor<AppInfoOptions>();
@@ -502,12 +536,13 @@ public class DeepelephManager : IDeepelephManager, IScoped
                                 Rects = body["rects"]?.ToString(),
                                 Extend = body["extend"]?.ToString(),
                                 CreateTime = DateTime.Now,
-                                TrackId = body["TrackId"]?.ToString(),
+                                TrackId = body["trackId"]?.ToString(),
+                                IsAuto = true
 
                             };
-                            var signImg = Path.Combine(Directory.GetCurrentDirectory(), "Files", App.Configuration["AppInfo:AlarmImg"], model.EventId + ".jpg");
+                            var signImg = Path.Combine(Directory.GetCurrentDirectory(), "Files", App.Configuration["AppInfo:AttendanceImg"], model.EventId + ".jpg");
                             var steam = await model.SnapshotUrl.GetAsByteArrayAsync();
-                            model.SnapshotUrl = $"http://192.168.10.186:8003/Files/attendanceImg/{model.EventId}.jpg";
+                            model.SnapshotUrl = $"/Files/{App.Configuration["AppInfo:AttendanceImg"]}/{model.EventId}.jpg";
                             using (MemoryStream ms = new MemoryStream(steam))
                             {
                                 using (Bitmap bmp = new Bitmap(ms))

SafeCampus.API/SafeCampus.Application/SafeCampus.Application.csproj

@@ -23,8 +23,6 @@
     <ItemGroup>
         <Folder Include="Entity\" />
         <Folder Include="Manager\DeepelephManager\Dto\" />
-        <Folder Include="Services\Business\BuildingService\Dto\" />
-        <Folder Include="Services\Business\DormitoryService\Dto\" />
         <Folder Include="Services\Business\PersonFacesService\Dto\" />
     </ItemGroup>
 

SafeCampus.API/SafeCampus.Application/SafeCampus.Application.xml

@@ -37,6 +37,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:SafeCampus.Application.Manager.DeepelephManager.DeepelephManager.SubscriberAttendance">
+            <summary>
+            订阅无感考勤
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:SafeCampus.Application.Manager.DeepelephManager.DeepelephManager.TimestampToDateTime(System.String)">
             <summary>
             时间戳转本时区日期时间
@@ -304,6 +310,21 @@
             事件发生时间结束
             </summary>
         </member>
+        <member name="P:SafeCampus.Application.Services.Business.AttendanceService.BuildAttendanceSearch.BuildId">
+            <summary>
+            宿舍楼id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.AttendanceService.BuildAttendanceSearch.ReturnTime">
+            <summary>
+            归寝日期
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.AttendanceService.BuildAttendanceSearch.IsAuto">
+            <summary>
+            是否自动上报
+            </summary>
+        </member>
         <member name="M:SafeCampus.Application.Services.Business.AttendanceService.IAttendanceService.Add(SafeCampus.Application.Services.Business.AttendanceService.AttendanceDto)">
             <summary>
             添加考勤记录
@@ -325,6 +346,81 @@
             <param name="search"></param>
             <returns></returns>
         </member>
+        <member name="M:SafeCampus.Application.Services.Business.AttendanceService.IAttendanceService.GetPageListByBuild(SafeCampus.Application.Services.Business.AttendanceService.BuildAttendanceSearch)">
+            <summary>
+            根据寝室id和归寝时间获取宿舍楼的出入记录
+            </summary>
+            <param name="id"></param>
+            <param name="returnTime"></param>
+            <returns></returns>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto.Id">
+            <summary>
+            ID
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto.Name">
+            <summary>
+            宿舍楼名称
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto.Gender">
+            <summary>
+            男寝还是女寝
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto.InsCameraId">
+            <summary>
+            进入摄像头id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto.InsCameraName">
+            <summary>
+            摄像头名称
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto.OutCameraId">
+            <summary>
+            出去摄像头id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto.OutCameraName">
+            <summary>
+            出去摄像头名称
+            </summary>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.BuildingService.IBuildingService.Add(SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto)">
+            <summary>
+            添加
+            </summary>
+            <param name="input">添加参数</param>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.BuildingService.IBuildingService.Update(SafeCampus.Application.Services.Business.BuildingService.BuildingInfoDto)">
+            <summary>
+            修改
+            </summary>
+            <param name="input">添加参数</param>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.BuildingService.IBuildingService.Delete(System.Int64)">
+            <summary>
+            删除
+            </summary>
+            <param name="id">id</param>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.BuildingService.IBuildingService.GetNoPageList">
+            <summary>
+            获取列表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="P:SafeCampus.Application.Services.Business.CameraGroupService.CameraGroupAddInput.ParentId">
             <summary>
             父级id
@@ -891,6 +987,157 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoDto.Id">
+            <summary>
+            ID
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoDto.Name">
+            <summary>
+            寝室名称
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoDto.Gender">
+            <summary>
+            男寝还是女寝
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoDto.BuildId">
+            <summary>
+            所属宿舍楼id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoDto.PersonInfos">
+            <summary>
+            人员列表
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoDto.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoList.Id">
+            <summary>
+            ID
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoList.Name">
+            <summary>
+            寝室名称
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoList.Gender">
+            <summary>
+            男寝还是女寝
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoList.BuildId">
+            <summary>
+            所属宿舍楼id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoList.PersonCount">
+            <summary>
+            人员数量
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoList.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoSearch.Name">
+            <summary>
+            寝室名称
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoSearch.Gender">
+            <summary>
+            男寝还是女寝
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoSearch.BuildId">
+            <summary>
+            所属宿舍楼id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitorySetPersonInput.DormitoryId">
+            <summary>
+            寝室id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.DormitorySetPersonInput.PersonIds">
+            <summary>
+            人员id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.ReturnDormitoryISearch.ReturnTime">
+            <summary>
+            归寝查询日期（默认当天）
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.DormitoryService.ReturnDormitoryList.DormitoryCount">
+            <summary>
+            归寝人员数量
+            </summary>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.DormitoryService.IDormitoryService.Add(SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoDto)">
+            <summary>
+            添加
+            </summary>
+            <param name="input">添加参数</param>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.DormitoryService.IDormitoryService.Update(SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoDto)">
+            <summary>
+            修改
+            </summary>
+            <param name="input">添加参数</param>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.DormitoryService.IDormitoryService.GetInfo(System.Int64)">
+            <summary>
+            获取详情
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.DormitoryService.IDormitoryService.Delete(System.Int64)">
+            <summary>
+            删除
+            </summary>
+            <param name="id">id</param>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.DormitoryService.IDormitoryService.SetAssignPerson(SafeCampus.Application.Services.Business.DormitoryService.DormitorySetPersonInput)">
+            <summary>
+            给寝室分配人员
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.DormitoryService.IDormitoryService.GetPageList(SafeCampus.Application.Services.Business.DormitoryService.DormitoryInfoSearch)">
+            <summary>
+            获取列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.DormitoryService.IDormitoryService.GetReturnPageList(SafeCampus.Application.Services.Business.DormitoryService.ReturnDormitoryISearch)">
+            <summary>
+            查询归寝寝室列表
+            </summary>
+            <param name="search"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SafeCampus.Application.Services.Business.DormitoryService.IDormitoryService.GetReturnInfo(System.Int64,System.DateTime)">
+            <summary>
+            查询寝室归寝详情
+            </summary>
+            <param name="id"></param>
+            <param name="returnTime"></param>
+            <returns></returns>
+        </member>
         <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowDto.Id">
             <summary>
             主键Id
@@ -936,6 +1183,51 @@
             总数
             </summary>
         </member>
+        <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowList.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowList.ExtJson">
+            <summary>
+            分片Json信息
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowList.QueryTime">
+            <summary>
+            查询时间
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowList.StartTime">
+            <summary>
+            开始时间
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowList.EndTime">
+            <summary>
+            结束时间
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowList.CameraIds">
+            <summary>
+            摄像头id列表
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowList.CameraNames">
+            <summary>
+            摄像头名称列表
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowList.Split">
+            <summary>
+            分片类型
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowList.Total">
+            <summary>
+            总数
+            </summary>
+        </member>
         <member name="P:SafeCampus.Application.Services.Business.PassengerFlowService.Dto.PassengerFlowSearch.StartTime">
             <summary>
             开始时间
@@ -1025,7 +1317,7 @@
             寝室名称
             </summary>
         </member>
-        <member name="P:SafeCampus.Application.Services.Business.PersonInfoService.PersonInfoDto.PersonFacesList">
+        <member name="P:SafeCampus.Application.Services.Business.PersonInfoService.PersonInfoDto.Faces">
             <summary>
             人脸列表
             </summary>
@@ -1127,6 +1419,16 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.HandWarnInput.Id">
+            <summary>
+            预警id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.HandWarnInput.Remark">
+            <summary>
+            处理意见
+            </summary>
+        </member>
         <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.TenantCode">
             <summary>
             租户id
@@ -1187,6 +1489,71 @@
             人员名称
             </summary>
         </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.Gender">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.PersonSetId">
+            <summary>
+            班级id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.PersonSetName">
+            <summary>
+            班级名称
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.PersonId">
+            <summary>
+            人员id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.FaceSimilarity">
+            <summary>
+            人脸相似度
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.TrackId">
+            <summary>
+            人员跟踪id,同一个id表示是同一个人
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.ClothsSetId">
+            <summary>
+            服装库id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.ClothId">
+            <summary>
+            服装id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.ClothSimilarity">
+            <summary>
+            服装相似度
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.SpeedLevel">
+            <summary>
+            奔跑速度
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.MaxAroundTracks">
+            <summary>
+            奔跑时周围人数
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.Count">
+            <summary>
+            人群数量
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.Duration">
+            <summary>
+            持续时长
+            </summary>
+        </member>
         <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoDto.PersonType">
             <summary>
             人员类型
@@ -1262,6 +1629,21 @@
             人员名称
             </summary>
         </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoList.PersonSetId">
+            <summary>
+            班级id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoList.PersonSetName">
+            <summary>
+            班级名称
+            </summary>
+        </member>
+        <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoList.Gender">
+            <summary>
+            性别
+            </summary>
+        </member>
         <member name="P:SafeCampus.Application.Services.Business.Warn.Dto.WarnInfoList.PersonType">
             <summary>
             人员类型
@@ -1302,7 +1684,7 @@
             预警处理状态
             </summary>
         </member>
-        <member name="M:SafeCampus.Application.Services.Business.Warn.Service.IWarnInfoService.HandWarn(System.Int64,System.String)">
+        <member name="M:SafeCampus.Application.Services.Business.Warn.Service.IWarnInfoService.HandWarn(SafeCampus.Application.Services.Business.Warn.Dto.HandWarnInput)">
             <summary>
             处理预警
             </summary>

SafeCampus.API/SafeCampus.Application/Services/Business/AttendanceService/AttendanceService.cs

@@ -1,9 +1,14 @@
-namespace SafeCampus.Application.Services.Business.AttendanceService;
+using IP2Region.Net.XDB;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+
+namespace SafeCampus.Application.Services.Business.AttendanceService;
 
 public class AttendanceService:DbRepository<Attendance>, IAttendanceService
 {
     public async Task<bool> Add(AttendanceDto input)
     {
+        var buildingInfo = ChangeRepository<DbRepository<BuildingInfo>>();//切换仓储
+        var build = await buildingInfo.GetListAsync();
         var model = input.Adapt<Attendance>();
         //if (string.IsNullOrEmpty(model.PersonId))
         //{
@@ -22,6 +27,7 @@ public class AttendanceService:DbRepository<Attendance>, IAttendanceService
         //        return true;
         //    }
         //}
+        model.InsOut = build.Any(x=>x.InsCameraId==model.CameraId);
         await InsertAsync(model);
         return true;
     }
@@ -59,4 +65,18 @@ public class AttendanceService:DbRepository<Attendance>, IAttendanceService
             .ToListAsync();
         return list.Adapt<List<AttendanceList>>();
     }
+
+    public async Task<SqlSugarPagedList<AttendanceList>> GetPageListByBuild(BuildAttendanceSearch search)
+    {
+        var buildingInfo = ChangeRepository<DbRepository<BuildingInfo>>();//切换仓储
+        var build = await buildingInfo.GetFirstAsync(x => x.Id == search.BuildId);
+        var query = Context.Queryable<Attendance>()
+            //.Includes(x => x.CameraInfoItem)
+            .Where(x=>x.CameraId==build.InsCameraId||x.CameraId==build.OutCameraId)
+            .WhereIF(search.IsAuto.HasValue, x => x.IsAuto == search.IsAuto);
+
+        var list = await query.OrderByDescending(x => x.Tick)
+            .ToPagedListAsyncMapster<Attendance, AttendanceList>(search.PageNum, search.PageSize);
+        return list;
+    }
 }

SafeCampus.API/SafeCampus.Application/Services/Business/AttendanceService/Dto/BuildAttendanceSearch.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace SafeCampus.Application.Services.Business.AttendanceService;
+
+public class BuildAttendanceSearch:BasePageInput
+{
+    /// <summary>
+    /// 宿舍楼id
+    /// </summary>
+    [Required]
+    public long BuildId { get; set; }
+    /// <summary>
+    /// 归寝日期
+    /// </summary>
+    [Required]
+    public DateTime ReturnTime { get; set; }
+    /// <summary>
+    /// 是否自动上报
+    /// </summary>
+    public bool? IsAuto { get; set; }
+    
+}

SafeCampus.API/SafeCampus.Application/Services/Business/AttendanceService/IAttendanceService.cs

@@ -20,4 +20,11 @@ public interface IAttendanceService:ITransient
     /// <param name="search"></param>
     /// <returns></returns>
     Task<List<AttendanceList>> GetNoPageList(AttendanceSearch search);
+    /// <summary>
+    /// 根据寝室id和归寝时间获取宿舍楼的出入记录
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="returnTime"></param>
+    /// <returns></returns>
+    Task<SqlSugarPagedList<AttendanceList>> GetPageListByBuild(BuildAttendanceSearch search);
 }

SafeCampus.API/SafeCampus.Application/Services/Business/BuildingService/BuildingService.cs

@@ -1,6 +1,48 @@
 namespace SafeCampus.Application.Services.Business.BuildingService;
 
-public class BuildingService
+public class BuildingService:DbRepository<BuildingInfo>,IBuildingService
 {
-    
+    public async Task<bool> Add(BuildingInfoDto input)
+    {
+        var model = input.Adapt<BuildingInfo>();
+        await InsertAsync(model);
+        return true;
+    }
+
+    public async Task<bool> Update(BuildingInfoDto input)
+    {
+        if (!input.Id.HasValue)
+        {
+            throw Oops.Oh("请填写ID");
+        }
+        var model = await GetFirstAsync(p => p.Id == input.Id);
+        if (model == null)
+        {
+            throw Oops.Oh("信息不存在");
+        }
+        var res = input.Adapt(model);
+        await UpdateAsync(res);
+        return true;
+    }
+
+    public async Task<bool> Delete(long id)
+    {
+        var model = await GetFirstAsync(x => x.Id == id);
+        if (model == null)
+        {
+            throw Oops.Oh("信息不存在");
+        }
+        await DeleteAsync(model);
+        return true;
+    }
+
+    public async Task<List<BuildingInfoDto>> GetNoPageList()
+    {
+        var list = await Context.Queryable<BuildingInfo>()
+            .Includes(x => x.InsCameraInfoItem)
+            .Includes(x => x.OutCameraInfoItem)
+            .ToListAsync();
+        //var list = await GetListAsync();
+        return list.Adapt<List<BuildingInfoDto>>();
+    }
 }

SafeCampus.API/SafeCampus.Application/Services/Business/BuildingService/Dto/BuildingInfoDto.cs

@@ -0,0 +1,47 @@
+namespace SafeCampus.Application.Services.Business.BuildingService;
+
+public class BuildingInfoDto
+{
+    /// <summary>
+    /// ID
+    /// </summary>
+    public long? Id { get; set; }
+    /// <summary>
+    /// 宿舍楼名称
+    /// </summary>
+    public string Name { get; set; }
+    /// <summary>
+    /// 男寝还是女寝
+    /// </summary>
+    public bool Gender { get; set; }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+    /// <summary>
+    /// 进入摄像头id
+    /// </summary>
+    public string InsCameraId { get; set; }
+    /// <summary>
+    /// 摄像头名称
+    /// </summary>
+    public string InsCameraName { get; set;}
+    /// <summary>
+    /// 出去摄像头id
+    /// </summary>
+    public string OutCameraId { get; set; }
+    /// <summary>
+    /// 出去摄像头名称
+    /// </summary>
+    public string OutCameraName { get; set;}
+}
+
+public class BuildingInfoDtoMapper : IRegister
+{
+    public void Register(TypeAdapterConfig config)
+    {
+        config.ForType<BuildingInfo, BuildingInfoDto>()
+            .Map(x => x.InsCameraName, x => x.InsCameraInfoItem.SensorName)
+            .Map(x => x.OutCameraName, x => x.OutCameraInfoItem.SensorName);
+    }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/BuildingService/IBuildingService.cs

@@ -1,6 +1,29 @@
-namespace SafeCampus.Application.Services.Business.BuildingService;
+
+namespace SafeCampus.Application.Services.Business.BuildingService;
 
 public interface IBuildingService:ITransient
 {
-    
+    /// <summary>
+    /// 添加
+    /// </summary>
+    /// <param name="input">添加参数</param>
+    /// <returns></returns>
+    Task<bool> Add(BuildingInfoDto input);
+    /// <summary>
+    /// 修改
+    /// </summary>
+    /// <param name="input">添加参数</param>
+    /// <returns></returns>
+    Task<bool> Update(BuildingInfoDto input);
+    /// <summary>
+    /// 删除
+    /// </summary>
+    /// <param name="id">id</param>
+    /// <returns></returns>
+    Task<bool> Delete(long id);
+    /// <summary>
+    /// 获取列表
+    /// </summary>
+    /// <returns></returns>
+    Task<List<BuildingInfoDto>> GetNoPageList();
 }

SafeCampus.API/SafeCampus.Application/Services/Business/CameraGroupService/CameraGroupService.cs

@@ -11,11 +11,11 @@ public class CameraGroupService :DbRepository<CameraGroup>, ICameraGroupService
 
     public async Task<bool> Update(CameraGroupInput input)
     {
-        if (!input.ID.HasValue)
+        if (!input.Id.HasValue)
         {
             throw Oops.Oh("请填写ID");
         }
-        var model = await GetFirstAsync(p => p.Id == input.ID);
+        var model = await GetFirstAsync(p => p.Id == input.Id);
         if (model == null)
         {
             throw Oops.Oh("信息不存在");

SafeCampus.API/SafeCampus.Application/Services/Business/CameraGroupService/Dto/CameraGroupInput.cs

@@ -3,5 +3,5 @@
 public class CameraGroupInput
 {
     public string Name { get; set; }
-    public long? ID { get; set; }
+    public long? Id { get; set; }
 }

SafeCampus.API/SafeCampus.Application/Services/Business/ClassRoomCallService/ClassRoomCallService.cs

@@ -36,7 +36,7 @@ public class ClassRoomCallService : DbRepository<ClassRoomCall>, IClassRoomCallS
         //var res = input.Adapt(model);
         model.PersonSetId = input.PersonSetId;
         model.PersonId = input.PersonId;
-        await Context.Updateable<ClassRoomCall>()
+        await Context.Updateable(model)
             .UpdateColumns(x => new
             {
                 x.PersonSetId,

SafeCampus.API/SafeCampus.Application/Services/Business/DormitoryService/DormitoryService.cs

@@ -1,6 +1,109 @@
 namespace SafeCampus.Application.Services.Business.DormitoryService;
 
-public class DormitoryService
+public class DormitoryService:DbRepository<DormitoryInfo>,IDormitoryService
 {
-    
+    public async Task<bool> Add(DormitoryInfoDto input)
+    {
+        var model = input.Adapt<DormitoryInfo>();
+        await InsertAsync(model);
+        return true;
+    }
+
+    public async Task<bool> Update(DormitoryInfoDto input)
+    {
+        if (!input.Id.HasValue)
+        {
+            throw Oops.Oh("请填写ID");
+        }
+        var model = await GetFirstAsync(p => p.Id == input.Id);
+        if (model == null)
+        {
+            throw Oops.Oh("信息不存在");
+        }
+        var res = input.Adapt(model);
+        await UpdateAsync(res);
+        return true;
+    }
+
+    public async Task<DormitoryInfoDto> GetInfo(long id)
+    {
+        var query = await Context.Queryable<DormitoryInfo>()
+            .Includes(x => x.PersonInfos)
+            .FirstAsync(x => x.Id == id);
+        return query.Adapt<DormitoryInfoDto>();
+    }
+
+    public async Task<bool> Delete(long id)
+    {
+        var personInfo = ChangeRepository<DbRepository<PersonInfo>>();//切换仓储
+        var model = await GetFirstAsync(x => x.Id == id);
+        if (model == null)
+        {
+            throw Oops.Oh("信息不存在");
+        }
+
+        var isOK = await personInfo.IsAnyAsync(x => x.DormitoryId == model.Id);
+        if (isOK)
+        {
+            throw Oops.Oh("寝室下还有人员，请转移至其他寝室后在删除！");
+        }
+        await DeleteAsync(model);
+        return true;
+    }
+
+    public async Task<bool> SetAssignPerson(DormitorySetPersonInput input)
+    {
+        var model = await GetFirstAsync(x => x.Id == input.DormitoryId);
+        if (model == null)
+        {
+            throw Oops.Oh("寝室不存在");
+        }
+        var personInfo = ChangeRepository<DbRepository<PersonInfo>>();//切换仓储
+        await personInfo.Context.Updateable<PersonInfo>().SetColumns(x => x.DormitoryId == input.DormitoryId)
+            .Where(x => input.PersonIds.Contains(x.PersonId)).ExecuteCommandAsync();
+        return true;
+    }
+
+    public async Task<SqlSugarPagedList<DormitoryInfoList>> GetPageList(DormitoryInfoSearch search)
+    {
+        var query = Context.Queryable<DormitoryInfo>()
+            .Includes(x => x.PersonInfos)
+            .WhereIF(search.Gender.HasValue, x => x.Gender == search.Gender)
+            .WhereIF(!string.IsNullOrEmpty(search.Name), x => x.Name.Contains(search.Name))
+            .WhereIF(search.BuildId.HasValue, x => x.BuildId == search.BuildId);
+
+        var list = await query.OrderByDescending(x => x.CreateTime)
+            .ToPagedListAsyncMapster<DormitoryInfo, DormitoryInfoList>(search.PageNum, search.PageSize);
+        return list;
+    }
+
+    public async Task<SqlSugarPagedList<ReturnDormitoryList>> GetReturnPageList(ReturnDormitoryISearch search)
+    {
+        var buildingInfo = ChangeRepository<DbRepository<BuildingInfo>>();//切换仓储
+        var build = await buildingInfo.GetFirstAsync(x => x.Id == search.BuildId);
+        var query = Context.Queryable<DormitoryInfo>()
+            .Includes(x=>x.BuildingInfoItem)
+            .Includes(x1 => x1.PersonInfos,
+                xx => xx.Attendances
+                    .Where(x => x.Tick.Year == search.ReturnTime.Year && x.Tick.Month == search.ReturnTime.Month &&
+                                //x.Tick.Day == search.ReturnTime.Day&&x.CameraId== build.InsCameraId).ToList())
+                                x.Tick.Day == search.ReturnTime.Day).ToList())
+            .WhereIF(search.Gender.HasValue, x => x.Gender == search.Gender)
+            .WhereIF(!string.IsNullOrEmpty(search.Name), x => x.Name.Contains(search.Name))
+            .WhereIF(search.BuildId.HasValue, x => x.BuildId == search.BuildId);
+
+        var list = await query.OrderByDescending(x => x.CreateTime)
+            .ToPagedListAsyncMapster<DormitoryInfo, ReturnDormitoryList>(search.PageNum, search.PageSize);
+        return list;
+    }
+
+    public async Task<ReturnDormitoryDto> GetReturnInfo(long id, DateTime returnTime)
+    {
+        var query = await Context.Queryable<DormitoryInfo>()
+            .Includes(x => x.PersonInfos, xx => xx.Attendances.Where(x =>
+                    x.Tick.Year == returnTime.Year && x.Tick.Month == returnTime.Month &&
+                    x.Tick.Day == returnTime.Day).ToList())
+            .FirstAsync(x => x.Id == id);
+        return query.Adapt<ReturnDormitoryDto>();
+    }
 }

SafeCampus.API/SafeCampus.Application/Services/Business/DormitoryService/Dto/DormitoryInfoDto.cs

@@ -0,0 +1,30 @@
+namespace SafeCampus.Application.Services.Business.DormitoryService;
+
+public class DormitoryInfoDto
+{
+    /// <summary>
+    /// ID
+    /// </summary>
+    public long? Id { get; set; }
+    /// <summary>
+    /// 寝室名称
+    /// </summary>
+    public string Name { get; set; }
+    /// <summary>
+    /// 男寝还是女寝
+    /// </summary>
+    public bool Gender { get; set; }
+    /// <summary>
+    /// 所属宿舍楼id
+    /// </summary>
+    public long BuildId { get; set; }
+  
+    /// <summary>
+    /// 人员列表
+    /// </summary>
+    public List<PersonInfo> PersonInfos { get; set; }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/DormitoryService/Dto/DormitoryInfoList.cs

@@ -0,0 +1,37 @@
+namespace SafeCampus.Application.Services.Business.DormitoryService;
+
+public class DormitoryInfoList
+{
+    /// <summary>
+    /// ID
+    /// </summary>
+    public long? Id { get; set; }
+    /// <summary>
+    /// 寝室名称
+    /// </summary>
+    public string Name { get; set; }
+    /// <summary>
+    /// 男寝还是女寝
+    /// </summary>
+    public bool Gender { get; set; }
+    /// <summary>
+    /// 所属宿舍楼id
+    /// </summary>
+    public long BuildId { get; set; }
+    /// <summary>
+    /// 人员数量
+    /// </summary>
+    public int PersonCount { get; set; }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+}
+public class DormitoryInfoListMapper : IRegister
+{
+    public void Register(TypeAdapterConfig config)
+    {
+        config.ForType<DormitoryInfo, DormitoryInfoList>()
+            .Map(x => x.PersonCount, x => x.PersonInfos.Count);
+    }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/DormitoryService/Dto/DormitoryInfoSearch.cs

@@ -0,0 +1,17 @@
+namespace SafeCampus.Application.Services.Business.DormitoryService;
+
+public class DormitoryInfoSearch:BasePageInput
+{
+    /// <summary>
+    /// 寝室名称
+    /// </summary>
+    public string Name { get; set; }
+    /// <summary>
+    /// 男寝还是女寝
+    /// </summary>
+    public bool? Gender { get; set; }
+    /// <summary>
+    /// 所属宿舍楼id
+    /// </summary>
+    public  long? BuildId { get; set; }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/DormitoryService/Dto/DormitorySetPersonInput.cs

@@ -0,0 +1,13 @@
+namespace SafeCampus.Application.Services.Business.DormitoryService;
+
+public class DormitorySetPersonInput
+{
+    /// <summary>
+    /// 寝室id
+    /// </summary>
+    public long DormitoryId { get; set; }
+    /// <summary>
+    /// 人员id
+    /// </summary>
+    public List<string> PersonIds { get; set; }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/DormitoryService/Dto/ReturnDormitoryDto.cs

@@ -0,0 +1,17 @@
+using SafeCampus.Application.Services.Business.AttendanceService;
+
+namespace SafeCampus.Application.Services.Business.DormitoryService;
+
+public class ReturnDormitoryDto: DormitoryInfoDto
+{
+    public List<AttendanceDto> AttendanceDtos { get; set; }
+}
+public class ReturnDormitoryDtoMapper : IRegister
+{
+    public void Register(TypeAdapterConfig config)
+    {
+        config.ForType<DormitoryInfo, ReturnDormitoryDto>()
+            .Map(x => x.AttendanceDtos,
+                x => x.PersonInfos.Any(xx=>xx.Attendances.Any())? x.PersonInfos.SelectMany(xx => xx.Attendances):null);
+    }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/DormitoryService/Dto/ReturnDormitoryISearch.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace SafeCampus.Application.Services.Business.DormitoryService;
+
+public class ReturnDormitoryISearch: DormitoryInfoSearch
+{
+    /// <summary>
+    /// 归寝查询日期（默认当天）
+    /// </summary>
+    [Required]
+    public DateTime ReturnTime { get; set; }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/DormitoryService/Dto/ReturnDormitoryList.cs

@@ -0,0 +1,18 @@
+namespace SafeCampus.Application.Services.Business.DormitoryService;
+
+public class ReturnDormitoryList: DormitoryInfoList
+{
+    /// <summary>
+    /// 归寝人员数量
+    /// </summary>
+    public int DormitoryCount { get; set; }
+}
+public class ReturnDormitoryListMapper : IRegister
+{
+    public void Register(TypeAdapterConfig config)
+    {
+        config.ForType<DormitoryInfo, ReturnDormitoryList>()
+            .Map(x => x.DormitoryCount, x => x.PersonInfos.Sum(xx=>xx.Attendances.GroupBy(xxx=>xxx.PersonId).Count()))
+            .Map(x => x.PersonCount, x => x.PersonInfos.Count);
+    }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/DormitoryService/IDormitoryService.cs

@@ -2,5 +2,52 @@
 
 public interface IDormitoryService:ITransient
 {
-    
+    /// <summary>
+    /// 添加
+    /// </summary>
+    /// <param name="input">添加参数</param>
+    /// <returns></returns>
+    Task<bool> Add(DormitoryInfoDto input);
+    /// <summary>
+    /// 修改
+    /// </summary>
+    /// <param name="input">添加参数</param>
+    /// <returns></returns>
+    Task<bool> Update(DormitoryInfoDto input);
+    /// <summary>
+    /// 获取详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<DormitoryInfoDto> GetInfo(long id);
+    /// <summary>
+    /// 删除
+    /// </summary>
+    /// <param name="id">id</param>
+    /// <returns></returns>
+    Task<bool> Delete(long id);
+    /// <summary>
+    /// 给寝室分配人员
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<bool> SetAssignPerson(DormitorySetPersonInput input);
+    /// <summary>
+    /// 获取列表
+    /// </summary>
+    /// <returns></returns>
+    Task<SqlSugarPagedList<DormitoryInfoList>> GetPageList(DormitoryInfoSearch search);
+    /// <summary>
+    /// 查询归寝寝室列表
+    /// </summary>
+    /// <param name="search"></param>
+    /// <returns></returns>
+    Task<SqlSugarPagedList<ReturnDormitoryList>> GetReturnPageList(ReturnDormitoryISearch search);
+    /// <summary>
+    /// 查询寝室归寝详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="returnTime"></param>
+    /// <returns></returns>
+    Task<ReturnDormitoryDto> GetReturnInfo(long id,DateTime returnTime);
 }

SafeCampus.API/SafeCampus.Application/Services/Business/PassengerFlowService/Dto/PassengerFlowDto.cs

@@ -39,4 +39,5 @@ public class PassengerFlowDto
     /// 总数
     /// </summary>
     public int Total { get; set; }
-}
+}
+

SafeCampus.API/SafeCampus.Application/Services/Business/PassengerFlowService/Dto/PassengerFlowList.cs

@@ -0,0 +1,42 @@
+namespace SafeCampus.Application.Services.Business.PassengerFlowService.Dto;
+
+public class PassengerFlowList
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 分片Json信息
+    /// </summary>
+    public string ExtJson { get; set; }
+    /// <summary>
+    /// 查询时间
+    /// </summary>
+    public DateTime QueryTime { get; set; }
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    public DateTime StartTime { get; set; }
+    /// <summary>
+    /// 结束时间
+    /// </summary>
+    public DateTime EndTime { get; set; }
+    /// <summary>
+    /// 摄像头id列表
+    /// </summary>
+    public string CameraIds { get; set; }
+    /// <summary>
+    /// 摄像头名称列表
+    /// </summary>
+    public string CameraNames { get; set; }
+    /// <summary>
+    /// 分片类型
+    /// </summary>
+    public bool Split { get; set; }
+    /// <summary>
+    /// 总数
+    /// </summary>
+    public int Total { get; set; }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/PassengerFlowService/IPassengerFlowService.cs

@@ -15,5 +15,5 @@ public interface IPassengerFlowService : ITransient
     /// </summary>
     /// <param name="search"></param>
     /// <returns></returns>
-    Task<SqlSugarPagedList<PassengerFlowDto>> GetPageList(PassengerFlowSearch search);
+    Task<SqlSugarPagedList<PassengerFlowList>> GetPageList(PassengerFlowSearch search);
 }

SafeCampus.API/SafeCampus.Application/Services/Business/PassengerFlowService/PassengerFlowService.cs

@@ -22,7 +22,7 @@ public class PassengerFlowService:DbRepository<PassengerFlow>, IPassengerFlowSer
         return true;
     }
 
-    public async Task<SqlSugarPagedList<PassengerFlowDto>> GetPageList(PassengerFlowSearch search)
+    public async Task<SqlSugarPagedList<PassengerFlowList>> GetPageList(PassengerFlowSearch search)
     {
         var query = Context.Queryable<PassengerFlow>()
             .WhereIF(search.Split.HasValue, x => x.Split == search.Split)
@@ -31,7 +31,7 @@ public class PassengerFlowService:DbRepository<PassengerFlow>, IPassengerFlowSer
             .WhereIF(search.EndTime.HasValue, x => x.QueryTime <= search.EndTime);
 
         var list = await query.OrderByDescending(x => x.QueryTime)
-            .ToPagedListAsyncMapster<PassengerFlow, PassengerFlowDto>(search.PageNum, search.PageSize);
+            .ToPagedListAsyncMapster<PassengerFlow, PassengerFlowList>(search.PageNum, search.PageSize);
         return list;
     }
 }

SafeCampus.API/SafeCampus.Application/Services/Business/PersonInfoService/Dto/PersonInfoDto.cs

@@ -49,7 +49,7 @@ public class PersonInfoDto
     /// <summary>
     /// 人脸列表
     /// </summary>
-    public List<PersonFaces> PersonFacesList { get; set; }
+    public List<PersonFaces> Faces { get; set; }
     /// <summary>
     /// 创建时间
     /// </summary>
@@ -63,6 +63,7 @@ public class PersonInfoDtoMapper : IRegister
             //.Map(dest => dest.CameraName, src => src.CameraId.GetDescriptionByEnum<CameraType>());
             .Map(dest => dest.PersonSetId, src => src.PersonSetId)
             .Map(dest => dest.PersonSetName, src => src.PersonSetInfoItem.PersonSetName)
+            .Map(dest => dest.Faces, src => src.PersonFacesList)
             .Map(dest => dest.DormitoryName, src => src.DormitoryInfoItem.Name);
     }
 }

SafeCampus.API/SafeCampus.Application/Services/Business/PersonInfoService/PersonInfoService.cs

@@ -27,7 +27,11 @@ public class PersonInfoService:DbRepository<PersonInfo>, IPersonInfoService
 
     public async Task<PersonInfoDto> GetInfo(string id)
     {
-        var model = await GetFirstAsync(x => x.PersonId == id);
+        var model = await Context.Queryable<PersonInfo>()
+            .Includes(x => x.DormitoryInfoItem)
+            .Includes(x => x.PersonSetInfoItem)
+            .Includes(x => x.PersonFacesList)
+            .FirstAsync(x => x.PersonId == id);
         if (model == null)
         {
             return null;
@@ -64,8 +68,8 @@ public class PersonInfoService:DbRepository<PersonInfo>, IPersonInfoService
             .Includes(x=>x.PersonFacesList)
             .Includes(x=>x.DormitoryInfoItem)
             .WhereIF(!string.IsNullOrEmpty(search.PersonSetId), x => x.PersonSetId == search.PersonSetId)
-            .WhereIF(!string.IsNullOrEmpty(search.PersonName), x => x.Name == search.PersonName)
-            .WhereIF(!string.IsNullOrEmpty(search.Phone), x => x.Phone == search.Phone);
+            .WhereIF(!string.IsNullOrEmpty(search.PersonName), x => x.Name.Contains(search.PersonName))
+            .WhereIF(!string.IsNullOrEmpty(search.Phone), x => x.Phone.Contains(search.Phone));
 
         var list = await query.OrderByDescending(x => x.CreateTime)
             .ToPagedListAsyncMapster<PersonInfo, PersonInfoDto>(search.PageNum, search.PageSize);

SafeCampus.API/SafeCampus.Application/Services/Business/Warn/Dto/HandWarnInput.cs

@@ -0,0 +1,14 @@
+namespace SafeCampus.Application.Services.Business.Warn.Dto;
+
+public class HandWarnInput
+{
+    /// <summary>
+    /// 预警id
+    /// </summary>
+    public long Id { get; set; }
+    /// <summary>
+    /// 处理意见
+    /// </summary>
+    public string Remark { get; set; }
+
+}

SafeCampus.API/SafeCampus.Application/Services/Business/Warn/Dto/WarnInfoDto.cs

@@ -54,6 +54,58 @@ public class WarnInfoDto
     /// </summary>
     public string PersonName { get; set; }
     /// <summary>
+    /// 性别
+    /// </summary>
+    public string Gender { get; set; }
+    /// <summary>
+    /// 班级id
+    /// </summary>
+    public string PersonSetId { get; set; }
+    /// <summary>
+    /// 班级名称
+    /// </summary>
+    public string PersonSetName { get; set; }
+    /// <summary>
+    /// 人员id
+    /// </summary>
+    public string PersonId { get; set; }
+    /// <summary>
+    /// 人脸相似度
+    /// </summary>
+    public float? FaceSimilarity { get; set; }
+    /// <summary>
+    /// 人员跟踪id,同一个id表示是同一个人
+    /// </summary>
+    public string TrackId { get; set; }
+    /// <summary>
+    /// 服装库id
+    /// </summary>
+    public string ClothsSetId { get; set; }
+    /// <summary>
+    /// 服装id
+    /// </summary>
+    public string ClothId { get; set; }
+    /// <summary>
+    /// 服装相似度
+    /// </summary>
+    public float? ClothSimilarity { get; set; }
+    /// <summary>
+    /// 奔跑速度
+    /// </summary>
+    public string SpeedLevel { get; set; }
+    /// <summary>
+    /// 奔跑时周围人数
+    /// </summary>
+    public int? MaxAroundTracks { get; set; }
+    /// <summary>
+    /// 人群数量
+    /// </summary>
+    public int? Count { get; set; }
+    /// <summary>
+    /// 持续时长
+    /// </summary>
+    public int? Duration { get; set; }
+    /// <summary>
     /// 人员类型
     /// </summary>
     public string PersonType { get; set; }
@@ -78,3 +130,14 @@ public class WarnInfoDto
     /// </summary>
     public DateTime? HandTime { get; set; }
 }
+public class WarnInfoDtoMapper : IRegister
+{
+    public void Register(TypeAdapterConfig config)
+    {
+        config.ForType<WarnInfo, WarnInfoDto>()
+            //.Map(dest => dest.CameraName, src => src.CameraId.GetDescriptionByEnum<CameraType>());
+            .Map(x => x.PersonSetName,x=>x.PersonSetInfoItem.PersonSetName)
+            .Map(x => x.PersonName,x=>x.PersonInfoItem.Name)
+            .Map(dest => dest.CameraName, src => src.CameraInfoItem.SensorName);
+    }
+}

SafeCampus.API/SafeCampus.Application/Services/Business/Warn/Dto/WarnInfoList.cs

@@ -41,6 +41,18 @@ public class WarnInfoList
     /// </summary>
     public string PersonName { get; set; }
     /// <summary>
+    /// 班级id
+    /// </summary>
+    public string PersonSetId { get; set; }
+    /// <summary>
+    /// 班级名称
+    /// </summary>
+    public string PersonSetName { get; set; }
+    /// <summary>
+    /// 性别
+    /// </summary>
+    public string Gender { get; set; }
+    /// <summary>
     /// 人员类型
     /// </summary>
     public string PersonType { get; set; }
@@ -60,6 +72,8 @@ public class WarnInfoListMapper : IRegister
         config.ForType<WarnInfo, WarnInfoList>()
             //.Map(dest => dest.CameraName, src => src.CameraId.GetDescriptionByEnum<CameraType>());
             .Map(dest => dest.CameraName, src => src.CameraInfoItem.SensorName)
+            .Map(x=>x.PersonName,x=>x.PersonInfoItem.Name)
+            .Map(x=>x.PersonSetName,x=>x.PersonSetInfoItem.PersonSetName)
             .Map(dest => dest.CameraGroup, src => src.CameraInfoItem.CameraGroupItem.Name);
     }
 }

SafeCampus.API/SafeCampus.Application/Services/Business/Warn/Service/IWarnInfoService.cs

@@ -10,7 +10,7 @@ public interface IWarnInfoService:IApiBaseInterface<WarnInfoDto, WarnInfoList, W
     /// <param name="id"></param>
     /// <param name="remark"></param>
     /// <returns></returns>
-    Task<bool> HandWarn(long id,string remark);
+    Task<bool> HandWarn(HandWarnInput input);
     /// <summary>
     /// 获取列表不分页
     /// </summary>

SafeCampus.API/SafeCampus.Application/Services/Business/Warn/Service/WarnInfoService.cs

@@ -53,7 +53,11 @@ public class WarnInfoService:DbRepository<WarnInfo>, IWarnInfoService,ITransient
 
     public async Task<WarnInfoDto> GetInfo(long Id)
     {
-        var model = await Context.Queryable<WarnInfo>().Includes(x=>x.CameraInfoItem).Where(x=>x.Id==Id).FirstAsync();
+        var model = await Context.Queryable<WarnInfo>()
+            .Includes(x=>x.CameraInfoItem)
+            .Includes(x => x.PersonInfoItem)
+            .Includes(x => x.PersonSetInfoItem)
+            .FirstAsync(x => x.Id == Id);
         if (model == null)
         {
             throw Oops.Oh("信息不存在！");
@@ -93,6 +97,8 @@ public class WarnInfoService:DbRepository<WarnInfo>, IWarnInfoService,ITransient
        
         var query = Context.Queryable<WarnInfo>()
             .Includes(x=>x.CameraInfoItem)
+            .Includes(x=>x.PersonInfoItem)
+            .Includes(x=>x.PersonSetInfoItem)
             .WhereIF(search.WarnHand.HasValue, x => x.WarnHand == search.WarnHand)
             .WhereIF(!string.IsNullOrEmpty(search.AlarmType),x => x.AlarmType == search.AlarmType)
             .WhereIF(!string.IsNullOrEmpty(search.CameraId), x => x.CameraId == search.CameraId)
@@ -107,14 +113,14 @@ public class WarnInfoService:DbRepository<WarnInfo>, IWarnInfoService,ITransient
 
     }
 
-    public async Task<bool> HandWarn(long id, string remark)
+    public async Task<bool> HandWarn(HandWarnInput input)
     {
-        var model = await GetFirstAsync(p => p.Id == id);
+        var model = await GetFirstAsync(p => p.Id == input.Id);
         if (model == null)
         {
             throw Oops.Oh("信息不存在！");
         }
-        model.Remark = remark;
+        model.Remark = input.Remark;
         model.WarnHand = 1;
         model.HandTime = DateTime.Now;
         await UpdateAsync(model);

SafeCampus.API/SafeCampus.Application/obj/Debug/net6.0/SafeCampus.Application.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Application")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Application")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Application")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Application/obj/Debug/net6.0/SafeCampus.Application.AssemblyInfoInputs.cache

@@ -1 +1 @@
-70bc5289494d16bc959530194a004c3b74cb88c74bc6afbffd4652a594d9558d
+13d08345706d9cc702038fbc16aeea8f054b206dee59f83a95fad54c7fc11d7c

SafeCampus.API/SafeCampus.Application/obj/Debug/net7.0/SafeCampus.Application.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Application")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Application")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Application")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Application/obj/Debug/net7.0/SafeCampus.Application.AssemblyInfoInputs.cache

@@ -1 +1 @@
-70bc5289494d16bc959530194a004c3b74cb88c74bc6afbffd4652a594d9558d
+13d08345706d9cc702038fbc16aeea8f054b206dee59f83a95fad54c7fc11d7c

SafeCampus.API/SafeCampus.Application/obj/Debug/net8.0/SafeCampus.Application.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Application")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Application")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Application")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Application/obj/Debug/net8.0/SafeCampus.Application.AssemblyInfoInputs.cache

@@ -1 +1 @@
-70bc5289494d16bc959530194a004c3b74cb88c74bc6afbffd4652a594d9558d
+13d08345706d9cc702038fbc16aeea8f054b206dee59f83a95fad54c7fc11d7c

SafeCampus.API/SafeCampus.Application/obj/SafeCampus.Application.csproj.nuget.dgspec.json

@@ -124,6 +124,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     },
     "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Cache\\SafeCampus.Cache.csproj": {
@@ -264,6 +269,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     },
     "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Core\\SafeCampus.Core.csproj": {
@@ -536,6 +546,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     },
     "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Plugin\\SafeCampus.Plugin.Aop\\SafeCampus.Plugin.Aop.csproj": {
@@ -658,6 +673,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     },
     "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.SqlSugar\\SafeCampus.SqlSugar.csproj": {
@@ -798,6 +818,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     },
     "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.System\\SafeCampus.System.csproj": {
@@ -971,6 +996,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     }
   }

SafeCampus.API/SafeCampus.Application/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "kAt7Z4rcXRuB3cYmj09KCUb/5aGTknaeZuAQSrhoe1ylvq25s1tym+OyuV9nmkpcsHJ1Zf+HQTvCRnevIX+beQ==",
+  "dgSpecHash": "c2pqXFRmJq7envzaQJtEcB4IToioHqra9ydxhZr59Vt/yUEld3SvXDDpMWrGsXSunLyep2XQn5XwUxcRnGQWgg==",
   "success": true,
   "projectFilePath": "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Application\\SafeCampus.Application.csproj",
   "expectedPackageFiles": [
@@ -112,6 +112,23 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\oscar.data.sqlclient\\4.0.4\\oscar.data.sqlclient.4.0.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\portable.bouncycastle\\1.9.0\\portable.bouncycastle.1.9.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.collections\\4.3.0\\runtime.any.system.collections.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.diagnostics.tracing\\4.3.0\\runtime.any.system.diagnostics.tracing.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.globalization\\4.3.0\\runtime.any.system.globalization.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.io\\4.3.0\\runtime.any.system.io.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection\\4.3.0\\runtime.any.system.reflection.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.extensions\\4.3.0\\runtime.any.system.reflection.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.primitives\\4.3.0\\runtime.any.system.reflection.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.resources.resourcemanager\\4.3.0\\runtime.any.system.resources.resourcemanager.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime\\4.3.0\\runtime.any.system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.handles\\4.3.0\\runtime.any.system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.interopservices\\4.3.0\\runtime.any.system.runtime.interopservices.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding\\4.3.0\\runtime.any.system.text.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding.extensions\\4.3.0\\runtime.any.system.text.encoding.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.threading.tasks\\4.3.0\\runtime.any.system.threading.tasks.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.diagnostics.debug\\4.3.0\\runtime.win.system.diagnostics.debug.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.io.filesystem\\4.3.0\\runtime.win.system.io.filesystem.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.runtime.extensions\\4.3.0\\runtime.win.system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpcompress\\0.37.2\\sharpcompress.0.37.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpziplib\\1.4.2\\sharpziplib.1.4.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\simpleredis\\1.1.9\\simpleredis.1.1.9.nupkg.sha512",
@@ -134,6 +151,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.5.0\\swashbuckle.aspnetcore.swagger.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.5.0\\swashbuckle.aspnetcore.swaggergen.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.5.0\\swashbuckle.aspnetcore.swaggerui.6.5.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.3.0\\system.buffers.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.codedom\\8.0.0\\system.codedom.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
@@ -181,6 +199,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.memory\\4.5.3\\system.memory.4.5.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.private.uri\\4.3.0\\system.private.uri.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive\\5.0.0\\system.reactive.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive.linq\\5.0.0\\system.reactive.linq.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
@@ -197,6 +216,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
@@ -210,12 +230,14 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\6.0.0\\system.text.encoding.codepages.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\7.0.0\\system.text.encoding.codepages.7.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\8.0.0\\system.text.encoding.codepages.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encodings.web\\8.0.0\\system.text.encodings.web.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.0\\system.text.json.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.3\\system.text.json.8.0.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.regularexpressions\\4.3.1\\system.text.regularexpressions.4.3.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.channels\\8.0.0\\system.threading.channels.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.overlapped\\4.3.0\\system.threading.overlapped.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",

SafeCampus.API/SafeCampus.Cache/obj/Debug/net6.0/SafeCampus.Cache.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Cache")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Cache")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Cache")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Cache/obj/Debug/net6.0/SafeCampus.Cache.AssemblyInfoInputs.cache

@@ -1 +1 @@
-9ff22ea910012ec4dbd1dd0c390cf6303ec8e88739b24c41c5efb3d456c7ac32
+64b38f408a403d07afa3333f7b3a09824ccaec3ee71ef8f567ee72a5a13cebed

SafeCampus.API/SafeCampus.Cache/obj/Debug/net7.0/SafeCampus.Cache.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Cache")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Cache")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Cache")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Cache/obj/Debug/net7.0/SafeCampus.Cache.AssemblyInfoInputs.cache

@@ -1 +1 @@
-9ff22ea910012ec4dbd1dd0c390cf6303ec8e88739b24c41c5efb3d456c7ac32
+64b38f408a403d07afa3333f7b3a09824ccaec3ee71ef8f567ee72a5a13cebed

SafeCampus.API/SafeCampus.Cache/obj/Debug/net8.0/SafeCampus.Cache.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Cache")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Cache")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Cache")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Cache/obj/Debug/net8.0/SafeCampus.Cache.AssemblyInfoInputs.cache

@@ -1 +1 @@
-9ff22ea910012ec4dbd1dd0c390cf6303ec8e88739b24c41c5efb3d456c7ac32
+64b38f408a403d07afa3333f7b3a09824ccaec3ee71ef8f567ee72a5a13cebed

SafeCampus.API/SafeCampus.Cache/obj/SafeCampus.Cache.csproj.nuget.dgspec.json

@@ -142,6 +142,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     },
     "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Core\\SafeCampus.Core.csproj": {
@@ -414,6 +419,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     }
   }

SafeCampus.API/SafeCampus.Cache/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "t9HMX1FcLhEStgZaVpCzN98xhmd1HnmKT7gh8EWP1GZt2GPCukFB+tQdMTB+WapbaHW7SDvwwm6tezc/CrqJ/A==",
+  "dgSpecHash": "lB/cWKH/PNwj7/I7/qHm/cymyP2vsohK4xla9Ri7BW5oETMjSxP0B5OnTkKkdSGtKCxZHBX1+F6teumeSUPWoQ==",
   "success": true,
   "projectFilePath": "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Cache\\SafeCampus.Cache.csproj",
   "expectedPackageFiles": [
@@ -97,6 +97,23 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\portable.bouncycastle\\1.9.0\\portable.bouncycastle.1.9.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.collections\\4.3.0\\runtime.any.system.collections.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.diagnostics.tracing\\4.3.0\\runtime.any.system.diagnostics.tracing.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.globalization\\4.3.0\\runtime.any.system.globalization.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.io\\4.3.0\\runtime.any.system.io.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection\\4.3.0\\runtime.any.system.reflection.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.extensions\\4.3.0\\runtime.any.system.reflection.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.primitives\\4.3.0\\runtime.any.system.reflection.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.resources.resourcemanager\\4.3.0\\runtime.any.system.resources.resourcemanager.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime\\4.3.0\\runtime.any.system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.handles\\4.3.0\\runtime.any.system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.interopservices\\4.3.0\\runtime.any.system.runtime.interopservices.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding\\4.3.0\\runtime.any.system.text.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding.extensions\\4.3.0\\runtime.any.system.text.encoding.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.threading.tasks\\4.3.0\\runtime.any.system.threading.tasks.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.diagnostics.debug\\4.3.0\\runtime.win.system.diagnostics.debug.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.io.filesystem\\4.3.0\\runtime.win.system.io.filesystem.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.runtime.extensions\\4.3.0\\runtime.win.system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpcompress\\0.37.2\\sharpcompress.0.37.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpziplib\\1.4.2\\sharpziplib.1.4.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\simpleredis\\1.1.9\\simpleredis.1.1.9.nupkg.sha512",
@@ -111,6 +128,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.5.0\\swashbuckle.aspnetcore.swagger.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.5.0\\swashbuckle.aspnetcore.swaggergen.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.5.0\\swashbuckle.aspnetcore.swaggerui.6.5.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.3.0\\system.buffers.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.codedom\\8.0.0\\system.codedom.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
@@ -150,6 +168,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.management\\8.0.0\\system.management.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.private.uri\\4.3.0\\system.private.uri.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive\\5.0.0\\system.reactive.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive.linq\\5.0.0\\system.reactive.linq.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
@@ -165,6 +184,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
@@ -174,12 +194,14 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\6.0.0\\system.text.encoding.codepages.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\7.0.0\\system.text.encoding.codepages.7.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\8.0.0\\system.text.encoding.codepages.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encodings.web\\8.0.0\\system.text.encodings.web.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.0\\system.text.json.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.3\\system.text.json.8.0.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.regularexpressions\\4.3.1\\system.text.regularexpressions.4.3.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.channels\\8.0.0\\system.threading.channels.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.overlapped\\4.3.0\\system.threading.overlapped.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",

SafeCampus.API/SafeCampus.Core/obj/Debug/net6.0/SafeCampus.Core.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Core")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Core")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Core")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Core/obj/Debug/net6.0/SafeCampus.Core.AssemblyInfoInputs.cache

@@ -1 +1 @@
-d235d94859b15be85258d0324847b1ad0158db2c0386682015736134eb38631e
+5dc42481238150072f93285701628eed4b9aff8c381353af63dac672eb8e55e7

SafeCampus.API/SafeCampus.Core/obj/Debug/net7.0/SafeCampus.Core.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Core")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Core")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Core")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Core/obj/Debug/net7.0/SafeCampus.Core.AssemblyInfoInputs.cache

@@ -1 +1 @@
-d235d94859b15be85258d0324847b1ad0158db2c0386682015736134eb38631e
+5dc42481238150072f93285701628eed4b9aff8c381353af63dac672eb8e55e7

SafeCampus.API/SafeCampus.Core/obj/Debug/net8.0/SafeCampus.Core.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Core")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Core")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Core")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Core/obj/Debug/net8.0/SafeCampus.Core.AssemblyInfoInputs.cache

@@ -1 +1 @@
-d235d94859b15be85258d0324847b1ad0158db2c0386682015736134eb38631e
+5dc42481238150072f93285701628eed4b9aff8c381353af63dac672eb8e55e7

SafeCampus.API/SafeCampus.Core/obj/SafeCampus.Core.csproj.nuget.dgspec.json

@@ -274,6 +274,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     }
   }

SafeCampus.API/SafeCampus.Core/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "wOp1AXrPJb+oebW1K6qpmIb7RKznNMeSg5wyuvOSLfVG4tqbyDNpLUUQG5f3tRwKlBFxLiB6cY/Od0f6sx6uPQ==",
+  "dgSpecHash": "gWTj0UMVO8MvM0Apy3rz0HhGB7KYxYHVG6fxMGtboHuBDLKKX+aolH89kLR9W/C4WmUctg8Nqr10d6bq5WuQsg==",
   "success": true,
   "projectFilePath": "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Core\\SafeCampus.Core.csproj",
   "expectedPackageFiles": [
@@ -96,6 +96,23 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\portable.bouncycastle\\1.9.0\\portable.bouncycastle.1.9.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.collections\\4.3.0\\runtime.any.system.collections.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.diagnostics.tracing\\4.3.0\\runtime.any.system.diagnostics.tracing.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.globalization\\4.3.0\\runtime.any.system.globalization.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.io\\4.3.0\\runtime.any.system.io.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection\\4.3.0\\runtime.any.system.reflection.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.extensions\\4.3.0\\runtime.any.system.reflection.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.primitives\\4.3.0\\runtime.any.system.reflection.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.resources.resourcemanager\\4.3.0\\runtime.any.system.resources.resourcemanager.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime\\4.3.0\\runtime.any.system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.handles\\4.3.0\\runtime.any.system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.interopservices\\4.3.0\\runtime.any.system.runtime.interopservices.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding\\4.3.0\\runtime.any.system.text.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding.extensions\\4.3.0\\runtime.any.system.text.encoding.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.threading.tasks\\4.3.0\\runtime.any.system.threading.tasks.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.diagnostics.debug\\4.3.0\\runtime.win.system.diagnostics.debug.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.io.filesystem\\4.3.0\\runtime.win.system.io.filesystem.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.runtime.extensions\\4.3.0\\runtime.win.system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpcompress\\0.37.2\\sharpcompress.0.37.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpziplib\\1.4.2\\sharpziplib.1.4.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\simpletool\\1.0.6\\simpletool.1.0.6.nupkg.sha512",
@@ -109,6 +126,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.5.0\\swashbuckle.aspnetcore.swagger.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.5.0\\swashbuckle.aspnetcore.swaggergen.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.5.0\\swashbuckle.aspnetcore.swaggerui.6.5.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.3.0\\system.buffers.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.codedom\\8.0.0\\system.codedom.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
@@ -148,6 +166,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.management\\8.0.0\\system.management.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.private.uri\\4.3.0\\system.private.uri.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive\\5.0.0\\system.reactive.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive.linq\\5.0.0\\system.reactive.linq.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
@@ -163,6 +182,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
@@ -172,12 +192,14 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\6.0.0\\system.text.encoding.codepages.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\7.0.0\\system.text.encoding.codepages.7.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\8.0.0\\system.text.encoding.codepages.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encodings.web\\8.0.0\\system.text.encodings.web.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.0\\system.text.json.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.3\\system.text.json.8.0.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.regularexpressions\\4.3.1\\system.text.regularexpressions.4.3.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.channels\\8.0.0\\system.threading.channels.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.overlapped\\4.3.0\\system.threading.overlapped.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",

SafeCampus.API/SafeCampus.Plugin/SafeCampus.Plugin.Aop/obj/Debug/net6.0/SafeCampus.Plugin.Aop.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Plugin.Aop")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Plugin.Aop")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Plugin.Aop")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Plugin/SafeCampus.Plugin.Aop/obj/Debug/net6.0/SafeCampus.Plugin.Aop.AssemblyInfoInputs.cache

@@ -1 +1 @@
-8e72a271e93584a1d649b052f70fd0ccf263aaa907ccc6879c39d669728ef487
+937b385dbc8fa12ee357cf285aa85d56800c2bdd3a086c9aa8100aedebee9f37

SafeCampus.API/SafeCampus.Plugin/SafeCampus.Plugin.Aop/obj/Debug/net7.0/SafeCampus.Plugin.Aop.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Plugin.Aop")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Plugin.Aop")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Plugin.Aop")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Plugin/SafeCampus.Plugin.Aop/obj/Debug/net7.0/SafeCampus.Plugin.Aop.AssemblyInfoInputs.cache

@@ -1 +1 @@
-8e72a271e93584a1d649b052f70fd0ccf263aaa907ccc6879c39d669728ef487
+937b385dbc8fa12ee357cf285aa85d56800c2bdd3a086c9aa8100aedebee9f37

SafeCampus.API/SafeCampus.Plugin/SafeCampus.Plugin.Aop/obj/Debug/net8.0/SafeCampus.Plugin.Aop.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.Plugin.Aop")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.Plugin.Aop")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.Plugin.Aop")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.Plugin/SafeCampus.Plugin.Aop/obj/Debug/net8.0/SafeCampus.Plugin.Aop.AssemblyInfoInputs.cache

@@ -1 +1 @@
-8e72a271e93584a1d649b052f70fd0ccf263aaa907ccc6879c39d669728ef487
+937b385dbc8fa12ee357cf285aa85d56800c2bdd3a086c9aa8100aedebee9f37

SafeCampus.API/SafeCampus.Plugin/SafeCampus.Plugin.Aop/obj/SafeCampus.Plugin.Aop.csproj.nuget.dgspec.json

@@ -142,6 +142,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     },
     "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Core\\SafeCampus.Core.csproj": {
@@ -414,6 +419,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     },
     "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Plugin\\SafeCampus.Plugin.Aop\\SafeCampus.Plugin.Aop.csproj": {
@@ -536,6 +546,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     }
   }

SafeCampus.API/SafeCampus.Plugin/SafeCampus.Plugin.Aop/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "zRsZgGix3QpJXGSxVWkFbuyhB478edJBmMK2BBnd5zlfaXOPr241kfgCapB6nlvNEp9M+yF685n7Y8RXm55M0Q==",
+  "dgSpecHash": "LJtiEUEgPXyFboJb9k45NMh7B36iGM3dLQ4nIl3xEN0omqufdWb67CAhaohuZCtbcOAwUfTiCt+GWnVcor7yAg==",
   "success": true,
   "projectFilePath": "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.Plugin\\SafeCampus.Plugin.Aop\\SafeCampus.Plugin.Aop.csproj",
   "expectedPackageFiles": [
@@ -97,6 +97,23 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\portable.bouncycastle\\1.9.0\\portable.bouncycastle.1.9.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.collections\\4.3.0\\runtime.any.system.collections.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.diagnostics.tracing\\4.3.0\\runtime.any.system.diagnostics.tracing.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.globalization\\4.3.0\\runtime.any.system.globalization.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.io\\4.3.0\\runtime.any.system.io.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection\\4.3.0\\runtime.any.system.reflection.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.extensions\\4.3.0\\runtime.any.system.reflection.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.primitives\\4.3.0\\runtime.any.system.reflection.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.resources.resourcemanager\\4.3.0\\runtime.any.system.resources.resourcemanager.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime\\4.3.0\\runtime.any.system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.handles\\4.3.0\\runtime.any.system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.interopservices\\4.3.0\\runtime.any.system.runtime.interopservices.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding\\4.3.0\\runtime.any.system.text.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding.extensions\\4.3.0\\runtime.any.system.text.encoding.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.threading.tasks\\4.3.0\\runtime.any.system.threading.tasks.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.diagnostics.debug\\4.3.0\\runtime.win.system.diagnostics.debug.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.io.filesystem\\4.3.0\\runtime.win.system.io.filesystem.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.runtime.extensions\\4.3.0\\runtime.win.system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpcompress\\0.37.2\\sharpcompress.0.37.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpziplib\\1.4.2\\sharpziplib.1.4.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\simpleredis\\1.1.9\\simpleredis.1.1.9.nupkg.sha512",
@@ -111,6 +128,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.5.0\\swashbuckle.aspnetcore.swagger.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.5.0\\swashbuckle.aspnetcore.swaggergen.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.5.0\\swashbuckle.aspnetcore.swaggerui.6.5.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.3.0\\system.buffers.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.codedom\\8.0.0\\system.codedom.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
@@ -150,6 +168,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.management\\8.0.0\\system.management.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.private.uri\\4.3.0\\system.private.uri.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive\\5.0.0\\system.reactive.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive.linq\\5.0.0\\system.reactive.linq.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
@@ -165,6 +184,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
@@ -174,12 +194,14 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\6.0.0\\system.text.encoding.codepages.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\7.0.0\\system.text.encoding.codepages.7.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\8.0.0\\system.text.encoding.codepages.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encodings.web\\8.0.0\\system.text.encodings.web.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.0\\system.text.json.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.3\\system.text.json.8.0.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.regularexpressions\\4.3.1\\system.text.regularexpressions.4.3.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.channels\\8.0.0\\system.threading.channels.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.overlapped\\4.3.0\\system.threading.overlapped.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",

SafeCampus.API/SafeCampus.SqlSugar/obj/Debug/net6.0/SafeCampus.SqlSugar.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.SqlSugar")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.SqlSugar")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.SqlSugar")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.SqlSugar/obj/Debug/net6.0/SafeCampus.SqlSugar.AssemblyInfoInputs.cache

@@ -1 +1 @@
-f46fe0598e46580b9185df7054a2cd006f65526f9b394b197e648c5c98e9475b
+de8a88f77a101183a7a1a5a0958e2bf8b7d329eef119479678efdd0e62cdf474

SafeCampus.API/SafeCampus.SqlSugar/obj/Debug/net7.0/SafeCampus.SqlSugar.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.SqlSugar")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.SqlSugar")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.SqlSugar")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.SqlSugar/obj/Debug/net7.0/SafeCampus.SqlSugar.AssemblyInfoInputs.cache

@@ -1 +1 @@
-f46fe0598e46580b9185df7054a2cd006f65526f9b394b197e648c5c98e9475b
+de8a88f77a101183a7a1a5a0958e2bf8b7d329eef119479678efdd0e62cdf474

SafeCampus.API/SafeCampus.SqlSugar/obj/Debug/net8.0/SafeCampus.SqlSugar.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.SqlSugar")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.SqlSugar")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.SqlSugar")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.SqlSugar/obj/Debug/net8.0/SafeCampus.SqlSugar.AssemblyInfoInputs.cache

@@ -1 +1 @@
-f46fe0598e46580b9185df7054a2cd006f65526f9b394b197e648c5c98e9475b
+de8a88f77a101183a7a1a5a0958e2bf8b7d329eef119479678efdd0e62cdf474

SafeCampus.API/SafeCampus.SqlSugar/obj/SafeCampus.SqlSugar.csproj.nuget.dgspec.json

@@ -274,6 +274,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     },
     "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.SqlSugar\\SafeCampus.SqlSugar.csproj": {
@@ -414,6 +419,11 @@
           },
           "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202/PortableRuntimeIdentifierGraph.json"
         }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
       }
     }
   }

SafeCampus.API/SafeCampus.SqlSugar/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "0C+ug6BmN0tVu1MADe4DbJzBi6W6AtpjpE3WKX/yV1jP28q9Fq7UkppEklVs/mGTzyjG5u7pMsvRYPRCnvqolw==",
+  "dgSpecHash": "VvFyjeUup1XQazECgEcQZ7xmpgJ2tgjo3jSi/j8hF4T0HK32BT7dWWg0l+2ipon/TEwMwlByE//w1p2ftfn0vQ==",
   "success": true,
   "projectFilePath": "F:\\Project\\QJKJ\\SafeCampus\\SafeCampus.API\\SafeCampus.SqlSugar\\SafeCampus.SqlSugar.csproj",
   "expectedPackageFiles": [
@@ -105,6 +105,23 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\oscar.data.sqlclient\\4.0.4\\oscar.data.sqlclient.4.0.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\portable.bouncycastle\\1.9.0\\portable.bouncycastle.1.9.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.collections\\4.3.0\\runtime.any.system.collections.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.diagnostics.tracing\\4.3.0\\runtime.any.system.diagnostics.tracing.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.globalization\\4.3.0\\runtime.any.system.globalization.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.io\\4.3.0\\runtime.any.system.io.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection\\4.3.0\\runtime.any.system.reflection.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.extensions\\4.3.0\\runtime.any.system.reflection.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.reflection.primitives\\4.3.0\\runtime.any.system.reflection.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.resources.resourcemanager\\4.3.0\\runtime.any.system.resources.resourcemanager.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime\\4.3.0\\runtime.any.system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.handles\\4.3.0\\runtime.any.system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.runtime.interopservices\\4.3.0\\runtime.any.system.runtime.interopservices.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding\\4.3.0\\runtime.any.system.text.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.text.encoding.extensions\\4.3.0\\runtime.any.system.text.encoding.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.any.system.threading.tasks\\4.3.0\\runtime.any.system.threading.tasks.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.diagnostics.debug\\4.3.0\\runtime.win.system.diagnostics.debug.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.io.filesystem\\4.3.0\\runtime.win.system.io.filesystem.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\runtime.win.system.runtime.extensions\\4.3.0\\runtime.win.system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpcompress\\0.37.2\\sharpcompress.0.37.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\sharpziplib\\1.4.2\\sharpziplib.1.4.2.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\simpletool\\1.0.6\\simpletool.1.0.6.nupkg.sha512",
@@ -125,6 +142,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.5.0\\swashbuckle.aspnetcore.swagger.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.5.0\\swashbuckle.aspnetcore.swaggergen.6.5.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.5.0\\swashbuckle.aspnetcore.swaggerui.6.5.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.3.0\\system.buffers.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.codedom\\8.0.0\\system.codedom.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
@@ -167,6 +185,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.memory\\4.5.3\\system.memory.4.5.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.private.uri\\4.3.0\\system.private.uri.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive\\5.0.0\\system.reactive.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reactive.linq\\5.0.0\\system.reactive.linq.5.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
@@ -183,6 +202,7 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
@@ -193,12 +213,14 @@
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\6.0.0\\system.text.encoding.codepages.6.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\7.0.0\\system.text.encoding.codepages.7.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.codepages\\8.0.0\\system.text.encoding.codepages.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.encodings.web\\8.0.0\\system.text.encodings.web.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.0\\system.text.json.8.0.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.json\\8.0.3\\system.text.json.8.0.3.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.text.regularexpressions\\4.3.1\\system.text.regularexpressions.4.3.1.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.channels\\8.0.0\\system.threading.channels.8.0.0.nupkg.sha512",
+    "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.overlapped\\4.3.0\\system.threading.overlapped.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512",
     "C:\\Users\\王晓寒\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",

SafeCampus.API/SafeCampus.System/Const/BizConfigConst.cs

@@ -13,6 +13,10 @@ public class BizConfigConst
     /// </summary>
     public const string BIZ_SMS_STATES = "BIZ_SMS_STATES";
     /// <summary>
+    /// 归寝时间设置
+    /// </summary>
+    public const string BIZ_DORMITORY_TIME = "BIZ_DORMITORY_TIME";
+    /// <summary>
     /// 短信推送预警阈值
     /// </summary>
     public const string BIZ_SMS_STATES_DAY = "BIZ_SMS_STATES_DAY";

SafeCampus.API/SafeCampus.System/Entity/Attendance.cs

@@ -3,7 +3,7 @@
 [Tenant(SqlSugarConst.DB_DEFAULT)]
 [BatchEdit]
 [CodeGen]
-[IgnoreInitTable]
+//[IgnoreInitTable]
 public class Attendance : PrimaryKeyEntity
 {
     /// <summary>
@@ -77,6 +77,11 @@ public class Attendance : PrimaryKeyEntity
     [SugarColumn(ColumnName = "Rects", ColumnDescription = "目标在快照中的位置", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
     public string Rects { get; set; }
     /// <summary>
+    /// 目标是进来还是出去
+    /// </summary>
+    [SugarColumn(ColumnName = "InsOut", ColumnDescription = "目标是进来还是出去",  IsNullable = true)]
+    public bool InsOut { get; set; }
+    /// <summary>
     /// 人员扩展信息
     /// </summary>
     [SugarColumn(ColumnName = "Extend", ColumnDescription = "人员扩展信息", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]

SafeCampus.API/SafeCampus.System/Entity/BuildingInfo.cs

@@ -1,4 +1,7 @@
 namespace SafeCampus.System;
+/// <summary>
+/// 学生宿舍楼表
+/// </summary>
 [SugarTable("BuildingInfo", TableDescription = "学生宿舍楼表")]
 [Tenant(SqlSugarConst.DB_DEFAULT)]
 [BatchEdit]
@@ -19,6 +22,26 @@ public class BuildingInfo : PrimaryKeyEntity
     /// <summary>
     /// 创建时间
     /// </summary>
-    [SugarColumn(ColumnName = "CreateTime", ColumnDescription = "创建时间", IsNullable = true)]
+    [SugarColumn(ColumnName = "CreateTime", ColumnDescription = "创建时间", IsOnlyIgnoreUpdate = true, IsNullable = true)]
     public DateTime CreateTime { get; set; }
+    /// <summary>
+    /// 进入摄像头id
+    /// </summary>
+    [SugarColumn(ColumnName = "InsCameraId", ColumnDescription = "进入摄像头id", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    public string InsCameraId { get; set; }
+    /// <summary>
+    /// 出去摄像头id
+    /// </summary>
+    [SugarColumn(ColumnName = "OutCameraId", ColumnDescription = "出去摄像头id", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    public string OutCameraId { get; set; }
+    /// <summary>
+    /// 进入摄像头
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(InsCameraId), nameof(CameraInfo.SensorId))]
+    public CameraInfo InsCameraInfoItem { get; set; }
+    /// <summary>
+    /// 出去摄像头
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(OutCameraId), nameof(CameraInfo.SensorId))]
+    public CameraInfo OutCameraInfoItem { get; set; }
 }

SafeCampus.API/SafeCampus.System/Entity/DormitoryInfo.cs

@@ -3,7 +3,7 @@
 [Tenant(SqlSugarConst.DB_DEFAULT)]
 [BatchEdit]
 [CodeGen]
-//[IgnoreInitTable]
+[IgnoreInitTable]
 public class DormitoryInfo : PrimaryKeyEntity
 {
     /// <summary>
@@ -17,6 +17,11 @@ public class DormitoryInfo : PrimaryKeyEntity
     [SugarColumn(ColumnName = "Gender", ColumnDescription = "寝室类型", IsNullable = false)]
     public bool Gender { get; set; }
     /// <summary>
+    /// 所属宿舍楼id
+    /// </summary>
+    [SugarColumn(ColumnName = "BuildId", ColumnDescription = "所属宿舍楼id", IsNullable = false)]
+    public long BuildId { get; set; }
+    /// <summary>
     /// 人员列表
     /// </summary>
     [Navigate(NavigateType.OneToMany, nameof(PersonInfo.DormitoryId))]
@@ -24,6 +29,11 @@ public class DormitoryInfo : PrimaryKeyEntity
     /// <summary>
     /// 创建时间
     /// </summary>
-    [SugarColumn(ColumnName = "CreateTime", ColumnDescription = "创建时间", IsNullable = true)]
+    [SugarColumn(ColumnName = "CreateTime", ColumnDescription = "创建时间", IsOnlyIgnoreUpdate = true, IsNullable = true)]
     public DateTime CreateTime { get; set; }
+    /// <summary>
+    /// 宿舍楼信息
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(BuildId))]
+    public BuildingInfo BuildingInfoItem { get; set; }
 }

SafeCampus.API/SafeCampus.System/Entity/PersonInfo.cs

@@ -3,7 +3,7 @@
 [Tenant(SqlSugarConst.DB_DEFAULT)]
 [BatchEdit]
 [CodeGen]
-//[IgnoreInitTable]
+[IgnoreInitTable]
 public class PersonInfo
 {
     /// <summary>
@@ -59,7 +59,7 @@ public class PersonInfo
     /// <summary>
     /// 所属寝室id
     /// </summary>
-    [SugarColumn(ColumnName = "DormitoryId", ColumnDescription = "所属寝室id", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    [SugarColumn(ColumnName = "DormitoryId", ColumnDescription = "所属寝室id",IsNullable = true)]
     public long? DormitoryId { get; set; }
     /// <summary>
     /// 人脸列表
@@ -76,4 +76,9 @@ public class PersonInfo
     /// </summary>
     [Navigate(NavigateType.OneToOne, nameof(DormitoryId))]
     public DormitoryInfo DormitoryInfoItem { get; set; }
+    /// <summary>
+    /// 考勤列表
+    /// </summary>
+    [Navigate(NavigateType.OneToMany, nameof(Attendance.PersonId))]
+    public List<Attendance> Attendances { get; set; }
 }

SafeCampus.API/SafeCampus.System/Entity/WarnInfo.cs

@@ -36,11 +36,7 @@ public class WarnInfo : BaseEntity
     /// </summary>
     [SugarColumn(ColumnName = "CameraId", ColumnDescription = "摄像头id", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
     public string CameraId { get; set; }
-    /// <summary>
-    ///摄像头信息
-    /// </summary>
-    [Navigate(NavigateType.OneToOne, nameof(CameraId), nameof(CameraInfo.SensorId))]
-    public CameraInfo CameraInfoItem { get; set; }
+  
     /// <summary>
     /// 事件发生时间
     /// </summary>
@@ -61,11 +57,71 @@ public class WarnInfo : BaseEntity
     /// </summary>
     [SugarColumn(ColumnName = "Rects", ColumnDescription = "目标在快照中的位置", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
     public string Rects { get; set; }
+    ///// <summary>
+    ///// 人员名称
+    ///// </summary>
+    //[SugarColumn(ColumnName = "PersonName", ColumnDescription = "人员名称", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    //public string PersonName { get; set; }
+    /// <summary>
+    /// 性别
+    /// </summary>
+    [SugarColumn(ColumnName = "Gender", ColumnDescription = "性别", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    public string Gender { get; set; }
+    /// <summary>
+    /// 班级id
+    /// </summary>
+    [SugarColumn(ColumnName = "PersonSetId", ColumnDescription = "班级id", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    public string PersonSetId { get; set; }
+    /// <summary>
+    /// 人员id
+    /// </summary>
+    [SugarColumn(ColumnName = "PersonId", ColumnDescription = "人员id", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    public string PersonId { get; set; }
+    /// <summary>
+    /// 人脸相似度
+    /// </summary>
+    [SugarColumn(ColumnName = "FaceSimilarity", ColumnDescription = "人脸相似度", IsNullable = true)]
+    public float? FaceSimilarity { get; set; }
+    /// <summary>
+    /// 人员跟踪id,同一个id表示是同一个人
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackId", ColumnDescription = "人员跟踪id", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    public string TrackId { get; set; }
+    /// <summary>
+    /// 服装库id
+    /// </summary>
+    [SugarColumn(ColumnName = "ClothsSetId", ColumnDescription = "服装库id", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    public string ClothsSetId { get; set; }
+    /// <summary>
+    /// 服装id
+    /// </summary>
+    [SugarColumn(ColumnName = "ClothId", ColumnDescription = "服装id", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    public string ClothId { get; set; }
+    /// <summary>
+    /// 服装相似度
+    /// </summary>
+    [SugarColumn(ColumnName = "ClothSimilarity", ColumnDescription = "服装相似度", IsNullable = true)]
+    public float? ClothSimilarity { get; set; }
+    /// <summary>
+    /// 奔跑速度
+    /// </summary>
+    [SugarColumn(ColumnName = "SpeedLevel", ColumnDescription = "奔跑速度", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+    public string SpeedLevel { get; set; }
+    /// <summary>
+    /// 奔跑时周围人数
+    /// </summary>
+    [SugarColumn(ColumnName = "MaxAroundTracks", ColumnDescription = "奔跑时周围人数",  IsNullable = true)]
+    public int? MaxAroundTracks { get; set; }
+    /// <summary>
+    /// 人群数量
+    /// </summary>
+    [SugarColumn(ColumnName = "Count", ColumnDescription = "人群数量", IsNullable = true)]
+    public int? Count { get; set; }
     /// <summary>
-    /// 人员名称
+    /// 持续时长
     /// </summary>
-    [SugarColumn(ColumnName = "PersonName", ColumnDescription = "人员名称", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
-    public string PersonName { get; set; }
+    [SugarColumn(ColumnName = "Duration", ColumnDescription = "持续时长", IsNullable = true)]
+    public int? Duration { get; set; }
     /// <summary>
     /// 人员类型
     /// </summary>
@@ -96,4 +152,19 @@ public class WarnInfo : BaseEntity
     /// </summary>
     [SugarColumn(ColumnName = "HandTime",  ColumnDescription = "处理时间", IsNullable = true)]
     public DateTime? HandTime { get; set; }
+    /// <summary>
+    ///摄像头信息
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(CameraId), nameof(CameraInfo.SensorId))]
+    public CameraInfo CameraInfoItem { get; set; }
+    /// <summary>
+    /// 班级信息
+    /// </summary>
+    [Navigate(NavigateType.OneToOne,nameof(PersonSetId),nameof(PersonSetInfo.PersonSetId))]
+    public PersonSetInfo PersonSetInfoItem { get; set; }
+    /// <summary>
+    /// 人员信息
+    /// </summary>
+    [Navigate(NavigateType.OneToOne,nameof(PersonId),nameof(PersonInfo.PersonId))]
+    public PersonInfo PersonInfoItem { get; set; }
 }

SafeCampus.API/SafeCampus.System/SafeCampus.System.xml

@@ -61,6 +61,11 @@
             短信推送开关
             </summary>
         </member>
+        <member name="F:SafeCampus.System.BizConfigConst.BIZ_DORMITORY_TIME">
+            <summary>
+            归寝时间设置
+            </summary>
+        </member>
         <member name="F:SafeCampus.System.BizConfigConst.BIZ_SMS_STATES_DAY">
             <summary>
             短信推送预警阈值
@@ -761,6 +766,11 @@
             目标在快照中的位置
             </summary>
         </member>
+        <member name="P:SafeCampus.System.Attendance.InsOut">
+            <summary>
+            目标是进来还是出去
+            </summary>
+        </member>
         <member name="P:SafeCampus.System.Attendance.Extend">
             <summary>
             人员扩展信息
@@ -776,6 +786,46 @@
             摄像头信息
              </summary>
         </member>
+        <member name="T:SafeCampus.System.BuildingInfo">
+            <summary>
+            学生宿舍楼表
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.BuildingInfo.Name">
+            <summary>
+            宿舍楼名称
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.BuildingInfo.Gender">
+            <summary>
+            男寝还是女寝
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.BuildingInfo.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.BuildingInfo.InsCameraId">
+            <summary>
+            进入摄像头id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.BuildingInfo.OutCameraId">
+            <summary>
+            出去摄像头id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.BuildingInfo.InsCameraInfoItem">
+            <summary>
+            进入摄像头
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.BuildingInfo.OutCameraInfoItem">
+            <summary>
+            出去摄像头
+            </summary>
+        </member>
         <member name="P:SafeCampus.System.CameraGroup.Name">
             <summary>
             分组名称
@@ -1026,11 +1076,26 @@
             男寝还是女寝
             </summary>
         </member>
+        <member name="P:SafeCampus.System.DormitoryInfo.BuildId">
+            <summary>
+            所属宿舍楼id
+            </summary>
+        </member>
         <member name="P:SafeCampus.System.DormitoryInfo.PersonInfos">
             <summary>
             人员列表
             </summary>
         </member>
+        <member name="P:SafeCampus.System.DormitoryInfo.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.DormitoryInfo.BuildingInfoItem">
+            <summary>
+            宿舍楼信息
+            </summary>
+        </member>
         <member name="P:SafeCampus.System.PassengerFlow.QueryTime">
             <summary>
             查询时间
@@ -1156,6 +1221,11 @@
             寝室信息
             </summary>
         </member>
+        <member name="P:SafeCampus.System.PersonInfo.Attendances">
+            <summary>
+            考勤列表
+            </summary>
+        </member>
         <member name="P:SafeCampus.System.PersonSetInfo.PersonSetId">
             <summary>
             班级id
@@ -2412,11 +2482,6 @@
             摄像头id
             </summary>
         </member>
-        <member name="P:SafeCampus.System.WarnInfo.CameraInfoItem">
-             <summary>
-            摄像头信息
-             </summary>
-        </member>
         <member name="P:SafeCampus.System.WarnInfo.Tick">
             <summary>
             事件发生时间
@@ -2437,9 +2502,64 @@
             目标在快照中的位置
             </summary>
         </member>
-        <member name="P:SafeCampus.System.WarnInfo.PersonName">
+        <member name="P:SafeCampus.System.WarnInfo.Gender">
             <summary>
-            人员名称
+            性别
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.PersonSetId">
+            <summary>
+            班级id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.PersonId">
+            <summary>
+            人员id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.FaceSimilarity">
+            <summary>
+            人脸相似度
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.TrackId">
+            <summary>
+            人员跟踪id,同一个id表示是同一个人
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.ClothsSetId">
+            <summary>
+            服装库id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.ClothId">
+            <summary>
+            服装id
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.ClothSimilarity">
+            <summary>
+            服装相似度
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.SpeedLevel">
+            <summary>
+            奔跑速度
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.MaxAroundTracks">
+            <summary>
+            奔跑时周围人数
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.Count">
+            <summary>
+            人群数量
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.Duration">
+            <summary>
+            持续时长
             </summary>
         </member>
         <member name="P:SafeCampus.System.WarnInfo.PersonType">
@@ -2472,6 +2592,21 @@
             处理时间
             </summary>
         </member>
+        <member name="P:SafeCampus.System.WarnInfo.CameraInfoItem">
+             <summary>
+            摄像头信息
+             </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.PersonSetInfoItem">
+            <summary>
+            班级信息
+            </summary>
+        </member>
+        <member name="P:SafeCampus.System.WarnInfo.PersonInfoItem">
+            <summary>
+            人员信息
+            </summary>
+        </member>
         <member name="T:SafeCampus.System.AuthEventSubscriber">
             <summary>
             认证模块事件总线

SafeCampus.API/SafeCampus.System/obj/Debug/net6.0/SafeCampus.System.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.System")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.System")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.System")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.System/obj/Debug/net6.0/SafeCampus.System.AssemblyInfoInputs.cache

@@ -1 +1 @@
-007197918a8ef4681a2c74d8c7b41f9277a2421db76fe87a7fc6fb42399b6629
+ed2b1257f9bab0c897f6e06c373b73dea35f96ba5e4df205a47ed45641f907df

SafeCampus.API/SafeCampus.System/obj/Debug/net7.0/SafeCampus.System.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.System")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.System")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.System")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]

SafeCampus.API/SafeCampus.System/obj/Debug/net7.0/SafeCampus.System.AssemblyInfoInputs.cache

@@ -1 +1 @@
-007197918a8ef4681a2c74d8c7b41f9277a2421db76fe87a7fc6fb42399b6629
+ed2b1257f9bab0c897f6e06c373b73dea35f96ba5e4df205a47ed45641f907df

SafeCampus.API/SafeCampus.System/obj/Debug/net8.0/SafeCampus.System.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("SafeCampus.System")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+895c1895ca019eda5147abf95218245d4fcedc5b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("3.0.0+7765c6b5ad28c1c08626624ead60ab4307228fd7")]
 [assembly: System.Reflection.AssemblyProductAttribute("SafeCampus.System")]
 [assembly: System.Reflection.AssemblyTitleAttribute("SafeCampus.System")]
 [assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.0")]