+ * 考试项目表; 前端控制器 + *
+ * + * @author Automated procedures + * @since 2023-08-10 + */ +@Api(tags = "考试项目") +@RestController +@RequestMapping("/tdTestProject") +@Slf4j +public class TdProjectController { + + @Autowired + private ITdProjectService projectService; + + @ApiOperation("获取项目列表 (考试项目和基础操作)") + @PostMapping("/queryProjectList") + public BaseResponse list(@RequestBody ProjectDto projectDto) { + log.info("获取考试项目=========》projectDto{}",projectDto); + return BaseResponse.success(projectService.queryProjectList(projectDto)); + } +} diff --git a/src/main/java/com/jwl/driver/server/controller/TdQuestionTestController.java b/src/main/java/com/jwl/driver/server/controller/TdQuestionTestController.java index 55a877f..2d27c6b 100644 --- a/src/main/java/com/jwl/driver/server/controller/TdQuestionTestController.java +++ b/src/main/java/com/jwl/driver/server/controller/TdQuestionTestController.java @@ -2,6 +2,7 @@ package com.jwl.driver.server.controller; import com.jwl.driver.server.dto.QuestionQueryDto; +import com.jwl.driver.server.dto.TestQueryDto; import com.jwl.driver.server.dto.TestSubmitDto; import com.jwl.driver.server.response.BaseResponse; import com.jwl.driver.server.service.ITdQuestionService; @@ -40,7 +41,10 @@ public class TdQuestionTestController { return BaseResponse.success(testService.testSubmit(submitDto)); } - - - + @ApiOperation("获取考试统计") + @PostMapping("/testTotal") + public BaseResponse testTotal(@RequestBody @Valid TestQueryDto queryDto) { + log.info("考试统计查询======>queryDto:{}", queryDto); + return BaseResponse.success(testService.testTotal(queryDto)); + } } diff --git a/src/main/java/com/jwl/driver/server/controller/TdTestProjectController.java b/src/main/java/com/jwl/driver/server/controller/TdTestProjectController.java deleted file mode 100644 index 7d74518..0000000 --- a/src/main/java/com/jwl/driver/server/controller/TdTestProjectController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jwl.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *- * 考试项目表; 前端控制器 - *
- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//tdTestProject") -public class TdTestProjectController { - -} diff --git a/src/main/java/com/jwl/driver/server/controller/TdTestProjectVideosController.java b/src/main/java/com/jwl/driver/server/controller/TdTestProjectVideosController.java deleted file mode 100644 index bb0ff82..0000000 --- a/src/main/java/com/jwl/driver/server/controller/TdTestProjectVideosController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jwl.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *- * 视频标识表; 前端控制器 - *
- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//tdTestProjectVideos") -public class TdTestProjectVideosController { - -} diff --git a/src/main/java/com/jwl/driver/server/dto/ProjectDto.java b/src/main/java/com/jwl/driver/server/dto/ProjectDto.java new file mode 100644 index 0000000..33334dd --- /dev/null +++ b/src/main/java/com/jwl/driver/server/dto/ProjectDto.java @@ -0,0 +1,55 @@ +package com.jwl.driver.server.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *+ * 考试项目查询; + *
+ * + * @author Automated procedures + * @since 2023-08-10 + */ +@Data +@Accessors(chain = true) +@ApiModel("考试项目查询入参") +public class ProjectDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 考试项目 + */ + @ApiModelProperty("考试项目") + private Integer projectId; + + /** + * 类型 + */ + @ApiModelProperty("类型 1:考试项目 2:基础操作") + private String type; + + /** + * 所属科目 + */ + @ApiModelProperty("所属科目") + private String subject; + + /** + * 车型标识 + */ + @ApiModelProperty("车型标识") + private Integer carTypeId; + + /** + * 驾驶类型，手动挡，自动挡，A2:B2等（在字典表里配置） + */ + @ApiModelProperty("驾驶类型") + private String driveType; + +} diff --git a/src/main/java/com/jwl/driver/server/dto/TestQueryDto.java b/src/main/java/com/jwl/driver/server/dto/TestQueryDto.java new file mode 100644 index 0000000..4214069 --- /dev/null +++ b/src/main/java/com/jwl/driver/server/dto/TestQueryDto.java @@ -0,0 +1,35 @@ +package com.jwl.driver.server.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * @author 曹林 + * @description 成绩查询入参 + * @create 2023/8/14 21:22 + */ +@Data +@Accessors(chain = true) +@ApiModel("成绩查询入参") +public class TestQueryDto { + + /** + * 车型标识 + */ + @ApiModelProperty(value = "车型标识",required = true) + @NotNull(message = "车型标识不能为空") + private Integer carTypeId; + + /** + * 科目 + */ + @ApiModelProperty(value = "科目",required = true) + @NotNull(message = "考试科目不能为空") + private String subject ; +} diff --git a/src/main/java/com/jwl/driver/server/dto/TestSubmitDto.java b/src/main/java/com/jwl/driver/server/dto/TestSubmitDto.java index bf4040c..437643a 100644 --- a/src/main/java/com/jwl/driver/server/dto/TestSubmitDto.java +++ b/src/main/java/com/jwl/driver/server/dto/TestSubmitDto.java @@ -28,6 +28,13 @@ public class TestSubmitDto { @NotNull(message = "车型标识不能为空") private Integer carTypeId; + /** + * 科目 + */ + @ApiModelProperty(value = "科目",required = true) + @NotNull(message = "考试科目不能为空") + private String subject ; + /** * 考试得分 */ diff --git a/src/main/java/com/jwl/driver/server/entity/TdMember.java b/src/main/java/com/jwl/driver/server/entity/TdMember.java index d018f4b..5bed54f 100644 --- a/src/main/java/com/jwl/driver/server/entity/TdMember.java +++ b/src/main/java/com/jwl/driver/server/entity/TdMember.java @@ -76,8 +76,8 @@ public class TdMember implements Serializable { /** * 会员描述 */ - @TableField("DESC") - private String desc; + @TableField("DESCRIPTION") + private String DESCRIPTION; /** * 创建时间 diff --git a/src/main/java/com/jwl/driver/server/entity/TdTestProject.java b/src/main/java/com/jwl/driver/server/entity/TdProject.java similarity index 81% rename from src/main/java/com/jwl/driver/server/entity/TdTestProject.java rename to src/main/java/com/jwl/driver/server/entity/TdProject.java index 570a824..0ad2bfa 100644 --- a/src/main/java/com/jwl/driver/server/entity/TdTestProject.java +++ b/src/main/java/com/jwl/driver/server/entity/TdProject.java @@ -19,15 +19,21 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class TdTestProject implements Serializable { +public class TdProject implements Serializable { private static final long serialVersionUID = 1L; /** * 考试项目 */ - @TableId("TEST_PROJECT_ID") - private Integer testProjectId; + @TableId("PROJECT_ID") + private Integer projectId; + + /** + * 类型 + */ + @TableField("TYPE") + private String type; /** * 所属科目 @@ -47,6 +53,12 @@ public class TdTestProject implements Serializable { @TableField("DRIVE_TYPE") private String driveType; + /** + * 描述 + */ + @TableField("DESCRIPTION") + private String description; + /** * 创建时间 */ diff --git a/src/main/java/com/jwl/driver/server/entity/TdQuestionTest.java b/src/main/java/com/jwl/driver/server/entity/TdQuestionTest.java index 4421327..14e5283 100644 --- a/src/main/java/com/jwl/driver/server/entity/TdQuestionTest.java +++ b/src/main/java/com/jwl/driver/server/entity/TdQuestionTest.java @@ -36,6 +36,12 @@ public class TdQuestionTest implements Serializable { @TableField("CAR_TYPE_ID") private Integer carTypeId; + /** + * 考试科目 + */ + @TableField("SUBJECT") + private String subject; + /** * 用户标识 */ diff --git a/src/main/java/com/jwl/driver/server/entity/TdTestProjectVideos.java b/src/main/java/com/jwl/driver/server/entity/TdTestProjectVideos.java deleted file mode 100644 index cf66a9f..0000000 --- a/src/main/java/com/jwl/driver/server/entity/TdTestProjectVideos.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.jwl.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *- * 视频标识表; - *
- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdTestProjectVideos implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 视频标识 - */ - @TableId(value = "VIDEO_ID", type = IdType.AUTO) - private Integer videoId; - - /** - * 考试项目 - */ - @TableField("TEST_PROJECT_ID") - private Integer testProjectId; - - /** - * 视频图片 - */ - private String videoImage; - - /** - * 视频链接 - */ - private String videoUrl; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - -} diff --git a/src/main/java/com/jwl/driver/server/generator/MysqlParamGenerator.java b/src/main/java/com/jwl/driver/server/generator/MysqlParamGenerator.java index 78da371..b8a2a8c 100644 --- a/src/main/java/com/jwl/driver/server/generator/MysqlParamGenerator.java +++ b/src/main/java/com/jwl/driver/server/generator/MysqlParamGenerator.java @@ -1,15 +1,15 @@ package com.jwl.driver.server.generator; public class MysqlParamGenerator { - private static final String host = "127.0.0.1:3306"; - private static final String database = "driver_test"; + private static final String host = "118.31.23.45"; + private static final String database = "driver_server"; 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 = "123456"; + private static final String password = "admin231280"; private static final String module = "com.jwl.driver.server"; // projectPath项为空即可 - private static final String projectPath = "/driver-server"; + private static final String projectPath = ""; // todo 实体类是否继承基础类-具备开始时间和结束时间实体类的基础属性 private static final String superEntityClass = ""; diff --git a/src/main/java/com/jwl/driver/server/mapper/TdTestProjectMapper.java b/src/main/java/com/jwl/driver/server/mapper/TdProjectMapper.java similarity index 63% rename from src/main/java/com/jwl/driver/server/mapper/TdTestProjectMapper.java rename to src/main/java/com/jwl/driver/server/mapper/TdProjectMapper.java index 6351efb..fa0789f 100644 --- a/src/main/java/com/jwl/driver/server/mapper/TdTestProjectMapper.java +++ b/src/main/java/com/jwl/driver/server/mapper/TdProjectMapper.java @@ -1,6 +1,6 @@ package com.jwl.driver.server.mapper; -import com.jwl.driver.server.entity.TdTestProject; +import com.jwl.driver.server.entity.TdProject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author Automated procedures * @since 2023-08-10 */ -public interface TdTestProjectMapper extends BaseMapper- * 视频标识表; Mapper 接口 - *
- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdTestProjectVideosMapper extends BaseMapper+ * 考试项目表; 服务类 + *
+ * + * @author Automated procedures + * @since 2023-08-10 + */ +public interface ITdProjectService extends IService
@@ -19,5 +21,12 @@ public interface ITdQuestionTestService extends IService
- * 考试项目表; 服务类
- *
- * 视频标识表; 服务类
- *
+ * 考试项目表; 服务实现类
+ *
@@ -26,13 +35,43 @@ public class TdQuestionTestServiceImpl extends ServiceImpl
- * 考试项目表; 服务实现类
- *
- * 视频标识表; 服务实现类
- *
+ * 考试项目表;
+ *