小么熊🐻 пре 2 година
родитељ
комит
cb65fba812

+ 8 - 8
nbjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionWrongController.java

@@ -73,7 +73,7 @@ public class QuestionWrongController extends BaseController{
 
     @PostMapping("wrongs")
     @ApiOperation("合并本机和云端错题")
-    public Response<Integer> wrongs(@RequestBody Long[] questionIds,Integer km){
+    public Response<Integer> wrongs(@RequestBody QuestionWrongYunDTO questionWrongYunDTO){
         //查询该用户已收藏的题目列表
         QuestionWrongListDTO dto = new QuestionWrongListDTO();
         dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
@@ -81,13 +81,13 @@ public class QuestionWrongController extends BaseController{
         List<String> questionIdsStr = dblist.stream().map(o -> o.getQuestionId()+","+o.getKm()).collect(Collectors.toList());
 
         List<QuestionWrong> qlist = new ArrayList<QuestionWrong>();
-        for (Long qid : questionIds) {
-            if (questionIdsStr.contains(qid+","+km)) {
+        for (Long qid : questionWrongYunDTO.getQuestionIds()) {
+            if (questionIdsStr.contains(qid+","+questionWrongYunDTO.getKm())) {
                 continue;
             }
             QuestionWrong questionWrong = new QuestionWrong();
             questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
-            questionWrong.setKm(km);
+            questionWrong.setKm(questionWrongYunDTO.getKm());
             questionWrong.setQuestionId(qid);
             qlist.add(questionWrong);
         }
@@ -100,20 +100,20 @@ public class QuestionWrongController extends BaseController{
 
     @PostMapping("bakWrongs")
     @ApiOperation("备份本机错题到云端")
-    public Response<Integer> bakWrongs(@RequestBody Long[] questionIds,Integer km){
+    public Response<Integer> bakWrongs(@RequestBody QuestionWrongYunDTO questionWrongYunDTO){
         //首先删除云端数据
         Long userId = SecurityUtils.getLoginUser().getStudent().getId();
         QueryWrapper<QuestionWrong> queryWrapper = new QueryWrapper<QuestionWrong>();
         queryWrapper.eq("user_id",userId);
-        queryWrapper.eq("km",km);
+        queryWrapper.eq("km",questionWrongYunDTO.getKm());
         questionWrongService.remove(queryWrapper);
 
         //保存上传的错题
         List<QuestionWrong> qlist = new ArrayList<QuestionWrong>();
-        for (Long qid : questionIds) {
+        for (Long qid : questionWrongYunDTO.getQuestionIds()) {
             QuestionWrong questionWrong = new QuestionWrong();
             questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
-            questionWrong.setKm(km);
+            questionWrong.setKm(questionWrongYunDTO.getKm());
             questionWrong.setQuestionId(qid);
             qlist.add(questionWrong);
         }

+ 28 - 0
nbjk-service/src/main/java/com/miaxis/question/dto/QuestionWrongYunDTO.java

@@ -0,0 +1,28 @@
+package com.miaxis.question.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * wrong对象 question_wrong
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@Data
+public class QuestionWrongYunDTO extends BaseBusinessEntity {
+
+
+
+
+    @ApiModelProperty(value = "题目ID")
+    private Long[] questionIds;
+
+    /** 科目 */
+    @ApiModelProperty(value = "考试科目(1、2、3、4)")
+    private Integer km;
+
+
+
+}