From 39aaa557c5d85f17a597ef10149cba412ae01431 Mon Sep 17 00:00:00 2001 From: caolin <1149034574@qq.com> Date: Sun, 29 Jun 2025 20:06:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=94=E9=A2=98=E7=9B=B8=E5=85=B3=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logs/driver-server/driver-server-root.log | 20 ++++ logs/driver-server/driver-server.log | 5 + .../controller/WrjExamPlaceController.java | 21 ++++ .../server/controller/WrjModelController.java | 21 ++++ .../WrjQuestionPracticeController.java | 21 ++++ .../controller/WrjSchoolController.java | 21 ++++ .../controller/WrjSchoolModelController.java | 21 ++++ .../WrjSchoolServiceController.java | 21 ++++ .../controller/WrjSchoolTagController.java | 21 ++++ .../WrjUserCollectQuestionController.java | 21 ++++ .../WrjUserErrorQuestionController.java | 21 ++++ .../com/wrj/driver/server/dto/ChapterDto.java | 6 -- .../driver/server/entity/WrjExamPlace.java | 97 ++++++++++++++++++ .../wrj/driver/server/entity/WrjModel.java | 48 +++++++++ .../server/entity/WrjQuestionPractice.java | 78 ++++++++++++++ .../wrj/driver/server/entity/WrjSchool.java | 86 ++++++++++++++++ .../driver/server/entity/WrjSchoolModel.java | 40 ++++++++ .../server/entity/WrjSchoolService.java | 47 +++++++++ .../driver/server/entity/WrjSchoolTag.java | 47 +++++++++ .../server/entity/WrjUserCollectQuestion.java | 47 +++++++++ .../server/entity/WrjUserErrorQuestion.java | 47 +++++++++ .../server/generator/MysqlParamGenerator.java | 4 +- .../server/mapper/WrjExamPlaceMapper.java | 16 +++ .../driver/server/mapper/WrjModelMapper.java | 16 +++ .../mapper/WrjQuestionPracticeMapper.java | 16 +++ .../driver/server/mapper/WrjSchoolMapper.java | 16 +++ .../server/mapper/WrjSchoolModelMapper.java | 16 +++ .../server/mapper/WrjSchoolServiceMapper.java | 16 +++ .../server/mapper/WrjSchoolTagMapper.java | 16 +++ .../mapper/WrjUserCollectQuestionMapper.java | 16 +++ .../mapper/WrjUserErrorQuestionMapper.java | 16 +++ .../server/service/IWrjExamPlaceService.java | 16 +++ .../server/service/IWrjModelService.java | 16 +++ .../service/IWrjQuestionPracticeService.java | 16 +++ .../service/IWrjSchoolModelService.java | 16 +++ .../server/service/IWrjSchoolService.java | 16 +++ .../service/IWrjSchoolServiceService.java | 16 +++ .../server/service/IWrjSchoolTagService.java | 16 +++ .../IWrjUserCollectQuestionService.java | 16 +++ .../service/IWrjUserErrorQuestionService.java | 16 +++ .../service/impl/WrjExamPlaceServiceImpl.java | 20 ++++ .../service/impl/WrjModelServiceImpl.java | 20 ++++ .../impl/WrjQuestionPracticeServiceImpl.java | 20 ++++ .../impl/WrjSchoolModelServiceImpl.java | 20 ++++ .../service/impl/WrjSchoolServiceImpl.java | 20 ++++ .../impl/WrjSchoolServiceServiceImpl.java | 20 ++++ .../service/impl/WrjSchoolTagServiceImpl.java | 20 ++++ .../WrjUserCollectQuestionServiceImpl.java | 20 ++++ .../impl/WrjUserErrorQuestionServiceImpl.java | 20 ++++ .../resources/mapper/WrjExamPlaceMapper.xml | 5 + src/main/resources/mapper/WrjModelMapper.xml | 5 + .../mapper/WrjQuestionPracticeMapper.xml | 5 + .../main/resources/mapper/WrjSchoolMapper.xml | 3 +- .../resources/mapper/WrjSchoolModelMapper.xml | 5 + .../mapper/WrjSchoolServiceMapper.xml | 5 + .../resources/mapper/WrjSchoolTagMapper.xml | 5 + .../mapper/WrjUserCollectQuestionMapper.xml | 5 + .../mapper/WrjUserErrorQuestionMapper.xml | 5 + .../server/mapper/TdSysUserMapper.class | Bin 325 -> 0 bytes .../impl/TdQuestionTestServiceImpl.class | Bin 11379 -> 0 bytes .../impl/TdSysConfigListServiceImpl.class | Bin 9449 -> 0 bytes .../impl/TdSysUserLogServiceImpl.class | Bin 2187 -> 0 bytes .../service/impl/TdSysUserServiceImpl.class | Bin 8669 -> 0 bytes 63 files changed, 1263 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/wrj/driver/server/controller/WrjExamPlaceController.java create mode 100644 src/main/java/com/wrj/driver/server/controller/WrjModelController.java create mode 100644 src/main/java/com/wrj/driver/server/controller/WrjQuestionPracticeController.java create mode 100644 src/main/java/com/wrj/driver/server/controller/WrjSchoolController.java create mode 100644 src/main/java/com/wrj/driver/server/controller/WrjSchoolModelController.java create mode 100644 src/main/java/com/wrj/driver/server/controller/WrjSchoolServiceController.java create mode 100644 src/main/java/com/wrj/driver/server/controller/WrjSchoolTagController.java create mode 100644 src/main/java/com/wrj/driver/server/controller/WrjUserCollectQuestionController.java create mode 100644 src/main/java/com/wrj/driver/server/controller/WrjUserErrorQuestionController.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjExamPlace.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjModel.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjQuestionPractice.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjSchool.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjSchoolModel.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjSchoolService.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjSchoolTag.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjUserCollectQuestion.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjUserErrorQuestion.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjExamPlaceMapper.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjModelMapper.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjQuestionPracticeMapper.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjSchoolMapper.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjSchoolModelMapper.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjSchoolServiceMapper.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjSchoolTagMapper.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjUserCollectQuestionMapper.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjUserErrorQuestionMapper.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjExamPlaceService.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjModelService.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjQuestionPracticeService.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjSchoolModelService.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjSchoolService.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjSchoolServiceService.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjSchoolTagService.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjUserCollectQuestionService.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjUserErrorQuestionService.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjExamPlaceServiceImpl.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjModelServiceImpl.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjQuestionPracticeServiceImpl.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjSchoolModelServiceImpl.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjSchoolServiceImpl.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjSchoolServiceServiceImpl.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjSchoolTagServiceImpl.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjUserCollectQuestionServiceImpl.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjUserErrorQuestionServiceImpl.java create mode 100644 src/main/resources/mapper/WrjExamPlaceMapper.xml create mode 100644 src/main/resources/mapper/WrjModelMapper.xml create mode 100644 src/main/resources/mapper/WrjQuestionPracticeMapper.xml rename target/classes/mapper/TdSysUserMapper.xml => src/main/resources/mapper/WrjSchoolMapper.xml (70%) create mode 100644 src/main/resources/mapper/WrjSchoolModelMapper.xml create mode 100644 src/main/resources/mapper/WrjSchoolServiceMapper.xml create mode 100644 src/main/resources/mapper/WrjSchoolTagMapper.xml create mode 100644 src/main/resources/mapper/WrjUserCollectQuestionMapper.xml create mode 100644 src/main/resources/mapper/WrjUserErrorQuestionMapper.xml delete mode 100644 target/classes/com/wrj/driver/server/mapper/TdSysUserMapper.class delete mode 100644 target/classes/com/wrj/driver/server/service/impl/TdQuestionTestServiceImpl.class delete mode 100644 target/classes/com/wrj/driver/server/service/impl/TdSysConfigListServiceImpl.class delete mode 100644 target/classes/com/wrj/driver/server/service/impl/TdSysUserLogServiceImpl.class delete mode 100644 target/classes/com/wrj/driver/server/service/impl/TdSysUserServiceImpl.class diff --git a/logs/driver-server/driver-server-root.log b/logs/driver-server/driver-server-root.log index ccdfd34..958388b 100644 --- a/logs/driver-server/driver-server-root.log +++ b/logs/driver-server/driver-server-root.log @@ -15,3 +15,23 @@ 2025-06-29 19:29:23.451 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Documentation plugins bootstrapped 2025-06-29 19:29:23.454 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s) 2025-06-29 19:29:23.480 [main] INFO s.d.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references +2025-06-29 20:05:42.265 [background-preinit] INFO org.hibernate.validator.internal.util.Version - HV000001: Hibernate Validator 6.2.3.Final +2025-06-29 20:05:43.065 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode! +2025-06-29 20:05:43.067 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Bootstrapping Spring Data Redis repositories in DEFAULT mode. +2025-06-29 20:05:43.092 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 14 ms. Found 0 Redis repository interfaces. +2025-06-29 20:05:43.278 [main] INFO o.s.context.annotation.ConfigurationClassEnhancer - @Bean method SecurityAutoConfiguration.springAsyncUtil is non-static and returns an object assignable to Spring's BeanFactoryPostProcessor interface. This will result in a failure to process annotations such as @Autowired, @Resource and @PostConstruct within the method's declaring @Configuration class. Add the 'static' modifier to this method to avoid these container lifecycle issues; see @Bean javadoc for complete details. +2025-06-29 20:05:43.607 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8899 (http) +2025-06-29 20:05:43.614 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8899"] +2025-06-29 20:05:43.615 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] +2025-06-29 20:05:43.615 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.63] +2025-06-29 20:05:43.748 [main] INFO o.a.c.c.C.[Tomcat].[localhost].[/driver-api] - Initializing Spring embedded WebApplicationContext +2025-06-29 20:05:43.748 [main] INFO o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 1443 ms +2025-06-29 20:05:44.372 [main] WARN c.b.mybatisplus.core.metadata.TableInfoHelper - Warn: Could not find @TableId in Class: com.wrj.driver.server.entity.WrjSchoolModel. +2025-06-29 20:05:44.448 [main] WARN c.b.mybatisplus.core.metadata.TableInfoHelper - Warn: Could not find @TableId in Class: com.wrj.driver.server.entity.WrjUserCollectQuestion. +2025-06-29 20:05:44.459 [main] WARN c.b.mybatisplus.core.metadata.TableInfoHelper - Warn: Could not find @TableId in Class: com.wrj.driver.server.entity.WrjUserErrorQuestion. +2025-06-29 20:05:46.247 [main] INFO s.d.s.w.WebMvcPropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2ControllerWebMvc#getDocumentation(String, HttpServletRequest)] +2025-06-29 20:05:46.610 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8899"] +2025-06-29 20:05:46.626 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat started on port(s): 8899 (http) with context path '/driver-api' +2025-06-29 20:05:46.627 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Documentation plugins bootstrapped +2025-06-29 20:05:46.629 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s) +2025-06-29 20:05:46.657 [main] INFO s.d.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references diff --git a/logs/driver-server/driver-server.log b/logs/driver-server/driver-server.log index 4335f0d..f25037a 100644 --- a/logs/driver-server/driver-server.log +++ b/logs/driver-server/driver-server.log @@ -3,3 +3,8 @@ 2025-06-29 19:29:18.975 [main] INFO com.wrj.driver.server.DriverServerApplication - The following 1 profile is active: "prod" 2025-06-29 19:29:20.672 [main] DEBUG com.wrj.driver.server.filter.TokenFilter - Filter 'tokenFilter' configured for use 2025-06-29 19:29:23.647 [main] INFO com.wrj.driver.server.DriverServerApplication - Started DriverServerApplication in 5.154 seconds (JVM running for 6.615) +2025-06-29 20:05:42.269 [main] INFO com.wrj.driver.server.DriverServerApplication - Starting DriverServerApplication using Java 1.8.0_311 on CAOLIN with PID 11788 (G:\project\newPartTimeJob\wrj-applet-api\target\classes started by 曹林 in G:\project\newPartTimeJob\wrj-applet-api) +2025-06-29 20:05:42.270 [main] DEBUG com.wrj.driver.server.DriverServerApplication - Running with Spring Boot v2.5.14, Spring v5.3.20 +2025-06-29 20:05:42.270 [main] INFO com.wrj.driver.server.DriverServerApplication - The following 1 profile is active: "prod" +2025-06-29 20:05:43.777 [main] DEBUG com.wrj.driver.server.filter.TokenFilter - Filter 'tokenFilter' configured for use +2025-06-29 20:05:46.840 [main] INFO com.wrj.driver.server.DriverServerApplication - Started DriverServerApplication in 4.973 seconds (JVM running for 6.362) diff --git a/src/main/java/com/wrj/driver/server/controller/WrjExamPlaceController.java b/src/main/java/com/wrj/driver/server/controller/WrjExamPlaceController.java new file mode 100644 index 0000000..dfc2169 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/controller/WrjExamPlaceController.java @@ -0,0 +1,21 @@ +package com.wrj.driver.server.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *
+ * 考试地点表 前端控制器 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@RestController +@RequestMapping("/wrjExamPlace") +public class WrjExamPlaceController { + +} diff --git a/src/main/java/com/wrj/driver/server/controller/WrjModelController.java b/src/main/java/com/wrj/driver/server/controller/WrjModelController.java new file mode 100644 index 0000000..2970d57 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/controller/WrjModelController.java @@ -0,0 +1,21 @@ +package com.wrj.driver.server.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 无人机机型表 前端控制器 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@RestController +@RequestMapping("/wrjModel") +public class WrjModelController { + +} diff --git a/src/main/java/com/wrj/driver/server/controller/WrjQuestionPracticeController.java b/src/main/java/com/wrj/driver/server/controller/WrjQuestionPracticeController.java new file mode 100644 index 0000000..4b983d6 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/controller/WrjQuestionPracticeController.java @@ -0,0 +1,21 @@ +package com.wrj.driver.server.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 用户答题练习表 前端控制器 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@RestController +@RequestMapping("/wrjQuestionPractice") +public class WrjQuestionPracticeController { + +} diff --git a/src/main/java/com/wrj/driver/server/controller/WrjSchoolController.java b/src/main/java/com/wrj/driver/server/controller/WrjSchoolController.java new file mode 100644 index 0000000..0c39f24 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/controller/WrjSchoolController.java @@ -0,0 +1,21 @@ +package com.wrj.driver.server.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 无人机培训机构 前端控制器 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@RestController +@RequestMapping("/wrjSchool") +public class WrjSchoolController { + +} diff --git a/src/main/java/com/wrj/driver/server/controller/WrjSchoolModelController.java b/src/main/java/com/wrj/driver/server/controller/WrjSchoolModelController.java new file mode 100644 index 0000000..14e8503 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/controller/WrjSchoolModelController.java @@ -0,0 +1,21 @@ +package com.wrj.driver.server.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 培训机构培训项目表 前端控制器 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@RestController +@RequestMapping("/wrjSchoolModel") +public class WrjSchoolModelController { + +} diff --git a/src/main/java/com/wrj/driver/server/controller/WrjSchoolServiceController.java b/src/main/java/com/wrj/driver/server/controller/WrjSchoolServiceController.java new file mode 100644 index 0000000..dc16861 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/controller/WrjSchoolServiceController.java @@ -0,0 +1,21 @@ +package com.wrj.driver.server.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 培训机构其他服务表 前端控制器 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@RestController +@RequestMapping("/wrjSchoolService") +public class WrjSchoolServiceController { + +} diff --git a/src/main/java/com/wrj/driver/server/controller/WrjSchoolTagController.java b/src/main/java/com/wrj/driver/server/controller/WrjSchoolTagController.java new file mode 100644 index 0000000..b582392 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/controller/WrjSchoolTagController.java @@ -0,0 +1,21 @@ +package com.wrj.driver.server.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 培训机构培训标签表 前端控制器 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@RestController +@RequestMapping("/wrjSchoolTag") +public class WrjSchoolTagController { + +} diff --git a/src/main/java/com/wrj/driver/server/controller/WrjUserCollectQuestionController.java b/src/main/java/com/wrj/driver/server/controller/WrjUserCollectQuestionController.java new file mode 100644 index 0000000..ad0c433 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/controller/WrjUserCollectQuestionController.java @@ -0,0 +1,21 @@ +package com.wrj.driver.server.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 用户收藏表 前端控制器 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@RestController +@RequestMapping("/wrjUserCollectQuestion") +public class WrjUserCollectQuestionController { + +} diff --git a/src/main/java/com/wrj/driver/server/controller/WrjUserErrorQuestionController.java b/src/main/java/com/wrj/driver/server/controller/WrjUserErrorQuestionController.java new file mode 100644 index 0000000..444b162 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/controller/WrjUserErrorQuestionController.java @@ -0,0 +1,21 @@ +package com.wrj.driver.server.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 用户错题表 前端控制器 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@RestController +@RequestMapping("/wrjUserErrorQuestion") +public class WrjUserErrorQuestionController { + +} diff --git a/src/main/java/com/wrj/driver/server/dto/ChapterDto.java b/src/main/java/com/wrj/driver/server/dto/ChapterDto.java index 4fa1145..3f3e9b0 100644 --- a/src/main/java/com/wrj/driver/server/dto/ChapterDto.java +++ b/src/main/java/com/wrj/driver/server/dto/ChapterDto.java @@ -27,10 +27,4 @@ public class ChapterDto { @ApiModelProperty("题目数") private Integer count; - /** - * 科目 - */ - @ApiModelProperty("科目") - private Integer subject; - } diff --git a/src/main/java/com/wrj/driver/server/entity/WrjExamPlace.java b/src/main/java/com/wrj/driver/server/entity/WrjExamPlace.java new file mode 100644 index 0000000..afe8136 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjExamPlace.java @@ -0,0 +1,97 @@ +package com.wrj.driver.server.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 考试地点表 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_exam_place") +public class WrjExamPlace implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "place_id", type = IdType.AUTO) + private Integer placeId; + + /** + * 考试地点名 + */ + @TableField("place_name") + private String placeName; + + /** + * 城市 + */ + @TableField("city") + private String city; + + /** + * 地址 + */ + @TableField("address") + private String address; + + /** + * 考试类型 + */ + @TableField("exam_type") + private String examType; + + /** + * 考试时间 + */ + @TableField("exam_date") + private String examDate; + + /** + * 联系人 + */ + @TableField("contacts") + private String contacts; + + /** + * 负责人 + */ + @TableField("leader") + private String leader; + + @TableField("creator") + private String creator; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + @TableField("updater") + private String updater; + + /** + * 跟新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + @TableField("deleted") + private Boolean deleted; + + +} diff --git a/src/main/java/com/wrj/driver/server/entity/WrjModel.java b/src/main/java/com/wrj/driver/server/entity/WrjModel.java new file mode 100644 index 0000000..5b63213 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjModel.java @@ -0,0 +1,48 @@ +package com.wrj.driver.server.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 无人机机型表 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_model") +public class WrjModel implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "model_id") + private Integer modelId; + + /** + * 项目名 + */ + @TableField("model_name") + private String modelName; + + /** + * 排序 + */ + @TableField("sort") + private String sort; + + @TableField("is_active") + private Boolean isActive; + + +} diff --git a/src/main/java/com/wrj/driver/server/entity/WrjQuestionPractice.java b/src/main/java/com/wrj/driver/server/entity/WrjQuestionPractice.java new file mode 100644 index 0000000..dfde3a5 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjQuestionPractice.java @@ -0,0 +1,78 @@ +package com.wrj.driver.server.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 用户答题练习表 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_question_practice") +public class WrjQuestionPractice implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 练习标识 + */ + @TableId(value = "practice_id", type = IdType.AUTO) + private Long practiceId; + + /** + * 题目标识 + */ + @TableField("question_id") + private Long questionId; + + /** + * 用户标识 + */ + @TableField("user_id") + private Long userId; + + /** + * 练习类型 1-顺序练习 2-章节练习 3-随机练习 4-模拟考试 + */ + @TableField("practice_type") + private String practiceType; + + /** + * 用户选择的答案 + */ + @TableField("answer") + private String answer; + + /** + * 业务标识,顺序练习对应顺序练习批次,模拟考试对应考试test_id + */ + @TableField("business_code") + private Long businessCode; + + /** + * 练习时间 + */ + @TableField("practice_time") + private LocalDateTime practiceTime; + + /** + * 是否清除 + */ + @TableField("is_clear") + private Boolean isClear; + +} diff --git a/src/main/java/com/wrj/driver/server/entity/WrjSchool.java b/src/main/java/com/wrj/driver/server/entity/WrjSchool.java new file mode 100644 index 0000000..31e2cb8 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjSchool.java @@ -0,0 +1,86 @@ +package com.wrj.driver.server.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 无人机培训机构 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_school") +public class WrjSchool implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "school_id", type = IdType.AUTO) + private Integer schoolId; + + /** + * 驾校培训机构名 + */ + @TableField("school_name") + private String schoolName; + + /** + * 资格证图片地址 + */ + @TableField("certs") + private String certs; + + /** + * 地址 + */ + @TableField("address") + private String address; + + /** + * 介绍文案 + */ + @TableField("introduction") + private String introduction; + + /** + * 联系人 + */ + @TableField("contacts") + private String contacts; + + /** + * 联系方式 + */ + @TableField("phone") + private String phone; + + /** + * 培训机构logo地址 + */ + @TableField("logo") + private String logo; + + /** + * 宣传图片 + */ + @TableField("img_url") + private String imgUrl; + + /** + * 城市 + */ + @TableField("city") + private String city; + +} diff --git a/src/main/java/com/wrj/driver/server/entity/WrjSchoolModel.java b/src/main/java/com/wrj/driver/server/entity/WrjSchoolModel.java new file mode 100644 index 0000000..e8e0665 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjSchoolModel.java @@ -0,0 +1,40 @@ +package com.wrj.driver.server.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 培训机构培训项目表 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_school_model") +public class WrjSchoolModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 培训机构 + */ + @TableField("school_id") + private Integer schoolId; + + /** + * 培训项目id + */ + @TableField("model_id") + private Integer modelId; + + +} diff --git a/src/main/java/com/wrj/driver/server/entity/WrjSchoolService.java b/src/main/java/com/wrj/driver/server/entity/WrjSchoolService.java new file mode 100644 index 0000000..576a20b --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjSchoolService.java @@ -0,0 +1,47 @@ +package com.wrj.driver.server.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 培训机构其他服务表 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_school_service") +public class WrjSchoolService implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 培训机构 + */ + @TableId("school_id") + private Integer schoolId; + + /** + * 标签 + */ + @TableField("tag") + private String tag; + + /** + * 是否默认 + */ + @TableField("is_default") + private Boolean isDefault; + + +} diff --git a/src/main/java/com/wrj/driver/server/entity/WrjSchoolTag.java b/src/main/java/com/wrj/driver/server/entity/WrjSchoolTag.java new file mode 100644 index 0000000..a0e9204 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjSchoolTag.java @@ -0,0 +1,47 @@ +package com.wrj.driver.server.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 培训机构培训标签表 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_school_tag") +public class WrjSchoolTag implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 培训机构 + */ + @TableId("school_id") + private Integer schoolId; + + /** + * 标签 + */ + @TableField("tag") + private String tag; + + /** + * 是否默认 + */ + @TableField("is_default") + private Boolean isDefault; + + +} diff --git a/src/main/java/com/wrj/driver/server/entity/WrjUserCollectQuestion.java b/src/main/java/com/wrj/driver/server/entity/WrjUserCollectQuestion.java new file mode 100644 index 0000000..82d8340 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjUserCollectQuestion.java @@ -0,0 +1,47 @@ +package com.wrj.driver.server.entity; + +import java.time.LocalDateTime; +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 用户收藏表 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_user_collect_question") +public class WrjUserCollectQuestion implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 题目标识 + */ + @TableField("question_id") + private Long questionId; + + /** + * 用户标识 + */ + @TableField("user_id") + private Long userId; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + +} diff --git a/src/main/java/com/wrj/driver/server/entity/WrjUserErrorQuestion.java b/src/main/java/com/wrj/driver/server/entity/WrjUserErrorQuestion.java new file mode 100644 index 0000000..059e96e --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjUserErrorQuestion.java @@ -0,0 +1,47 @@ +package com.wrj.driver.server.entity; + +import java.time.LocalDateTime; +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 用户错题表 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_user_error_question") +public class WrjUserErrorQuestion implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 题目标识 + */ + @TableField("question_id") + private Long questionId; + + /** + * 用户标识 + */ + @TableField("user_id") + private Long userId; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + +} diff --git a/src/main/java/com/wrj/driver/server/generator/MysqlParamGenerator.java b/src/main/java/com/wrj/driver/server/generator/MysqlParamGenerator.java index 9d3eaec..bc24b56 100644 --- a/src/main/java/com/wrj/driver/server/generator/MysqlParamGenerator.java +++ b/src/main/java/com/wrj/driver/server/generator/MysqlParamGenerator.java @@ -1,8 +1,8 @@ package com.wrj.driver.server.generator; public class MysqlParamGenerator { - private static final String host = "118.31.23.45"; - private static final String database = "driver_server"; + private static final String host = "47.98.161.246"; + private static final String database = "shisong-wrj"; private static final String url = "jdbc:mysql://" + host + "/" + database + "?characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai&failOverReadOnly=false"; private static final String userName = "root"; private static final String password = "admin231280"; diff --git a/src/main/java/com/wrj/driver/server/mapper/WrjExamPlaceMapper.java b/src/main/java/com/wrj/driver/server/mapper/WrjExamPlaceMapper.java new file mode 100644 index 0000000..d9d8897 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/mapper/WrjExamPlaceMapper.java @@ -0,0 +1,16 @@ +package com.wrj.driver.server.mapper; + +import com.wrj.driver.server.entity.WrjExamPlace; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * 考试地点表 Mapper 接口 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface WrjExamPlaceMapper extends BaseMapper+ * 无人机机型表 Mapper 接口 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface WrjModelMapper extends BaseMapper+ * 用户答题练习表 Mapper 接口 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface WrjQuestionPracticeMapper extends BaseMapper+ * 无人机培训机构 Mapper 接口 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface WrjSchoolMapper extends BaseMapper+ * 培训机构培训项目表 Mapper 接口 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface WrjSchoolModelMapper extends BaseMapper+ * 培训机构其他服务表 Mapper 接口 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface WrjSchoolServiceMapper extends BaseMapper+ * 培训机构培训标签表 Mapper 接口 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface WrjSchoolTagMapper extends BaseMapper+ * 用户收藏表 Mapper 接口 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface WrjUserCollectQuestionMapper extends BaseMapper+ * 用户错题表 Mapper 接口 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface WrjUserErrorQuestionMapper extends BaseMapper+ * 考试地点表 服务类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface IWrjExamPlaceService extends IService+ * 无人机机型表 服务类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface IWrjModelService extends IService+ * 用户答题练习表 服务类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface IWrjQuestionPracticeService extends IService+ * 培训机构培训项目表 服务类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface IWrjSchoolModelService extends IService+ * 无人机培训机构 服务类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface IWrjSchoolService extends IService+ * 培训机构其他服务表 服务类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface IWrjSchoolServiceService extends IService+ * 培训机构培训标签表 服务类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface IWrjSchoolTagService extends IService+ * 用户收藏表 服务类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface IWrjUserCollectQuestionService extends IService+ * 用户错题表 服务类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +public interface IWrjUserErrorQuestionService extends IService+ * 考试地点表 服务实现类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Service +public class WrjExamPlaceServiceImpl extends ServiceImpl+ * 无人机机型表 服务实现类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Service +public class WrjModelServiceImpl extends ServiceImpl+ * 用户答题练习表 服务实现类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Service +public class WrjQuestionPracticeServiceImpl extends ServiceImpl+ * 培训机构培训项目表 服务实现类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Service +public class WrjSchoolModelServiceImpl extends ServiceImpl+ * 无人机培训机构 服务实现类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Service +public class WrjSchoolServiceImpl extends ServiceImpl+ * 培训机构其他服务表 服务实现类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Service +public class WrjSchoolServiceServiceImpl extends ServiceImpl+ * 培训机构培训标签表 服务实现类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Service +public class WrjSchoolTagServiceImpl extends ServiceImpl+ * 用户收藏表 服务实现类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Service +public class WrjUserCollectQuestionServiceImpl extends ServiceImpl+ * 用户错题表 服务实现类 + *
+ * + * @author Automated procedures + * @since 2025-06-29 + */ +@Service +public class WrjUserErrorQuestionServiceImpl extends ServiceImplg>e=RTb^rI*9w+bM2UiJ7-^Yk)8PW2Ow z$!vUthfOP8IJ&r9sY+rUUV}<-KTlk&Vkx`Faym1k4i8)Pz82iBwTRie`bbnx$|-g3 zKFx#DY^Uckwp1=qzUOIW@F-2pUWaB)1k``XJi+64&}jbV0}WIev-neLBi!zsMBmZ2 zj{d}f&ZGUk`#aU_8EV8*8LfS+&1T}Or48B*+w|HCmZ@t>?N_WKk!lreQ=JNwGTiR$ z>ieem77m()b7kX{g#LKAF1q+HI1SWD7+qVBg!pF2aI&yEVM{&qUpA>ygI5L zHFCD;!6oY!xa=g6JuNO9g96S}i7)a_bwLwKWd&P;`2N?x0W27J0nPe|?66Z)`EOC7 z0=W@e$ct2{He%R4%;)aK5Or0VbqA$|Y>H!*?c_{@r=le#{JdFpcf*gZDh1rbOFnrM zo#|z#040NCD*q>Ku|E3R3i|huU+&|3RZ2`6j>-Lajj+4R5~=7WL#Z_NA=vEmb&<+2 z39eDXgY0=?DjyzY+;v7uE4VyQ0VV32lA+MRaG?doD%N3T=xkmc
#I4S*ie)`QH306T5Fo#p*3|q~bpPrF^fp)J0F&v6xVK zFAZKHKS4wpzOGsNVzL8eG zmgCj3*^xGEQUneQUNj3D$`b_FzVT`(flD~m!YjG`#TNNPk5vF~$+UjM4M94@ez(O~ z=bOS+T*ru!>*IdSERVW@L{KuXZXXs;&+c8`g*tOI#qh561vi%PRyv_=r&IEp>aDuG zP43t6eW}v%9iD6OJwoyhc|gZ6;+J%JP@Q$&sha(jGYslo-Eh~2f2q$JVDRRyIHAcy z48U&7I-aLn>xpdE%(+T4X`=^%GWtH^sqjuCJD4`@RUTnb9ey+g6jVZ}&RDH?1-|;J zJm{i6L5Gn}_pxHoRckUui3MN#e-bMo)l8XZ`{-#RsDYWZSKpk99j{Sg8O(TrRXV5Q zPLp@jX=YfsoH+!`u8xNl{Ke}qf4MutpX;tyR}8%F2&s!3&K)IO#rGTCIo?i8o6|Vv zJrAEIG2(m+-{CbEAfI(fhWJzrfCdcnse1?*L5d?$Cw4ANV&aF12|T;zX@oAJ;_wAj zo=12bRZaYhX?)x~j>tHw#}U1Znx5tf=w}gbe)1A(i9F{b<^n{iyNue4m )%T~Fm~z!_}9+i^SY!xlV@t@seJK88E+B--&e*zT%zo2NQotyCh?$hfM0 z7Fk%dXCp3P6ep #{v;(?G=+6)3hOkn#`tXkDz0FyhBH^NPs2S| zaI=Ot;m!O~9pX~pBEVbt7s6Y)?As`?XVp*fUCsG(m(WNft?s#svDUbT3mR*>g<8T* zlW5|#cU67WBzWI;7X1op7F@ 6#`6TdN;5TE*k2Zl1&zp=!4l zojgh^Fr{crC@TKfc(hX*SUTmXOMMM!)U@ZQ$|+U8@Me@#s$G!d6~riXrxe8X9k4En z_u>5{pqQa=6P-7=p+^|w+qy$rnGEiDg5-DeukyXu-S;beZ~DfW4ay*Wdp3T$i|^G( zjz^#3yR#|wx^c9fMZ99`<5<%aYj;O0Dmhx(6zgzD^TQm?X^L%kN8zfiOFv1{&?-LE zKXq%ojDP3(cZKQgeUzg!@)30M-4)w0jyum{GvP#Rrwca|-WBV1;T42;$9i0NA>lo- zy)ImR5sZ!}IYUlzfp4FaJVDs!B##mHImrhI`<&!K!agUtr-W06UkaQI!UazI2^Tme z2p2eQCA=rLPst=}FETk4WO{|Wb2)*#V*>Yghi`I?f}XxkxS*#m5iaQIbA$_e`UGKL zCVaSr)2q}tlXO9*p8=;!=sg_kyMX>@Tpv+&z$=f-isdo%2z~({;1}iYH=y=MSg+w> zsjaPzF8d)8)BeAR1RbB 5F7J|iQIAh?JisMBO}fvpo_&_l@{~UsFBx4Z8BO}5zhabq3xCZjsG!d<;s3o4 N{S#jBp?}5;KLK_8;phMW diff --git a/target/classes/com/wrj/driver/server/service/impl/TdSysUserLogServiceImpl.class b/target/classes/com/wrj/driver/server/service/impl/TdSysUserLogServiceImpl.class deleted file mode 100644 index 2566ca7a1c5a4e2e1d17de4937274b3733872e43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2187 zcmbVN+fo}x5IrMwL1HnG1QI3WV#gQ>2iCF44PhJ`#f}_d93 RlBke}?dj>6={|G1r}xjlfB6l-CZ6Z8fZG||$svK;N^C0e zi4vdY@EJZ=+80V}DN#~lTZy|l%ws2mdo#F#FEhBG!GjET1=8ELYlk}mQ-$K8Kyue> zNrAbl?aC*S(~y4MYIJCMt?D(c&Y|VoY91St;Y&LZ*seA`$2{?m%$9E-OWzEne>T`n zY1&S=W7b=>)8H9bs$RRsbuLtBF9~D<>sZn%a8jrqS;v;yvD~&<3w_&dmns*Vsvh@@ zZW*=2enQ)kroKzr3T2(MlDc;)w8Q>2M*s*IjVK@=K~O*Kk_u5FZ7r#8ATaH9$&t3F zBi^pk5||%~uJO@-*YYig=X@DNosdcpT46-;`VNRgAm2YX1|l6eOiV|hIDu>F@&>2o zfMXInzbC_&UhAm}Eko%uTDE4lT?Y0U?hoy%VR??-@*>kYZCIflbURUC${#}M2Dazw zRG#N>C~uQ;?pR$CGK6DK8%qBf_RgfOBv(;xRt9&B@$jm-niu&^`OsELT%J&C8!ES? z`5+=$jy$vjo3(u3bv@>SmnA=is^_=OpsPyng`(}m^S?I(k|({8SvJo?8h9OV2&|5; z{E=)JDB~*w5An#r*Lajc#lT~HW1xyX15cFLS8Gp|_!b8SYN!jWk9R+TWCPE@THYFe z=#0OMUZX%s9sZv+A#m&B(4(niMFuidZ9zSp((wD&FXuAlt~{0FXL)znQ`|`|<7=9} z>iw3mFz5&sH Ki-5n9ep{2Gk5)?w_|C zBcAE!EilXJ fjKm zN!u M@&7_mIoe zGLz5tU~J{qdYJtkSMs@^F_*yeLF^6fa~@ejo+ac3!d)cbcPUq}gf*fviDr{{c8Nw| z?DlcQ7>NkW+^;TH#(Q|5IF *72%sWscNUx z=dA!v<6G+UZ9l%Fdb<7S37{8mt5s);a2Ds(@H<8LF3zjI3mU$s;rjth#%n?D`r`n8 zg5Oom-_!8>qc917py8*g^A7`D^GAOCvD))bRL`FV@H70GqW9+-{z5f=?#EyH@mB#% z$7_E4wJQI{kH1yr->J{v2k;O0g{r+9;O2dbe!m|V70FAgn>+sumler>4B(&e&+7A* zhJOiQr9$Fg@t&&voBI5F0RMsi4B)@;->Uh(lIDMugue{nSNI@+4{=42{3w8r@xMU` zWfM`&4<*kp`2q1sK>%~5&@Y-Q{eCG@odNY3 6xX1;;qS;9ceeWMG}#ws96?^S+-$EtXM*DYmF6e2_-t>kyy*FxY2Izv*K-` zCew%|Lc5G++lqIFjP!y~S<<%lMYspajA7fh(xZR|BdQ6tt8s*c%a ziy7y