Browse Source

bug 修复

夏文涛 1 year ago
parent
commit
4a904dbd32
100 changed files with 4755 additions and 6604 deletions
  1. 672 377
      .idea/workspace.xml
  2. 0 4232
      logs/smart-2024-12-10.log
  3. 0 196
      logs/smart-2024-12-11.log
  4. 0 340
      logs/smart-2024-12-12.log
  5. 342 0
      logs/smart-2024-12-23.log
  6. 1468 0
      logs/smart-2024-12-24.log
  7. 56 0
      logs/smart-2024-12-25.log
  8. 195 0
      logs/smart-2024-12-26.log
  9. 893 860
      logs/smart-2024-12-09.log
  10. 139 0
      logs/smart-2024-12-30.log
  11. 774 0
      logs/smart-2024-12-31.log
  12. 1 1
      src/main/java/com/template/api/AlumniCategoryControllerAPI.java
  13. 97 6
      src/main/java/com/template/common/utils/TimeExchange.java
  14. 23 3
      src/main/java/com/template/controller/AlumniActivityController.java
  15. 16 12
      src/main/java/com/template/controller/AlumniCategoryController.java
  16. 10 11
      src/main/java/com/template/controller/AlumniClubApplyController.java
  17. 0 2
      src/main/java/com/template/controller/AlumniClubController.java
  18. 8 0
      src/main/java/com/template/controller/AlumniEndorseController.java
  19. 10 0
      src/main/java/com/template/controller/AlumniImageController.java
  20. 1 1
      src/main/java/com/template/controller/AlumniUserController.java
  21. 5 9
      src/main/java/com/template/controller/LoginController.java
  22. 3 1
      src/main/java/com/template/mapper/AlumniCategoryMapper.java
  23. 0 2
      src/main/java/com/template/model/pojo/AlumniCategoryImage.java
  24. 1 0
      src/main/java/com/template/model/pojo/AlumniClub.java
  25. 0 3
      src/main/java/com/template/model/request/insertClubRequest.java
  26. 0 3
      src/main/java/com/template/model/request/updateClubRequest.java
  27. 1 1
      src/main/java/com/template/services/AlumniCategoryService.java
  28. 2 0
      src/main/java/com/template/services/AlumniClubService.java
  29. 6 11
      src/main/java/com/template/services/impl/AlumniCategoryServiceImpl.java
  30. 8 0
      src/main/java/com/template/services/impl/AlumniClubServiceImpl.java
  31. 1 1
      src/main/resources/mapper/template/ActivitySigninMapper.xml
  32. 14 1
      src/main/resources/mapper/template/AlumniCategoryMapper.xml
  33. 1 1
      src/main/resources/mapper/template/AlumniClubApplyMapper.xml
  34. 5 2
      src/main/resources/mapper/template/AlumniClubMapper.xml
  35. 3 3
      src/main/resources/mapper/template/AlumniEndorseMapper.xml
  36. BIN
      target/alumni.jar
  37. BIN
      target/alumni.jar.original
  38. 0 202
      target/classes/META-INF/spring-configuration-metadata.json
  39. 0 109
      target/classes/application-dev.yml
  40. 0 109
      target/classes/application-prod.yml
  41. 0 105
      target/classes/application.yml
  42. BIN
      target/classes/com/template/AutoCode.class
  43. BIN
      target/classes/com/template/MybatisPlusApplication.class
  44. BIN
      target/classes/com/template/annotation/ControllerIsShow.class
  45. BIN
      target/classes/com/template/annotation/DESRespondSecret.class
  46. BIN
      target/classes/com/template/annotation/ExcelExport.class
  47. BIN
      target/classes/com/template/annotation/ExcelImport.class
  48. BIN
      target/classes/com/template/annotation/PassToken.class
  49. BIN
      target/classes/com/template/annotation/UserLoginCheck.class
  50. BIN
      target/classes/com/template/aop/DESResponseSecretAspect.class
  51. BIN
      target/classes/com/template/aop/LoggingAspect.class
  52. BIN
      target/classes/com/template/aop/LoginCheckAspect.class
  53. BIN
      target/classes/com/template/api/ActivityImageControllerAPI.class
  54. BIN
      target/classes/com/template/api/AlumniActivityControllerAPI.class
  55. BIN
      target/classes/com/template/api/AlumniAdminApplyControllerAPI.class
  56. BIN
      target/classes/com/template/api/AlumniCategoryControllerAPI.class
  57. BIN
      target/classes/com/template/api/AlumniCategoryImageControllerAPI.class
  58. BIN
      target/classes/com/template/api/AlumniCategoryNewsControllerAPI.class
  59. BIN
      target/classes/com/template/api/AlumniClubApplyControllerAPI.class
  60. BIN
      target/classes/com/template/api/AlumniClubControllerAPI.class
  61. BIN
      target/classes/com/template/api/AlumniEndorseControllerAPI.class
  62. BIN
      target/classes/com/template/api/AlumniImageControllerAPI.class
  63. BIN
      target/classes/com/template/api/AlumniNewsControllerAPI.class
  64. BIN
      target/classes/com/template/api/AlumniOrgControllerAPI.class
  65. BIN
      target/classes/com/template/api/AlumniReturnControllerAPI.class
  66. BIN
      target/classes/com/template/api/AlumniUserControllerAPI.class
  67. BIN
      target/classes/com/template/api/DingTalkControllerAPI.class
  68. BIN
      target/classes/com/template/api/ExcelControllerAPI.class
  69. BIN
      target/classes/com/template/api/FileControllerAPI.class
  70. BIN
      target/classes/com/template/api/LogInfoControllerAPI.class
  71. BIN
      target/classes/com/template/api/LoginControllerAPI.class
  72. BIN
      target/classes/com/template/api/SmsCodeControllerAPI.class
  73. BIN
      target/classes/com/template/api/SystemMenuControllerAPI.class
  74. BIN
      target/classes/com/template/common/constanst/Constanst.class
  75. BIN
      target/classes/com/template/common/exception/EmsException.class
  76. BIN
      target/classes/com/template/common/exception/EmsExceptionHandler.class
  77. BIN
      target/classes/com/template/common/exception/MyCustomException.class
  78. BIN
      target/classes/com/template/common/jh/ReqRespResearchProductQuestionnaireItem.class
  79. BIN
      target/classes/com/template/common/jh/SectionUtil.class
  80. BIN
      target/classes/com/template/common/result/Code.class
  81. BIN
      target/classes/com/template/common/result/ResponseStatusEnum.class
  82. BIN
      target/classes/com/template/common/utils/AccessToken.class
  83. BIN
      target/classes/com/template/common/utils/AesTestOne.class
  84. BIN
      target/classes/com/template/common/utils/AesUtil.class
  85. BIN
      target/classes/com/template/common/utils/AesUtils.class
  86. BIN
      target/classes/com/template/common/utils/Base64Util.class
  87. BIN
      target/classes/com/template/common/utils/CommonUtil.class
  88. BIN
      target/classes/com/template/common/utils/DataBliu.class
  89. BIN
      target/classes/com/template/common/utils/DateUtils.class
  90. BIN
      target/classes/com/template/common/utils/DingTalkUtils.class
  91. BIN
      target/classes/com/template/common/utils/EncryptUtil.class
  92. BIN
      target/classes/com/template/common/utils/EncryptionUtil.class
  93. BIN
      target/classes/com/template/common/utils/ExcelClassField.class
  94. BIN
      target/classes/com/template/common/utils/ExcelUtil3.class
  95. BIN
      target/classes/com/template/common/utils/ExcelUtils.class
  96. BIN
      target/classes/com/template/common/utils/ExcelUtils2.class
  97. BIN
      target/classes/com/template/common/utils/FileUtils.class
  98. BIN
      target/classes/com/template/common/utils/GetVertifyCode.class
  99. BIN
      target/classes/com/template/common/utils/HMACUtils.class
  100. 0 0
      target/classes/com/template/common/utils/HttpClientUtils$1.class

File diff suppressed because it is too large
+ 672 - 377
.idea/workspace.xml


File diff suppressed because it is too large
+ 0 - 4232
logs/smart-2024-12-10.log


File diff suppressed because it is too large
+ 0 - 196
logs/smart-2024-12-11.log


