夏文涛 1 рік тому
батько
коміт
e7149e8234
62 змінених файлів з 11286 додано та 465 видалено
  1. 342 379
      .idea/workspace.xml
  2. 1130 0
      logs/smart-2024-12-17.log
  3. 8995 0
      logs/smart-2024-12-18.log
  4. 476 0
      logs/smart-2024-12-19.log
  5. 26 0
      src/main/java/com/template/aop/LoggingAspect.java
  6. 3 0
      src/main/java/com/template/api/FileControllerAPI.java
  7. 25 18
      src/main/java/com/template/controller/AlumniActivityController.java
  8. 17 1
      src/main/java/com/template/controller/AlumniCategoryImageController.java
  9. 4 3
      src/main/java/com/template/controller/AlumniClubApplyController.java
  10. 18 2
      src/main/java/com/template/controller/AlumniClubController.java
  11. 4 2
      src/main/java/com/template/controller/AlumniEndorseController.java
  12. 3 1
      src/main/java/com/template/controller/AlumniImageController.java
  13. 1 6
      src/main/java/com/template/controller/AlumniUserController.java
  14. 48 4
      src/main/java/com/template/controller/FileController.java
  15. 1 0
      src/main/java/com/template/controller/LoginController.java
  16. 4 0
      src/main/java/com/template/model/pojo/AlumniCategory.java
  17. 0 1
      src/main/java/com/template/model/pojo/AlumniCategoryImage.java
  18. 12 0
      src/main/java/com/template/model/pojo/AlumniClub.java
  19. 12 0
      src/main/java/com/template/model/request/insertClubRequest.java
  20. 11 0
      src/main/java/com/template/model/request/updateClubRequest.java
  21. 13 0
      src/main/java/com/template/model/vo/ClubListDataVO.java
  22. 14 0
      src/main/java/com/template/model/vo/HomeClubVo.java
  23. 2 0
      src/main/java/com/template/services/AlumniUserService.java
  24. 5 0
      src/main/java/com/template/services/impl/AlumniUserServiceImpl.java
  25. 2 2
      src/main/resources/mapper/template/ActivityImageMapper.xml
  26. 3 3
      src/main/resources/mapper/template/ActivityReportMapper.xml
  27. 2 2
      src/main/resources/mapper/template/AlumniActivityMapper.xml
  28. 39 5
      src/main/resources/mapper/template/AlumniClubApplyMapper.xml
  29. 5 4
      src/main/resources/mapper/template/AlumniClubMapper.xml
  30. 4 4
      src/main/resources/mapper/template/AlumniEndorseMapper.xml
  31. 3 3
      src/main/resources/mapper/template/AlumniImageMapper.xml
  32. 1 1
      src/main/resources/mapper/template/AlumniUserMapper.xml
  33. BIN
      target/alumni.jar
  34. BIN
      target/alumni.jar.original
  35. BIN
      target/classes/com/template/aop/LoggingAspect.class
  36. BIN
      target/classes/com/template/api/FileControllerAPI.class
  37. BIN
      target/classes/com/template/controller/AlumniActivityController.class
  38. BIN
      target/classes/com/template/controller/AlumniCategoryImageController.class
  39. BIN
      target/classes/com/template/controller/AlumniClubApplyController.class
  40. BIN
      target/classes/com/template/controller/AlumniClubController.class
  41. BIN
      target/classes/com/template/controller/AlumniEndorseController.class
  42. BIN
      target/classes/com/template/controller/AlumniImageController.class
  43. BIN
      target/classes/com/template/controller/AlumniUserController.class
  44. BIN
      target/classes/com/template/controller/FileController.class
  45. BIN
      target/classes/com/template/controller/LoginController.class
  46. BIN
      target/classes/com/template/model/pojo/AlumniCategory.class
  47. BIN
      target/classes/com/template/model/pojo/AlumniCategoryImage.class
  48. BIN
      target/classes/com/template/model/pojo/AlumniClub.class
  49. BIN
      target/classes/com/template/model/request/insertClubRequest.class
  50. BIN
      target/classes/com/template/model/request/updateClubRequest.class
  51. BIN
      target/classes/com/template/model/vo/ClubListDataVO.class
  52. BIN
      target/classes/com/template/model/vo/HomeClubVo.class
  53. 2 2
      target/classes/mapper/template/ActivityImageMapper.xml
  54. 3 3
      target/classes/mapper/template/ActivityReportMapper.xml
  55. 2 2
      target/classes/mapper/template/AlumniActivityMapper.xml
  56. 39 5
      target/classes/mapper/template/AlumniClubApplyMapper.xml
  57. 5 4
      target/classes/mapper/template/AlumniClubMapper.xml
  58. 4 4
      target/classes/mapper/template/AlumniEndorseMapper.xml
  59. 3 3
      target/classes/mapper/template/AlumniImageMapper.xml
  60. 1 1
      target/classes/mapper/template/AlumniUserMapper.xml
  61. 1 0
      target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  62. 1 0
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

Різницю між файлами не показано, бо вона завелика
+ 342 - 379
.idea/workspace.xml


Різницю між файлами не показано, бо вона завелика
+ 1130 - 0
logs/smart-2024-12-17.log


Різницю між файлами не показано, бо вона завелика
+ 8995 - 0
logs/smart-2024-12-18.log


+ 476 - 0
logs/smart-2024-12-19.log

