app接口功能

bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/StayPersonEntity.java

@@ -133,4 +133,8 @@ public class StayPersonEntity {
      */
     private Integer isCertificate;
 
+    /**
+     * 人脸验证信息
+     */
+    private int faceStatus;
 }

bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/StayPersonController.java

@@ -83,12 +83,12 @@ public class StayPersonController extends BaseController{
 
     /**
      * 所有人员进行人脸验证
-     * @param list
+     * @param data
      * @return
      */
-    @PostMapping("allRecognition")
+    @GetMapping("allRecognition")
     @SysLog(title = "现场人员管理", businessType = OperaType.QUERY,  module = "基础管理->现场人员管理", details = "所有人员进行人脸验证")
-    public AjaxResult allRecognition(@RequestBody List<PeopleInfoEntity> list) {
-        return service.allRecognition(list);
+    public AjaxResult allRecognition(ProjectVo data) {
+        return service.allRecognition(data);
     }
 }

bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/StayPersonMapper.java

@@ -21,6 +21,13 @@ public interface StayPersonMapper {
      */
     List<StayPersonEntity> getStayPersonList(ProjectVo vo);
 
+    /**
+     * 获取所有人脸验证的人员id和类别
+     * @param vo
+     * @return
+     */
+    List<PeopleInfoEntity> getStayPersonInfoList(ProjectVo vo);
+
     /**
      * 获取施工距离
      * @return String

bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IStayPersonService.java

@@ -45,8 +45,8 @@ public interface IStayPersonService {
 
     /**
      * 多个人员进行人脸验证
-     * @param list
+     * @param data
      * @return AjaxResult
      */
-    AjaxResult allRecognition(List<PeopleInfoEntity> list);
+    AjaxResult allRecognition(ProjectVo data);
 }

bonus-modules/bonus-app/src/main/java/com/bonus/app/service/StayPersonServiceImpl.java

@@ -155,14 +155,16 @@ public class StayPersonServiceImpl implements IStayPersonService{
 
     /**
      * 多个人员进行人脸验证
-     * @param list
+     * @param data
      * @return
      */
     @Override
-    public AjaxResult allRecognition(List<PeopleInfoEntity> list) {
+    public AjaxResult allRecognition(ProjectVo data) {
+        List<PeopleInfoEntity> list = new ArrayList<>();
         ShInfoEntity shData = new ShInfoEntity();
         List<ShInfoEntity> listSh = new ArrayList<>();
         try {
+            list = mapper.getStayPersonInfoList(data);
             if(list.size()!=0){
                 for (PeopleInfoEntity vo : list) {
                     shData = mapper.getShInfoList(vo);

bonus-modules/bonus-app/src/main/resources/mapper/StayPersonMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.bonus.app.mapper.StayPersonMapper">
 
     <select id="getStayPersonList" resultType="com.bonus.app.entity.StayPersonEntity" >
-        select  tpp.id gtId ,twt.team_id teamId,twt.team_name teamName,blt.sh_code shCode,tpp.lon sgLon,tpp.lat sgLat,
+        select  tpp.id gtId ,twt.team_id teamId,twt.team_name teamName,blt.sh_code shCode,tpp.lon sgLon,tpp.lat sgLat,blt.face_status faceStatus,
         peopel_type as userType,tddone.data_val as dl,tddtwo.data_val as lon,tddthree.data_val as lat,tddfour.data_val as wd,tddfive.data_val as xl,tddsix.data_val as xy,
                 case
                     WHEN  peopel_type=0 then tpe.aqm_code
@@ -65,10 +65,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         group by twt.team_id,blt.sh_code,sbx.gt_id,blt.peopel_type,tddone.data_val,tddtwo.data_val,tddthree.data_val,tddfour.data_val,tddfive.data_val,tddsix.data_val,
-        tpe.aqm_code,tpe.mj_code,tpe.id,tlu.id
+        tpe.aqm_code,tpe.mj_code,tpe.id,tlu.id,blt.face_status
         order by twt.team_id,userId
     </select>
 
+    <!--获取所有人脸验证的人员id和类别-->
+    <select id="getStayPersonInfoList" resultType="com.bonus.app.entity.PeopleInfoEntity" >
+        select peopel_type as userType,
+               case
+                   WHEN  peopel_type=0 then tpe.id
+                   WHEN  peopel_type=1 then tlu.id
+                   ELSE ''
+                   END AS userId
+        from tb_bracelet blt
+                 left join tb_sh_box sbx on blt.box_ix=sbx.id and sbx.del_flag = 0
+                 left join tb_people tpe on blt.bid_id=tpe.id and peopel_type=0
+                 left join tb_ls_user tlu on blt.bid_id=tlu.id and peopel_type=1
+        where sbx.gt_id = #{gtId}
+    </select>
+
     <!--获取施工距离-->
     <select id="getDistance" resultType="java.lang.String">
         SELECT dict_value