收藏与错题 bean与接口修改

nbjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java

@@ -62,21 +62,22 @@ public class QuestionCollectionController extends BaseController {
 
     @PostMapping("collections")
     @ApiOperation("合并本机和云端收藏")
-    public Response<Integer> collections(@RequestBody List<QuestionCollectionDTO> list) {
+    public Response<Integer> collections(@RequestBody QuestionCollectionYunDTO col) {
         //查询该用户已收藏的题目列表
         QuestionCollectionListDTO dto = new QuestionCollectionListDTO();
         dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         List<QuestionCollection> dblist = questionCollectionService.selectQuestionCollectionList(dto);
-        List<String> questionIds = dblist.stream().map(o -> (o.getQuestionId()+","+o.getKm())).collect(Collectors.toList());
+        List<String> questionIdsStr = dblist.stream().map(o -> (o.getQuestionId()+","+o.getKm())).collect(Collectors.toList());
 
         List<QuestionCollection> qlist = new ArrayList<QuestionCollection>();
-        for (QuestionCollectionDTO questionCollectionDTO : list) {
-            if (questionIds.contains(questionCollectionDTO.getQuestionId()+","+questionCollectionDTO.getKm())) {
+        for (Long qid : col.getQuestionIds()) {
+            if (questionIdsStr.contains(qid+","+col.getKm())) {
                 continue;
             }
             QuestionCollection questionCollection = new QuestionCollection();
-            BeanUtils.copyProperties(questionCollectionDTO, questionCollection);
             questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+            questionCollection.setKm(col.getKm());
+            questionCollection.setQuestionId(qid);
             qlist.add(questionCollection);
         }
         if (qlist.isEmpty()) {
@@ -88,20 +89,21 @@ public class QuestionCollectionController extends BaseController {
 
     @PostMapping("bakCollections")
     @ApiOperation("备份本机收藏到云端")
-    public Response<Integer> bakCollections(@RequestBody List<QuestionCollectionDTO> list,Integer km) {
+    public Response<Integer> bakCollections(@RequestBody QuestionCollectionYunDTO col) {
         //首先删除云端数据
         Long userId = SecurityUtils.getLoginUser().getStudent().getId();
         QueryWrapper<QuestionCollection> queryWrapper = new QueryWrapper<QuestionCollection>();
         queryWrapper.eq("user_id",userId);
-        queryWrapper.eq("km",km);
+        queryWrapper.eq("km",col.getKm());
         questionCollectionService.remove(queryWrapper);
 
         //保存上传的收藏题
         List<QuestionCollection> qlist = new ArrayList<QuestionCollection>();
-        for (QuestionCollectionDTO questionCollectionDTO : list) {
+        for (Long qid : col.getQuestionIds()) {
             QuestionCollection questionCollection = new QuestionCollection();
-            BeanUtils.copyProperties(questionCollectionDTO, questionCollection);
             questionCollection.setUserId(userId);
+            questionCollection.setKm(col.getKm());
+            questionCollection.setQuestionId(qid);
             qlist.add(questionCollection);
         }
         if (qlist.isEmpty()) {

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 QuestionWrongYunDTO questionWrongYunDTO){
+    public Response<Integer> wrongs(@RequestBody QuestionWrongYunDTO wrong){
         //查询该用户已收藏的题目列表
         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 : questionWrongYunDTO.getQuestionIds()) {
-            if (questionIdsStr.contains(qid+","+questionWrongYunDTO.getKm())) {
+        for (Long qid : wrong.getQuestionIds()) {
+            if (questionIdsStr.contains(qid+","+wrong.getKm())) {
                 continue;
             }
             QuestionWrong questionWrong = new QuestionWrong();
             questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
-            questionWrong.setKm(questionWrongYunDTO.getKm());
+            questionWrong.setKm(wrong.getKm());
             questionWrong.setQuestionId(qid);
             qlist.add(questionWrong);
         }
@@ -100,20 +100,20 @@ public class QuestionWrongController extends BaseController{
 
     @PostMapping("bakWrongs")
     @ApiOperation("备份本机错题到云端")
-    public Response<Integer> bakWrongs(@RequestBody QuestionWrongYunDTO questionWrongYunDTO){
+    public Response<Integer> bakWrongs(@RequestBody QuestionWrongYunDTO wrong){
         //首先删除云端数据
         Long userId = SecurityUtils.getLoginUser().getStudent().getId();
         QueryWrapper<QuestionWrong> queryWrapper = new QueryWrapper<QuestionWrong>();
         queryWrapper.eq("user_id",userId);
-        queryWrapper.eq("km",questionWrongYunDTO.getKm());
+        queryWrapper.eq("km",wrong.getKm());
         questionWrongService.remove(queryWrapper);
 
         //保存上传的错题
         List<QuestionWrong> qlist = new ArrayList<QuestionWrong>();
-        for (Long qid : questionWrongYunDTO.getQuestionIds()) {
+        for (Long qid : wrong.getQuestionIds()) {
             QuestionWrong questionWrong = new QuestionWrong();
-            questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
-            questionWrong.setKm(questionWrongYunDTO.getKm());
+            questionWrong.setUserId(userId);
+            questionWrong.setKm(wrong.getKm());
             questionWrong.setQuestionId(qid);
             qlist.add(questionWrong);
         }
@@ -154,7 +154,7 @@ public class QuestionWrongController extends BaseController{
 
 
     @GetMapping("/wrongByUser")
-    @ApiOperation("恢复云端错题到本机（根据用户获取收错题）")
+    @ApiOperation("恢复云端错题到本机（根据用户获取错题）")
     public Response<List<QuestionInfo>> wrongByUser(@ModelAttribute QuestionWrongListDTO dto){
         dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         List<QuestionInfo> list = questionWrongService.selectWrongByUserId(dto);

nbjk-service/src/main/java/com/miaxis/question/domain/QuestionCollection.java

@@ -44,7 +44,7 @@ public class QuestionCollection extends BaseBusinessEntity{
     /** 科目 */
     @Excel(name = "科目")
     @TableField("km")
-    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）")
-    private String km;
+    @ApiModelProperty(value = "考试科目（1、2、3、4）")
+    private Integer km;
 
 }

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionCollectionDelDTO.java

@@ -15,13 +15,8 @@ public class QuestionCollectionDelDTO {
 
 
     /** 科目 */
-    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）")
-    private String km;
-
-    /** 车型 */
-    @ApiModelProperty(value = "车型（小车 、客车、货车、摩托车）")
-    private String carType;
-
+    @ApiModelProperty(value = "考试科目（1、2、3、4）")
+    private Integer km;
 
 
 }

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionCollectionListDTO.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * @date 2021-08-18
  */
 @Data
-public class QuestionCollectionListDTO extends BaseBusinessEntity {
+public class QuestionCollectionListDTO  {
 
 
     private static final long serialVersionUID = 1L;
@@ -26,7 +26,7 @@ public class QuestionCollectionListDTO extends BaseBusinessEntity {
     private Long questionId;
 
     /** 科目 */
-    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）")
-    private String km;
+    @ApiModelProperty(value = "考试科目（1、2、3、4）")
+    private Integer km;
 
 }

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionCollectionYunDTO.java

@@ -0,0 +1,21 @@
+package com.miaxis.question.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class QuestionCollectionYunDTO {
+
+
+    @ApiModelProperty(value = "题目ID", required = true, example = "[1,2,3,4]")
+    private Long[] questionIds;
+
+    /**
+     * 科目
+     */
+    @ApiModelProperty(value = "考试科目（1、2、3、4）", required = true, example = "1")
+    private Integer km;
+
+
+}

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionInfoDTO.java

@@ -13,9 +13,8 @@ import lombok.Data;
  * @date 2021-10-20
  */
 @Data
-@TableName("question_info")
 @ApiModel(value = "QuestionInfo", description = "题库对象 question_info")
-public class QuestionInfoDTO extends BaseBusinessEntity {
+public class QuestionInfoDTO  {
     private static final long serialVersionUID = 1L;
 
     /**  主键 */

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionInfoFlDTO.java

@@ -12,7 +12,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "QuestionInfoFlDTO", description = "返回精选分类")
-public class QuestionInfoFlDTO extends BaseBusinessEntity {
+public class QuestionInfoFlDTO  {
     private static final long serialVersionUID = 1L;
 
 

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionInfoFreeDTO.java

@@ -12,7 +12,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "QuestionInfoTestDTO", description = "模拟考试输入对象")
-public class QuestionInfoFreeDTO extends BaseBusinessEntity {
+public class QuestionInfoFreeDTO  {
     private static final long serialVersionUID = 1L;
 
 

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionInfoSortDTO.java

@@ -11,7 +11,7 @@ import lombok.Data;
  * @date 2021-10-20
  */
 @Data
-public class QuestionInfoSortDTO extends BaseBusinessEntity {
+public class QuestionInfoSortDTO  {
     private static final long serialVersionUID = 1L;
 
 

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionInfoTestDTO.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 @Data
 @ApiModel(value = "QuestionInfoTestDTO", description = "模拟考试输入对象")
-public class QuestionInfoTestDTO extends BaseBusinessEntity {
+public class QuestionInfoTestDTO  {
     private static final long serialVersionUID = 1L;
 
 

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionWrongListDTO.java

@@ -11,7 +11,7 @@ import lombok.Data;
  * @date 2021-08-19
  */
 @Data
-public class QuestionWrongListDTO extends BaseBusinessEntity {
+public class QuestionWrongListDTO  {
 
 
     @ApiModelProperty(value = "用户ID",hidden = true)

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

@@ -11,18 +11,17 @@ import lombok.Data;
  * @date 2021-08-19
  */
 @Data
-public class QuestionWrongYunDTO extends BaseBusinessEntity {
+public class QuestionWrongYunDTO {
 
 
-
-
-    @ApiModelProperty(value = "题目ID")
+    @ApiModelProperty(value = "题目ID", required = true, example = "[1,2,3,4]")
     private Long[] questionIds;
 
-    /** 科目 */
-    @ApiModelProperty(value = "考试科目（1、2、3、4）")
+    /**
+     * 科目
+     */
+    @ApiModelProperty(value = "考试科目（1、2、3、4）", required = true, example = "1")
     private Integer km;
 
 
-
 }