@@ -0,0 +1,476 @@
+2024-12-19 09:17:57.303 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-19 09:17:57.328 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 10708 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-19 09:17:57.329 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-19 09:17:57.988 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-19 09:17:58.039 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-19 09:17:58.041 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-19 09:17:58.077 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 24 ms. Found 0 Redis repository interfaces.
+2024-12-19 09:17:58.915 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-19 09:17:58.923 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:17:58.923 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-19 09:17:58.924 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-19 09:17:59.004 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-19 09:17:59.004 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1622 ms
+2024-12-19 09:17:59.350 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-19 09:17:59.815 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-19 09:18:01.036 [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-19 09:18:02.863 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:18:03.971 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-19 09:18:03.978 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-19 09:18:03.978 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-19 09:18:03.979 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-19 09:18:03.979 [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-19 09:18:03.979 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-19 09:18:03.979 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-19 09:18:03.979 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@45571cc9
+2024-12-19 09:18:04.024 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-19 09:18:04.106 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:18:04.252 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-19 09:18:04.254 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-19 09:18:04.254 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-19 09:18:04.262 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 7.675 seconds (JVM running for 8.779)
+2024-12-19 09:18:12.291 [http-nio-8687-exec-1] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-12-19 09:18:12.291 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-12-19 09:18:12.293 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 2 ms
+2024-12-19 09:18:12.330 [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-19 09:18:20.860 [http-nio-8687-exec-4] ERROR c.t.c.exception.EmsExceptionHandler - 错误信息
+org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
+### Error querying database.  Cause: com.baomidou.mybatisplus.core.exceptions.MybatisPlusException: Error: Method queryTotal execution error.
+### The error may exist in file [D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes\mapper\template\AlumniImageMapper.xml]
+### The error may involve defaultParameterMap
+### The error occurred while setting parameters
+### Cause: com.baomidou.mybatisplus.core.exceptions.MybatisPlusException: Error: Method queryTotal execution error.
+	at com.template.common.exception.EmsExceptionHandler.exception(EmsExceptionHandler.java:80)
+	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: org.apache.ibatis.exceptions.PersistenceException: 
+### Error querying database.  Cause: com.baomidou.mybatisplus.core.exceptions.MybatisPlusException: Error: Method queryTotal execution error.
+### The error may exist in file [D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes\mapper\template\AlumniImageMapper.xml]
+### The error may involve defaultParameterMap
+### The error occurred while setting parameters
+### Cause: com.baomidou.mybatisplus.core.exceptions.MybatisPlusException: Error: Method queryTotal execution error.
+	at org.apache.ibatis.exceptions.ExceptionFactory.wrapException(ExceptionFactory.java:30)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:153)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:145)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:140)
+	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.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:427)
+	at com.sun.proxy.$Proxy99.selectList(Unknown Source)
+	at org.mybatis.spring.SqlSessionTemplate.selectList(SqlSessionTemplate.java:224)
+	at com.baomidou.mybatisplus.core.override.PageMapperMethod.executeForMany2(PageMapperMethod.java:128)
+	at com.baomidou.mybatisplus.core.override.PageMapperMethod.execute(PageMapperMethod.java:98)
+	at com.baomidou.mybatisplus.core.override.PageMapperProxy.invoke(PageMapperProxy.java:64)
+	at com.sun.proxy.$Proxy146.imagePageDatas(Unknown Source)
+	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.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:344)
+	at org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:198)
+	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)
+	at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:137)
+	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)
+	at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:215)
+	at com.sun.proxy.$Proxy147.imagePageDatas(Unknown Source)
+	at com.template.services.impl.AlumniImageServiceImpl.imagePageDatas(AlumniImageServiceImpl.java:61)
+	at com.template.services.impl.AlumniImageServiceImpl$$FastClassBySpringCGLIB$$c6f34c9d.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
+	at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
+	at com.template.services.impl.AlumniImageServiceImpl$$EnhancerBySpringCGLIB$$ae47a975.imagePageDatas(<generated>)
+	at com.template.controller.AlumniImageController.queryImagePage(AlumniImageController.java:54)
+	at com.template.controller.AlumniImageController$$FastClassBySpringCGLIB$$9a05a84e.invoke(<generated>)
+	at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
+	at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:771)
+	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)
+	at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:749)
+	at org.springframework.aop.framework.adapter.AfterReturningAdviceInterceptor.invoke(AfterReturningAdviceInterceptor.java:57)
+	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)
+	at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:749)
+	at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:97)
+	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)
+	at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:749)
+	at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:691)
+	at com.template.controller.AlumniImageController$$EnhancerBySpringCGLIB$$cee55efe.queryImagePage(<generated>)
+	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.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
+Caused by: com.baomidou.mybatisplus.core.exceptions.MybatisPlusException: Error: Method queryTotal execution error.
+	at com.baomidou.mybatisplus.core.toolkit.ExceptionUtils.mpe(ExceptionUtils.java:41)
+	at com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor.queryTotal(PaginationInterceptor.java:214)
+	at com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor.intercept(PaginationInterceptor.java:168)
+	at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:62)
+	at com.sun.proxy.$Proxy201.prepare(Unknown Source)
+	at org.apache.ibatis.executor.SimpleExecutor.prepareStatement(SimpleExecutor.java:87)
+	at org.apache.ibatis.executor.SimpleExecutor.doQuery(SimpleExecutor.java:62)
+	at org.apache.ibatis.executor.BaseExecutor.queryFromDatabase(BaseExecutor.java:325)
+	at org.apache.ibatis.executor.BaseExecutor.query(BaseExecutor.java:156)
+	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:109)
+	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.apache.ibatis.plugin.Plugin.invoke(Plugin.java:64)
+	at com.sun.proxy.$Proxy200.query(Unknown Source)
+	at com.github.pagehelper.PageInterceptor.intercept(PageInterceptor.java:132)
+	at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:62)
+	at com.sun.proxy.$Proxy200.query(Unknown Source)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:151)
+	... 97 common frames omitted
+Caused by: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ',ai.is_pass = 2 ) TOTAL' at line 11
+	at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:120)
+	at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:97)
+	at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:122)
+	at com.mysql.cj.jdbc.ClientPreparedStatement.executeInternal(ClientPreparedStatement.java:953)
+	at com.mysql.cj.jdbc.ClientPreparedStatement.executeQuery(ClientPreparedStatement.java:1003)
+	at com.zaxxer.hikari.pool.ProxyPreparedStatement.executeQuery(ProxyPreparedStatement.java:52)
+	at com.zaxxer.hikari.pool.HikariProxyPreparedStatement.executeQuery(HikariProxyPreparedStatement.java)
+	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.apache.ibatis.logging.jdbc.PreparedStatementLogger.invoke(PreparedStatementLogger.java:56)
+	at com.sun.proxy.$Proxy202.executeQuery(Unknown Source)
+	at com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor.queryTotal(PaginationInterceptor.java:199)
+	... 115 common frames omitted
+2024-12-19 09:22:24.448 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:22:24.561 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-19 09:22:24.561 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-19 09:22:24.562 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-19 09:22:24.562 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:22:24.562 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-19 09:22:24.563 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:22:24.564 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-19 09:22:24.567 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+2024-12-19 09:50:58.207 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-19 09:50:58.222 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 17596 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-19 09:50:58.222 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-19 09:50:58.746 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-19 09:50:58.783 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-19 09:50:58.784 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-19 09:50:58.816 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 23 ms. Found 0 Redis repository interfaces.
+2024-12-19 09:50:59.612 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-19 09:50:59.617 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:50:59.617 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-19 09:50:59.618 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-19 09:50:59.681 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-19 09:50:59.681 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1425 ms
+2024-12-19 09:51:00.005 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-19 09:51:00.439 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-19 09:51:01.711 [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-19 09:51:03.484 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:51:04.558 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-19 09:51:04.564 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-19 09:51:04.565 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-19 09:51:04.565 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-19 09:51:04.566 [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-19 09:51:04.566 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-19 09:51:04.566 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-19 09:51:04.566 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@29ac632a
+2024-12-19 09:51:04.597 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-19 09:51:04.676 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:51:04.817 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-19 09:51:04.818 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-19 09:51:04.818 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-19 09:51:04.826 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 6.975 seconds (JVM running for 7.586)
+2024-12-19 09:51:10.076 [http-nio-8687-exec-1] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-12-19 09:51:10.076 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-12-19 09:51:10.077 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 1 ms
+2024-12-19 09:55:10.192 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:55:10.311 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-19 09:55:10.312 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-19 09:55:10.312 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-19 09:55:10.312 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:55:10.312 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-19 09:55:10.313 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:55:10.315 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-19 09:55:10.317 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+2024-12-19 09:55:12.689 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-19 09:55:12.702 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 15552 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-19 09:55:12.703 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-19 09:55:13.211 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-19 09:55:13.248 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-19 09:55:13.256 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-19 09:55:13.286 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 21 ms. Found 0 Redis repository interfaces.
+2024-12-19 09:55:14.005 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-19 09:55:14.010 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:55:14.011 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-19 09:55:14.011 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-19 09:55:14.074 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-19 09:55:14.074 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1336 ms
+2024-12-19 09:55:14.382 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-19 09:55:14.798 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-19 09:55:16.034 [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-19 09:55:17.799 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:55:18.827 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-19 09:55:18.833 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-19 09:55:18.833 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-19 09:55:18.833 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-19 09:55:18.834 [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-19 09:55:18.834 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-19 09:55:18.834 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-19 09:55:18.834 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@2a201aa9
+2024-12-19 09:55:18.863 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-19 09:55:18.938 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:55:19.094 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-19 09:55:19.095 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-19 09:55:19.095 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-19 09:55:19.102 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 6.79 seconds (JVM running for 7.352)
+2024-12-19 09:55:20.628 [http-nio-8687-exec-1] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-12-19 09:55:20.628 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-12-19 09:55:20.629 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 1 ms
+2024-12-19 09:56:59.994 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:57:00.109 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-19 09:57:00.109 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-19 09:57:00.109 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-19 09:57:00.109 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:57:00.109 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-19 09:57:00.111 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:57:00.112 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-19 09:57:00.115 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+2024-12-19 09:57:02.679 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-19 09:57:02.694 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 17604 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-19 09:57:02.694 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-19 09:57:03.197 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-19 09:57:03.230 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-19 09:57:03.231 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-19 09:57:03.261 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 21 ms. Found 0 Redis repository interfaces.
+2024-12-19 09:57:03.995 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-19 09:57:04.000 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:57:04.000 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-19 09:57:04.000 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-19 09:57:04.059 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-19 09:57:04.059 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1330 ms
+2024-12-19 09:57:04.358 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-19 09:57:04.781 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-19 09:57:05.952 [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-19 09:57:07.863 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:57:08.878 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-19 09:57:08.885 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-19 09:57:08.886 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-19 09:57:08.886 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-19 09:57:08.887 [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-19 09:57:08.887 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-19 09:57:08.887 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-19 09:57:08.887 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@30336205
+2024-12-19 09:57:08.951 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-19 09:57:09.033 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:57:09.155 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-19 09:57:09.157 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-19 09:57:09.157 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-19 09:57:09.165 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 6.824 seconds (JVM running for 7.426)
+2024-12-19 09:57:09.236 [http-nio-8687-exec-1] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-12-19 09:57:09.237 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-12-19 09:57:09.237 [http-nio-8687-exec-1] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 0 ms
+2024-12-19 09:58:29.832 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:58:29.975 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-19 09:58:29.975 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-19 09:58:29.976 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-19 09:58:29.976 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:58:29.976 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-19 09:58:29.977 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:58:29.978 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-19 09:58:29.979 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+2024-12-19 09:58:33.476 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
+2024-12-19 09:58:33.490 [main] INFO  com.template.MybatisPlusApplication - Starting MybatisPlusApplication using Java 1.8.0_181 on DESKTOP-4B4LOJM with PID 20664 (D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\target\classes started by Bingo in D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai)
+2024-12-19 09:58:33.491 [main] INFO  com.template.MybatisPlusApplication - The following profiles are active: prod
+2024-12-19 09:58:34.013 [main] WARN  o.m.s.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.template]' package. Please check your configuration.
+2024-12-19 09:58:34.058 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-12-19 09:58:34.059 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+2024-12-19 09:58:34.100 [main] INFO  o.s.d.r.c.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 23 ms. Found 0 Redis repository interfaces.
+2024-12-19 09:58:34.912 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8687 (http)
+2024-12-19 09:58:34.919 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:58:34.920 [main] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+2024-12-19 09:58:34.920 [main] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.39]
+2024-12-19 09:58:35.002 [main] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring embedded WebApplicationContext
+2024-12-19 09:58:35.002 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1475 ms
+2024-12-19 09:58:35.325 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+2024-12-19 09:58:35.769 [main] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+2024-12-19 09:58:37.096 [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-19 09:58:38.938 [main] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:58:40.030 [main] INFO  org.quartz.impl.StdSchedulerFactory - Using default implementation for ThreadExecutor
+2024-12-19 09:58:40.036 [main] INFO  o.quartz.core.SchedulerSignalerImpl - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-12-19 09:58:40.036 [main] INFO  org.quartz.core.QuartzScheduler - Quartz Scheduler v.2.3.2 created.
+2024-12-19 09:58:40.036 [main] INFO  org.quartz.simpl.RAMJobStore - RAMJobStore initialized.
+2024-12-19 09:58:40.037 [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-19 09:58:40.037 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-12-19 09:58:40.037 [main] INFO  org.quartz.impl.StdSchedulerFactory - Quartz scheduler version: 2.3.2
+2024-12-19 09:58:40.037 [main] INFO  org.quartz.core.QuartzScheduler - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@61e8fbfc
+2024-12-19 09:58:40.067 [main] INFO  o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
+2024-12-19 09:58:40.147 [main] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8687"]
+2024-12-19 09:58:40.275 [main] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8687 (http) with context path '/alumni'
+2024-12-19 09:58:40.276 [main] INFO  o.s.s.quartz.SchedulerFactoryBean - Starting Quartz Scheduler now
+2024-12-19 09:58:40.276 [main] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-12-19 09:58:40.284 [main] INFO  com.template.MybatisPlusApplication - Started MybatisPlusApplication in 7.149 seconds (JVM running for 7.673)
+2024-12-19 09:58:40.312 [http-nio-8687-exec-2] INFO  o.a.c.c.C.[.[localhost].[/alumni] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-12-19 09:58:40.312 [http-nio-8687-exec-2] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-12-19 09:58:40.313 [http-nio-8687-exec-2] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 1 ms
+2024-12-19 09:58:47.066 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:58:47.179 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-19 09:58:47.179 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-19 09:58:47.179 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-19 09:58:47.179 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-19 09:58:47.180 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-19 09:58:47.181 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-19 09:58:47.182 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-19 09:58:47.184 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.

+ 26 - 0
src/main/java/com/template/aop/LoggingAspect.java

@@ -0,0 +1,26 @@
+package com.template.aop;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+
+/**
+ * @Author: xwt
+ * @Date: 2024/12/18 星期三 14:43
+ * @Description: com.template.aop
+ * @Version: 1.0
+ */
+//@Aspect
+//@Component
+public class LoggingAspect {
+
+    //@Before("execution(* com.template.services.*.*(..))")
+    public void logBefore(JoinPoint joinPoint) {
+        Object[] args = joinPoint.getArgs();
+        System.out.println("Method called: " + joinPoint.getSignature().getName());
+        System.out.println("With arguments: " + Arrays.toString(args));
+    }
+}

+ 3 - 0
src/main/java/com/template/api/FileControllerAPI.java

@@ -15,4 +15,7 @@ public interface FileControllerAPI {
     @ApiOperation(value = "文件上传", notes = "文件上传", httpMethod = "POST")
     CommonResult uploadFile(@RequestParam("file") MultipartFile file, String name) throws Exception;
 
+    @PostMapping(value = "/deleteFile")
+    @ApiOperation(value = "删除文件", notes = "删除文件", httpMethod = "POST")
+    CommonResult deleteFile(String name) throws Exception;
 }

+ 25 - 18
src/main/java/com/template/controller/AlumniActivityController.java

@@ -298,13 +298,15 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
         List<ActivityReport> reports = activityReportService.queryReported(userId);
         String statuStr = null;
         String nowDate = TimeExchange.getTime();
-        if (statuId.intValue() == eStatusType.Unstart.getValue()) {//未开始
-            statuStr = "and aa.start_time > '" + nowDate + "'";
-        } else if (statuId.intValue() == eStatusType.Inprogress.getValue()) {//进行中
-
-            statuStr = "and aa.start_time < '" + nowDate + "' and aa.end_time > '" + nowDate + "'";
-        } else if (statuId.intValue() == eStatusType.Ended.getValue()) {//已结束
-            statuStr = "and aa.end_time < '" + nowDate + "'";
+        if(statuId != null){
+            if (statuId.intValue() == eStatusType.Unstart.getValue()) {//未开始
+                statuStr = "and aa.start_time > '" + nowDate + "'";
+            } else if (statuId.intValue() == eStatusType.Inprogress.getValue()) {//进行中
+
+                statuStr = "and aa.start_time < '" + nowDate + "' and aa.end_time > '" + nowDate + "'";
+            } else if (statuId.intValue() == eStatusType.Ended.getValue()) {//已结束
+                statuStr = "and aa.end_time < '" + nowDate + "'";
+            }
         }
         PageUtils<AlumniActivityPageVo> result = alumniActivityService.queryActivityPages(currentPage, pageCount, userName, collegeId, periodId, majorId, classId, orgName, theme, statuStr, createStartTime, createEndTime, startTime, endTime, signsTime, signeTime);
         for (AlumniActivityPageVo aapv : result.getList()) {
@@ -377,14 +379,17 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
 
         String statuStr = null;
         String nowDate = TimeExchange.getTime();
-        if (aaer.getStatuId().intValue() == eStatusType.Unstart.getValue()) {//未开始
-            statuStr = "and aa.start_time > '" + nowDate + "'";
-        } else if (aaer.getStatuId().intValue() == eStatusType.Inprogress.getValue()) {//进行中
-
-            statuStr = "and aa.start_time < '" + nowDate + "' and aa.end_time > '" + nowDate + "'";
-        } else if (aaer.getStatuId().intValue() == eStatusType.Ended.getValue()) {//已结束
-            statuStr = "and aa.end_time < '" + nowDate + "'";
+        if(aaer.getStatuId() != null){
+            if (aaer.getStatuId().intValue() == eStatusType.Unstart.getValue()) {//未开始
+                statuStr = "and aa.start_time > '" + nowDate + "'";
+            } else if (aaer.getStatuId().intValue() == eStatusType.Inprogress.getValue()) {//进行中
+
+                statuStr = "and aa.start_time < '" + nowDate + "' and aa.end_time > '" + nowDate + "'";
+            } else if (aaer.getStatuId().intValue() == eStatusType.Ended.getValue()) {//已结束
+                statuStr = "and aa.end_time < '" + nowDate + "'";
+            }
         }
+
         PageUtils<AlumniActivityPageVo> result = alumniActivityService.queryActivityPages(1, 3000, aaer.getUserName(), aaer.getCollegeId()
                 , aaer.getPeriodId(), aaer.getMajorId(), aaer.getClassId(), aaer.getOrgName(), aaer.getTheme(), statuStr,
                 aaer.getCreateStartTime(), aaer.getCreateEndTime(), aaer.getStartTime(), aaer.getEndTime(), aaer.getSignsTime(), aaer.getSigneTime());
@@ -423,8 +428,9 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
                 dataRow.createCell(13).setCellValue((acv.getReportNumber() == null ? 0 : acv.getReportNumber()) + "人");//已报名
                 dataRow.createCell(14).setCellValue((acv.getSigninNumber() == null ? 0 : acv.getSigninNumber()) + "人");//已签到
                 dataRow.createCell(15).setCellValue(TimeExchange.chineseDateTime(acv.getCreateTime()));//创建时间
+                i++;
             }
-            i++;
+
         }
         //endregion
         //region 活动管理明细
@@ -447,7 +453,7 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
             if (resultOne != null && resultOne.size() > 0) {
                 int i = 0;
                 for (ActivityDetailExcelVo acv : resultOne) {
-                    Row dataRowOne = sheet.createRow(i + 1);
+                    Row dataRowOne = sheetOne.createRow(i + 1);
                     dataRowOne.createCell(0).setCellValue(i + 1);//序号
                     dataRowOne.createCell(1).setCellValue(acv.getTheme());//活动主题
                     dataRowOne.createCell(2).setCellValue(acv.getName());//参加人
@@ -457,8 +463,8 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
                     dataRowOne.createCell(6).setCellValue(acv.getClassName());//班级
                     dataRowOne.createCell(7).setCellValue(TimeExchange.chineseDateTime(acv.getReportTime()));//报名时间
                     dataRowOne.createCell(8).setCellValue(TimeExchange.chineseDateTime(acv.getSigninTime()));//签到时间
+                    i++;
                 }
-                i++;
             }
         }
         //endregion
@@ -896,8 +902,9 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
                 dataRow.createCell(13).setCellValue(acv.getApplyUserAdmin());//审核人
                 dataRow.createCell(14).setCellValue(acv.getPassTime() != null ? TimeExchange.DateToString(acv.getPassTime(), "yyyy-MM-dd HH:mm:ss") : "");//审核时间
                 dataRow.createCell(15).setCellValue(TimeExchange.DateToString(acv.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));//创建时间
+                i++;
             }
-            i++;
+
         }
         //endregion
 

+ 17 - 1
src/main/java/com/template/controller/AlumniCategoryImageController.java

@@ -5,12 +5,14 @@ import com.template.api.AlumniCategoryImageControllerAPI;
 import com.template.common.utils.paramUtils;
 import com.template.model.pojo.AlumniCategory;
 import com.template.model.pojo.AlumniCategoryImage;
+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.model.vo.ListDataVO;
 import com.template.services.AlumniCategoryImageService;
+import com.template.services.AlumniUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -31,6 +35,8 @@ import java.util.List;
 public class AlumniCategoryImageController implements AlumniCategoryImageControllerAPI {
 
     @Autowired
+    private AlumniUserService alumniUserService;
+    @Autowired
     private AlumniCategoryImageService alumniCategoryImageService;
 
     @Override
@@ -100,7 +106,17 @@ public class AlumniCategoryImageController implements AlumniCategoryImageControl
     @Override
     public CommonResult queryCategoryImagePage(int currentPage, int pageCount, String startTime, String endTime) {
         PageUtils<AlumniCategoryImage> result = alumniCategoryImageService.queryPageList(currentPage, pageCount, startTime, endTime);
-
+        if (result.getList() != null && result.getList().size() > 0) {
+            List<String> userIds = result.getList().stream().map(AlumniCategoryImage::getCreateUser).collect(Collectors.toList());
+            List<AlumniUser> users = alumniUserService.queryDataByIds(userIds);
+            for (AlumniCategoryImage 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);
     }
 

+ 4 - 3
src/main/java/com/template/controller/AlumniClubApplyController.java

@@ -249,15 +249,16 @@ public class AlumniClubApplyController implements AlumniClubApplyControllerAPI {
                 dataRow.createCell(1).setCellValue(acv.getApplyName());
                 dataRow.createCell(2).setCellValue(acv.getCollegeName());
                 dataRow.createCell(3).setCellValue(acv.getPeriodName());
-                dataRow.createCell(4).setCellValue(acv.getPeriodName());
+                dataRow.createCell(4).setCellValue(acv.getMajorName());
                 dataRow.createCell(5).setCellValue(acv.getClassName());
                 dataRow.createCell(6).setCellValue(acv.getName());
                 dataRow.createCell(7).setCellValue(acv.getApplyUserName());
-                dataRow.createCell(8).setCellValue(acv.getName());
+                dataRow.createCell(8).setCellValue(ePassType.stringOf(acv.getIsPass()) );
                 dataRow.createCell(9).setCellValue(acv.getPassTime());
                 dataRow.createCell(10).setCellValue(acv.getCreateTime());
+                i++;
             }
-            i++;
+
         }
 
         // 将工作簿写入文件

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

@@ -86,6 +86,11 @@ public class AlumniClubController implements AlumniClubControllerAPI {
             ac.setContact(icr.getContact());
         }
 
+        ac.setContacts(icr.getContacts());
+        ac.setPhone(icr.getPhone());
+        ac.setEmail(icr.getEmail());
+        ac.setAddress(icr.getAddress());
+
         ac.setAdmin(StringUtils.join(icr.getAdmins().stream().map(UserVo::getId).collect(Collectors.toList()), ","));
         ac.setAdminName(StringUtils.join(icr.getAdmins().stream().map(UserVo::getName).collect(Collectors.toList()), ","));
 
@@ -121,6 +126,10 @@ public class AlumniClubController implements AlumniClubControllerAPI {
         ac.setContact(org.springframework.util.StringUtils.hasText(ucr.getContact()) ? ucr.getContact() : ac.getContact());
         ac.setAdmin(StringUtils.join(ucr.getAdmins().stream().map(UserVo::getId).collect(Collectors.toList()), ","));
         ac.setAdminName(StringUtils.join(ucr.getAdmins().stream().map(UserVo::getName).collect(Collectors.toList()), ","));
+        ac.setContacts(ucr.getContacts());
+        ac.setPhone(ucr.getPhone());
+        ac.setEmail(ucr.getEmail());
+        ac.setAddress(ucr.getAddress());
 
         int result = alumniClubService.updateAlumniClub(ac);
         if (result <= 0) {
@@ -242,8 +251,8 @@ public class AlumniClubController implements AlumniClubControllerAPI {
                 dataRow.createCell(4).setCellValue(cev.getAdminName());
                 dataRow.createCell(5).setCellValue(cev.getCreateUser());
                 dataRow.createCell(6).setCellValue(cev.getCreateTime());
+                i++;
             }
-            i++;
         }
 
         // 将工作簿写入文件
@@ -266,6 +275,10 @@ public class AlumniClubController implements AlumniClubControllerAPI {
             result.setName(topData.getName());
             result.setDescription(topData.getDescription());
             result.setContact(topData.getContact());
+            result.setContacts(topData.getContacts());
+            result.setPhone(topData.getPhone());
+            result.setEmail(topData.getEmail());
+            result.setAddress(topData.getAddress());
             result.setCreateTime(TimeExchange.chineseDateShortTime(topData.getCreateTime()) + "成立");
             //查看当前登陆人是否已加入 未加入 或 申请中
             if (au.getOrgId() != null && au.getOrgId().intValue() ==topData.getId().intValue()) {
@@ -305,7 +318,10 @@ public class AlumniClubController implements AlumniClubControllerAPI {
             data.setName(ac.getName());
             data.setDescription(ac.getDescription());
             data.setContact(ac.getContact());
-
+            data.setContacts(ac.getContacts());
+            data.setPhone(ac.getPhone());
+            data.setEmail(ac.getEmail());
+            data.setAddress(ac.getAddress());
             if(existApply != null && existApply.size() > 0){
                 Optional<AlumniClubApply> oExist = existApply.stream().filter(e -> e.getClubId().intValue() == ac.getId().intValue()).findFirst();
                 if(oExist !=null && oExist.isPresent()){

+ 4 - 2
src/main/java/com/template/controller/AlumniEndorseController.java

@@ -195,8 +195,9 @@ public class AlumniEndorseController implements AlumniEndorseControllerAPI {
                 dataRow.createCell(9).setCellValue(aepv.getPreferredMethodName());//上榜方式
                 dataRow.createCell(10).setCellValue(aepv.getDescript());//人物简介
                 dataRow.createCell(11).setCellValue(aepv.getCreateTime());//创建时间
+                i++;
             }
-            i++;
+
         }
         //endregion
 
@@ -285,8 +286,9 @@ public class AlumniEndorseController implements AlumniEndorseControllerAPI {
                 dataRow.createCell(10).setCellValue(aepv.getDescript());//人物简介
                 dataRow.createCell(11).setCellValue(aepv.getPassName());//审核时间
                 dataRow.createCell(12).setCellValue(aepv.getCreateTime());//创建时间
+                i++;
             }
-            i++;
+
         }
         //endregion
 

+ 3 - 1
src/main/java/com/template/controller/AlumniImageController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -124,7 +125,7 @@ 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) {
-        PageUtils<ImageApplyPageVo> result = alumniImageService.imageApplyPageDatas(currentPage, userId, pageCount, userName, orgName, collegeId, periodId, majorId, classId, isPass, startTime, endTime);
+        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()));
             rg.setImages(Arrays.asList(rg.getImage().split(",")));
@@ -169,6 +170,7 @@ public class AlumniImageController implements AlumniImageControllerAPI {
 
 
         ai.setIsPass(isPass);
+        ai.setPassTime(new Date());
         ai.setPassValue(passValue);
 
         int result = alumniImageService.updateAlumniImage(ai);

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

@@ -96,12 +96,7 @@ public class AlumniUserController implements AlumniUserControllerAPI {
         }
 
         PageUtils<UserVo> result = null;
-        if (childDepartmentIds != null && childDepartmentIds.size() > 0) {
-            result = alumniUserService.queryUserPages(currentPage, pageCount, childDepartmentIds);
-        } else {
-            IPage<UserVo> userData = new Page<>();
-            result = new PageUtils<UserVo>(userData);
-        }
+        result = alumniUserService.queryUserPages(currentPage, pageCount, childDepartmentIds);
 
         return CommonResult.ok(result);
     }

+ 48 - 4
src/main/java/com/template/controller/FileController.java

@@ -28,19 +28,20 @@ public class FileController implements FileControllerAPI {
      * 发布到服务器上后就不需要考虑堡垒机的问题,因为最终域名引导到程序上,
      * 然后程序是在那个服务器内的,所以也就避开了堡垒机验证问题,
      * 只需要把ip换成服务的ip地址即可,内网ip也同样可以访问,因为程序和服务器此时已经是在同一个网段
+     *
      * @param file
      * @return
      * @throws Exception
      */
     @Override
     public CommonResult uploadFile(MultipartFile file, String name) throws Exception {
-        uploadFileResponse result= new uploadFileResponse();
+        uploadFileResponse result = new uploadFileResponse();
 
-        name =name == null ? StrUtils.getRandomName(file.getOriginalFilename()) : name;
+        name = name == null ? StrUtils.getRandomName(file.getOriginalFilename()) : name;
 
         String user = "root"; //SFTP服务器用户名
-        String password = "Wer@2024!!!..."; // SFTP服务器密码
-        String host = "120.53.230.172";  //  SFTP服务器地址
+        String password = "Waimai2024#"; // SFTP服务器密码
+        String host = "172.16.40.122";  //  SFTP服务器地址
         int port = 22; // SFTP 服务器端口
         String remoteDirPath = "/home/image"; // 远程目录路径
         //从MultipartFile对象中获取流
@@ -73,6 +74,7 @@ public class FileController implements FileControllerAPI {
             }
             //  文件上传到远程服务器上
             channelSftp.put(inputStream, name);
+
             //  从远程服务器上下载文件
             //channelSftp.get(downpath, spath);
         } catch (JSchException e) {
@@ -90,4 +92,46 @@ public class FileController implements FileControllerAPI {
         return CommonResult.ok(result);
     }
 
+    @Override
+    public CommonResult deleteFile(String name) throws Exception {
+        uploadFileResponse result = new uploadFileResponse();
+
+        String user = "root"; //SFTP服务器用户名
+        String password = "Waimai2024#"; // SFTP服务器密码
+        String host = "172.16.40.122";  //  SFTP服务器地址
+        int port = 22; // SFTP 服务器端口
+        String remoteDirPath = "/home/image"; // 远程目录路径
+        //String downpath="/book/《Python爬虫开发与项目实战》.pdf";
+        //String spath="C:/Users/F1339769/Desktop";
+        JSch jsch = new JSch();
+        Session session = null;
+        ChannelSftp channelSftp = null;
+        try {
+            session = jsch.getSession(user, host, port);
+            session.setPassword(password);
+            session.setConfig("StrictHostKeyChecking", "no");
+            session.connect(30000);
+            System.out.println("连接成功");
+            channelSftp = (ChannelSftp) session.openChannel("sftp");
+            channelSftp.connect();
+
+            //  文件上传到远程服务器上
+            channelSftp.rm(remoteDirPath + "/" + name);
+
+            //  从远程服务器上下载文件
+            //channelSftp.get(downpath, spath);
+        } catch (JSchException e) {
+            e.printStackTrace();
+        } finally {
+            if (channelSftp != null) {
+                channelSftp.disconnect();
+            }
+            if (session != null) {
+                session.disconnect();
+            }
+        }
+
+        return CommonResult.ok("删除成功");
+    }
+
 }

+ 1 - 0
src/main/java/com/template/controller/LoginController.java

@@ -349,6 +349,7 @@ public class LoginController implements LoginControllerAPI {
     @Override
     @PassToken
     public CommonResult queryReduce() {
+        //alumniUserService.createUser("yahahah",16);
         return CommonResult.ok("当前系统版本为:1V");
     }
 

+ 4 - 0
src/main/java/com/template/model/pojo/AlumniCategory.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -39,10 +41,12 @@ public class AlumniCategory implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
     @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
 

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

@@ -54,7 +54,6 @@ public class AlumniCategoryImage implements Serializable {
 
     @ApiModelProperty(value = "创建人员")
     @TableField(fill = FieldFill.INSERT)
-    @JsonIgnore
     private String createUser;
 
     @ApiModelProperty(value = "更新人员")

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

@@ -60,6 +60,18 @@ public class AlumniClub implements Serializable {
     @ApiModelProperty(value = "联系我们")
     private String contact;
 
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
     @ApiModelProperty(value = "管理员ID 多个管理员用逗号隔开")
     @JsonIgnore
     private String admin;

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

@@ -53,6 +53,18 @@ public class insertClubRequest implements Serializable {
     @ApiModelProperty(value = "联系我们")
     private String contact;
 
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
     @ApiModelProperty(value = "管理员集合")
     @NotEmpty(message = "管理员集合不能为空")
     private List<UserVo> admins;

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

@@ -52,6 +52,17 @@ public class updateClubRequest implements Serializable {
     @ApiModelProperty(value = "联系我们")
     private String contact;
 
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
 
     @ApiModelProperty(value = "管理员集合")
     @NotEmpty(message = "管理员集合不能为空")

+ 13 - 0
src/main/java/com/template/model/vo/ClubListDataVO.java

@@ -1,5 +1,6 @@
 package com.template.model.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -32,6 +33,18 @@ public class ClubListDataVO {
      */
     private String contact;
 
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
     /**
      * 当前人是否已加入该组织
      * 1:已加入

+ 14 - 0
src/main/java/com/template/model/vo/HomeClubVo.java

@@ -1,6 +1,7 @@
 package com.template.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -34,6 +35,19 @@ public class HomeClubVo {
      */
     private String contact;
 
+
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
     /**
      * 时间
      */

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

@@ -45,4 +45,6 @@ public interface AlumniUserService extends IService<AlumniUser> {
     PageUtils<AlumniUser> queryUserPageByClassId(int currentPage, int pageCount,Integer classId, String name);
 
     AlumniUser queryUserByCnp(String cardNumber,String name,String phone);
+
+//    void createUser(String name, int age);
 }

+ 5 - 0
src/main/java/com/template/services/impl/AlumniUserServiceImpl.java

@@ -154,4 +154,9 @@ public class AlumniUserServiceImpl extends ServiceImpl<AlumniUserMapper, AlumniU
         AlumniUser au = alumniUserMapper.selectOne(queryWrapper);
         return au;
     }
+
+//    @Override
+//    public void createUser(String name, int age) {
+//        System.out.println("Creating user: " + name + ", age: " + age);
+//    }
 }

+ 2 - 2
src/main/resources/mapper/template/ActivityImageMapper.xml

@@ -12,7 +12,7 @@
         select ai.id,ai.image,ai.is_pass,ai.apply_user_name,aa.theme from activity_image ai
         left join alumni_activity aa on aa.deleted = 0 and aa.id = ai.activity_id
         where ai.deleted = 0
-        and FIND_IN_SET(#{userId},ai.apply_user)
+        and FIND_IN_SET(${userId},ai.apply_user)
         order by ai.create_time desc
     </select>
 
@@ -47,7 +47,7 @@
         </if>
         where ai.deleted = 0 and ai.is_pass = 1
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ai.apply_user)
+            and FIND_IN_SET(${userId},ai.apply_user)
         </if>
         order by ai.create_time desc
     </select>

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

@@ -33,10 +33,10 @@
         left join activity_signin asd on asd.deleted = 0 and asd.activity_id = ar.activity_id and asd.user_id =
         ar.user_id
         where ar.deleted = 0
-        <if test="articivityIds != null and articivityIds.size() > 0">
+        <if test="activityIds != null and activityIds.size() > 0">
             and ar.activity_id in
-            <foreach collection="articivityIds" item="articivityId" index="index" open="(" close=")" separator=",">
-                ${userId}
+            <foreach collection="activityIds" item="activityId" index="index" open="(" close=")" separator=",">
+                ${activityId}
             </foreach>
         </if>
     </select>

+ 2 - 2
src/main/resources/mapper/template/AlumniActivityMapper.xml

@@ -125,7 +125,7 @@
             and (aa.signs_time BETWEEN #{signsTime} and #{signeTime} or aa.signe_time BETWEEN #{signsTime} and #{signeTime})
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},aa.apply_user)
+            and FIND_IN_SET(${userId},aa.apply_user)
         </if>
     </select>
 
@@ -183,7 +183,7 @@
         </if>
         where aa.deleted = 0 and aa.is_pass = 1
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},aa.apply_user)
+            and FIND_IN_SET(${userId},aa.apply_user)
         </if>
         order by aa.create_time desc
     </select>

+ 39 - 5
src/main/resources/mapper/template/AlumniClubApplyMapper.xml

@@ -16,11 +16,11 @@
         <result property="passValue" column="pass_value"/>
     </resultMap>
     <select id="queryClubApplys" resultType="com.template.model.vo.ApplyClubVo" resultMap="ClubDataApplyMap">
-        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
+        select aca.id,au.name as apply_name,au.college_name,aca.apply_user_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
-        <if test="applyUsername != null and applyUsername != ''">
-            and au.name like '%' #{applyUsername} '%'
+        <if test="userName != null and userName != ''">
+            and au.name like '%' #{userName} '%'
         </if>
         <if test="collegeId != null and collegeId != 0">
             and au.college_id = #{collegeId}
@@ -45,7 +45,41 @@
             and aca.create_time BETWEEN #{startTime} AND #{endTime}
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},aca.apply_user)
+            and FIND_IN_SET(${userId},aca.apply_user)
+        </if>
+    </select>
+
+    <select id="queryClubExcelApplys" resultType="com.template.model.vo.ApplyClubVo" resultMap="ClubDataApplyMap">
+        select aca.id,au.name as apply_name,au.college_name,aca.apply_user_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
+        <if test="userName != null and userName != ''">
+            and au.name like '%' #{userName} '%'
+        </if>
+        <if test="collegeId != null and collegeId != 0">
+            and au.college_id = #{collegeId}
+        </if>
+        <if test="periodId != null and periodId != 0">
+            and au.period_id = #{periodId}
+        </if>
+        <if test="majorId != null and majorId != 0">
+            and au.major_id = #{majorId}
+        </if>
+        <if test="classId != null and classId != 0">
+            and au.class_id = #{classId}
+        </if>
+        where aca.deleted= 0
+        <if test="name != null and name != ''">
+            and aca.name like '%' #{name} '%'
+        </if>
+        <if test="isPass != null and isPass != 0">
+            and aca.is_pass = #{isPass}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and aca.create_time BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="userId != null and userId != 0">
+            and FIND_IN_SET(${userId},aca.apply_user)
         </if>
     </select>
 
@@ -73,7 +107,7 @@
             and aca.name like '%' #{name} '%'
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},aca.apply_user)
+            and FIND_IN_SET(${userId},aca.apply_user)
         </if>
         order by aca.create_time desc
     </select>

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

@@ -9,6 +9,10 @@
         <result property="categoryName" column="category_name"/>
         <result property="description" column="description"/>
         <result property="contact" column="contact"/>
+        <result property="contacts" column="contacts"/>
+        <result property="phone" column="phone"/>
+        <result property="address" column="address"/>
+        <result property="email" column="email"/>
         <result property="admin" column="admin"/>
         <result property="adminName" column="admin_name"/>
         <result property="isPass" column="is_pass"/>
@@ -19,7 +23,7 @@
     </resultMap>
     <select id="queryClubPages" resultType="com.template.model.pojo.AlumniClub" resultMap="ClubDataPageMap">
         select
-        ac.id,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,ac.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
@@ -59,9 +63,6 @@
         <if test="name != null and name != ''">
             and ac.name like '%' #{name} '%'
         </if>
-        <if test="userId != null and userId != 0">
-            and ac.create_user = #{userId}
-        </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and ac.create_time BETWEEN #{startTime} AND #{endTime}
         </if>

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

@@ -83,19 +83,19 @@
         </if>
         where ae.deleted = 0
         <if test="isPass != null and isPass != 0">
-            and ae.is_pass = #{keyword}
+            and ae.is_pass = #{isPass}
         </if>
         <if test="keyword != null and keyword != ''">
             and (ae.data_no like '%' #{keyword} '%' or ae.name like '%' #{keyword} '%')
         </if>
         <if test="name != null and name != ''">
-            and ae.name like '%' #{keyword} '%'
+            and ae.name like '%' #{name} '%'
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and ae.create_time BETWEEN #{startTime} AND #{endTime}
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ae.apply_user)
+            and FIND_IN_SET(${userId},ae.apply_user)
         </if>
         order by ae.create_time desc
     </select>
@@ -185,7 +185,7 @@
         left join alumni_user au on au.deleted = 0 and au.id = ae.user_id
         where ae.deleted = 0 and ae.is_pass = 1
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ae.apply_user)
+            and FIND_IN_SET(${userId},ae.apply_user)
         </if>
         <if test="name != null and name != ''">
             and ae.name like '%' #{name} '%'

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

@@ -36,7 +36,7 @@
         <if test="classId != null and classId != 0">
             and au.class_id = #{classId}
         </if>
-        where ai.deleted = 0,ai.is_pass = 2
+        where ai.deleted = 0 and ai.is_pass = 2
     </select>
 
 
@@ -87,7 +87,7 @@
             and ai.create_time BETWEEN #{startTime} AND #{endTime}
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ai.apply_user)
+            and FIND_IN_SET(${userId},ai.apply_user)
         </if>
     </select>
 
@@ -172,7 +172,7 @@
         </if>
         where ai.deleted = 0 and ai.is_pass = 1
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ai.apply_user)
+            and FIND_IN_SET(${userId},ai.apply_user)
         </if>
         order by ai.create_time desc
     </select>

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

@@ -22,7 +22,7 @@
         select
         id,card_number,name
         from alumni_user
-        where deleted = 0
+        where deleted = 0 and role_id is not null
         <if test="departmentIds != null and departmentIds.size() > 0">
             and (college_id in
             <foreach collection="departmentIds" item="departmentId" index="index" open="(" close=")" separator=",">

BIN
target/alumni.jar


BIN
target/alumni.jar.original


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


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


BIN
target/classes/com/template/controller/AlumniActivityController.class


BIN
target/classes/com/template/controller/AlumniCategoryImageController.class


BIN
target/classes/com/template/controller/AlumniClubApplyController.class


BIN
target/classes/com/template/controller/AlumniClubController.class


BIN
target/classes/com/template/controller/AlumniEndorseController.class


BIN
target/classes/com/template/controller/AlumniImageController.class


BIN
target/classes/com/template/controller/AlumniUserController.class


BIN
target/classes/com/template/controller/FileController.class


BIN
target/classes/com/template/controller/LoginController.class


BIN
target/classes/com/template/model/pojo/AlumniCategory.class


BIN
target/classes/com/template/model/pojo/AlumniCategoryImage.class


BIN
target/classes/com/template/model/pojo/AlumniClub.class


BIN
target/classes/com/template/model/request/insertClubRequest.class


BIN
target/classes/com/template/model/request/updateClubRequest.class


BIN
target/classes/com/template/model/vo/ClubListDataVO.class


BIN
target/classes/com/template/model/vo/HomeClubVo.class


+ 2 - 2
target/classes/mapper/template/ActivityImageMapper.xml

@@ -12,7 +12,7 @@
         select ai.id,ai.image,ai.is_pass,ai.apply_user_name,aa.theme from activity_image ai
         left join alumni_activity aa on aa.deleted = 0 and aa.id = ai.activity_id
         where ai.deleted = 0
-        and FIND_IN_SET(#{userId},ai.apply_user)
+        and FIND_IN_SET(${userId},ai.apply_user)
         order by ai.create_time desc
     </select>
 
@@ -47,7 +47,7 @@
         </if>
         where ai.deleted = 0 and ai.is_pass = 1
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ai.apply_user)
+            and FIND_IN_SET(${userId},ai.apply_user)
         </if>
         order by ai.create_time desc
     </select>

+ 3 - 3
target/classes/mapper/template/ActivityReportMapper.xml

@@ -33,10 +33,10 @@
         left join activity_signin asd on asd.deleted = 0 and asd.activity_id = ar.activity_id and asd.user_id =
         ar.user_id
         where ar.deleted = 0
-        <if test="articivityIds != null and articivityIds.size() > 0">
+        <if test="activityIds != null and activityIds.size() > 0">
             and ar.activity_id in
-            <foreach collection="articivityIds" item="articivityId" index="index" open="(" close=")" separator=",">
-                ${userId}
+            <foreach collection="activityIds" item="activityId" index="index" open="(" close=")" separator=",">
+                ${activityId}
             </foreach>
         </if>
     </select>

+ 2 - 2
target/classes/mapper/template/AlumniActivityMapper.xml

@@ -125,7 +125,7 @@
             and (aa.signs_time BETWEEN #{signsTime} and #{signeTime} or aa.signe_time BETWEEN #{signsTime} and #{signeTime})
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},aa.apply_user)
+            and FIND_IN_SET(${userId},aa.apply_user)
         </if>
     </select>
 
@@ -183,7 +183,7 @@
         </if>
         where aa.deleted = 0 and aa.is_pass = 1
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},aa.apply_user)
+            and FIND_IN_SET(${userId},aa.apply_user)
         </if>
         order by aa.create_time desc
     </select>

+ 39 - 5
target/classes/mapper/template/AlumniClubApplyMapper.xml

@@ -16,11 +16,11 @@
         <result property="passValue" column="pass_value"/>
     </resultMap>
     <select id="queryClubApplys" resultType="com.template.model.vo.ApplyClubVo" resultMap="ClubDataApplyMap">
-        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
+        select aca.id,au.name as apply_name,au.college_name,aca.apply_user_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
-        <if test="applyUsername != null and applyUsername != ''">
-            and au.name like '%' #{applyUsername} '%'
+        <if test="userName != null and userName != ''">
+            and au.name like '%' #{userName} '%'
         </if>
         <if test="collegeId != null and collegeId != 0">
             and au.college_id = #{collegeId}
@@ -45,7 +45,41 @@
             and aca.create_time BETWEEN #{startTime} AND #{endTime}
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},aca.apply_user)
+            and FIND_IN_SET(${userId},aca.apply_user)
+        </if>
+    </select>
+
+    <select id="queryClubExcelApplys" resultType="com.template.model.vo.ApplyClubVo" resultMap="ClubDataApplyMap">
+        select aca.id,au.name as apply_name,au.college_name,aca.apply_user_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
+        <if test="userName != null and userName != ''">
+            and au.name like '%' #{userName} '%'
+        </if>
+        <if test="collegeId != null and collegeId != 0">
+            and au.college_id = #{collegeId}
+        </if>
+        <if test="periodId != null and periodId != 0">
+            and au.period_id = #{periodId}
+        </if>
+        <if test="majorId != null and majorId != 0">
+            and au.major_id = #{majorId}
+        </if>
+        <if test="classId != null and classId != 0">
+            and au.class_id = #{classId}
+        </if>
+        where aca.deleted= 0
+        <if test="name != null and name != ''">
+            and aca.name like '%' #{name} '%'
+        </if>
+        <if test="isPass != null and isPass != 0">
+            and aca.is_pass = #{isPass}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and aca.create_time BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="userId != null and userId != 0">
+            and FIND_IN_SET(${userId},aca.apply_user)
         </if>
     </select>
 
