错题 收藏 添加创建时间接口

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

@@ -14,6 +14,7 @@ import com.miaxis.question.dto.QuestionCollectionDelDTO;
 import com.miaxis.question.dto.QuestionCollectionListDTO;
 import com.miaxis.question.dto.QuestionCollectionYunDTO;
 import com.miaxis.question.service.IQuestionCollectionService;
+import com.miaxis.question.vo.QuestionColIdDateVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -154,9 +155,9 @@ public class QuestionCollectionController extends BaseController {
 
     @GetMapping("/appCollectionByUser")
     @ApiOperation("app恢复云端收藏到本机（根据用户获取收藏题）")
-    public Response<List<Long>> appCollectionByUser(@ModelAttribute QuestionCollectionListDTO dto){
+    public Response<List<QuestionColIdDateVo>> appCollectionByUser(@ModelAttribute QuestionCollectionListDTO dto){
         dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
-        List<Long> list = questionCollectionService.selectCollectionIdByUserId(dto);
+        List<QuestionColIdDateVo> list = questionCollectionService.selectCollectionIdByUserId(dto);
         return Response.success(list);
     }
 

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

@@ -12,6 +12,7 @@ import com.miaxis.question.dto.QuestionWrongDelDTO;
 import com.miaxis.question.dto.QuestionWrongListDTO;
 import com.miaxis.question.dto.QuestionWrongYunDTO;
 import com.miaxis.question.service.IQuestionWrongService;
+import com.miaxis.question.vo.QuestionWrongIdDateVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -154,9 +155,9 @@ public class QuestionWrongController extends BaseController{
 
     @GetMapping("/appWrongByUser")
     @ApiOperation("app恢复云端错题到本机（根据用户获取错题）")
-    public Response<List<Long>> appWrongByUser(@ModelAttribute QuestionWrongListDTO dto){
+    public Response<List<QuestionWrongIdDateVo>> appWrongByUser(@ModelAttribute QuestionWrongListDTO dto){
         dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
-        List<Long> list = questionWrongService.selectWrongIdByUserId(dto);
+        List<QuestionWrongIdDateVo> list = questionWrongService.selectWrongIdByUserId(dto);
         return Response.success(list);
     }
 

nbjk-service/src/main/java/com/miaxis/question/mapper/QuestionCollectionMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.question.domain.QuestionCollection;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionCollectionListDTO;
+import com.miaxis.question.vo.QuestionColIdDateVo;
 
 /**
  * collectionMapper接口
@@ -23,7 +24,7 @@ public interface QuestionCollectionMapper extends BaseMapper<QuestionCollection>
 
     List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto);
 
-    List<Long> selectCollectionIdByUserId(QuestionCollectionListDTO dto);
+    List<QuestionColIdDateVo> selectCollectionIdByUserId(QuestionCollectionListDTO dto);
 
     Integer selectCollectionCountByUserId(QuestionCollectionListDTO dto);
 

nbjk-service/src/main/java/com/miaxis/question/mapper/QuestionWrongMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.domain.QuestionWrong;
 import com.miaxis.question.dto.QuestionWrongListDTO;
+import com.miaxis.question.vo.QuestionWrongIdDateVo;
 
 /**
  * wrongMapper接口
@@ -25,5 +26,5 @@ public interface QuestionWrongMapper extends BaseMapper<QuestionWrong> {
 
     Integer selectWrongCountByUserId(QuestionWrongListDTO dto);
 
-    List<Long> selectWrongIdByUserId(QuestionWrongListDTO dto);
+    List<QuestionWrongIdDateVo> selectWrongIdByUserId(QuestionWrongListDTO dto);
 }

nbjk-service/src/main/java/com/miaxis/question/service/IQuestionCollectionService.java

@@ -5,6 +5,7 @@ import com.miaxis.question.domain.QuestionCollection;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionCollectionListDTO;
 import com.miaxis.question.dto.QuestionWrongListDTO;
+import com.miaxis.question.vo.QuestionColIdDateVo;
 
 import java.util.List;
 
@@ -25,7 +26,7 @@ public interface IQuestionCollectionService extends IService<QuestionCollection>
 
     List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto);
 
-    List<Long> selectCollectionIdByUserId(QuestionCollectionListDTO dto);
+    List<QuestionColIdDateVo> selectCollectionIdByUserId(QuestionCollectionListDTO dto);
 
     Integer selectCollectionCountByUserId(QuestionCollectionListDTO dto);
 

nbjk-service/src/main/java/com/miaxis/question/service/IQuestionWrongService.java

@@ -8,6 +8,7 @@ import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.domain.QuestionWrong;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.question.dto.QuestionWrongListDTO;
+import com.miaxis.question.vo.QuestionWrongIdDateVo;
 
 /**
  * wrongService接口
@@ -26,7 +27,7 @@ public interface IQuestionWrongService extends IService<QuestionWrong>{
 
     List<QuestionInfo> selectWrongByUserId(QuestionWrongListDTO dto);
 
-    List<Long> selectWrongIdByUserId(QuestionWrongListDTO dto);
+    List<QuestionWrongIdDateVo> selectWrongIdByUserId(QuestionWrongListDTO dto);
 
     Integer selectWrongCountByUserId(QuestionWrongListDTO dto);
 

nbjk-service/src/main/java/com/miaxis/question/service/impl/QuestionCollectionServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionCollectionListDTO;
+import com.miaxis.question.vo.QuestionColIdDateVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.miaxis.question.mapper.QuestionCollectionMapper;
@@ -45,7 +46,7 @@ public class QuestionCollectionServiceImpl extends ServiceImpl<QuestionCollectio
     }
 
     @Override
-    public List<Long> selectCollectionIdByUserId(QuestionCollectionListDTO dto) {
+    public List<QuestionColIdDateVo> selectCollectionIdByUserId(QuestionCollectionListDTO dto) {
         return questionCollectionMapper.selectCollectionIdByUserId(dto);
     }
 

nbjk-service/src/main/java/com/miaxis/question/service/impl/QuestionWrongServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionWrongListDTO;
+import com.miaxis.question.vo.QuestionWrongIdDateVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.miaxis.question.mapper.QuestionWrongMapper;
@@ -38,7 +39,7 @@ public class QuestionWrongServiceImpl extends ServiceImpl<QuestionWrongMapper, Q
     }
 
     @Override
-    public List<Long> selectWrongIdByUserId(QuestionWrongListDTO dto) {
+    public List<QuestionWrongIdDateVo> selectWrongIdByUserId(QuestionWrongListDTO dto) {
         return questionWrongMapper.selectWrongIdByUserId(dto);
     }
 

nbjk-service/src/main/java/com/miaxis/question/vo/QuestionColIdDateVo.java

@@ -0,0 +1,24 @@
+package com.miaxis.question.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "QuestionColIdDateVo", description = "收藏题返回ID与时间")
+public class QuestionColIdDateVo {
+
+
+
+    @ApiModelProperty(value = "分类题（包含科一到科四）")
+    private Long id;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+}

nbjk-service/src/main/java/com/miaxis/question/vo/QuestionWrongIdDateVo.java

@@ -0,0 +1,24 @@
+package com.miaxis.question.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "QuestionWrongIdDateVo", description = "错题返回ID与时间")
+public class QuestionWrongIdDateVo {
+
+
+
+    @ApiModelProperty(value = "分类题（包含科一到科四）")
+    private Long id;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+}

nbjk-service/src/main/java/com/miaxis/wx/service/WxService.java

@@ -44,6 +44,18 @@ public interface WxService {
             @RequestParam("openid") String openid
     );
 
+
+    /**
+     * 获取接口调用凭据（小程序）
+     */
+    @GetMapping(value = "/cgi-bin/token")
+    String getXcxToken(
+            @RequestParam("grant_type") String grantType,
+            @RequestParam("appid") String appid,
+            @RequestParam("secret") String secret
+    );
+
+
     /**
      *  小程序获取openid
      * @param appid

nbjk-service/src/main/resources/mapper/question/QuestionCollectionMapper.xml

@@ -40,9 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectCollectionIdByUserId" resultType="java.lang.Long">
+    <select id="selectCollectionIdByUserId" resultType="com.miaxis.question.vo.QuestionColIdDateVo">
 
-        select q1.id from question_info q1 join question_collection q2 on q1.id = q2.question_id
+        select q1.id,q2.create_time from question_info q1 join question_collection q2 on q1.id = q2.question_id
         <where>
             <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
             <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>

nbjk-service/src/main/resources/mapper/question/QuestionWrongMapper.xml

@@ -38,9 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by q2.create_time
     </select>
 
-    <select id="selectWrongIdByUserId" resultType="java.lang.Long">
+    <select id="selectWrongIdByUserId" resultType="com.miaxis.question.vo.QuestionWrongIdDateVo">
 
-        select q1.id from question_info q1 join question_wrong q2 on q1.id = q2.question_id
+        select q1.id,q2.create_time from question_info q1 join question_wrong q2 on q1.id = q2.question_id
         <where>
             <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
             <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>