Browse Source

更新!

TRX 1 year ago
parent
commit
d2f68a742c

+ 3 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/visitor/VisitorMain.java

@@ -135,6 +135,9 @@ public class VisitorMain extends SuperMain {
     @Schema(description = "第一次访问时间")
     private Long firstVisitTime;
 
+    @Schema(description = "最后访问时间")
+    private Long lastVisitTime;
+
     @Schema(description = "到访部门")
     private String departments = "";
 

+ 10 - 5
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorMainService.java

@@ -290,12 +290,14 @@ public class VisitorMainService extends SuperService {
             if (ObjectUtils.isEmpty(visitorMain)) {
                 return null;
             }
+            // 待来访 状态改为 已到访
             if (visitorMain.getState() == VisitorState.WaitVisit) {
                 visitorMain.setState(VisitorState.Visit);
                 visitorMain.setFirstVisitTime(System.currentTimeMillis());
-                visitorMainDao.save(visitorMain);
-                return visitorMain;
             }
+            visitorMain.setLastVisitTime(System.currentTimeMillis());
+            visitorMainDao.save(visitorMain);
+            return visitorMain;
         }
         return null;
     }
@@ -327,14 +329,17 @@ public class VisitorMainService extends SuperService {
      */
     public ResultContent checkExpireInfo(VisitorMain visitorMain) {
         if (ObjectUtils.isNotEmpty(visitorMain)) {
+            // 已审核  已过期
             if (visitorMain.getReViewSuccess() != null && visitorMain.getReViewSuccess() && visitorMain.getEndTime() <= System.currentTimeMillis()) {
                 // 取消人脸
-                com.github.microservice.auth.client.content.ResultContent resultContent = userFaceService.delete(
-                        visitorMain.getTempUserId(), visitorMain.getFaceFileId());
+                com.github.microservice.auth.client.content.ResultContent resultContent = userFaceService.delete(visitorMain.getTempUserId(), visitorMain.getFaceFileId());
                 if (resultContent.isSuccess()) {
                     visitorMain.setIsCancel(Boolean.TRUE);
                     visitorMain.setIsClearFace(Boolean.TRUE);
-
+                    // 如果未使用,,则把状态改为 已失效
+                    if (visitorMain.getState() == VisitorState.WaitVisit) {
+                        visitorMain.setState(VisitorState.Cancel);
+                    }
                     visitorMainDao.save(visitorMain);
                     return ResultContent.buildSuccess();
                 } else {