@@ -73,7 +107,7 @@
             and aca.name like '%' #{name} '%'
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},aca.apply_user)
+            and FIND_IN_SET(${userId},aca.apply_user)
         </if>
         order by aca.create_time desc
     </select>

+ 5 - 4
target/classes/mapper/template/AlumniClubMapper.xml

@@ -9,6 +9,10 @@
         <result property="categoryName" column="category_name"/>
         <result property="description" column="description"/>
         <result property="contact" column="contact"/>
+        <result property="contacts" column="contacts"/>
+        <result property="phone" column="phone"/>
+        <result property="address" column="address"/>
+        <result property="email" column="email"/>
         <result property="admin" column="admin"/>
         <result property="adminName" column="admin_name"/>
         <result property="isPass" column="is_pass"/>
@@ -19,7 +23,7 @@
     </resultMap>
     <select id="queryClubPages" resultType="com.template.model.pojo.AlumniClub" resultMap="ClubDataPageMap">
         select
-        ac.id,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,ac.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
@@ -59,9 +63,6 @@
         <if test="name != null and name != ''">
             and ac.name like '%' #{name} '%'
         </if>
-        <if test="userId != null and userId != 0">
-            and ac.create_user = #{userId}
-        </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and ac.create_time BETWEEN #{startTime} AND #{endTime}
         </if>