File diff suppressed because it is too large
+ 0 - 340
logs/smart-2024-12-12.log


+ 342 - 0
logs/smart-2024-12-23.log

@@ -0,0 +1,342 @@
+2024-12-23 17:27:19.843 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-23 17:27:19.861 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 25412 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-23 17:27:19.861 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-23 17:27:20.660 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-23 17:27:20.713 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-23 17:27:20.715 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-23 17:27:20.755 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 28 ms. Found 0 Redis repository interfaces.
+2024-12-23 17:27:21.662 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-23 17:27:21.668 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-23 17:27:21.669 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-23 17:27:21.669 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-23 17:27:21.744 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-23 17:27:21.744 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1834 ms
+2024-12-23 17:27:22.122 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-23 17:27:22.561 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-23 17:27:23.979 [main] WARN  o.s.w.s.r.ResourceHttpRequestHandler - Locations list is empty. No resources will be served unless a custom ResourceResolver is configured as an alternative to PathResourceResolver.
+2024-12-23 17:27:25.877 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-23 17:27:27.016 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-23 17:27:27.026 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-23 17:27:27.026 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-23 17:27:27.027 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-23 17:27:27.027 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler meta-data: Quartz Scheduler (v2.3.2) 'quartzScheduler' with instanceId 'NON_CLUSTERED'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered.
+
+2024-12-23 17:27:27.027 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-23 17:27:27.027 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-23 17:27:27.028 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@103388c6
+2024-12-23 17:27:27.058 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-23 17:27:27.140 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-23 17:27:27.282 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-23 17:27:27.284 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-23 17:27:27.284 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-23 17:27:27.295 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 7.977 seconds (JVM running for 9.019)
+2024-12-23 17:28:42.138 [http-nio-8687-exec-1] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-12-23 17:28:42.138 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-12-23 17:28:42.139 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 1 ms
+2024-12-23 17:28:42.185 [http-nio-8687-exec-1] ERROR c.t.c.exception.EmsExceptionHandler - 错误信息
+java.lang.RuntimeException: 登录凭证已过去,请重新登录
+	at com.template.common.exception.EmsExceptionHandler.exception(EmsExceptionHandler.java:70)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:205)
+	at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:150)
+	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:106)
+	at org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver.doResolveHandlerMethodException(ExceptionHandlerExceptionResolver.java:421)
+	at org.springframework.web.servlet.handler.AbstractHandlerMethodExceptionResolver.doResolveException(AbstractHandlerMethodExceptionResolver.java:75)
+	at org.springframework.web.servlet.handler.AbstractHandlerExceptionResolver.resolveException(AbstractHandlerExceptionResolver.java:141)
+	at org.springframework.web.servlet.handler.HandlerExceptionResolverComposite.resolveException(HandlerExceptionResolverComposite.java:80)
+	at org.springframework.web.servlet.DispatcherServlet.processHandlerException(DispatcherServlet.java:1321)
+	at org.springframework.web.servlet.DispatcherServlet.processDispatchResult(DispatcherServlet.java:1132)
+	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1078)
+	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:961)
+	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)
+	at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898)
+	at javax.servlet.http.HttpServlet.service(HttpServlet.java:645)
+	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)
+	at javax.servlet.http.HttpServlet.service(HttpServlet.java:750)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202)
+	at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97)
+	at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:542)
+	at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:143)
+	at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
+	at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78)
+	at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)
+	at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:374)
+	at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
+	at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868)
+	at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1590)
+	at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
+	at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
+	at java.lang.Thread.run(Thread.java:748)
+2024-12-23 17:28:53.665 [http-nio-8687-exec-4] ERROR c.t.c.exception.EmsExceptionHandler - 错误信息
+org.springframework.web.method.annotation.MethodArgumentTypeMismatchException: Failed to convert value of type 'java.lang.String' to required type 'java.lang.Integer'; nested exception is java.lang.NumberFormatException: For input string: "但茂华"
+	at com.template.common.exception.EmsExceptionHandler.returnException(EmsExceptionHandler.java:178)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:205)
+	at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:150)
+	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:106)
+	at org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver.doResolveHandlerMethodException(ExceptionHandlerExceptionResolver.java:417)
+	at org.springframework.web.servlet.handler.AbstractHandlerMethodExceptionResolver.doResolveException(AbstractHandlerMethodExceptionResolver.java:75)
+	at org.springframework.web.servlet.handler.AbstractHandlerExceptionResolver.resolveException(AbstractHandlerExceptionResolver.java:141)
+	at org.springframework.web.servlet.handler.HandlerExceptionResolverComposite.resolveException(HandlerExceptionResolverComposite.java:80)
+	at org.springframework.web.servlet.DispatcherServlet.processHandlerException(DispatcherServlet.java:1321)
+	at org.springframework.web.servlet.DispatcherServlet.processDispatchResult(DispatcherServlet.java:1132)
+	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1078)
+	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:961)
+	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)
+	at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898)
+	at javax.servlet.http.HttpServlet.service(HttpServlet.java:645)
+	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)
+	at javax.servlet.http.HttpServlet.service(HttpServlet.java:750)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
+	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
+	at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202)
+	at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97)
+	at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:542)
+	at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:143)
+	at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
+	at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78)
+	at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)
+	at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:374)
+	at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
+	at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868)
+	at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1590)
+	at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
+	at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
+	at java.lang.Thread.run(Thread.java:748)
+Caused by: java.lang.NumberFormatException: For input string: "但茂华"
+	at java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
+	at java.lang.Integer.parseInt(Integer.java:580)
+	at java.lang.Integer.valueOf(Integer.java:766)
+	at org.springframework.util.NumberUtils.parseNumber(NumberUtils.java:211)
+	at org.springframework.beans.propertyeditors.CustomNumberEditor.setAsText(CustomNumberEditor.java:115)
+	at org.springframework.beans.TypeConverterDelegate.doConvertTextValue(TypeConverterDelegate.java:429)
+	at org.springframework.beans.TypeConverterDelegate.doConvertValue(TypeConverterDelegate.java:402)
+	at org.springframework.beans.TypeConverterDelegate.convertIfNecessary(TypeConverterDelegate.java:155)
+	at org.springframework.beans.TypeConverterSupport.convertIfNecessary(TypeConverterSupport.java:73)
+	at org.springframework.beans.TypeConverterSupport.convertIfNecessary(TypeConverterSupport.java:53)
+	at org.springframework.validation.DataBinder.convertIfNecessary(DataBinder.java:696)
+	at org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver.resolveArgument(AbstractNamedValueMethodArgumentResolver.java:125)
+	at org.springframework.web.method.support.HandlerMethodArgumentResolverComposite.resolveArgument(HandlerMethodArgumentResolverComposite.java:122)
+	at org.springframework.web.method.support.InvocableHandlerMethod.getMethodArgumentValues(InvocableHandlerMethod.java:179)
+	at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:146)
+	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:106)
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:893)
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:807)
+	at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)
+	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1061)
+	... 43 common frames omitted
+2024-12-23 17:41:13.318 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-23 17:41:13.444 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-23 17:41:13.445 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-23 17:41:13.445 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-23 17:41:13.445 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-23 17:41:13.446 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-23 17:41:13.448 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-23 17:41:13.450 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-23 17:41:13.454 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+2024-12-23 17:41:42.014 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-23 17:41:42.029 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 30944 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-23 17:41:42.030 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-23 17:41:42.643 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-23 17:41:42.692 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-23 17:41:42.694 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-23 17:41:42.734 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 30 ms. Found 0 Redis repository interfaces.
+2024-12-23 17:41:43.496 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-23 17:41:43.501 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-23 17:41:43.501 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-23 17:41:43.502 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-23 17:41:43.566 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-23 17:41:43.566 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1494 ms
+2024-12-23 17:41:43.930 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-23 17:41:44.366 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-23 17:41:45.765 [main] WARN  o.s.w.s.r.ResourceHttpRequestHandler - Locations list is empty. No resources will be served unless a custom ResourceResolver is configured as an alternative to PathResourceResolver.
+2024-12-23 17:41:47.513 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-23 17:41:48.548 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-23 17:41:48.554 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-23 17:41:48.554 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-23 17:41:48.555 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-23 17:41:48.555 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler meta-data: Quartz Scheduler (v2.3.2) 'quartzScheduler' with instanceId 'NON_CLUSTERED'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered.
+
+2024-12-23 17:41:48.555 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-23 17:41:48.555 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-23 17:41:48.555 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@53964b0e
+2024-12-23 17:41:48.592 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-23 17:41:48.715 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-23 17:41:48.834 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-23 17:41:48.835 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-23 17:41:48.835 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-23 17:41:48.842 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 7.19 seconds (JVM running for 7.754)
+2024-12-23 17:41:51.635 [http-nio-8687-exec-1] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-12-23 17:41:51.635 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-12-23 17:41:51.636 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 1 ms
+2024-12-23 17:42:07.421 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-23 17:42:07.537 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-23 17:42:07.537 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-23 17:42:07.537 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-23 17:42:07.537 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-23 17:42:07.537 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-23 17:42:07.539 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-23 17:42:07.540 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-23 17:42:07.545 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+2024-12-23 17:52:07.799 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-23 17:52:07.810 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 36980 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-23 17:52:07.811 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-23 17:52:08.341 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-23 17:52:08.378 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-23 17:52:08.380 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-23 17:52:08.413 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 22 ms. Found 0 Redis repository interfaces.
+2024-12-23 17:52:09.188 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-23 17:52:09.194 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-23 17:52:09.194 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-23 17:52:09.194 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-23 17:52:09.256 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-23 17:52:09.256 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1410 ms
+2024-12-23 17:52:09.561 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-23 17:52:09.993 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-23 17:52:11.217 [main] WARN  o.s.w.s.r.ResourceHttpRequestHandler - Locations list is empty. No resources will be served unless a custom ResourceResolver is configured as an alternative to PathResourceResolver.
+2024-12-23 17:52:13.011 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-23 17:52:14.038 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-23 17:52:14.044 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-23 17:52:14.044 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-23 17:52:14.044 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-23 17:52:14.045 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler meta-data: Quartz Scheduler (v2.3.2) 'quartzScheduler' with instanceId 'NON_CLUSTERED'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered.
+
+2024-12-23 17:52:14.045 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-23 17:52:14.045 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-23 17:52:14.045 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@7ca0b2cf
+2024-12-23 17:52:14.072 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-23 17:52:14.142 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-23 17:52:14.271 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-23 17:52:14.273 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-23 17:52:14.273 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-23 17:52:14.280 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 6.843 seconds (JVM running for 7.34)
+2024-12-23 17:52:36.899 [http-nio-8687-exec-1] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-12-23 17:52:36.899 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-12-23 17:52:36.900 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 1 ms
+2024-12-23 17:53:07.988 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-23 17:53:08.103 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-23 17:53:08.103 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-23 17:53:08.103 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-23 17:53:08.104 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-23 17:53:08.104 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-23 17:53:08.106 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-23 17:53:08.107 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-23 17:53:08.109 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+2024-12-23 17:53:11.634 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-23 17:53:11.648 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 33476 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-23 17:53:11.649 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-23 17:53:12.180 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-23 17:53:12.222 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-23 17:53:12.224 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-23 17:53:12.256 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 23 ms. Found 0 Redis repository interfaces.
+2024-12-23 17:53:13.002 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-23 17:53:13.007 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-23 17:53:13.008 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-23 17:53:13.008 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-23 17:53:13.079 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-23 17:53:13.079 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1395 ms
+2024-12-23 17:53:13.399 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-23 17:53:13.810 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-23 17:53:14.990 [main] WARN  o.s.w.s.r.ResourceHttpRequestHandler - Locations list is empty. No resources will be served unless a custom ResourceResolver is configured as an alternative to PathResourceResolver.
+2024-12-23 17:53:16.766 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-23 17:53:17.761 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-23 17:53:17.767 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-23 17:53:17.767 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-23 17:53:17.768 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-23 17:53:17.768 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler meta-data: Quartz Scheduler (v2.3.2) 'quartzScheduler' with instanceId 'NON_CLUSTERED'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered.
+
+2024-12-23 17:53:17.768 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-23 17:53:17.769 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-23 17:53:17.769 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@16224bd8
+2024-12-23 17:53:17.796 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-23 17:53:17.866 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-23 17:53:17.989 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-23 17:53:17.990 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-23 17:53:17.991 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-23 17:53:17.998 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 6.711 seconds (JVM running for 7.237)
+2024-12-23 17:53:20.410 [http-nio-8687-exec-1] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-12-23 17:53:20.410 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-12-23 17:53:20.411 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 1 ms
+2024-12-23 17:53:26.809 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-23 17:53:26.927 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-23 17:53:26.927 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-23 17:53:26.927 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-23 17:53:26.927 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-23 17:53:26.927 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-23 17:53:26.929 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-23 17:53:26.930 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-23 17:53:26.932 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.

