whycxzp
2024-07-23 76b408284c8eb7d4a3884bffe98cd9ee61decb05
人脸登录更新
3个文件已修改
32 ■■■■ 已修改文件
src/main/java/com/whyc/controller/FaceController.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/FaceMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PermitGroupUserMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/FaceController.java
@@ -3,18 +3,19 @@
import com.arcsoft.face.FaceEngine;
import com.arcsoft.face.toolkit.ImageFactory;
import com.arcsoft.face.toolkit.ImageInfo;
import com.whyc.constant.UserOperation;
import com.whyc.constant.YamlProperties;
import com.whyc.dto.Response;
import com.whyc.factory.FaceEngineFactory;
import com.whyc.pojo.PermitGroup;
import com.whyc.pojo.UserInf;
import com.whyc.service.FaceService;
import com.whyc.service.PermitGroupUserService;
import com.whyc.service.UserService;
import com.whyc.service.*;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import com.whyc.util.FaceIdentifyUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -46,6 +48,12 @@
    @Resource
    private UserService userService;
    @Resource
    private MapOutlineService mapOutlineService;
    @Autowired
    private BaoJiGroupUserService baoJiGroupUserService;
    @GetMapping("activeOnline")
    @ApiOperation(value = "在线激活人脸识别引擎",notes = "只需要刚开始时调用一次,会导致appId与硬件设备绑定,必须有外部网络,否则激活会失败!" +
@@ -360,7 +368,8 @@
                                if(!temp.getUId().equals(userByUKeyId.getUId())){
                                    return res.set(1,false,"UKey对应用户和当前人脸对应用户不匹配");
                                }
                                res.setData2(temp);
                                List<Object> dataList = new ArrayList<>();
                                dataList.add(temp);
                                // 将登陆成功的用户存入session
                                ActionUtil.getSession().setAttribute("user", temp);
@@ -370,12 +379,22 @@
                                ActionUtil.getSession().setAttribute("ip", ActionUtil.getRequest().getRemoteAddr());
                                List<PermitGroup> permitList = permitGroupUserService.getPermitByUser(temp.getUId());
                                if (permitList!=null && permitList.size()!=0) {
                                    dataList.add(permitList.get(0).getPermitGroupId());
                                    ActionUtil.getSession().setAttribute("permits", permitList);
                                } else {
                                    res.setCode(1);
                                    res.setData(false);
                                    res.setMsg("还未分配权限");
                                }
                                //查询用户对应的班组标识
                                dataList.add(baoJiGroupUserService.getGroupFlag(temp.getUId().intValue()));
                                //查询激活的地图
                                String mapName = mapOutlineService.selectMapName();
                                dataList.add(mapName);
                                CommonUtil.record(temp.getUId(), UserOperation.TYPE_LOGIN.getType(), UserOperation.TYPE_LOGIN.getTypeName(), UserOperation.TYPE_LOGIN.getTypeNameEn());
                                res.setData2(dataList);
                                //将新登录的用户存入application
                                userService.setApplication(temp);
                            }
src/main/resources/mapper/FaceMapper.xml
@@ -15,6 +15,7 @@
        <id property="uId" column="uId" />
        <result property="uName" column="uName"/>
        <result property="uSnId" column="uSnId"/>
        <result property="uRole" column="uRole"/>
        <result property="upassword" column="upassword"/>
        <association property="face" javaType="UserFace">
            <result property="url" column="url" />
@@ -29,7 +30,7 @@
        on inf.face_id=face.id where uId=#{uId} limit 1
    </select>
    <select id="findAllFaceUrl" resultMap="Map_UserInf2">
        select inf.uName,inf.uId,inf.uSnId,inf.upassword,face.url from db_user.tb_user_inf inf inner join db_user.tb_user_face face
        select inf.uName,inf.uId,inf.uSnId,inf.upassword,inf.uRole,face.url from db_user.tb_user_inf inf inner join db_user.tb_user_face face
        on inf.face_id=face.id
    </select>
</mapper>
src/main/resources/mapper/PermitGroupUserMapper.xml
@@ -4,7 +4,7 @@
    <select id="getPermitByUser" resultType="com.whyc.pojo.PermitGroup">
        select  tb_user_permitgroup.num,permit_group_name,permit_item_name,permit_item_value
        select  tb_user_permitgroup.num,permit_group_name,tb_user_permitgroup.permit_group_id,permit_item_name,permit_item_value
        from db_user.tb_user_permitgroup,db_user.tb_user_permitgroup_data
        where tb_user_permitgroup.permit_group_id=tb_user_permitgroup_data.permit_group_id
        and tb_user_permitgroup_data.uId=#{userId}