+ 4 - 4
target/classes/mapper/template/AlumniEndorseMapper.xml

@@ -83,19 +83,19 @@
         </if>
         where ae.deleted = 0
         <if test="isPass != null and isPass != 0">
-            and ae.is_pass = #{keyword}
+            and ae.is_pass = #{isPass}
         </if>
         <if test="keyword != null and keyword != ''">
             and (ae.data_no like '%' #{keyword} '%' or ae.name like '%' #{keyword} '%')
         </if>
         <if test="name != null and name != ''">
-            and ae.name like '%' #{keyword} '%'
+            and ae.name like '%' #{name} '%'
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and ae.create_time BETWEEN #{startTime} AND #{endTime}
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ae.apply_user)
+            and FIND_IN_SET(${userId},ae.apply_user)
         </if>
         order by ae.create_time desc
     </select>
@@ -185,7 +185,7 @@
         left join alumni_user au on au.deleted = 0 and au.id = ae.user_id
         where ae.deleted = 0 and ae.is_pass = 1
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ae.apply_user)
+            and FIND_IN_SET(${userId},ae.apply_user)
         </if>
         <if test="name != null and name != ''">
             and ae.name like '%' #{name} '%'

+ 3 - 3
target/classes/mapper/template/AlumniImageMapper.xml