File diff suppressed because it is too large
+ 1468 - 0
logs/smart-2024-12-24.log


+ 56 - 0
logs/smart-2024-12-25.log

@@ -0,0 +1,56 @@
+2024-12-25 10:22:38.140 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-25 10:22:38.310 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-25 10:22:38.312 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-25 10:22:38.312 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-25 10:22:38.312 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-25 10:22:38.314 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-25 10:22:38.321 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-25 10:22:38.329 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-25 10:22:38.338 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+2024-12-25 10:23:35.417 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-25 10:23:35.440 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 10676 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-25 10:23:35.440 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-25 10:23:36.330 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-25 10:23:36.388 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-25 10:23:36.390 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-25 10:23:36.430 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 27 ms. Found 0 Redis repository interfaces.
+2024-12-25 10:23:37.278 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-25 10:23:37.283 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-25 10:23:37.283 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-25 10:23:37.283 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-25 10:23:37.358 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-25 10:23:37.359 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1874 ms
+2024-12-25 10:23:37.687 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-25 10:23:38.119 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-25 10:23:39.364 [main] WARN  o.s.w.s.r.ResourceHttpRequestHandler - Locations list is empty. No resources will be served unless a custom ResourceResolver is configured as an alternative to PathResourceResolver.
+2024-12-25 10:23:41.211 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-25 10:23:42.267 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-25 10:23:42.274 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-25 10:23:42.275 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-25 10:23:42.275 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-25 10:23:42.276 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler meta-data: Quartz Scheduler (v2.3.2) 'quartzScheduler' with instanceId 'NON_CLUSTERED'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered.
+
+2024-12-25 10:23:42.276 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-25 10:23:42.276 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-25 10:23:42.276 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@3ac726af
+2024-12-25 10:23:42.306 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-25 10:23:42.417 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-25 10:23:42.544 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-25 10:23:42.546 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-25 10:23:42.546 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-25 10:23:42.553 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 7.504 seconds (JVM running for 8.432)
+2024-12-25 11:54:58.265 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-25 11:54:58.446 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-25 11:54:58.448 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-25 11:54:58.448 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-25 11:54:58.448 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-25 11:54:58.449 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-25 11:54:58.455 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-25 11:54:58.460 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-25 11:54:58.463 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.

File diff suppressed because it is too large
+ 195 - 0
logs/smart-2024-12-26.log


File diff suppressed because it is too large
+ 893 - 860
logs/smart-2024-12-09.log


File diff suppressed because it is too large
+ 139 - 0
logs/smart-2024-12-30.log


File diff suppressed because it is too large
+ 774 - 0
logs/smart-2024-12-31.log


+ 1 - 1
src/main/java/com/template/api/AlumniCategoryControllerAPI.java

