From 2d529ec4b8dd92993c80f5d381dccb4d3244f916 Mon Sep 17 00:00:00 2001 From: caolin <1149034574@qq.com> Date: Sun, 27 Aug 2023 16:38:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=93=E9=A1=B9=E9=A2=98?= =?UTF-8?q?=E7=9B=AE=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/TdQuestionController.java | 6 ++++++ .../jwl/driver/server/dto/QuestionQueryDto.java | 7 +++++++ .../driver/server/mapper/TdQuestionMapper.java | 8 ++++++++ .../server/service/ITdQuestionService.java | 8 ++++++++ .../service/impl/TdQuestionServiceImpl.java | 5 +++++ src/main/resources/application-dev.yml | 1 - src/main/resources/application-prod.yml | 4 ++-- src/main/resources/application.yml | 2 +- src/main/resources/mapper/TdQuestionMapper.xml | 16 ++++++++++++++++ 9 files changed, 53 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jwl/driver/server/controller/TdQuestionController.java b/src/main/java/com/jwl/driver/server/controller/TdQuestionController.java index 8cf623f..6c716e6 100644 --- a/src/main/java/com/jwl/driver/server/controller/TdQuestionController.java +++ b/src/main/java/com/jwl/driver/server/controller/TdQuestionController.java @@ -98,5 +98,11 @@ public class TdQuestionController { return result; } + @ApiOperation("查询各专项分类题目数量") + @PostMapping("/querySpecialNum") + public BaseResponse querySpecialNum(@RequestBody QuestionQueryDto queryDto) { + log.info("查询各专项分类题目数量======>queryDto:{}", queryDto); + return BaseResponse.success(tdQuestionService.querySpecialNum(queryDto)); + } } diff --git a/src/main/java/com/jwl/driver/server/dto/QuestionQueryDto.java b/src/main/java/com/jwl/driver/server/dto/QuestionQueryDto.java index c801c14..0f63e27 100644 --- a/src/main/java/com/jwl/driver/server/dto/QuestionQueryDto.java +++ b/src/main/java/com/jwl/driver/server/dto/QuestionQueryDto.java @@ -103,6 +103,13 @@ public class QuestionQueryDto implements Serializable { */ @ApiModelProperty("是否v新规") private Integer isNew; + + /** + * 是否是图片 + */ + @ApiModelProperty("是否是图片") + private Integer isImage; + /** * 考点 */ diff --git a/src/main/java/com/jwl/driver/server/mapper/TdQuestionMapper.java b/src/main/java/com/jwl/driver/server/mapper/TdQuestionMapper.java index 4e339c1..f7c995c 100644 --- a/src/main/java/com/jwl/driver/server/mapper/TdQuestionMapper.java +++ b/src/main/java/com/jwl/driver/server/mapper/TdQuestionMapper.java @@ -7,6 +7,7 @@ import com.jwl.driver.server.vo.QuestionVo; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -33,4 +34,11 @@ public interface TdQuestionMapper extends BaseMapper { List queryQuestionByRandom(@Param("queryDto") QuestionQueryDto queryDto); int updateQuestion(@Param("questionVo") QuestionVo questionVo); + + /** + * 获取专项分类里题目数量 + * @param queryDto + * @return + */ + Map querySpecialNum(@Param("queryDto") QuestionQueryDto queryDto); } diff --git a/src/main/java/com/jwl/driver/server/service/ITdQuestionService.java b/src/main/java/com/jwl/driver/server/service/ITdQuestionService.java index 387f538..474ef33 100644 --- a/src/main/java/com/jwl/driver/server/service/ITdQuestionService.java +++ b/src/main/java/com/jwl/driver/server/service/ITdQuestionService.java @@ -7,6 +7,7 @@ import com.jwl.driver.server.vo.QuestionVo; import com.jwl.driver.server.vo.QusetionCategoryVo; import java.util.List; +import java.util.Map; /** *

@@ -60,4 +61,11 @@ public interface ITdQuestionService extends IService { * @return */ int updateQuestion(QuestionVo questionVo); + + /** + * 获取专项分类里题目数量 + * @param queryDto + * @return + */ + Map querySpecialNum(QuestionQueryDto queryDto); } diff --git a/src/main/java/com/jwl/driver/server/service/impl/TdQuestionServiceImpl.java b/src/main/java/com/jwl/driver/server/service/impl/TdQuestionServiceImpl.java index fa456e3..b3fe235 100644 --- a/src/main/java/com/jwl/driver/server/service/impl/TdQuestionServiceImpl.java +++ b/src/main/java/com/jwl/driver/server/service/impl/TdQuestionServiceImpl.java @@ -137,6 +137,11 @@ public class TdQuestionServiceImpl extends ServiceImpl querySpecialNum(QuestionQueryDto queryDto) { + return this.getBaseMapper().querySpecialNum(queryDto); + } + /** * 问题选项规整 */ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c6602ee..173d2d7 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -12,7 +12,6 @@ spring: timeout: 5000 password: 123456 - # 数据库 配置 datasource: url: jdbc:mysql://127.0.0.1:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index a221110..060cdf1 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -9,6 +9,6 @@ spring: # 数据库 配置 datasource: - url: jdbc:mysql://127.0.0.1:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://114.55.169.15:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai username: root - password: admin231280 + password: Zhou202109 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c492bcf..951669c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: application: name: '@artifactId@' profiles: - active: test + active: prod #mybatis mybatis-plus: mapper-locations: classpath*:/mapper/**Mapper.xml diff --git a/src/main/resources/mapper/TdQuestionMapper.xml b/src/main/resources/mapper/TdQuestionMapper.xml index 456d995..e794f86 100644 --- a/src/main/resources/mapper/TdQuestionMapper.xml +++ b/src/main/resources/mapper/TdQuestionMapper.xml @@ -68,6 +68,9 @@ and tq.IS_NEW = #{queryDto.isNew} + + and tq.IMAGE_URL is not null + and find_in_set(#{queryDto.examKey},tq.EXAM_KEYS) @@ -172,5 +175,18 @@ where QUESTION_ID = #{questionVo.questionId} + +