@@ -36,7 +36,7 @@
         <if test="classId != null and classId != 0">
             and au.class_id = #{classId}
         </if>
-        where ai.deleted = 0,ai.is_pass = 2
+        where ai.deleted = 0 and ai.is_pass = 2
     </select>
 
 
@@ -87,7 +87,7 @@
             and ai.create_time BETWEEN #{startTime} AND #{endTime}
         </if>
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ai.apply_user)
+            and FIND_IN_SET(${userId},ai.apply_user)
         </if>
     </select>
 
@@ -172,7 +172,7 @@
         </if>
         where ai.deleted = 0 and ai.is_pass = 1
         <if test="userId != null and userId != 0">
-            and FIND_IN_SET(#{userId},ai.apply_user)
+            and FIND_IN_SET(${userId},ai.apply_user)
         </if>
         order by ai.create_time desc
     </select>

+ 1 - 1
target/classes/mapper/template/AlumniUserMapper.xml

@@ -22,7 +22,7 @@
         select
         id,card_number,name
         from alumni_user
-        where deleted = 0
+        where deleted = 0 and role_id is not null
         <if test="departmentIds != null and departmentIds.size() > 0">
             and (college_id in
             <foreach collection="departmentIds" item="departmentId" index="index" open="(" close=")" separator=",">

+ 1 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -168,6 +168,7 @@ com\template\controller\AlumniEndorseController.class
 com\template\model\enumModel\eWeekStatu.class
 com\template\model\vo\ImageMyPageVo$ImageMyPageVoBuilder.class
 com\template\model\pojo\AlumniClubApply.class
+com\template\aop\LoggingAspect.class
 com\template\common\utils\FileUtils.class
 com\template\annotation\ExcelImport.class
 com\template\model\pojo\ActivitySignin.class

+ 1 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -237,6 +237,7 @@ D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\src\main\java\c
 D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\src\main\java\com\template\handle\NonStaticResourceHttpRequestHandler.java
 D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\src\main\java\com\template\model\enumModel\eStatusType.java
 D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\src\main\java\com\template\model\request\contentRequest.java
+D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\src\main\java\com\template\aop\LoggingAspect.java
 D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\src\main\java\com\template\common\utils\smsUtil.java
 D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\src\main\java\com\template\common\result\Code.java
 D:\Bingo\Desktop\工作内容\校友生态\school_ecology_houtai\src\main\java\com\template\model\vo\ClassSettingDateVo.java