From c6708bf8af6bb763a2432e8dcf3f82b0c34aa8c6 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 22 Nov 2024 09:07:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/common/config/SpringMvcConfig.java | 12 ++++++------ .../serve/common/util/TianYiYunSmsUtil.java | 2 +- .../visit/api/VisitMainInnerController.java | 19 ++++++++++--------- .../modules/visit/api/VisitMainOuterApi.java | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java b/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java index f3cf536..4ecd4fd 100644 --- a/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java +++ b/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java @@ -25,16 +25,16 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration(proxyBeanMethods = false) public class SpringMvcConfig implements WebMvcConfigurer { - private final LimitSubmitInterceptor limitSubmitInterceptor; + //private final LimitSubmitInterceptor limitSubmitInterceptor; //private final ApiAuthInterceptor apiAuthInterceptor; private final ProjectProperties projectProperties; - @Override - public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(limitSubmitInterceptor) - .addPathPatterns("/**"); - } +// @Override +// public void addInterceptors(InterceptorRegistry registry) { +// registry.addInterceptor(limitSubmitInterceptor) +// .addPathPatterns("/**"); +// } @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { diff --git a/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java b/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java index 32c01ef..9ac3fe5 100644 --- a/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java +++ b/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java @@ -56,7 +56,7 @@ public class TianYiYunSmsUtil { DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH时mm分"); String visitDateFormat = visitDate.format(df); String msg = "【嘉士利】预约成功通知:您的预约已被确认，请您于"+visitDateFormat +"访问："+accessUser+ - "，您的访问信息如下:"+url+"，点击链接展示来访二维码，门卫扫码即可完成登记。期待您的到访。"; + "，您的访问信息如下："+url+"，点击链接展示来访二维码，门卫扫码即可完成登记。期待您的到访。"; send(mobile,msg); } diff --git a/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java b/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java index f314222..f92f342 100644 --- a/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java +++ b/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java @@ -85,19 +85,20 @@ public class VisitMainInnerController { VisitMain visitMain = visitMainService.getById(id); // 判断是否超过2小时 LocalDateTime nowTime = LocalDateTime.now(); - if(visitMain.getVisitStartDate()!=null&&nowTime.isBefore(visitMain.getVisitStartDate())){ + VisitTheme visitTheme = visitThemeService.getById(visitMain.getThemeId()); + if(visitTheme.getVisitStartDate()!=null&&nowTime.isBefore(visitTheme.getVisitStartDate())){ return R.error("登记时间未开始"); } - if(visitMain.getVisitEndDate()!=null&&nowTime.isAfter(visitMain.getVisitEndDate())){ + if(visitTheme.getVisitEndDate()!=null&&nowTime.isAfter(visitTheme.getVisitEndDate())){ return R.error("已结束登记"); } - if(visitMain.getVisitTime()!=null){ - LocalDateTime time = visitMain.getVisitTime().plusHours(2); - // 两小时以内不支持核对 - if(LocalDateTime.now().isBefore(time)){ - Assert.throwEx("2小时以内不支持多次核对"); - } - } +// if(visitMain.getVisitTime()!=null){ +// LocalDateTime time = visitMain.getVisitTime().plusHours(2); +// // 两小时以内不支持核对 +// if(LocalDateTime.now().isBefore(time)){ +// Assert.throwEx("2小时以内不支持多次核对"); +// } +// } // 状态为待核对 if(visitMain.getCheckState().equals(VisitMainConst.CheckState_1)){ SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); diff --git a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java index 5637160..5de98cd 100644 --- a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java +++ b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java @@ -187,10 +187,10 @@ public class VisitMainOuterApi { return R.error("主题已停用"); } LocalDateTime nowTime = LocalDateTime.now(); - if(visitTheme.getCodeStartDate()!=null&&nowTime.isBefore(visitTheme.getCodeStartDate())){ + if(visitTheme.getVisitStartDate()!=null&&nowTime.isBefore(visitTheme.getVisitStartDate())){ return R.error("登记时间未开始"); } - if(visitTheme.getCodeEndDate()!=null&&nowTime.isAfter(visitTheme.getCodeEndDate())){ + if(visitTheme.getVisitEndDate()!=null&&nowTime.isAfter(visitTheme.getVisitEndDate())){ return R.error("已结束登记"); }