diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/StayPersonEntity.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/StayPersonEntity.java index 2f082a9..89dc8e0 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/StayPersonEntity.java +++ b/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; } diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/StayPersonController.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/StayPersonController.java index 20707e0..255f17f 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/StayPersonController.java +++ b/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 list) { - return service.allRecognition(list); + public AjaxResult allRecognition(ProjectVo data) { + return service.allRecognition(data); } } diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/StayPersonMapper.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/StayPersonMapper.java index e0c0271..fac2525 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/StayPersonMapper.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/StayPersonMapper.java @@ -21,6 +21,13 @@ public interface StayPersonMapper { */ List getStayPersonList(ProjectVo vo); + /** + * 获取所有人脸验证的人员id和类别 + * @param vo + * @return + */ + List getStayPersonInfoList(ProjectVo vo); + /** * 获取施工距离 * @return String diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IStayPersonService.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IStayPersonService.java index c528905..245f478 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IStayPersonService.java +++ b/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 list); + AjaxResult allRecognition(ProjectVo data); } diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/StayPersonServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/StayPersonServiceImpl.java index cdd630c..2ab16cf 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/StayPersonServiceImpl.java +++ b/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 list) { + public AjaxResult allRecognition(ProjectVo data) { + List list = new ArrayList<>(); ShInfoEntity shData = new ShInfoEntity(); List listSh = new ArrayList<>(); try { + list = mapper.getStayPersonInfoList(data); if(list.size()!=0){ for (PeopleInfoEntity vo : list) { shData = mapper.getShInfoList(vo); diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/StayPersonMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/StayPersonMapper.xml index d0c180b..df945cb 100644 --- a/bonus-modules/bonus-app/src/main/resources/mapper/StayPersonMapper.xml +++ b/bonus-modules/bonus-app/src/main/resources/mapper/StayPersonMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + +