新增接口

Server/YD_XinWei.Commons/Dto/Open/DeviceInfoDto.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace YD_XinWei.Commons.Dto.Open
+{
+    public class DeviceInfoDto
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int? Id { get; set; }
+
+        /// <summary>
+        /// Type (1平板2跳绳 3中长跑 4短跑 5敏捷 6坐位体前屈 7仰卧起坐 8引体向上 9立定跳远 10实心球 11排球 12游泳 13手环 100一体机)
+        /// </summary>
+        public double? Type { get; set; }
+
+        /// <summary>
+        /// 设备型号
+        /// </summary>
+        public string DeviceType { get; set; }
+
+        /// <summary>
+        /// 设备序列号
+        /// </summary>
+        public string DeviceSerial { get; set; }
+
+        /// <summary>
+        /// 设备mac地址
+        /// </summary>
+        public string DeviceMac { get; set; }
+
+        /// <summary>
+        /// 设备imei地址
+        /// </summary>
+        public string DeviceImei { get; set; }
+
+        /// <summary>
+        /// AI摄像机IP地址,多个ip用,隔开
+        /// </summary>
+        public string CameraIp { get; set; }
+
+        /// <summary>
+        /// 抢跑ip（短跑）
+        /// </summary>
+        public string GunJumpingIp { get; set; }
+
+        /// <summary>
+        /// 是否是EAI100摄像头
+        /// </summary>
+        public bool? Eai100Flag { get; set; }
+
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        public int? OrgId { get; set; }
+
+        /// <summary>
+        /// 组织名称
+        /// </summary>
+        public string OrgName { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public int? UserId { get; set; }
+
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 软件版本
+        /// </summary>
+        public string SoftwareVer { get; set; }
+
+        /// <summary>
+        /// 摄像头序列号、版本信息
+        /// </summary>
+        public string CameraInfo { get; set; }
+
+        /// <summary>
+        /// 硬件版本
+        /// </summary>
+        public string HardwareVer { get; set; }
+
+        /// <summary>
+        /// 应用时间
+        /// </summary>
+        public string DeployTime { get; set; }
+
+        /// <summary>
+        /// 最后登录时间
+        /// </summary>
+        public string LastLoginTime { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 授权状态(0无效 1有效)
+        /// </summary>
+        public int? State { get; set; }
+
+        /// <summary>
+        /// 状态(0无效 1有效)
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public string UpdateTime { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string UpdateBy { get; set; }
+
+        /// <summary>
+        /// 学校人脸的相似度（80-99之间的整数）
+        /// </summary>
+        public int? SimilarNumber { get; set; }
+    }
+
+}

Server/YD_XinWei.Commons/Dto/Open/ScoreRuleDto.cs

@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace YD_XinWei.Commons.Dto.Open
+{
+    public class ScoreRuleDto
+    {
+        /// <summary>
+        /// 项目类型(1-跳绳,2-跑步)
+        /// </summary>
+        public int? ProjectKind { get; set; }
+
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        public int? ProjectId { get; set; }
+
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string ProjectName { get; set; }
+
+        /// <summary>
+        /// 评分标准类型(1-国家标准,2-地方标准,3-自定义标准)
+        /// </summary>
+        public int? MarkType { get; set; }
+
+        /// <summary>
+        /// 模式
+        /// </summary>
+        public int? ModelType { get; set; }
+
+        /// <summary>
+        /// 年级ID
+        /// </summary>
+        public int? GradeId { get; set; }
+
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        public int? OrgId { get; set; }
+
+        /// <summary>
+        /// 标准ID
+        /// </summary>
+        public int? ProjectRuleId { get; set; }
+
+        /// <summary>
+        /// 规则排序(1降序 2升序)
+        /// </summary>
+        public int? RuleType { get; set; }
+
+        /// <summary>
+        /// 评分规则列表
+        /// </summary>
+        public List<ScoreRuleItemDto> Items { get; set; }
+
+        /// <summary>
+        /// 附加分规则
+        /// </summary>
+        public List<ScoreRulePlusDto> Pluses { get; set; }
+
+        /// <summary>
+        /// 附加分规则范围
+        /// </summary>
+        public List<ScoreScope> ScoreScopes { get; set; }
+    }
+
+    /// <summary>
+    /// ScoreRuleItemDto 类表示单个评分规则项的信息。
+    /// </summary>
+    public class ScoreRuleItemDto
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int? Id { get; set; }
+
+        /// <summary>
+        /// 性别(0未知1男2女)
+        /// </summary>
+        public int? Sex { get; set; }
+
+        /// <summary>
+        /// 级别名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public double? Score { get; set; }
+
+        /// <summary>
+        /// 最大值
+        /// </summary>
+        public double? Max { get; set; }
+
+        /// <summary>
+        /// 最小值
+        /// </summary>
+        public double? Min { get; set; }
+    }
+
+    /// <summary>
+    /// ScoreRulePlusDto 类表示单个附加分规则项的信息。
+    /// </summary>
+    public class ScoreRulePlusDto
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int? Id { get; set; }
+
+        /// <summary>
+        /// 性别(0未知1男2女)
+        /// </summary>
+        public int? Sex { get; set; }
+
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public double? Score { get; set; }
+
+        /// <summary>
+        /// 最大值
+        /// </summary>
+        public double? Max { get; set; }
+
+        /// <summary>
+        /// 最小值
+        /// </summary>
+        public double? Min { get; set; }
+
+        /// <summary>
+        /// 满分数值
+        /// </summary>
+        public double? MaxScore { get; set; }
+    }
+
+    /// <summary>
+    /// ScoreScope 类表示附加分规则的范围信息。
+    /// </summary>
+    public class ScoreScope
+    {
+        /// <summary>
+        /// 性别(1男2女)
+        /// </summary>
+        public int? Gender { get; set; }
+
+        /// <summary>
+        /// 最大成绩
+        /// </summary>
+        public double? MaxCount { get; set; }
+
+        /// <summary>
+        /// 最大分数
+        /// </summary>
+        public double? MaxScore { get; set; }
+
+        /// <summary>
+        /// 最大附加成绩
+        /// </summary>
+        public double? MaxPlusCount { get; set; }
+
+        /// <summary>
+        /// 最大附加分数
+        /// </summary>
+        public double? MaxPlusScore { get; set; }
+    }
+}

Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0fe6b9902074841df3483134524084275defee80")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1c36de9ae00d951cbe0a6ae28dfdf85462590015")]
 [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
 [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache

@@ -1 +1 @@
-05848327760aee62efe2eb50ea063d214c9b014ac40e23aa82e46c4c180418cf
+2026c8592f2e63760859291f951b2458bb9020b5df25ac0103844af8c2d15e63

Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-2f8580077efc240d28d071c5d67cca84980474465d3a9e219dd679ae90ead099
+2234f164660a5e08dc58515192ad8ac9b5061083036b5ca76e9e574a19157fbe

Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json

@@ -1 +1 @@
-{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=3745c9b034aa32c859c2d39720b663ab8b57b93c&path=/*"}}
+{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=1c36de9ae00d951cbe0a6ae28dfdf85462590015&path=/*"}}

Server/YD_XinWei/AutoMappers/MappingProfile.cs

@@ -1,6 +1,8 @@
 using AutoMapper;
+using VOL.Entity.DomainModels.XinWei;
 using YD_XinWei.Api.SmartSportsEntitys;
 using YD_XinWei.Commons.Dto.HomeWork;
+using YD_XinWei.Commons.Dto.Open;
 
 namespace YD_XinWei.Api.AutoMappers
 {
@@ -14,6 +16,8 @@ namespace YD_XinWei.Api.AutoMappers
             // ...
 
             //CreateMap<AddHomeWorkDto, S_HomeWork>();
+
+            CreateMap<XW_Device, DeviceInfoDto>();
         }
     }
 }

Server/YD_XinWei/Context/SmartSportsContext.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using VOL.Entity.DomainModels;
+using VOL.Entity.DomainModels.XinWei;
 using YD_XinWei.Api.Entitys;
 using YD_XinWei.Api.SmartSportsEntitys;
 
@@ -21,5 +22,7 @@ namespace YD_XinWei.Api.Context
 
         public DbSet<XW_ProjectMode> XW_ProjectMode { get; set; }
         public DbSet<XW_TestingProject> XW_TestingProject { get; set; }
+        public DbSet<XW_Device> XW_Device { get; set; }
+        public DbSet<XW_SportsTestData> XW_SportsTestData { get; set; }
     }
 }

Server/YD_XinWei/Controllers/XinWeiController.cs

@@ -23,12 +23,24 @@ namespace YD_XinWei.Api.Controllers
             _xinWeiService = xinWeiService;
         }
 
+        /// <summary>
+        /// 获取设备信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("/basic/{apiVersion}/device/open/getDeviceInfo")]
+        public async Task<DeviceInfoDto> GetDeviceInfo(string deviceSerial)
+        {
+            var res = await _xinWeiService.DeviceInfo(deviceSerial);
+            return res;
+        }
+
         /// <summary>
         /// 获取项目模式列表
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [Route("sports/{apiVersion}/common/getSportsModelTypeList")]
+        [Route("/sports/{apiVersion}/common/getSportsModelTypeList")]
         public async Task<List<ProjectModeDto>> GetSportsModelTypeList()
         {
             var res = await _xinWeiService.SportsModelTypeList();
@@ -40,7 +52,7 @@ namespace YD_XinWei.Api.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [Route("sports/{apiVersion}/common/getOrgSportsProjectList")]
+        [Route("/sports/{apiVersion}/common/getOrgSportsProjectList")]
         public async Task<List<TestingProjectDto>> GetOrgSportsProjectList(int orgId)
         {
             var res = await _xinWeiService.OrgSportsProjectList(orgId);
@@ -52,11 +64,24 @@ namespace YD_XinWei.Api.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [Route("basic/basic/{apiVersion}/open/getMinimumOfStudentInfoList")]
+        [Route("/basic/basic/{apiVersion}/open/getMinimumOfStudentInfoList")]
         public async Task<List<StudentInfoDto>> GetMinimumOfStudentInfoList(int orgId)
         {
             var res = await _xinWeiService.MinimumOfStudentInfoList(orgId);
             return res;
         }
+
+        /// <summary>
+        /// 获取人脸信息
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("/basic/{apiVersion}/open/getFaceListOfDevicePage")]
+        public async Task<FaceListOfDevicePageDto> GetFaceListOfDevicePage([FromQuery] FaceListOfDeviceDto dto)
+        {
+            var res = await _xinWeiService.FaceListOfDevicePage(dto);
+            return res;
+        }
     }
 }

Server/YD_XinWei/Services/Impl/XinWeiService.cs

@@ -1,6 +1,8 @@
 using AutoMapper;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
+using System.Security.Cryptography;
+using VOL.Entity.DomainModels.XinWei;
 using YD_XinWei.Api.Context;
 using YD_XinWei.Api.Services.Interface;
 using YD_XinWei.Api.SmartSportsEntitys;
@@ -9,11 +11,12 @@ using YD_XinWei.Commons.Dto.Common;
 using YD_XinWei.Commons.Dto.HomeWork;
 using YD_XinWei.Commons.Dto.Open;
 using YD_XinWei.Commons.Dto.School;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace YD_XinWei.Api.Services.Impl
 {
     /// <summary>
-    /// 服务
+    /// 服务实现
     /// </summary>
     public class XinWeiService : IXinWeiService
     {
@@ -31,6 +34,18 @@ namespace YD_XinWei.Api.Services.Impl
             _mapper = mapper;
         }
 
+        /// <summary>
+        /// 获取设备信息
+        /// </summary>
+        /// <param name="deviceSerial"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<DeviceInfoDto> DeviceInfo(string deviceSerial)
+        {
+            var deviceInfo = await _sportsContext.XW_Device.FirstAsync(x => x.DeviceSerial == deviceSerial);
+            var res = _mapper.Map<DeviceInfoDto>(deviceInfo);
+            return res;
+        }
 
         /// <summary>
         /// 项目模式
@@ -48,7 +63,6 @@ namespace YD_XinWei.Api.Services.Impl
             return res;
         }
 
-
         /// <summary>
         /// 体育项目
         /// </summary>
@@ -100,5 +114,49 @@ namespace YD_XinWei.Api.Services.Impl
 
             return res;
         }
+
+        /// <summary>
+        /// 获取人脸信息
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<FaceListOfDevicePageDto> FaceListOfDevicePage(FaceListOfDeviceDto dto)
+        {
+            var total = await _sportsContext.Student.CountAsync();
+
+            string schoolCode = await _sportsContext.School.Where(x => x.Id == dto.OrgId).Select(x => x.SchoolCode).FirstAsync();
+
+            var list = await _sportsContext.Student
+                .Where(x => x.SchoolCode == schoolCode)
+                .Select(s => new DeviceUserFaceVo()
+                {
+                    FaceId = s.StudentNo,
+                    FaceType = 1,
+                    FaceUrl = s.Photo,
+                    PersonId = s.IDCard,
+                    UserId = s.Id
+                })
+                .Skip((dto.PageNo - 1) * dto.PageSize)
+                .Take(dto.PageSize)
+                .ToListAsync();
+
+            return new FaceListOfDevicePageDto()
+            {
+                Total = total,
+                PageNum = dto.PageNo,
+                Pages = dto.PageSize,
+                List = list
+            };
+        }
+
+        /// <summary>
+        /// 获取训练评分规则
+        /// </summary>
+        /// <param name="orgId">学校Id</param>
+        /// <returns></returns>
+        public async Task<List<ScoreRuleDto>> ScoreRules(int orgId)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

Server/YD_XinWei/Services/Interface/IXinWeiService.cs

@@ -10,8 +10,18 @@ using YD_XinWei.Commons.Dto.School;
 
 namespace YD_XinWei.Api.Services.Interface
 {
+    /// <summary>
+    /// 服务接口
+    /// </summary>
     public interface IXinWeiService
     {
+        /// <summary>
+        /// 获取设备信息
+        /// </summary>
+        /// <param name="deviceSerial"></param>
+        /// <returns></returns>
+        Task<DeviceInfoDto> DeviceInfo(string deviceSerial);
+
         /// <summary>
         /// 项目模式
         /// </summary>
@@ -37,6 +47,13 @@ namespace YD_XinWei.Api.Services.Interface
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        Task<List<FaceListOfDevicePageDto>> FaceListOfDevicePage(FaceListOfDeviceDto dto);
+        Task<FaceListOfDevicePageDto> FaceListOfDevicePage(FaceListOfDeviceDto dto);
+
+        /// <summary>
+        /// 获取训练评分规则
+        /// </summary>
+        /// <param name="orgId">学校Id</param>
+        /// <returns></returns>
+        Task<List<ScoreRuleDto>> ScoreRules(int orgId);
     }
 }

Server/YD_XinWei/SmartSportsEntitys/XW_CameraInfo.cs

@@ -1,46 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using YD_XinWei.Api.Entitys;
-
-namespace VOL.Entity.DomainModels.XinWei
-{
-    [Table("XW_CameraInfo")]
-    public class XW_CameraInfo : EntityBase
-    {
-        /// <summary>
-        /// 编号
-        /// </summary>
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Display(Description = "主键Id")]
-        [Comment("编号")]
-        public int Id { get; set; }
-        /// <summary>
-        /// 摄像头序列号
-        /// </summary>
-        [Display(Name = "SerialNumber")]
-        [Comment("摄像头序列号")]
-        public string? SerialNumber { get; set; }
-
-        /// <summary>
-        /// 摄像头版本信息
-        /// </summary>
-        [Display(Name = "Version")]
-        [Comment("摄像头版本信息")]
-        public string? Version { get; set; }
-
-        /// <summary>
-        /// 设备Id
-        /// </summary>
-
-        public int XW_DeviceId { get; set; }
-
-        /// <summary>
-        /// 导航属性
-        /// </summary>
-        public XW_Device XW_Device { get; set; }
-    }
-}

Server/YD_XinWei/SmartSportsEntitys/XW_Device.cs

@@ -7,8 +7,11 @@ using YD_XinWei.Api.Entitys;
 
 namespace VOL.Entity.DomainModels.XinWei
 {
+    /// <summary>
+    /// 设备表
+    /// </summary>
     [Table("XW_Device")]
-    public class XW_Device : EntityBase
+    public class XW_Device
     {
         /// <summary>
         /// 编号
@@ -188,12 +191,11 @@ namespace VOL.Entity.DomainModels.XinWei
         [Comment("学校人脸的相似度")]
         public int? SimilarNumber { get; set; }
 
-
         /// <summary>
         /// 摄像头序列号、版本信息
         /// </summary>
         [Display(Name = "摄像头序列号、版本信息")]
         [Comment("摄像头序列号、版本信息")]
-        public List<XW_CameraInfo> CameraInfoList { get; set; } = new List<XW_CameraInfo>();
+        public string CameraInfo { get; set; }
     }
 }

Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml

@@ -69,6 +69,12 @@
             芯未
             </summary>
         </member>
+        <member name="M:YD_XinWei.Api.Controllers.XinWeiController.GetDeviceInfo(System.String)">
+            <summary>
+            获取设备信息
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:YD_XinWei.Api.Controllers.XinWeiController.GetSportsModelTypeList">
             <summary>
             获取项目模式列表
@@ -87,6 +93,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:YD_XinWei.Api.Controllers.XinWeiController.GetFaceListOfDevicePage(YD_XinWei.Commons.Dto.Open.FaceListOfDeviceDto)">
+            <summary>
+            获取人脸信息
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:YD_XinWei.Api.Entitys.EntityBase">
             <summary>
             数据库实体父类
@@ -229,7 +242,7 @@
         </member>
         <member name="T:YD_XinWei.Api.Services.Impl.XinWeiService">
             <summary>
-            服务
+            服务实现
             </summary>
         </member>
         <member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.#ctor(YD_XinWei.Api.Context.SmartSportsContext,AutoMapper.IMapper)">
@@ -239,6 +252,14 @@
             <param name="sportsContext"></param>
             <param name="mapper"></param>
         </member>
+        <member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.DeviceInfo(System.String)">
+            <summary>
+            获取设备信息
+            </summary>
+            <param name="deviceSerial"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
         <member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.SportsModelTypeList">
             <summary>
             项目模式
@@ -259,6 +280,13 @@
             <param name="orgId">学校Id</param>
             <returns></returns>
         </member>
+        <member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.FaceListOfDevicePage(YD_XinWei.Commons.Dto.Open.FaceListOfDeviceDto)">
+            <summary>
+            获取人脸信息
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:YD_XinWei.Api.Services.Interface.IStudentService.ClassListbyTeacher(System.String)">
             <summary>
             获取班级列表
@@ -293,6 +321,18 @@
             <param name="relevanceId"></param>
             <returns></returns>
         </member>
+        <member name="T:YD_XinWei.Api.Services.Interface.IXinWeiService">
+            <summary>
+            服务接口
+            </summary>
+        </member>
+        <member name="M:YD_XinWei.Api.Services.Interface.IXinWeiService.DeviceInfo(System.String)">
+            <summary>
+            获取设备信息
+            </summary>
+            <param name="deviceSerial"></param>
+            <returns></returns>
+        </member>
         <member name="M:YD_XinWei.Api.Services.Interface.IXinWeiService.SportsModelTypeList">
             <summary>
             项目模式
@@ -313,6 +353,13 @@
             <param name="orgId">学校Id</param>
             <returns></returns>
         </member>
+        <member name="M:YD_XinWei.Api.Services.Interface.IXinWeiService.FaceListOfDevicePage(YD_XinWei.Commons.Dto.Open.FaceListOfDeviceDto)">
+            <summary>
+            获取人脸信息
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="P:YD_XinWei.Api.SmartSportsEntitys.Sys_User.UserName">
              <summary>
             帐号
@@ -880,29 +927,9 @@
             修改时间
              </summary>
         </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.Id">
+        <member name="T:VOL.Entity.DomainModels.XinWei.XW_Device">
             <summary>
-            编号
+            设备表
-            </summary>
-        </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.SerialNumber">
-            <summary>
-            摄像头序列号
-            </summary>
-        </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.Version">
-            <summary>
-            摄像头版本信息
-            </summary>
-        </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.XW_DeviceId">
-            <summary>
-            设备Id
-            </summary>
-        </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.XW_Device">
-            <summary>
-            导航属性
             </summary>
         </member>
         <member name="P:VOL.Entity.DomainModels.XinWei.XW_Device.Id">
@@ -1030,7 +1057,7 @@
             学校人脸的相似度 (80-99 之间的整数)
             </summary>
         </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_Device.CameraInfoList">
+        <member name="P:VOL.Entity.DomainModels.XinWei.XW_Device.CameraInfo">
             <summary>
             摄像头序列号、版本信息
             </summary>

Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json

@@ -1,4 +1,76 @@
 [
+  {
+    "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController",
+    "Method": "GetDeviceInfo",
+    "RelativePath": "basic/{apiVersion}/device/open/getDeviceInfo",
+    "HttpMethod": "GET",
+    "IsController": true,
+    "Order": 0,
+    "Parameters": [
+      {
+        "Name": "deviceSerial",
+        "Type": "System.String",
+        "IsRequired": false
+      },
+      {
+        "Name": "apiVersion",
+        "Type": "",
+        "IsRequired": true
+      }
+    ],
+    "ReturnTypes": [
+      {
+        "Type": "YD_XinWei.Commons.Dto.Open.DeviceInfoDto",
+        "MediaTypes": [
+          "text/plain",
+          "application/json",
+          "text/json"
+        ],
+        "StatusCode": 200
+      }
+    ]
+  },
+  {
+    "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController",
+    "Method": "GetFaceListOfDevicePage",
+    "RelativePath": "basic/{apiVersion}/open/getFaceListOfDevicePage",
+    "HttpMethod": "GET",
+    "IsController": true,
+    "Order": 0,
+    "Parameters": [
+      {
+        "Name": "OrgId",
+        "Type": "System.Int32",
+        "IsRequired": false
+      },
+      {
+        "Name": "PageNo",
+        "Type": "System.Int32",
+        "IsRequired": false
+      },
+      {
+        "Name": "PageSize",
+        "Type": "System.Int32",
+        "IsRequired": false
+      },
+      {
+        "Name": "apiVersion",
+        "Type": "",
+        "IsRequired": true
+      }
+    ],
+    "ReturnTypes": [
+      {
+        "Type": "YD_XinWei.Commons.Dto.Open.FaceListOfDevicePageDto",
+        "MediaTypes": [
+          "text/plain",
+          "application/json",
+          "text/json"
+        ],
+        "StatusCode": 200
+      }
+    ]
+  },
   {
     "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController",
     "Method": "GetMinimumOfStudentInfoList",

Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3745c9b034aa32c859c2d39720b663ab8b57b93c")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1c36de9ae00d951cbe0a6ae28dfdf85462590015")]
 [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
 [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache

@@ -1 +1 @@
-2b4c09258c88cbdffc58fb2fcbfaad2605cbcdfe550d6b2ae72b6f3bdfefc6e5
+a4866615988ec3d94014186f3a083b49335ed583356c6a4f51cabda69fbc1294

Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-65ca0c03df4b5aeccfc799b9a69893d50e3091ab6d116ecdd06ab1499e662190
+0b885924c6cfa9a8470e64544c43de5a027bc2c8e1b105f9aa5492c4fc6edf75

Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json

@@ -1 +1 @@
-{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=3745c9b034aa32c859c2d39720b663ab8b57b93c&path=/*"}}
+{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=1c36de9ae00d951cbe0a6ae28dfdf85462590015&path=/*"}}

Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml

@@ -69,6 +69,12 @@
             芯未
             </summary>
         </member>
+        <member name="M:YD_XinWei.Api.Controllers.XinWeiController.GetDeviceInfo(System.String)">
+            <summary>
+            获取设备信息
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:YD_XinWei.Api.Controllers.XinWeiController.GetSportsModelTypeList">
             <summary>
             获取项目模式列表
@@ -87,6 +93,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:YD_XinWei.Api.Controllers.XinWeiController.GetFaceListOfDevicePage(YD_XinWei.Commons.Dto.Open.FaceListOfDeviceDto)">
+            <summary>
+            获取人脸信息
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:YD_XinWei.Api.Entitys.EntityBase">
             <summary>
             数据库实体父类
@@ -229,7 +242,7 @@
         </member>
         <member name="T:YD_XinWei.Api.Services.Impl.XinWeiService">
             <summary>
-            服务
+            服务实现
             </summary>
         </member>
         <member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.#ctor(YD_XinWei.Api.Context.SmartSportsContext,AutoMapper.IMapper)">
@@ -239,6 +252,14 @@
             <param name="sportsContext"></param>
             <param name="mapper"></param>
         </member>
+        <member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.DeviceInfo(System.String)">
+            <summary>
+            获取设备信息
+            </summary>
+            <param name="deviceSerial"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
         <member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.SportsModelTypeList">
             <summary>
             项目模式
@@ -259,6 +280,13 @@
             <param name="orgId">学校Id</param>
             <returns></returns>
         </member>
+        <member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.FaceListOfDevicePage(YD_XinWei.Commons.Dto.Open.FaceListOfDeviceDto)">
+            <summary>
+            获取人脸信息
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:YD_XinWei.Api.Services.Interface.IStudentService.ClassListbyTeacher(System.String)">
             <summary>
             获取班级列表
@@ -293,6 +321,18 @@
             <param name="relevanceId"></param>
             <returns></returns>
         </member>
+        <member name="T:YD_XinWei.Api.Services.Interface.IXinWeiService">
+            <summary>
+            服务接口
+            </summary>
+        </member>
+        <member name="M:YD_XinWei.Api.Services.Interface.IXinWeiService.DeviceInfo(System.String)">
+            <summary>
+            获取设备信息
+            </summary>
+            <param name="deviceSerial"></param>
+            <returns></returns>
+        </member>
         <member name="M:YD_XinWei.Api.Services.Interface.IXinWeiService.SportsModelTypeList">
             <summary>
             项目模式
@@ -313,6 +353,13 @@
             <param name="orgId">学校Id</param>
             <returns></returns>
         </member>
+        <member name="M:YD_XinWei.Api.Services.Interface.IXinWeiService.FaceListOfDevicePage(YD_XinWei.Commons.Dto.Open.FaceListOfDeviceDto)">
+            <summary>
+            获取人脸信息
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="P:YD_XinWei.Api.SmartSportsEntitys.Sys_User.UserName">
              <summary>
             帐号
@@ -880,29 +927,9 @@
             修改时间
              </summary>
         </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.Id">
+        <member name="T:VOL.Entity.DomainModels.XinWei.XW_Device">
             <summary>
-            编号
+            设备表
-            </summary>
-        </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.SerialNumber">
-            <summary>
-            摄像头序列号
-            </summary>
-        </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.Version">
-            <summary>
-            摄像头版本信息
-            </summary>
-        </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.XW_DeviceId">
-            <summary>
-            设备Id
-            </summary>
-        </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_CameraInfo.XW_Device">
-            <summary>
-            导航属性
             </summary>
         </member>
         <member name="P:VOL.Entity.DomainModels.XinWei.XW_Device.Id">
@@ -1030,7 +1057,7 @@
             学校人脸的相似度 (80-99 之间的整数)
             </summary>
         </member>
-        <member name="P:VOL.Entity.DomainModels.XinWei.XW_Device.CameraInfoList">
+        <member name="P:VOL.Entity.DomainModels.XinWei.XW_Device.CameraInfo">
             <summary>
             摄像头序列号、版本信息
             </summary>