更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/visitor/VisitorMainSearch.java

@@ -28,9 +28,14 @@ public class VisitorMainSearch extends SuperSearch {
     @Schema(description = "是否已失效")
     private Boolean isCancel = Boolean.FALSE;
 
+    @Schema(description = "清除人脸")
+    private Boolean isClearFace;
+
     @Schema(description = "是否已失效(审核通过，但使用时间已过)")
     private Boolean isOverTime = Boolean.FALSE;
 
+    @Schema(description = "是否离开")
+    private Boolean isLeave = Boolean.FALSE;
     //-------------------------------申请信息start--------------------
     @Schema(description = "申请人userId")
     private String applyUserId;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/visitor/impl/VisitorMainDaoImpl.java

@@ -77,6 +77,14 @@ public class VisitorMainDaoImpl extends BaseImpl implements VisitorMainDaoExtend
             criteria.and("isOverTime").is(param.getIsOverTime());
         }
 
+        if (param.getIsClearFace() != null) {
+            criteria.and("isClearFace").is(param.getIsClearFace());
+        }
+
+        if (param.getIsLeave() != null) {
+            criteria.and("isLeave").is(param.getIsLeave());
+        }
+
         if (StringUtils.isNotEmpty(param.getApplyUserId())) {
             criteria.and("applyUserId").is(param.getApplyUserId());
         }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/visitor/VisitorMain.java

@@ -130,7 +130,7 @@ public class VisitorMain extends SuperMain {
     @Schema(description = "访问时间长(分钟)")
     private Long minutes;
 
-    @Schema(description = "结束时间")
+    @Schema(description = "范文规定结束时间")
     private Long endTime;
 
     @Schema(description = "权限开始时间")

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorMainService.java

@@ -251,7 +251,7 @@ public class VisitorMainService extends SuperPermissService {
             return resultContent;
         }
         if (visitorMain.getState() != VisitorState.WaitVisit) {
-            return ResultContent.buildFail("当前状态不能取消");
+            return ResultContent.buildFail(String.format("当前状态不能取消:%s", visitorMain.getState().getRemark()));
         }
         visitorMain.setIsCancel(Boolean.TRUE);
         visitorMain.setState(VisitorState.Cancel);
@@ -384,9 +384,9 @@ public class VisitorMainService extends SuperPermissService {
         search.setState(VisitorState.WaitVisit);
         Long waitVisitNumber = visitorMainDao.count(search);
 
-        // 当前访客 （已到访，还没过期）
+        // 当前访客 （已到访，没离开）
         search.setState(VisitorState.Visit);
-        search.setIsOverTime(Boolean.FALSE);
+        search.setIsLeave(Boolean.FALSE);
         Long visitNumber = visitorMainDao.count(search);
 
         model.setWaitReViewNumber(waitReViewNumber);
@@ -414,6 +414,35 @@ public class VisitorMainService extends SuperPermissService {
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 每天检查数据，，如果访问时间已过期，则清除人脸数据
+     */
+    public void loopCheckVisitorData() {
+        this.checkAllWaitReView();
+        this.checkAllOverTimeData();
+    }
+
+    /**
+     * 检查所有的 审核通过的是否过期（好清理人脸信息）
+     */
+    private void checkAllOverTimeData() {
+        VisitorMainSearch param = new VisitorMainSearch();
+        // 审核通过
+        param.setReViewSuccess(Boolean.TRUE);
+        // 没清除人脸
+        param.setIsClearFace(Boolean.FALSE);
+
+        Pageable pageable = PageRequest.of(0, 100);
+        Page<VisitorMain> page = visitorMainDao.page(pageable, param);
+        List<VisitorMain> list = page.getContent();
+        log.info("checkAllOverTimeData size: " + list.size());
+        if (ObjectUtils.isNotEmpty(list)) {
+            list.forEach(visitorMain -> {
+                checkExpireInfo(visitorMain);
+            });
+        }
+    }
+
     /**
      * 检查数据是否过期
      *
@@ -423,13 +452,14 @@ public class VisitorMainService extends SuperPermissService {
     public ResultContent checkExpireInfo(VisitorMain visitorMain) {
         if (ObjectUtils.isNotEmpty(visitorMain)) {
             // 已审核  已过期
-            if (visitorMain.getReViewSuccess() != null && visitorMain.getReViewSuccess() && visitorMain.getEndTime() <= System.currentTimeMillis()) {
+            if (visitorMain.getReViewSuccess() != null && visitorMain.getReViewSuccess()
+                    && visitorMain.getPerEndTime() < System.currentTimeMillis()) {
+
                 // 取消人脸
                 com.github.microservice.auth.client.content.ResultContent resultContent = userFaceService.delete(visitorMain.getTempUserId(), visitorMain.getFaceFileId());
                 if (resultContent.isSuccess()) {
                     visitorMain.setIsOverTime(Boolean.TRUE);
                     visitorMain.setIsClearFace(Boolean.TRUE);
-
                     // 如果未使用，，则把状态改为 已失效
                     if (visitorMain.getState() == VisitorState.WaitVisit) {
                         visitorMain.setState(VisitorState.Cancel);
@@ -439,45 +469,16 @@ public class VisitorMainService extends SuperPermissService {
                 } else {
                     return ResultContent.buildFail(resultContent.getMsg());
                 }
-
             }
         }
         return ResultContent.buildFail("数据为空");
     }
 
-    /**
-     * 每天检查数据，，如果访问时间已过期，则清除人脸数据
-     */
-    public void loopCheckVisitorData() {
-        this.checkAllWaitReView();
-        this.checkAllOverTimeData();
-    }
-
-    /**
-     * 检查所有的 审核通过的是否过期（好清理人脸信息）
-     */
-    private void checkAllOverTimeData() {
-        VisitorMainSearch param = new VisitorMainSearch();
-        // 审核通过
-        param.setReViewSuccess(Boolean.TRUE);
-        // 未失效
-        param.setIsOverTime(Boolean.FALSE);
-        param.setIsCancel(Boolean.FALSE);
-
-        Pageable pageable = PageRequest.of(0, 100);
-        Page<VisitorMain> page = visitorMainDao.page(pageable, param);
-        List<VisitorMain> list = page.getContent();
-        if (ObjectUtils.isNotEmpty(list)) {
-            list.forEach(visitorMain -> {
-                checkExpireInfo(visitorMain);
-            });
-        }
-    }
-
     /**
      * 检查所有的待审核得数据是否过期
      */
     private void checkAllWaitReView() {
+        // 待审核
         List<VisitorMain> list = visitorMainDao.findByState(VisitorState.WaitReView);
         if (ObjectUtils.isNotEmpty(list)) {
             list.stream().forEach(visitorMain -> {