bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

移动端打卡接口更新实时人脸识别判断

黑艺新账号
北京泉江 1 year ago
parent
dffb92670d
commit
91a1da1a99
3 changed files with 175 additions and 142 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +55
    -4
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs
  2. +8
    -27
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/ADR_RecordApi.cs
  3. +112
    -111
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config

+ 55
- 4
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs View File

@@ -108,11 +108,36 @@ namespace Learun.Application.WebApi.Modules
/// <returns></returns>
public Response ClockIn(dynamic _)
{

Attendance parameter = this.GetReqData<Attendance>();
var userinfo = LoginUserInfo.Get();
//员工账号
string EmpNo = userinfo.account;
//根据用户编号获取用户头像
var einfo = empInfoIBLL.GetEmpInfoEntityByEmpNo(EmpNo);
if (einfo == null)
{
return Fail("用户数据错误！");
}
string userimg = einfo.Photo;
string imgid = parameter.Img;

adr_RestrictionBLL.ClockIn(parameter.ALon, parameter.ALat, parameter.AIsOut, parameter.ARemark,parameter.ADPhoto,parameter.ClockPlace,parameter.Img);
var url = Config.GetValue("FaceCheckApi");
string result = Util.HttpMethods.HttpGet($"{url}{userimg}/{imgid}");
if (result == "1")
{
adr_RestrictionBLL.ClockIn(parameter.ALon, parameter.ALat, parameter.AIsOut, parameter.ARemark, parameter.ADPhoto, parameter.ClockPlace, parameter.Img);

return Success("打卡成功");
return Success("打卡成功");
}
else
{
return Fail("打卡照片异常，请重新拍照！");
}

}
/// <summary>
/// 学生打卡
@@ -169,9 +194,35 @@ namespace Learun.Application.WebApi.Modules
public Response ClockInTeacher(dynamic _)
{
Attendance parameter = this.GetReqData<Attendance>();
adr_RestrictionBLL.ClockInTeacher(parameter.ALon, parameter.ALat, parameter.AIsOut, parameter.ARemark, parameter.ADPhoto, parameter.ClockPlace, parameter.LessonSortNo, parameter.ALTId, parameter.ALTOEId,parameter.Img);

return Success("打卡成功");
var userinfo = LoginUserInfo.Get();
//员工账号
string EmpNo = userinfo.account;

//根据用户编号获取用户头像
var einfo = empInfoIBLL.GetEmpInfoEntityByEmpNo(EmpNo);
if (einfo == null)
{
return Fail("用户数据错误！");
}
string userimg = einfo.Photo;
string imgid = parameter.Img;

var url = Config.GetValue("FaceCheckApi");

string result = Util.HttpMethods.HttpGet($"{url}{userimg}/{imgid}");
if (result == "1")
{
adr_RestrictionBLL.ClockInTeacher(parameter.ALon, parameter.ALat, parameter.AIsOut, parameter.ARemark, parameter.ADPhoto, parameter.ClockPlace, parameter.LessonSortNo, parameter.ALTId, parameter.ALTOEId, parameter.Img);

return Success("打卡成功");
}
else
{
return Fail("打卡照片异常，请重新拍照！");
}

}

/// <summary>


+ 8
- 27
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/ADR_RecordApi.cs View File

@@ -70,8 +70,9 @@ namespace Learun.Application.WebApi
public Response GetForm(dynamic _)
{
string keyValue = this.GetReqData();
var ADR_RecordData = aDR_RecordIBLL.GetADR_RecordEntity( keyValue );
var jsonData = new {
var ADR_RecordData = aDR_RecordIBLL.GetADR_RecordEntity(keyValue);
var jsonData = new
{
ADR_Record = ADR_RecordData,
};
return Success(jsonData);
@@ -101,30 +102,9 @@ namespace Learun.Application.WebApi
ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
ADR_RecordEntity entity = parameter.strEntity.ToObject<ADR_RecordEntity>();

//http://192.168.16.250:5000/facecheck/用户图片id/签到图片id
//样例接口
//http://192.168.16.250:5000/facecheck/29b6d3de-69db-4ffa-9105-b85f0b38e498/29b6d3de-69db-4ffa-9105-b85f0b38e498
//根据用户编号获取用户头像
EmpInfoEntity einfo = empInfoIBLL.GetEmpInfoEntityByEmpNo(entity.UserNo);
if (einfo == null)
{
return Fail("用户数据错误！");
}

string userimg = einfo.Photo;
string imgid = entity.Img;
aDR_RecordIBLL.SaveEntity(parameter.keyValue, entity);
return Success("保存成功！");

//http://192.168.16.250:5000/facecheck
string result = Util.HttpMethods.HttpGet("http://192.168.16.250:5000/facecheck/" + userimg + "/" + imgid);
if (result == "1")
{
aDR_RecordIBLL.SaveEntity(parameter.keyValue, entity);
return Success("保存成功！");
}
else
{
return Fail("打卡照片异常，请重新拍照！");
}
}
#endregion

@@ -133,9 +113,10 @@ namespace Learun.Application.WebApi
/// <summary>
/// 表单实体类
/// <summary>
private class ReqFormEntity {
private class ReqFormEntity
{
public string keyValue { get; set; }
public string strEntity{ get; set; }
public string strEntity { get; set; }
}
#endregion



+ 112
- 111
Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config View File

@@ -1,121 +1,122 @@
<?xml version="1.0" encoding="utf-8"?>
<appSettings>
<!-- ================== 1：开发系统相关配置 ================== -->
<!-- 启用系统日志-->
<add key="IsLog" value="true" />
<!-- 是否启用js、css压缩-->
<add key="JsCompressor" value="false" />
<!-- 是否启用js、css缓存-->
<add key="JsCompressorCache" value="false" />
<!-- 代码生成器路径-->
<add key="BackProject" value="Learun.Application.TwoDevelopment" />
<add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
<add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
<add key="WebDirectory" value="\Learun.Application.Web" />
<add key="ApiDirectory" value="\Learun.Application.WebApi" />
<add key="AppDirectory" value="\pulsApp" />
<add key="WxDirectory" value="\uniApp" />
<!-- ================== 1：开发系统相关配置 ================== -->
<!-- 启用系统日志-->
<add key="IsLog" value="true" />
<!-- 是否启用js、css压缩-->
<add key="JsCompressor" value="false" />
<!-- 是否启用js、css缓存-->
<add key="JsCompressorCache" value="false" />
<!-- 代码生成器路径-->
<add key="BackProject" value="Learun.Application.TwoDevelopment" />
<add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
<add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
<add key="WebDirectory" value="\Learun.Application.Web" />
<add key="ApiDirectory" value="\Learun.Application.WebApi" />
<add key="AppDirectory" value="\pulsApp" />
<add key="WxDirectory" value="\uniApp" />

<!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
<!--企业号CorpId -->
<add key="CorpId" value="wxa2c39f6194f4" />
<!--企业号凭证密钥 -->
<add key="CorpSecret" value="eDo9pEOXWqSgWtQ-_1NF_NTmGDTlZ3UFFdF3To-" />
<!-- ================== 3：访问过滤配置 ================== -->
<!--设置IP过滤 -->
<add key="FilterIP" value="false" />
<!--设置时段过滤 -->
<add key="FilterTime" value="false" />
<!-- ================== 4：系统软件参数配置 ================== -->
<!-- 联系我们 -->
<add key="Contact" value="" />
<!-- 公司名称 -->
<add key="CustomerCompanyName" value="数字化智慧校园" />
<!-- 系统名称 -->
<add key="SystemName" value="数字化智慧校园" />
<!-- 软件名称 -->
<add key="SoftName" value="数字化智慧校园" />
<!-- 软件版本 -->
<add key="Version" value="6.1.6.0" />
<!-- 软件注册码，备用 -->
<add key="RegisterKey" value="NO:2013101712345678" />
<!-- ================== 飞星通讯地址 下发新闻用 ================== -->
<add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />
<!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
<!--企业号CorpId -->
<add key="CorpId" value="wxa2c39f6194f4" />
<!--企业号凭证密钥 -->
<add key="CorpSecret" value="eDo9pEOXWqSgWtQ-_1NF_NTmGDTlZ3UFFdF3To-" />
<!-- ================== 3：访问过滤配置 ================== -->
<!--设置IP过滤 -->
<add key="FilterIP" value="false" />
<!--设置时段过滤 -->
<add key="FilterTime" value="false" />
<!-- ================== 4：系统软件参数配置 ================== -->
<!-- 联系我们 -->
<add key="Contact" value="" />
<!-- 公司名称 -->
<add key="CustomerCompanyName" value="数字化智慧校园" />
<!-- 系统名称 -->
<add key="SystemName" value="数字化智慧校园" />
<!-- 软件名称 -->
<add key="SoftName" value="数字化智慧校园" />
<!-- 软件版本 -->
<add key="Version" value="6.1.6.0" />
<!-- 软件注册码，备用 -->
<add key="RegisterKey" value="NO:2013101712345678" />
<!-- ================== 飞星通讯地址 下发新闻用 ================== -->
<add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />

<!-- ================== 5：外部邮件参数 ================== -->
<!-- 系统错误自动发送邮件 -->
<add key="ErrorToMail" value="false" />
<!-- 接收错误信息的邮箱 -->
<add key="RereceiveErrorMail" value="" />
<!-- 发出邮箱的名称 -->
<add key="MailName" value="" />
<!-- 发出邮箱的地址 -->
<add key="MailUserName" value="" />
<!-- 发出邮箱的密码 -->
<add key="MailPassword" value="" />
<!-- 发出邮箱设置邮箱主机 -->
<add key="MailHost" value="" />
<!--内控材料上传角色名-->
<add key="MPRoleName" value="内控材料上传员" />
<!-- ================== 5：外部邮件参数 ================== -->
<!-- 系统错误自动发送邮件 -->
<add key="ErrorToMail" value="false" />
<!-- 接收错误信息的邮箱 -->
<add key="RereceiveErrorMail" value="" />
<!-- 发出邮箱的名称 -->
<add key="MailName" value="" />
<!-- 发出邮箱的地址 -->
<add key="MailUserName" value="" />
<!-- 发出邮箱的密码 -->
<add key="MailPassword" value="" />
<!-- 发出邮箱设置邮箱主机 -->
<add key="MailHost" value="" />
<!--内控材料上传角色名-->
<add key="MPRoleName" value="内控材料上传员" />

<!-- ================== 6：即时通信参数 ================== -->
<!-- SignalR服务接口-->
<add key="IMUrl" value="http://localhost:8012/signalr" />
<add key="IMOpen" value="true" />
<!-- ================== 6：即时通信参数 ================== -->
<!-- SignalR服务接口-->
<add key="IMUrl" value="http://localhost:8012/signalr" />
<add key="IMOpen" value="true" />

<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
<!-- ==================注意附件上传地址 修改到主网站部署目录下的Resource要不然飞星会报错================== -->
<add key="AnnexesFile" value="D:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
<add key="ReportFile" value="~/Reports" />
<!-- ================== 工作流服务地址 ================== -->
<add key="workflowapi" value="http://localhost:8013" />
<!-- ================== 数字化校园主站地址 ================== -->
<add key="webrootpath" value="http://192.168.10.63:8001" />
<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
<!-- ==================注意附件上传地址 修改到主网站部署目录下的Resource要不然飞星会报错================== -->
<add key="AnnexesFile" value="D:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
<add key="ReportFile" value="~/Reports" />
<!-- ================== 工作流服务地址 ================== -->
<add key="workflowapi" value="http://localhost:8013" />
<!-- ================== 数字化校园主站地址 ================== -->
<add key="webrootpath" value="http://192.168.10.63:8001" />

<!--Redis 缓存前缀 -->
<add key="RedisPrev" value="LRADMS"/>
<!--缓存链接配置-->
<add key="RedisExchangeHosts" value="127.0.0.1:6379,allowadmin=true"/>
<!--head 头像存储地址 -->
<add key="fileHeadImg" value="C:/fileHeadImg"/>
<add key="fileAppDTImg" value="C:/fileAppDTImg" />
<!--印章管理存储图片路径 -->
<add key="Stamp" value="C:/StampImg" />
<add key="Intervals" value="1"/>
<!--Redis 缓存前缀 -->
<add key="RedisPrev" value="LRADMS"/>
<!--缓存链接配置-->
<add key="RedisExchangeHosts" value="127.0.0.1:6379,allowadmin=true"/>
<!--head 头像存储地址 -->
<add key="fileHeadImg" value="C:/fileHeadImg"/>
<add key="fileAppDTImg" value="C:/fileAppDTImg" />
<!--印章管理存储图片路径 -->
<add key="Stamp" value="C:/StampImg" />
<add key="Intervals" value="1"/>


<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>
<add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<add key="owin:AutomaticAppStartup" value="true"/>
<!-- ================== 默认头像 ================== -->
<add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
<!--统一身份认证加密公钥-->
<!--批量生成家长帐号时默认的角色Id-->
<add key="GenerateParentsRoleId" value="" />
<!--默认密码-->
<add key="defaultpwd" value="123456" />
<add key="SSOPublicSecret" value="bjquanjiang" />
<!-- 深信服ACIp -->
<add key="ACIp" value=""/>
<add key="ACIp2" value=""/>
<!-- 是否强制验证强密码 -->
<add key="verifypwd" value="false"/>
<!--疫情防控组角色Id-->
<add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
<add key="QJUrl" value="www.qj.com"/>
<!-- 报名选修课的最大课程数 -->
<add key="ElectiveLessonApplyMax" value="2" />
<!-- 报名线上选修课的最大课程数 -->
<add key="OnlineElectiveLessonApplyMax" value="2" />
<!--系主任角色Id-->
<add key="DeptDirectorRoleId" value="9310c5f3-1a0a-4f23-9452-3e5a15b3b722" />
<!--学校签章使用权角色Id 流程审批时是否有使用学校签章的权限；-->
<add key="StampRightRoleId" value="cf0dc3da-3706-41ec-9032-02d1f4650d3b"/>
<!--最早上课打卡时间（分钟）-->
<add key="StuAttendanceEarliestMinute" value="15" />
<!--教师授课打卡：上课前、下课后指定的时间（分钟）-->
<add key="TeachAttendanceEarliestMinute" value="5" />
<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>
<add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<add key="owin:AutomaticAppStartup" value="true"/>
<!-- ================== 默认头像 ================== -->
<add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
<!--统一身份认证加密公钥-->
<!--批量生成家长帐号时默认的角色Id-->
<add key="GenerateParentsRoleId" value="" />
<!--默认密码-->
<add key="defaultpwd" value="123456" />
<add key="SSOPublicSecret" value="bjquanjiang" />
<!-- 深信服ACIp -->
<add key="ACIp" value=""/>
<add key="ACIp2" value=""/>
<!-- 是否强制验证强密码 -->
<add key="verifypwd" value="false"/>
<!--疫情防控组角色Id-->
<add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
<add key="QJUrl" value="www.qj.com"/>
<!-- 报名选修课的最大课程数 -->
<add key="ElectiveLessonApplyMax" value="2" />
<!-- 报名线上选修课的最大课程数 -->
<add key="OnlineElectiveLessonApplyMax" value="2" />
<!--系主任角色Id-->
<add key="DeptDirectorRoleId" value="9310c5f3-1a0a-4f23-9452-3e5a15b3b722" />
<!--学校签章使用权角色Id 流程审批时是否有使用学校签章的权限；-->
<add key="StampRightRoleId" value="cf0dc3da-3706-41ec-9032-02d1f4650d3b"/>
<!--最早上课打卡时间（分钟）-->
<add key="StuAttendanceEarliestMinute" value="15" />
<!--教师授课打卡：上课前、下课后指定的时间（分钟）-->
<add key="TeachAttendanceEarliestMinute" value="5" />
<!--人脸识别接口-->
<add key="FaceCheckApi" value="http://192.168.16.250:5000/facecheck/"/>
</appSettings>

Write Preview
Loading…
Cancel
Save