From fd2c19e920e84e40e693e8cf0cce63d0fb4e223f Mon Sep 17 00:00:00 2001 From: caolin <1149034574@qq.com> Date: Wed, 16 Aug 2023 23:46:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E7=9B=B8=E5=85=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TdQuestionController.java | 13 +++++++ .../controller/TdSysUserController.java | 2 +- .../jwl/driver/server/filter/TokenFilter.java | 3 ++ .../server/service/ITdQuestionService.java | 8 ++++ .../service/impl/TdQuestionServiceImpl.java | 10 +++++ .../com/jwl/driver/server/util/SmsUtil.java | 10 ++--- .../driver/server/vo/QusetionCategoryVo.java | 38 +++++++++++++++++++ src/main/resources/application-prod.yml | 6 +-- src/main/resources/application-test.yml | 6 +-- src/main/resources/application.yml | 2 +- .../resources/mapper/TdQuestionMapper.xml | 3 ++ 11 files changed, 88 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/jwl/driver/server/vo/QusetionCategoryVo.java 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 d0084ee..dfffa36 100644 --- a/src/main/java/com/jwl/driver/server/controller/TdQuestionController.java +++ b/src/main/java/com/jwl/driver/server/controller/TdQuestionController.java @@ -1,6 +1,7 @@ package com.jwl.driver.server.controller; +import cn.hutool.core.collection.CollectionUtil; import com.jwl.driver.server.dto.QuestionQueryDto; import com.jwl.driver.server.exception.BusinessException; import com.jwl.driver.server.response.BaseResponse; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.stereotype.Controller; +import java.util.Collections; import java.util.Objects; /** @@ -64,4 +66,15 @@ public class TdQuestionController { } return BaseResponse.success(tdQuestionService.getTestQuestion(queryDto)); } + + @ApiOperation("题目分类") + @PostMapping("/questionCategory") + public BaseResponse questionCategory(@RequestBody QuestionQueryDto queryDto) { + log.info("分类题目标识======>questionIdList:{}", queryDto.getQuestionIdList()); + if (CollectionUtil.isEmpty(queryDto.getQuestionIdList())){ + return BaseResponse.success(Collections.emptyList()); + } + return BaseResponse.success(tdQuestionService.questionCategory(queryDto)); + } + } diff --git a/src/main/java/com/jwl/driver/server/controller/TdSysUserController.java b/src/main/java/com/jwl/driver/server/controller/TdSysUserController.java index d4842e5..c442d4f 100644 --- a/src/main/java/com/jwl/driver/server/controller/TdSysUserController.java +++ b/src/main/java/com/jwl/driver/server/controller/TdSysUserController.java @@ -32,7 +32,7 @@ public class TdSysUserController { @Autowired private ITdSysUserService userService; - @ApiOperation("用户登陆") + @ApiOperation("获取验证码") @GetMapping("/code") public BaseResponse code(@RequestParam String phone) { log.info("获取验证码======>phone:{}", phone); diff --git a/src/main/java/com/jwl/driver/server/filter/TokenFilter.java b/src/main/java/com/jwl/driver/server/filter/TokenFilter.java index 5bcf9bb..b1bb814 100644 --- a/src/main/java/com/jwl/driver/server/filter/TokenFilter.java +++ b/src/main/java/com/jwl/driver/server/filter/TokenFilter.java @@ -24,6 +24,9 @@ public class TokenFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + //移除线程变量里的缓存值 + TokenThreadUtil.remove(); + String requestTokenHeader = request.getHeader("Authorization"); if (StrUtil.isBlank(requestTokenHeader)) { log.warn("Bearer token 为空"); 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 9669d93..3d58369 100644 --- a/src/main/java/com/jwl/driver/server/service/ITdQuestionService.java +++ b/src/main/java/com/jwl/driver/server/service/ITdQuestionService.java @@ -3,6 +3,7 @@ package com.jwl.driver.server.service; import com.jwl.driver.server.dto.QuestionQueryDto; import com.jwl.driver.server.entity.TdQuestion; import com.baomidou.mybatisplus.extension.service.IService; +import com.jwl.driver.server.vo.QusetionCategoryVo; import com.jwl.driver.server.vo.QusetionVo; import java.util.List; @@ -45,4 +46,11 @@ public interface ITdQuestionService extends IService { * @return */ List getTestQuestion(QuestionQueryDto queryDto); + + /** + * 题目分类 + * @param queryDto + * @return + */ + List questionCategory(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 8eb7cc4..298ce25 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 @@ -9,6 +9,7 @@ import com.jwl.driver.server.mapper.TdQuestionMapper; import com.jwl.driver.server.service.ITdQuestionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jwl.driver.server.service.ITdSysConfigService; +import com.jwl.driver.server.vo.QusetionCategoryVo; import com.jwl.driver.server.vo.QusetionVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -78,4 +79,13 @@ public class TdQuestionServiceImpl extends ServiceImpl questionCategory(QuestionQueryDto queryDto) { + + return null; + + + + } } diff --git a/src/main/java/com/jwl/driver/server/util/SmsUtil.java b/src/main/java/com/jwl/driver/server/util/SmsUtil.java index b31763d..9ebe811 100644 --- a/src/main/java/com/jwl/driver/server/util/SmsUtil.java +++ b/src/main/java/com/jwl/driver/server/util/SmsUtil.java @@ -38,7 +38,7 @@ public class SmsUtil { private static String smsFreeSignName = "对嘛科技"; //用于存储短信验证码 - private static Map codeMap = new HashMap<>(); +// private static Map codeMap = new HashMap<>(); /** * 发送验证码 @@ -62,16 +62,16 @@ public class SmsUtil { if (code.length() == 5){ code = "0" + code; } - codeMap.put(phone, code); +// codeMap.put(phone, code); return code; } /** * 获取6位验证码 */ - public static String getCodeByPhone(String phone){ - return codeMap.get(phone); - } +// public static String getCodeByPhone(String phone){ +// return codeMap.get(phone); +// } /** * 通用的发送短信的方法 diff --git a/src/main/java/com/jwl/driver/server/vo/QusetionCategoryVo.java b/src/main/java/com/jwl/driver/server/vo/QusetionCategoryVo.java new file mode 100644 index 0000000..e67a3c0 --- /dev/null +++ b/src/main/java/com/jwl/driver/server/vo/QusetionCategoryVo.java @@ -0,0 +1,38 @@ +package com.jwl.driver.server.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * @author 曹林 + * @description 题型分类 + * @create 2023/8/13 17:13 + */ +@Data +@Accessors(chain = true) +@ApiModel("题型分类出参") +public class QusetionCategoryVo { + + private static final long serialVersionUID = 1L; + + /** + * 分类标识 + */ + @ApiModelProperty("分类标识") + private String category; + + /** + * 分类名称 + */ + @ApiModelProperty("分类名称") + private String categoryName; + + /** + * 类型数量 + */ + @ApiModelProperty("类型数量") + private Integer num; + +} diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 532b970..535806a 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: # redis 配置 redis: - host: 81.68.139.95 - port: 6793 + host: 118.31.23.45 + port: 6379 database: 8 timeout: 5000 - password: Rtf70vILtD + password: 123456 # 数据库 配置 datasource: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 532b970..535806a 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,11 +1,11 @@ spring: # redis 配置 redis: - host: 81.68.139.95 - port: 6793 + host: 118.31.23.45 + port: 6379 database: 8 timeout: 5000 - password: Rtf70vILtD + password: 123456 # 数据库 配置 datasource: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8a7bd1b..d1379e1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: application: name: '@artifactId@' profiles: - active: dev + active: test #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 c27fa56..21da8e0 100644 --- a/src/main/resources/mapper/TdQuestionMapper.xml +++ b/src/main/resources/mapper/TdQuestionMapper.xml @@ -55,6 +55,9 @@ and find_in_set(#{queryDto.cid},tq.CIDS) + + and find_in_set(#{queryDto.category},tq.CATEGORY) + and tpq.POINT = #{queryDto.point}