@@ -37,7 +37,7 @@ public interface AlumniCategoryControllerAPI {
      */
     @GetMapping(value = "/queryCategoryPage")
     @ApiOperation(value = "获取组织分类分页数据", notes = "获取组织分类分页数据", httpMethod = "GET")
-    CommonResult queryCategoryPage( @RequestParam int currentPage, @RequestParam int pageCount, String name, Integer userId, String startTime, String endTime);
+    CommonResult queryCategoryPage( @RequestParam int currentPage, @RequestParam int pageCount, String name, String userId, String startTime, String endTime);
 
 
 

+ 97 - 6
src/main/java/com/template/common/utils/TimeExchange.java

@@ -1,13 +1,16 @@
 package com.template.common.utils;
 
+import com.fasterxml.jackson.databind.deser.std.NumberDeserializers;
 import com.template.model.enumModel.eWeekStatu;
 import com.template.model.result.UnitTimeHelpModel;
 import com.template.model.vo.ClassSettingDateVo;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
+import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
@@ -25,7 +28,8 @@ public class TimeExchange {
 
     /**
      * 字符串转时间
-     * @param time 时间字符串
+     *
+     * @param time       时间字符串
      * @param formatDate 时间格式
      * @return
      */
@@ -45,6 +49,7 @@ public class TimeExchange {
 
     /**
      * Date转为String
+     *
      * @param time      时间
      * @param FormatStr 自定义时间格式
      * @return
@@ -63,6 +68,7 @@ public class TimeExchange {
 
     /**
      * 时间转中文的年月日格式
+     *
      * @param time
      * @return
      */
@@ -81,6 +87,7 @@ public class TimeExchange {
 
     /**
      * 时间转中文的年月日格式
+     *
      * @param time
      * @return
      */
@@ -99,6 +106,7 @@ public class TimeExchange {
 
     /**
      * String转时间戳
+     *
      * @param time
      * @return
      */
@@ -185,6 +193,7 @@ public class TimeExchange {
 
     /**
      * 时间减小时数
+     *
      * @param time
      * @param hour
      * @return
@@ -199,6 +208,7 @@ public class TimeExchange {
 
     /**
      * 时间加秒数
+     *
      * @param time
      * @param s
      * @return
@@ -213,6 +223,7 @@ public class TimeExchange {
 
     /**
      * 时间加分钟数
+     *
      * @param time
      * @param m
      * @return
@@ -227,6 +238,7 @@ public class TimeExchange {
 
     /**
      * 获取当天开始时间
+     *
      * @return
      */
     public static String getStartDate() {
@@ -242,6 +254,7 @@ public class TimeExchange {
 
     /**
      * 获取当天结束时间
+     *
      * @return
      */
     public static String getEndDate() {
@@ -257,6 +270,7 @@ public class TimeExchange {
 
     /**
      * 获取当天的年月日
+     *
      * @return
      */
     public static String getDate() {
@@ -266,6 +280,7 @@ public class TimeExchange {
 
     /**
      * 获取当天的年月
+     *
      * @return
      */
     public static String getDateMonth() {
@@ -275,6 +290,7 @@ public class TimeExchange {
 
     /**
      * 获取当前时间的年月日小时分钟秒
+     *
      * @return
      */
     public static String getTime() {
@@ -284,6 +300,7 @@ public class TimeExchange {
 
     /**
      * 获取当前时间的小时分钟
+     *
      * @return
      */
     public static String getOnlyMM() {
@@ -293,6 +310,7 @@ public class TimeExchange {
 
     /**
      * 获取当前时间的年份
+     *
      * @return
      */
     public static String getYear() {
@@ -302,6 +320,7 @@ public class TimeExchange {
 
     /**
      * 获取当前时间的年月
+     *
      * @return
      */
     public static String getMonth() {
@@ -311,6 +330,7 @@ public class TimeExchange {
 
     /**
      * 获取当前时间的月份
+     *
      * @return
      */
     public static String getNowMonth() {
@@ -320,6 +340,7 @@ public class TimeExchange {
 
     /**
      * 获取当前时间的小时分钟秒
+     *
      * @return
      */
     public static String getOnlyTime() {
@@ -329,6 +350,7 @@ public class TimeExchange {
 
     /**
      * 获取指定时间的年份
+     *
      * @param dateNow
      * @return
      */
@@ -339,6 +361,7 @@ public class TimeExchange {
 
     /**
      * 获取指定时间的月份
+     *
      * @param dateNow
      * @return
      */
@@ -349,6 +372,7 @@ public class TimeExchange {
 
     /**
      * 获取指定时间的天
+     *
      * @param dateNow
      * @return
      */
@@ -359,6 +383,7 @@ public class TimeExchange {
 
     /**
      * 获取指定时间的小时分钟秒
+     *
      * @param dateNow
      * @return
      */
@@ -398,6 +423,7 @@ public class TimeExchange {
 
     /**
      * 计算两个日期的时间差
+     *
      * @param time1
      * @param time2
      * @return
@@ -482,7 +508,6 @@ public class TimeExchange {
     }
 
 
-
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
@@ -777,6 +802,7 @@ public class TimeExchange {
 
     /**
      * 向前获取近6个月的年月 包含本月
+     *
      * @param n
      * @return
      */
@@ -791,10 +817,75 @@ public class TimeExchange {
         return months;
     }
 
-    public static void main(String[] args) {
-        List<String> resultMonth = getRecentMonths(13);
-
-        String sdsd = "";
+    public static void main(String[] args) throws InterruptedException {
+        BigDecimal total = new BigDecimal(200);
+        List<String> members = new ArrayList<>();
+        members.add("长沙陈奕迅");
+        members.add("管理在此谁敢造次");
+        members.add("旧雨");
+        members.add("群主我想要个女群员");
+        members.add("天然呆~");
+        members.add("尤尽闲");
+        members.add("陳拾叁");
+        members.add("打工人阿阿阿阿阿作");
+        members.add("哥布林斯莱耶");
+        members.add("天秤座可达鸭");
+        members.add(",");
+        members.add("阿吉");
+
+        List<Integer> mInt = new ArrayList<>();
+        System.out.println("以下为2024年度获得红包名单:");
+        Thread.sleep(500);
+        System.out.println("红包金额:"+total);
+        Thread.sleep(500);
+        System.out.println("红包总数:"+members.size());
+        int i = 0;
+        Random mrandom = new Random();
+        for (String m : members) {
+
+            Integer mId = mrandom.nextInt(12);
+            while (mInt.contains(mId)){
+                mId = mrandom.nextInt(12);
+            }
+            mInt.add(mId);
+
+            Thread.sleep(500);
+            System.out.print("*");
+            Thread.sleep(500);
+            System.out.print("*");
+            Thread.sleep(500);
+            System.out.print("*");
+            Thread.sleep(500);
+            System.out.print("*");
+            Thread.sleep(500);
+            System.out.print("*");
+            Thread.sleep(500);
+            System.out.println("*");
+            Thread.sleep(500);
+            if (i < (members.size() - 1)) {
+                Random random = new Random();
+                BigDecimal money = total;
+                double max = random.nextDouble() * ((total.doubleValue() - 1) / 2);
+                double min = random.nextDouble() * (max - 1);
+                while (money.doubleValue() > max || money.doubleValue() < min) {
+                    money = new BigDecimal(random.nextDouble() * (total.doubleValue() - 1));
+                }
+
+                BigDecimal roundedNumber = new BigDecimal(money.doubleValue()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                total = total.subtract(roundedNumber);
+                System.out.print(members.get(mId) + ":");
+                Thread.sleep(1500);
+                System.out.println(roundedNumber + "元");
+            } else {
+
+                System.out.print(members.get(mId) + ":");
+                Thread.sleep(1500);
+                System.out.println(total.setScale(2, BigDecimal.ROUND_HALF_UP) + "元");
+                Thread.sleep(1500);
+                System.out.println("抽奖结束,祝大家新年大吉,万事如意!");
+            }
+            i++;
+        }
     }
 
 

+ 23 - 3
src/main/java/com/template/controller/AlumniActivityController.java

@@ -516,10 +516,16 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
             return CommonResult.fail("报名已截至,报名失败");
         }
 
-        int reportCount = activityReportService.queryActivityReportNumber(id);
-        if (reportCount >= activity.getTotalNumber().intValue()) {
-            return CommonResult.fail("报名人数已满,报名失败");
+
+        ActivityReport oar = activityReportService.queryDataByUserId(userId,id);
+        if(oar != null){
+            return CommonResult.fail("当前用户已报名,请勿重复报名");
         }
+//
+//        int reportCount = activityReportService.queryActivityReportNumber(id);
+//        if (reportCount >= activity.getTotalNumber().intValue()) {
+//            return CommonResult.fail("报名人数已满,报名失败");
+//        }
 
         ActivityReport ar = new ActivityReport();
         ar.setActivityId(id);
@@ -568,6 +574,11 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
             return CommonResult.fail("暂未报名,无法签到");
         }
 
+        ActivitySignin oas = activitySigninService.queryDataByUserId(userId,id);
+        if(oas != null){
+            return CommonResult.fail("当前用户已签到,请勿重复签到");
+        }
+
         ActivitySignin as = new ActivitySignin();
         as.setActivityId(id);
         as.setUserId(userId);
@@ -775,6 +786,14 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
 
     @Override
     public CommonResult queryActivityApplyPages(int currentPage, int pageCount, Integer userId, String userName, Integer collegeId, Integer periodId, Integer majorId, Integer classId, String orgName, String theme, Integer isPass, String createStartTime, String createEndTime, String startTime, String endTime, String signsTime, String signeTime) throws ParseException {
+        AlumniUser au = alumniUserService.queryDataById(userId);
+        if (au == null) {
+            return CommonResult.fail("当前操作人已失效,无法加入");
+        }
+
+        if(au.getRoleId().intValue() == eRoleType.Super.getValue()){
+            userId = null;
+        }
         PageUtils<AlumniActivityApplyPageVo> result = alumniActivityService.queryActivityApplyPages(currentPage, pageCount, userId, userName, collegeId, periodId, majorId, classId, orgName, theme, isPass, createStartTime, createEndTime, startTime, endTime, signsTime, signeTime);
         for (AlumniActivityApplyPageVo aapv : result.getList()) {
             aapv.setPassName(ePassType.stringOf(aapv.getIsPass()));
@@ -818,6 +837,7 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
         }
 
         aa.setIsPass(isPass);
+        aa.setPassValue(passValue);
         aa.setPassTime(new Date());
 
         int result = alumniActivityService.updateAlumniActivity(aa);

+ 16 - 12
src/main/java/com/template/controller/AlumniCategoryController.java

@@ -4,12 +4,14 @@ package com.template.controller;
 import com.template.api.AlumniCategoryControllerAPI;
 import com.template.common.utils.paramUtils;
 import com.template.model.pojo.AlumniCategory;
+import com.template.model.pojo.AlumniClub;
 import com.template.model.pojo.AlumniUser;
 import com.template.model.request.insertCategoryRequest;
 import com.template.model.request.updateCategoryRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.services.AlumniCategoryService;
+import com.template.services.AlumniClubService;
 import com.template.services.AlumniUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -35,7 +37,7 @@ public class AlumniCategoryController implements AlumniCategoryControllerAPI {
     @Autowired
     private AlumniCategoryService alumniCategoryService;
     @Autowired
-    private AlumniUserService alumniUserService;
+    private AlumniClubService alumniClubService;
 
     @Override
     public CommonResult insertCategory(insertCategoryRequest icr, BindingResult bindingResult) {
@@ -98,23 +100,25 @@ public class AlumniCategoryController implements AlumniCategoryControllerAPI {
         if (result <= 0) {
             return CommonResult.fail("删除失败");
         }
+
+        //置空关联的组织数据
+        List<AlumniClub> clubs = alumniClubService.queryDatasByCategoryId(id);
+        if(clubs != null && clubs.size() > 0){
+            for (AlumniClub c:clubs) {
+                c.setCategoryId(0);
+                c.setCategoryName("");
+            }
+            alumniClubService.saveBatch(clubs);
+        }
+
+
         return CommonResult.ok("删除成功");
     }
 
     @Override
-    public CommonResult queryCategoryPage(int currentPage, int pageCount, String name, Integer userId, String startTime, String endTime) {
+    public CommonResult queryCategoryPage(int currentPage, int pageCount, String name, String userId, String startTime, String endTime) {
         PageUtils<AlumniCategory> result = alumniCategoryService.queryPageList(currentPage, pageCount, name, userId, startTime, endTime);
-        if (result.getList() != null && result.getList().size() > 0) {
-            List<String> userIds = result.getList().stream().map(AlumniCategory::getCreateUser).collect(Collectors.toList());
-            List<AlumniUser> users = alumniUserService.queryDataByIds(userIds);
-            for (AlumniCategory ac : result.getList()) {
-                Optional<AlumniUser> ou = users.stream().filter(e -> e.getId().toString().equals(ac.getCreateUser())).findFirst();
-                if(ou != null && ou.isPresent()){
-                    ac.setCreateUser(ou.get().getName());
-                }
 
-            }
-        }
 
 
         return CommonResult.ok(result);

+ 10 - 11
src/main/java/com/template/controller/AlumniClubApplyController.java

@@ -7,6 +7,7 @@ import com.template.common.utils.ExcelUtils;
 import com.template.common.utils.WeiXiaoUtil;
 import com.template.common.utils.paramUtils;
 import com.template.model.enumModel.ePassType;
+import com.template.model.enumModel.eRoleType;
 import com.template.model.pojo.AlumniClub;
 import com.template.model.pojo.AlumniClubApply;
 import com.template.model.pojo.AlumniUser;
@@ -75,12 +76,6 @@ public class AlumniClubApplyController implements AlumniClubApplyControllerAPI {
             return CommonResult.fail("组织数据已失效,无法加入");
         }
 
-        //人数是否超过组织规定的人数上限
-        int member = alumniClubApplyService.queryClubMember(id);
-        if (member >= ac.getNumber().intValue()) {
-            return CommonResult.fail("该组织人数上限已满,无法加入");
-        }
-
         AlumniClubApply acp = new AlumniClubApply();
         acp.setName(ac.getName());
         acp.setClubId(ac.getId());
@@ -116,6 +111,14 @@ public class AlumniClubApplyController implements AlumniClubApplyControllerAPI {
 
     @Override
     public CommonResult queryClubProcessPage(Integer userId, int currentPage, int pageCount, String name, String userName, Integer isPass, Integer collegeId, Integer periodId, Integer majorId, Integer classId, String startTime, String endTime, Integer categoryId) {
+        AlumniUser au = alumniUserService.queryDataById(userId);
+        if (au == null) {
+            return CommonResult.fail("当前操作人已失效,无法加入");
+        }
+
+        if(au.getRoleId().intValue() == eRoleType.Super.getValue()){
+            userId = null;
+        }
 
         PageUtils<ApplyClubVo> result = alumniClubApplyService.queryClubApplys(userId, currentPage, pageCount, name, userName, isPass, collegeId, periodId, majorId, classId, startTime, endTime, categoryId);
         for (ApplyClubVo acv : result.getList()) {
@@ -165,11 +168,7 @@ public class AlumniClubApplyController implements AlumniClubApplyControllerAPI {
         }
 
         if (isPass.intValue() == ePassType.Passed.getValue()) {
-            //人数是否超过组织规定的人数上限
-            int member = alumniClubApplyService.queryClubMember(id);
-            if (member >= ac.getNumber().intValue()) {
-                return CommonResult.fail("该组织人数上限已满,无法加入");
-            }
+
 
             au.setOrgId(ac.getId());
             au.setOrgName(ac.getName());

+ 0 - 2
src/main/java/com/template/controller/AlumniClubController.java

@@ -75,7 +75,6 @@ public class AlumniClubController implements AlumniClubControllerAPI {
 
         AlumniClub ac = new AlumniClub();
         ac.setName(icr.getName());
-        ac.setNumber(icr.getNumber());
         ac.setIsTop(icr.getIsTop() != null ? icr.getIsTop() : eTopType.UnTop.getValue());
         ac.setCategoryId(icr.getCategoryId());
         ac.setCategoryName(icr.getCategoryName());
@@ -117,7 +116,6 @@ public class AlumniClubController implements AlumniClubControllerAPI {
             return CommonResult.fail("数据已失效,更新失败");
         }
 
-        ac.setNumber(ucr.getNumber());
         ac.setIsTop(ucr.getIsTop() != null ? ucr.getIsTop() : ac.getIsTop());
         ac.setName(org.springframework.util.StringUtils.hasText(ucr.getName()) ? ucr.getName() : ac.getName());
         ac.setCategoryId(ucr.getCategoryId() != null ? ucr.getCategoryId() : ac.getCategoryId());

+ 8 - 0
src/main/java/com/template/controller/AlumniEndorseController.java

@@ -137,6 +137,7 @@ public class AlumniEndorseController implements AlumniEndorseControllerAPI {
 
     @Override
     public CommonResult queryEndorsePage(int currentPage, int pageCount, String keyword, Integer collegeId, Integer periodId, Integer majorId, Integer classId, String startTime, String endTime) {
+
         PageUtils<AlumniEndorsePageVo> result = alumniEndorseService.alumniEndorsePageDatas(currentPage, pageCount, collegeId, periodId, majorId, classId, startTime, endTime, keyword);
         for (AlumniEndorsePageVo aepv : result.getList()) {
             aepv.setPreferredMethodName(ePreferredMethod.stringOf(aepv.getPreferredMethod().intValue()));
@@ -223,7 +224,14 @@ public class AlumniEndorseController implements AlumniEndorseControllerAPI {
 
     @Override
     public CommonResult queryEndorseApplyPage(int currentPage, int pageCount, Integer userId, String keyword, String name, Integer isPass, Integer collegeId, Integer periodId, Integer majorId, Integer classId, String startTime, String endTime) {
+        AlumniUser au = alumniUserService.queryDataById(userId);
+        if (au == null) {
+            return CommonResult.fail("当前操作人已失效,无法加入");
+        }
 
+        if(au.getRoleId().intValue() == eRoleType.Super.getValue()){
+            userId = null;
+        }
         PageUtils<AlumniEndorseApplyPageVo> result = alumniEndorseService.alumniEndorsePageApplyDatas(currentPage, pageCount, userId, collegeId, periodId, majorId, classId, startTime, endTime, keyword, name, isPass);
         for (AlumniEndorseApplyPageVo aepv : result.getList()) {
             aepv.setPreferredMethodName(ePreferredMethod.stringOf(aepv.getPreferredMethod().intValue()));

+ 10 - 0
src/main/java/com/template/controller/AlumniImageController.java

@@ -6,6 +6,7 @@ import com.template.api.AlumniImageControllerAPI;
 import com.template.common.utils.WeiXiaoUtil;
 import com.template.common.utils.paramUtils;
 import com.template.model.enumModel.ePassType;
+import com.template.model.enumModel.eRoleType;
 import com.template.model.pojo.*;
 import com.template.model.request.insertImageRequest;
 import com.template.model.result.CommonResult;
@@ -125,6 +126,15 @@ public class AlumniImageController implements AlumniImageControllerAPI {
 
     @Override
     public CommonResult queryImageApplyPage(Integer userId, int currentPage, int pageCount, String userName, String orgName, Integer collegeId, Integer periodId, Integer majorId, Integer classId, Integer isPass, String startTime, String endTime) {
+        AlumniUser au = alumniUserService.queryDataById(userId);
+        if (au == null) {
+            return CommonResult.fail("当前操作人已失效,无法加入");
+        }
+
+        if(au.getRoleId().intValue() == eRoleType.Super.getValue()){
+            userId = null;
+        }
+
         PageUtils<ImageApplyPageVo> result = alumniImageService.imageApplyPageDatas(currentPage, pageCount,userId,  userName, orgName, collegeId, periodId, majorId, classId, isPass, startTime, endTime);
         for (ImageApplyPageVo rg : result.getList()) {
             rg.setPassName(ePassType.stringOf(rg.getIsPass()));

+ 1 - 1
src/main/java/com/template/controller/AlumniUserController.java

@@ -164,7 +164,7 @@ public class AlumniUserController implements AlumniUserControllerAPI {
         }
 
         AlumniUser existAccount = alumniUserService.queryDataByAccount(uar.getAccount());
-        if (existAccount.getId().intValue() != uar.getId().intValue()) {
+        if (existAccount != null && existAccount.getId().intValue() != uar.getId().intValue()) {
             return CommonResult.fail("该账号已存在,更新失败");
         }
 

+ 5 - 9
src/main/java/com/template/controller/LoginController.java

@@ -9,10 +9,7 @@ import com.template.annotation.PassToken;
 import com.template.api.LoginControllerAPI;
 import com.template.common.utils.*;
 import com.template.config.WxOpenidConfig;
-import com.template.model.enumModel.eAccountType;
-import com.template.model.enumModel.eApplyType;
-import com.template.model.enumModel.eOrgType;
-import com.template.model.enumModel.ePassType;
+import com.template.model.enumModel.*;
 import com.template.model.pojo.*;
 import com.template.model.request.changePasswordRequest;
 import com.template.model.request.loginRequest;
@@ -575,6 +572,9 @@ public class LoginController implements LoginControllerAPI {
         if (au == null) {
             return CommonResult.fail("当前操作人已失效,无法查看数据");
         }
+        if(au.getRoleId().intValue() == eRoleType.Super.getValue()){
+            userId = null;
+        }
         IPage<ApprovePageVo> accountData = new Page<>();
         PageUtils<ApprovePageVo> finallResult = new PageUtils<ApprovePageVo>(accountData);
         List<ApprovePageVo> datas = new ArrayList<>();
@@ -751,11 +751,6 @@ public class LoginController implements LoginControllerAPI {
             }
 
             if (isPass == ePassType.Passed.getValue()) {
-                //人数是否超过组织规定的人数上限
-                int member = alumniClubApplyService.queryClubMember(id);
-                if (member >= ac.getNumber().intValue()) {
-                    return CommonResult.fail("该组织人数上限已满,无法加入");
-                }
 
                 au.setOrgId(ac.getId());
                 au.setOrgName(ac.getName());
@@ -825,6 +820,7 @@ public class LoginController implements LoginControllerAPI {
 
             aa.setIsPass(isPass);
             aa.setPassTime(new Date());
+            aa.setPassValue(passValue);
 
             int result = alumniActivityService.updateAlumniActivity(aa);
             if (result <= 0) {

+ 3 - 1
src/main/java/com/template/mapper/AlumniCategoryMapper.java

@@ -1,7 +1,9 @@
 package com.template.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.template.model.pojo.AlumniCategory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.vo.AlumniEndorsePageVo;
 import com.template.model.vo.DeviceCountVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,5 +21,5 @@ import java.util.List;
  */
 @Repository
 public interface AlumniCategoryMapper extends BaseMapper<AlumniCategory> {
-
+    IPage<AlumniCategory> queryCategoryPages(IPage<AlumniCategory> page, @Param("userName") String userName, @Param("name") String name,@Param("startTime") String startTime, @Param("endTime") String endTime);
 }

+ 0 - 2
src/main/java/com/template/model/pojo/AlumniCategoryImage.java

@@ -42,13 +42,11 @@ public class AlumniCategoryImage implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
-    @JsonIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 

+ 1 - 0
src/main/java/com/template/model/pojo/AlumniClub.java

@@ -85,6 +85,7 @@ public class AlumniClub implements Serializable {
     private List<UserVo> admins;
 
     @ApiModelProperty(value = "人数")
+    @TableField(exist = false)
     private Integer number;
 
     @ApiModelProperty(value = "创建时间")

+ 0 - 3
src/main/java/com/template/model/request/insertClubRequest.java

@@ -43,9 +43,6 @@ public class insertClubRequest implements Serializable {
     @ApiModelProperty(value = "是否置顶 是:1 否:2")
     private Integer isTop;
 
-    @ApiModelProperty(value = "人数")
-    @NotNull(message = "人数不能为空")
-    private Integer number;
 
     @ApiModelProperty(value = "本会简介")
     private String description;

+ 0 - 3
src/main/java/com/template/model/request/updateClubRequest.java

@@ -36,9 +36,6 @@ public class updateClubRequest implements Serializable {
     @ApiModelProperty(value = "是否置顶")
     private Integer isTop;
 
-    @ApiModelProperty(value = "人数")
-    @NotNull(message = "人数不能为空")
-    private Integer number;
 
     @ApiModelProperty(value = "所属分类")
     private Integer categoryId;

+ 1 - 1
src/main/java/com/template/services/AlumniCategoryService.java

@@ -24,5 +24,5 @@ public interface AlumniCategoryService extends IService<AlumniCategory> {
 
     int deleteDataById(Integer id);
 
-    PageUtils<AlumniCategory> queryPageList(int currentPage, int pageCount, String name, Integer userId, String startTime, String endTime);
+    PageUtils<AlumniCategory> queryPageList(int currentPage, int pageCount, String name, String userId, String startTime, String endTime);
 }

+ 2 - 0
src/main/java/com/template/services/AlumniClubService.java

@@ -25,6 +25,8 @@ public interface AlumniClubService extends IService<AlumniClub> {
 
     AlumniClub queryDataById(Integer id);
 
+    List<AlumniClub> queryDatasByCategoryId(Integer categoryId);
+
     int deleteDataById(Integer id);
 
     PageUtils<AlumniClub> queryPageList(int currentPage, int pageCount, String name, String userName, String startTime, String endTime, Integer categoryId);

+ 6 - 11
src/main/java/com/template/services/impl/AlumniCategoryServiceImpl.java

@@ -17,7 +17,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -49,7 +49,7 @@ public class AlumniCategoryServiceImpl extends ServiceImpl<AlumniCategoryMapper,
     @Override
     public AlumniCategory queryDataByName(String name) {
         QueryWrapper<AlumniCategory> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("name",name);
+        queryWrapper.eq("name", name);
         AlumniCategory result = alumniCategoryMapper.selectOne(queryWrapper);
         return result;
     }
@@ -61,15 +61,10 @@ public class AlumniCategoryServiceImpl extends ServiceImpl<AlumniCategoryMapper,
     }
 
     @Override
-    public PageUtils<AlumniCategory> queryPageList(int currentPage, int pageCount, String name, Integer userId, String startTime, String endTime) {
-        Page<AlumniCategory> page = new Page<>(currentPage,pageCount);
-        QueryWrapper<AlumniCategory> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.hasText(name),"name",name);//分类名称
-        queryWrapper.like(userId != null && userId.intValue() > 0,"create_user",userId);//创建人
-        if(StringUtils.hasText(startTime) && StringUtils.hasText(endTime)){
-            queryWrapper.between("create_time",startTime,endTime);
-        }
-        IPage<AlumniCategory> result = alumniCategoryMapper.selectPage(page, queryWrapper);
+    public PageUtils<AlumniCategory> queryPageList(int currentPage, int pageCount, String name, String userId, String startTime, String endTime) {
+        Page<AlumniCategory> page = new Page<>(currentPage, pageCount);
+
+        IPage<AlumniCategory> result = alumniCategoryMapper.queryCategoryPages(page, userId, name, startTime, endTime);
         return new PageUtils(result);
     }
 }

+ 8 - 0
src/main/java/com/template/services/impl/AlumniClubServiceImpl.java

@@ -52,6 +52,14 @@ public class AlumniClubServiceImpl extends ServiceImpl<AlumniClubMapper, AlumniC
     }
 
     @Override
+    public List<AlumniClub> queryDatasByCategoryId(Integer categoryId) {
+        QueryWrapper<AlumniClub> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("category_id", categoryId);
+        List<AlumniClub> result = alumniClubMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
     public int deleteDataById(Integer id) {
         int result = alumniClubMapper.deleteById(id);
         return result;

+ 1 - 1
src/main/resources/mapper/template/ActivitySigninMapper.xml

@@ -7,7 +7,7 @@
         <result property="cardNumber" column="card_number"/>
     </resultMap>
     <select id="querySigninDatasByActivityId" resultType="com.template.model.vo.UserVo" resultMap="ActivitySigninMap">
-        select au.id,au.`name`,au.card_number from activity_report ar
+        select au.id,au.`name`,au.card_number from activity_signin ar
         left join alumni_user au on au.deleted = 0 and au.id = ar.user_id
         where ar.deleted = 0 and ar.activity_id = #{activityId}
     </select>

+ 14 - 1
src/main/resources/mapper/template/AlumniCategoryMapper.xml

@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.AlumniCategoryMapper">
-
+    <select id="queryCategoryPages" resultType="com.template.model.pojo.AlumniCategory">
+        select ac.id,ac.name,ac.create_time,ac.update_time,au.name as create_user,ac.update_user,ac.deleted from alumni_category ac
+        inner join alumni_user au on au.deleted = 0 and au.id = ac.create_user
+        <if test="userName != null and userName != ''">
+            and au.name like '%' #{userName} '%'
+        </if>
+        where ac.deleted = 0
+        <if test="name != null and name != ''">
+            and ac.name like '%' #{name} '%'
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and ac.create_time BETWEEN #{startTime} AND #{endTime}
+        </if>
+    </select>
 </mapper>

+ 1 - 1
src/main/resources/mapper/template/AlumniClubApplyMapper.xml

@@ -99,7 +99,7 @@
 
 
     <select id="queryApproveClubApplys" resultType="com.template.model.vo.ApplyClubVo" resultMap="ClubDataApplyMap">
-        select aca.club_id as id,au.name as apply_name,au.college_name,au.period_name,au.major_name,au.class_name,aca.name,aca.is_pass,aca.update_time as pass_time,aca.create_time,aca.pass_value
+        select aca.id,au.name as apply_name,au.college_name,au.period_name,au.major_name,au.class_name,aca.name,aca.is_pass,aca.update_time as pass_time,aca.create_time,aca.pass_value
         from alumni_club_apply aca
         inner join alumni_user au on au.deleted = 0 and au.id = aca.create_user
         where aca.deleted= 0 and aca.is_pass = 1

+ 5 - 2
src/main/resources/mapper/template/AlumniClubMapper.xml

@@ -23,7 +23,9 @@
     </resultMap>
     <select id="queryClubPages" resultType="com.template.model.pojo.AlumniClub" resultMap="ClubDataPageMap">
         select
-        ac.id,ac.contacts,ac.phone,ac.address,ac.email,ac.name,ac.category_id,ac.category_name,ac.is_top,ac.description,ac.contact,ac.admin,aca.is_pass,ac.number,ac.admin_name,ac.create_time,aca.create_time as pass_time,
+        ac.id,ac.contacts,ac.phone,ac.address,ac.email,ac.name,ac.category_id,ac.category_name,ac.is_top,ac.description,ac.contact,ac.admin,aca.is_pass,
+        (select Count(*) from alumni_club_apply where deleted = 0 and club_id = ac.id and is_pass = 2) as number
+        ,ac.admin_name,ac.create_time,aca.create_time as pass_time,
         au.name as create_username
         from alumni_club ac
         left join alumni_club_apply aca on aca.deleted =0 and aca.club_id = ac.id
@@ -53,7 +55,8 @@
     </resultMap>
     <select id="queryClubDatas" resultType="com.template.model.vo.ClubExcelVo" resultMap="ClubDataMap">
         select
-        ac.name,ac.category_name,ac.number,ac.admin_name,au.name as create_user,ac.create_time
+        ac.name,ac.category_name,
+        (select Count(*) from alumni_club_apply where deleted = 0 and club_id = ac.id and is_pass = 2) as number,ac.admin_name,au.name as create_user,ac.create_time
         from alumni_club ac
         inner join alumni_user au on au.deleted = 0 and au.id = ac.create_user
         <if test="userName != null and userName != ''">

+ 3 - 3
src/main/resources/mapper/template/AlumniEndorseMapper.xml

@@ -146,7 +146,7 @@
             resultMap="ApplicationRecordDatasMap">
         select
         ae.id,ae.data_no,ae.name,ae.card_number,au.phone,au.college_name,au.period_name,au.major_name,au.class_name,ae.preferred_method,ae.image,ae.descript,ae.pass_time,ae.create_time,ae.is_pass
-        ,ae.pass_value
+        ,IFNULL( ae.pass_value,'') as pass_value
         from alumni_endorse ae
         left join alumni_user au on au.deleted = 0 and au.id = ae.user_id
         where ae.deleted = 0
@@ -163,7 +163,7 @@
             resultMap="ApplicationRecordDatasMap">
         select
         ae.id,ae.data_no,ae.name,ae.card_number,au.phone,au.college_name,au.period_name,au.major_name,au.class_name,ae.preferred_method,ae.image,ae.descript,ae.pass_time,ae.create_time,ae.is_pass
-        ,ae.pass_value
+        ,IFNULL( ae.pass_value,'') as pass_value
         from alumni_endorse ae
         left join alumni_user au on au.deleted = 0 and au.id = ae.user_id
         where ae.deleted = 0
@@ -180,7 +180,7 @@
     <select id="applicationApproveRecordDatas" resultType="com.template.model.vo.ApplicationRecordPageVo" resultMap="ApplicationRecordDatasMap">
         select
         ae.id,ae.data_no,ae.name,ae.card_number,au.phone,au.college_name,au.period_name,au.major_name,au.class_name,ae.preferred_method,ae.image,ae.descript,ae.pass_time,ae.create_time,ae.is_pass
-        ,ae.pass_value
+        ,IFNULL( ae.pass_value,'') as pass_value
         from alumni_endorse ae
         left join alumni_user au on au.deleted = 0 and au.id = ae.user_id
         where ae.deleted = 0 and ae.is_pass = 1

BIN
target/alumni.jar


BIN
target/alumni.jar.original


+ 0 - 202
target/classes/META-INF/spring-configuration-metadata.json

@@ -1,202 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "cos",
-      "type": "com.template.config.CosConfig",
-      "sourceType": "com.template.config.CosConfig"
-    },
-    {
-      "name": "openid",
-      "type": "com.template.config.WxOpenidConfig",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "smong",
-      "type": "com.template.config.SmongConfig",
-      "sourceType": "com.template.config.SmongConfig"
-    },
-    {
-      "name": "tencentcloud",
-      "type": "com.template.config.smsConfig",
-      "sourceType": "com.template.config.smsConfig"
-    },
-    {
-      "name": "video",
-      "type": "com.template.config.VideoConfig",
-      "sourceType": "com.template.config.VideoConfig"
-    }
-  ],
-  "properties": [
-    {
-      "name": "cos.bucket-name",
-      "type": "java.lang.String",
-      "description": "存储桶名称",
-      "sourceType": "com.template.config.CosConfig"
-    },
-    {
-      "name": "cos.path",
-      "type": "java.lang.String",
-      "description": "存储桶访问路径",
-      "sourceType": "com.template.config.CosConfig"
-    },
-    {
-      "name": "cos.region",
-      "type": "java.lang.String",
-      "description": "存储桶地区",
-      "sourceType": "com.template.config.CosConfig"
-    },
-    {
-      "name": "cos.secret-id",
-      "type": "java.lang.String",
-      "description": "腾讯云账号秘钥",
-      "sourceType": "com.template.config.CosConfig"
-    },
-    {
-      "name": "cos.secret-key",
-      "type": "java.lang.String",
-      "description": "密码秘钥",
-      "sourceType": "com.template.config.CosConfig"
-    },
-    {
-      "name": "openid.appid",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.appkey",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.granttype",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.ip",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.ipconfig",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.ocode",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.return-url",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.shappid",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.shsecret",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.xappid",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.xsecret",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.WxOpenidConfig"
-    },
-    {
-      "name": "smong.app-key",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.SmongConfig"
-    },
-    {
-      "name": "smong.app-secret",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.SmongConfig"
-    },
-    {
-      "name": "smong.master-key",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.SmongConfig"
-    },
-    {
-      "name": "smong.product-id",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.SmongConfig"
-    },
-    {
-      "name": "tencentcloud.sdk-appid",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.smsConfig"
-    },
-    {
-      "name": "tencentcloud.secret-i-d",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.smsConfig"
-    },
-    {
-      "name": "tencentcloud.secret-key",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.smsConfig"
-    },
-    {
-      "name": "tencentcloud.sign-name",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.smsConfig"
-    },
-    {
-      "name": "tencentcloud.sms-min",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.smsConfig"
-    },
-    {
-      "name": "tencentcloud.template-id",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.smsConfig"
-    },
-    {
-      "name": "video.add-device",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.VideoConfig"
-    },
-    {
-      "name": "video.app-key",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.VideoConfig"
-    },
-    {
-      "name": "video.delete-device",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.VideoConfig"
-    },
-    {
-      "name": "video.get-device",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.VideoConfig"
-    },
-    {
-      "name": "video.info-device",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.VideoConfig"
-    },
-    {
-      "name": "video.secret",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.VideoConfig"
-    },
-    {
-      "name": "video.update-device",
-      "type": "java.lang.String",
-      "sourceType": "com.template.config.VideoConfig"
-    }
-  ],
-  "hints": []
-}

File diff suppressed because it is too large
+ 0 - 109
target/classes/application-dev.yml


File diff suppressed because it is too large
+ 0 - 109
target/classes/application-prod.yml


File diff suppressed because it is too large
+ 0 - 105
target/classes/application.yml


BIN
target/classes/com/template/AutoCode.class


BIN
target/classes/com/template/MybatisPlusApplication.class


BIN
target/classes/com/template/annotation/ControllerIsShow.class


BIN
target/classes/com/template/annotation/DESRespondSecret.class


BIN
target/classes/com/template/annotation/ExcelExport.class


BIN
target/classes/com/template/annotation/ExcelImport.class


BIN
target/classes/com/template/annotation/PassToken.class


BIN
target/classes/com/template/annotation/UserLoginCheck.class


BIN
target/classes/com/template/aop/DESResponseSecretAspect.class


BIN
target/classes/com/template/aop/LoggingAspect.class


BIN
target/classes/com/template/aop/LoginCheckAspect.class


BIN
target/classes/com/template/api/ActivityImageControllerAPI.class


BIN
target/classes/com/template/api/AlumniActivityControllerAPI.class


BIN
target/classes/com/template/api/AlumniAdminApplyControllerAPI.class


BIN
target/classes/com/template/api/AlumniCategoryControllerAPI.class


BIN
target/classes/com/template/api/AlumniCategoryImageControllerAPI.class


BIN
target/classes/com/template/api/AlumniCategoryNewsControllerAPI.class


BIN
target/classes/com/template/api/AlumniClubApplyControllerAPI.class


BIN
target/classes/com/template/api/AlumniClubControllerAPI.class


BIN
target/classes/com/template/api/AlumniEndorseControllerAPI.class


BIN
target/classes/com/template/api/AlumniImageControllerAPI.class


BIN
target/classes/com/template/api/AlumniNewsControllerAPI.class


BIN
target/classes/com/template/api/AlumniOrgControllerAPI.class


BIN
target/classes/com/template/api/AlumniReturnControllerAPI.class


BIN
target/classes/com/template/api/AlumniUserControllerAPI.class


BIN
target/classes/com/template/api/DingTalkControllerAPI.class


BIN
target/classes/com/template/api/ExcelControllerAPI.class


BIN
target/classes/com/template/api/FileControllerAPI.class


BIN
target/classes/com/template/api/LogInfoControllerAPI.class


BIN
target/classes/com/template/api/LoginControllerAPI.class


BIN
target/classes/com/template/api/SmsCodeControllerAPI.class


BIN
target/classes/com/template/api/SystemMenuControllerAPI.class


BIN
target/classes/com/template/common/constanst/Constanst.class


BIN
target/classes/com/template/common/exception/EmsException.class


BIN
target/classes/com/template/common/exception/EmsExceptionHandler.class


BIN
target/classes/com/template/common/exception/MyCustomException.class


BIN
target/classes/com/template/common/jh/ReqRespResearchProductQuestionnaireItem.class


BIN
target/classes/com/template/common/jh/SectionUtil.class


BIN
target/classes/com/template/common/result/Code.class


BIN
target/classes/com/template/common/result/ResponseStatusEnum.class


BIN
target/classes/com/template/common/utils/AccessToken.class


BIN
target/classes/com/template/common/utils/AesTestOne.class


BIN
target/classes/com/template/common/utils/AesUtil.class


BIN
target/classes/com/template/common/utils/AesUtils.class


BIN
target/classes/com/template/common/utils/Base64Util.class


BIN
target/classes/com/template/common/utils/CommonUtil.class


BIN
target/classes/com/template/common/utils/DataBliu.class


BIN
target/classes/com/template/common/utils/DateUtils.class


BIN
target/classes/com/template/common/utils/DingTalkUtils.class


BIN
target/classes/com/template/common/utils/EncryptUtil.class


BIN
target/classes/com/template/common/utils/EncryptionUtil.class


BIN
target/classes/com/template/common/utils/ExcelClassField.class


BIN
target/classes/com/template/common/utils/ExcelUtil3.class


BIN
target/classes/com/template/common/utils/ExcelUtils.class


BIN
target/classes/com/template/common/utils/ExcelUtils2.class


BIN
target/classes/com/template/common/utils/FileUtils.class


BIN
target/classes/com/template/common/utils/GetVertifyCode.class


BIN
target/classes/com/template/common/utils/HMACUtils.class


+ 0 - 0
target/classes/com/template/common/utils/HttpClientUtils$1.class


Some files were not shown because too many files changed in this diff