From dc2872d6d346a7de629b3b0686057ab54f216f09 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期五, 31 七月 2026 14:45:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/fangkeji

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorConfigServiceImpl.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorConfigServiceImpl.java
index 4789ad8..ec2bd80 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorConfigServiceImpl.java
@@ -93,6 +93,16 @@
         {
             config.setAppointmentRegistrationEnabled(request.getAppointmentRegistrationEnabled());
         }
+        if (request.getAppointmentDefaultVisitTime() != null)
+        {
+            String appointmentDefaultVisitTime = StringUtils.trim(request.getAppointmentDefaultVisitTime());
+            if (StringUtils.isNotEmpty(appointmentDefaultVisitTime)
+                    && !appointmentDefaultVisitTime.matches("([01]\\d|2[0-3]):[0-5]\\d"))
+            {
+                throw new ServiceException("预约登记默认访问时间格式不正确");
+            }
+            config.setAppointmentDefaultVisitTime(appointmentDefaultVisitTime);
+        }
         if (request.getRegisterReceiverConfirmEnabled() != null)
         {
             config.setRegisterReceiverConfirmEnabled(request.getRegisterReceiverConfirmEnabled());
@@ -181,6 +191,7 @@
         SysVisitorConfig config = new SysVisitorConfig();
         config.setOnsiteRegistrationEnabled(true);
         config.setAppointmentRegistrationEnabled(true);
+        config.setAppointmentDefaultVisitTime("");
         config.setRegisterReceiverConfirmEnabled(true);
         config.setSignReceiverConfirmEnabled(true);
         config.setFaceCompareEnabled(true);
@@ -200,6 +211,7 @@
         vo.setConfigId(config.getConfigId());
         vo.setOnsiteRegistrationEnabled(config.getOnsiteRegistrationEnabled());
         vo.setAppointmentRegistrationEnabled(config.getAppointmentRegistrationEnabled());
+        vo.setAppointmentDefaultVisitTime(config.getAppointmentDefaultVisitTime());
         vo.setRegisterReceiverConfirmEnabled(config.getRegisterReceiverConfirmEnabled());
         vo.setSignReceiverConfirmEnabled(config.getSignReceiverConfirmEnabled());
         vo.setFaceCompareEnabled(config.getFaceCompareEnabled());

--
Gitblit v1.7.1