题库

zzjs-service/src/main/java/com/miaxis/question/controller/QuestionErrorController.java → zzjs-admin/src/main/java/com/miaxis/app/controller/question/QuestionErrorController.java

@@ -1,28 +1,22 @@
-package com.miaxis.question.controller;
+package com.miaxis.app.controller.question;
 
-import com.miaxis.common.constant.Constants;
-import java.util.List;
-import java.util.Arrays;
-import io.swagger.annotations.*;
-import com.miaxis.common.core.domain.Response;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+
 import com.miaxis.question.domain.QuestionError;
 import com.miaxis.question.service.IQuestionErrorService;
-import com.miaxis.common.utils.poi.ExcelUtil;
-import com.miaxis.common.core.page.ResponsePageInfo;
+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 java.util.Arrays;
+import java.util.List;
 
 /**
  * 【错题】Controller
@@ -31,7 +25,7 @@ import com.miaxis.common.core.page.ResponsePageInfo;
  * @date 2021-03-16
  */
 @RestController
-@RequestMapping("/error/error")
+@RequestMapping(Constants.STUDENT_PREFIX+"/question/error")
 @Api(tags={"【小程序-错题】"})
 public class QuestionErrorController extends BaseController{
     @Autowired
@@ -40,7 +34,7 @@ public class QuestionErrorController extends BaseController{
     /**
      * 查询错题列表
      */
-    @PreAuthorize("@ss.hasPermi('error:error:list')")
+    @PreAuthorize("@ss.hasPermi('question:error:list')")
     @GetMapping("/list")
     @ApiOperation("查询错题列表")
     @ApiImplicitParams({
@@ -56,7 +50,7 @@ public class QuestionErrorController extends BaseController{
     /**
      * 导出错题列表
      */
-    @PreAuthorize("@ss.hasPermi('error:error:export')")
+    @PreAuthorize("@ss.hasPermi('question:error:export')")
     @Log(title = "错题", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出错题列表Excel")
@@ -69,7 +63,7 @@ public class QuestionErrorController extends BaseController{
     /**
      * 获取错题详细信息
      */
-    @PreAuthorize("@ss.hasPermi('error:error:query')")
+    @PreAuthorize("@ss.hasPermi('question:error:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取错题详细信息")
     public Response<QuestionError> getInfo(
@@ -82,7 +76,7 @@ public class QuestionErrorController extends BaseController{
     /**
      * 新增错题
      */
-    @PreAuthorize("@ss.hasPermi('error:error:add')")
+    @PreAuthorize("@ss.hasPermi('question:error:add')")
     @Log(title = "错题", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增错题")
@@ -93,7 +87,7 @@ public class QuestionErrorController extends BaseController{
     /**
      * 修改错题
      */
-    @PreAuthorize("@ss.hasPermi('error:error:edit')")
+    @PreAuthorize("@ss.hasPermi('question:error:edit')")
     @Log(title = "错题", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改错题")
@@ -104,7 +98,7 @@ public class QuestionErrorController extends BaseController{
     /**
      * 删除错题
      */
-    @PreAuthorize("@ss.hasPermi('error:error:remove')")
+    @PreAuthorize("@ss.hasPermi('question:error:remove')")
     @Log(title = "错题", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除错题")

zzjs-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoController.java

@@ -1,20 +1,21 @@
 package com.miaxis.app.controller.question;
 
-import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionInfoDto;
 import com.miaxis.question.service.IQuestionInfoService;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**

zzjs-service/src/main/java/com/miaxis/question/domain/QuestionError.java

@@ -1,17 +1,15 @@
 package com.miaxis.question.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
+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;
 /**
  * 错题对象 question_error
  *

zzjs-service/src/main/resources/mapper/question/QuestionErrorMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.question.mapper.QuestionErrorMapper">
+
+    <resultMap type="QuestionError" id="QuestionErrorResult">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="questionId"    column="question_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectQuestionErrorVo">
+        select id, user_id, question_id, create_time, update_time from question_error
+    </sql>
+
+    <select id="selectQuestionErrorList" parameterType="QuestionError" resultMap="QuestionErrorResult">
+        <include refid="selectQuestionErrorVo"/>
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="questionId != null "> and question_id = #{questionId}</if>
+        </where>
+    </select>
+
+</mapper>