'1'

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

@@ -1,5 +1,6 @@
 package com.miaxis.app.controller.question;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
@@ -12,6 +13,7 @@ import com.miaxis.question.domain.QuestionCollection;
 import com.miaxis.question.dto.QuestionCollectionDTO;
 import com.miaxis.question.service.IQuestionCollectionService;
 import io.swagger.annotations.*;
+import org.aspectj.weaver.patterns.TypePatternQuestions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -124,6 +126,25 @@ public class QuestionCollectionController extends BaseController{
             @ApiParam(name = "ids", value = "collectionids参数", required = true)
             @PathVariable Long[] ids
     ){
+//        questionCollectionService.removeByIds(Arrays.asList(ids));
+//        return Response.success();
         return toResponse(questionCollectionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }
+
+
+    @Log(title = "collectionQuestion", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/cancel/{questionId}")
+    @ApiOperation("取消收藏")
+    public  Response<Integer> remove(
+            @ApiParam(name = "questionId", value = "问题id", required = true)
+            @PathVariable String questionId
+    ){
+        Long userId = SecurityUtils.getLoginUser().getStudent().getId();
+        QueryWrapper<QuestionCollection> queryWrapper= new QueryWrapper<QuestionCollection>();
+        queryWrapper.eq("user_id",userId);
+        queryWrapper.eq("question_id",questionId);
+        questionCollectionService.remove(queryWrapper);
+        return Response.success();
+
+    }
 }

jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionVersionController.java

@@ -101,6 +101,7 @@ public class QuestionVersionController extends BaseController{
             @ApiParam(name = "ids", value = "versionids参数", required = true)
             @PathVariable Long[] ids
     ){
+        questionVersionService.removeByIds(Arrays.asList(ids));
         return toResponse(questionVersionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }
 }

jkt-admin/src/main/java/com/miaxis/app/controller/vip/AppVipCodeController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -40,10 +41,10 @@ public class AppVipCodeController extends BaseController{
     private IUserInfoService userInfoService;
     @PutMapping
     @ApiOperation("用户激活码激活")
-    public Response<Integer> edit(
-                                  String vipCode){
+    public Response<Integer> edit(String c, String b){
+
         QueryWrapper<VipCode> queryWrapper = new QueryWrapper<VipCode>();
-        queryWrapper.eq("vip_code", vipCode);
+        queryWrapper.eq("vip_code", "1");
         VipCode vipCodeEntity = vipCodeService.getOne(queryWrapper);
         if (vipCodeEntity == null){
             throw new CustomException("该激活码不存在");

jkt-service/src/main/java/com/miaxis/question/dto/QuestionCollectionDTO.java

@@ -1,6 +1,7 @@
 package com.miaxis.question.dto;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,12 +11,13 @@ import lombok.Data;
  * @date 2021-08-18
  */
 @Data
-public class QuestionCollectionDTO extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
+public class QuestionCollectionDTO {
+
 
 
 
     /** 题目ID */
+    @ApiModelProperty(value = "题目id")
     private Long questionId;
 
 

jkt-service/src/main/java/com/miaxis/question/dto/QuestionWrongDTO.java

@@ -1,15 +1,8 @@
 package com.miaxis.question.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * wrong对象 question_wrong
@@ -18,11 +11,12 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2021-08-19
  */
 @Data
-public class QuestionWrongDTO extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
+public class QuestionWrongDTO {
+
 
 
     /** 题目ID */
+    @ApiModelProperty(value = "题目id")
     private Long questionId;
 
 }