From f8efdbc9658a35e0a6a59a7062971ba6a0a72552 Mon Sep 17 00:00:00 2001
From: tiger_zhou <123456>
Date: Thu, 22 Sep 2022 17:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=90=86=E8=AE=BA=E8=AF=95=E9=A2=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../question/PagerQuestionBankController.java  |  4 ++--
 .../rtss/dao/{ => paper}/PagerQuestionDAO.java |  9 +++++----
 .../{ => paper}/question/PaperQuestion.java    |  2 +-
 .../question/PaperQuestionExample.java         |  2 +-
 .../question/PaperQuestionWithBLOBs.java       |  2 +-
 .../question/PagerQuestionService.java         | 15 +++++++--------
 .../question}/PagerLableQueryVO.java           |  5 +----
 .../question}/PaperQuestionOptionVO2.java      |  2 +-
 .../v2 => pager/question}/PaperQuestionVO.java |  4 ++--
 .../mybatis/mapper/PaperQuestionDAO.xml        | 18 +++++++++---------
 10 files changed, 30 insertions(+), 33 deletions(-)
 rename src/main/java/club/joylink/rtss/dao/{ => paper}/PagerQuestionDAO.java (85%)
 rename src/main/java/club/joylink/rtss/entity/{ => paper}/question/PaperQuestion.java (94%)
 rename src/main/java/club/joylink/rtss/entity/{ => paper}/question/PaperQuestionExample.java (99%)
 rename src/main/java/club/joylink/rtss/entity/{ => paper}/question/PaperQuestionWithBLOBs.java (86%)
 rename src/main/java/club/joylink/rtss/vo/client/{question/v2 => pager/question}/PagerLableQueryVO.java (83%)
 rename src/main/java/club/joylink/rtss/vo/client/{question/v2 => pager/question}/PaperQuestionOptionVO2.java (97%)
 rename src/main/java/club/joylink/rtss/vo/client/{question/v2 => pager/question}/PaperQuestionVO.java (96%)

diff --git a/src/main/java/club/joylink/rtss/controller/competition/question/PagerQuestionBankController.java b/src/main/java/club/joylink/rtss/controller/competition/question/PagerQuestionBankController.java
index 810a9961f..796af465f 100644
--- a/src/main/java/club/joylink/rtss/controller/competition/question/PagerQuestionBankController.java
+++ b/src/main/java/club/joylink/rtss/controller/competition/question/PagerQuestionBankController.java
@@ -5,9 +5,9 @@ import club.joylink.rtss.services.completition.question.PagerQuestionService;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.PageVO;
+import club.joylink.rtss.vo.client.pager.question.PagerLableQueryVO;
+import club.joylink.rtss.vo.client.pager.question.PaperQuestionVO;
 import club.joylink.rtss.vo.client.question.QuestionQueryVO;
-import club.joylink.rtss.vo.client.question.v2.PagerLableQueryVO;
-import club.joylink.rtss.vo.client.question.v2.PaperQuestionVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/club/joylink/rtss/dao/PagerQuestionDAO.java b/src/main/java/club/joylink/rtss/dao/paper/PagerQuestionDAO.java
similarity index 85%
rename from src/main/java/club/joylink/rtss/dao/PagerQuestionDAO.java
rename to src/main/java/club/joylink/rtss/dao/paper/PagerQuestionDAO.java
index b8e116d4b..892bb356e 100644
--- a/src/main/java/club/joylink/rtss/dao/PagerQuestionDAO.java
+++ b/src/main/java/club/joylink/rtss/dao/paper/PagerQuestionDAO.java
@@ -1,7 +1,8 @@
-package club.joylink.rtss.dao;
+package club.joylink.rtss.dao.paper;
 
-import club.joylink.rtss.entity.question.PaperQuestion;
-import club.joylink.rtss.entity.question.PaperQuestionExample;
+import club.joylink.rtss.dao.MyBatisBaseDao;
+import club.joylink.rtss.entity.paper.question.PaperQuestion;
+import club.joylink.rtss.entity.paper.question.PaperQuestionExample;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -10,7 +11,7 @@ import java.util.List;
 
 @Mapper
 @Repository
-public interface PagerQuestionDAO extends MyBatisBaseDao<PaperQuestion, Long, PaperQuestionExample>{
+public interface PagerQuestionDAO extends MyBatisBaseDao<PaperQuestion, Long, PaperQuestionExample> {
     @Select("<script>" +
             "select * from paper_question  where  1 = 1 " +
             "<choose>" +
diff --git a/src/main/java/club/joylink/rtss/entity/question/PaperQuestion.java b/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java
similarity index 94%
rename from src/main/java/club/joylink/rtss/entity/question/PaperQuestion.java
rename to src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java
index e3ffeea65..afab42b78 100644
--- a/src/main/java/club/joylink/rtss/entity/question/PaperQuestion.java
+++ b/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java
@@ -1,4 +1,4 @@
-package club.joylink.rtss.entity.question;
+package club.joylink.rtss.entity.paper.question;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
diff --git a/src/main/java/club/joylink/rtss/entity/question/PaperQuestionExample.java b/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionExample.java
similarity index 99%
rename from src/main/java/club/joylink/rtss/entity/question/PaperQuestionExample.java
rename to src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionExample.java
index 232cce9c8..fb9f185b3 100644
--- a/src/main/java/club/joylink/rtss/entity/question/PaperQuestionExample.java
+++ b/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionExample.java
@@ -1,4 +1,4 @@
-package club.joylink.rtss.entity.question;
+package club.joylink.rtss.entity.paper.question;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/src/main/java/club/joylink/rtss/entity/question/PaperQuestionWithBLOBs.java b/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionWithBLOBs.java
similarity index 86%
rename from src/main/java/club/joylink/rtss/entity/question/PaperQuestionWithBLOBs.java
rename to src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionWithBLOBs.java
index 753e6e870..48eade013 100644
--- a/src/main/java/club/joylink/rtss/entity/question/PaperQuestionWithBLOBs.java
+++ b/src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestionWithBLOBs.java
@@ -1,4 +1,4 @@
-package club.joylink.rtss.entity.question;
+package club.joylink.rtss.entity.paper.question;
 
 import java.io.Serializable;
 import lombok.Data;
diff --git a/src/main/java/club/joylink/rtss/services/completition/question/PagerQuestionService.java b/src/main/java/club/joylink/rtss/services/completition/question/PagerQuestionService.java
index 135bd9c91..3a3c2affd 100644
--- a/src/main/java/club/joylink/rtss/services/completition/question/PagerQuestionService.java
+++ b/src/main/java/club/joylink/rtss/services/completition/question/PagerQuestionService.java
@@ -2,20 +2,19 @@ package club.joylink.rtss.services.completition.question;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.constants.Project;
-import club.joylink.rtss.dao.PagerQuestionDAO;
-import club.joylink.rtss.entity.question.PaperQuestion;
-import club.joylink.rtss.entity.question.PaperQuestionExample;
+import club.joylink.rtss.dao.paper.PagerQuestionDAO;
+import club.joylink.rtss.entity.paper.question.PaperQuestion;
+import club.joylink.rtss.entity.paper.question.PaperQuestionExample;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.PageVO;
+import club.joylink.rtss.vo.client.pager.question.PagerLableQueryVO;
+import club.joylink.rtss.vo.client.pager.question.PaperQuestionOptionVO2;
+import club.joylink.rtss.vo.client.pager.question.PaperQuestionVO;
 import club.joylink.rtss.vo.client.question.QuestionQueryVO;
-import club.joylink.rtss.vo.client.question.v2.PagerLableQueryVO;
-import club.joylink.rtss.vo.client.question.v2.PaperQuestionOptionVO2;
-import club.joylink.rtss.vo.client.question.v2.PaperQuestionVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -126,7 +125,7 @@ public class PagerQuestionService {
      * @param random
      * @return
      */
-    public List<PaperQuestionVO> queryQuestionsForRaceLable(String projectCode, PagerLableQueryVO queryVO,boolean random) {
+    public List<PaperQuestionVO> queryQuestionsForRaceLable(String projectCode, PagerLableQueryVO queryVO, boolean random) {
         BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(queryVO.allNotNullOrEmpty(),"查询内容不能为空");
         int isDel = BusinessConsts.DBLogicDelete.NORMAL.ordinal();
 
diff --git a/src/main/java/club/joylink/rtss/vo/client/question/v2/PagerLableQueryVO.java b/src/main/java/club/joylink/rtss/vo/client/pager/question/PagerLableQueryVO.java
similarity index 83%
rename from src/main/java/club/joylink/rtss/vo/client/question/v2/PagerLableQueryVO.java
rename to src/main/java/club/joylink/rtss/vo/client/pager/question/PagerLableQueryVO.java
index ffcfd448e..75adf097d 100644
--- a/src/main/java/club/joylink/rtss/vo/client/question/v2/PagerLableQueryVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/pager/question/PagerLableQueryVO.java
@@ -1,11 +1,8 @@
-package club.joylink.rtss.vo.client.question.v2;
+package club.joylink.rtss.vo.client.pager.question;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/src/main/java/club/joylink/rtss/vo/client/question/v2/PaperQuestionOptionVO2.java b/src/main/java/club/joylink/rtss/vo/client/pager/question/PaperQuestionOptionVO2.java
similarity index 97%
rename from src/main/java/club/joylink/rtss/vo/client/question/v2/PaperQuestionOptionVO2.java
rename to src/main/java/club/joylink/rtss/vo/client/pager/question/PaperQuestionOptionVO2.java
index 2ac63b2a3..7ca8e2ca5 100644
--- a/src/main/java/club/joylink/rtss/vo/client/question/v2/PaperQuestionOptionVO2.java
+++ b/src/main/java/club/joylink/rtss/vo/client/pager/question/PaperQuestionOptionVO2.java
@@ -1,4 +1,4 @@
-package club.joylink.rtss.vo.client.question.v2;
+package club.joylink.rtss.vo.client.pager.question;
 
 import club.joylink.rtss.entity.RaceQuestionOption;
 import lombok.Getter;
diff --git a/src/main/java/club/joylink/rtss/vo/client/question/v2/PaperQuestionVO.java b/src/main/java/club/joylink/rtss/vo/client/pager/question/PaperQuestionVO.java
similarity index 96%
rename from src/main/java/club/joylink/rtss/vo/client/question/v2/PaperQuestionVO.java
rename to src/main/java/club/joylink/rtss/vo/client/pager/question/PaperQuestionVO.java
index be941c268..56826e675 100644
--- a/src/main/java/club/joylink/rtss/vo/client/question/v2/PaperQuestionVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/pager/question/PaperQuestionVO.java
@@ -1,8 +1,8 @@
-package club.joylink.rtss.vo.client.question.v2;
+package club.joylink.rtss.vo.client.pager.question;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.constants.Project;
-import club.joylink.rtss.entity.question.PaperQuestion;
+import club.joylink.rtss.entity.paper.question.PaperQuestion;
 import club.joylink.rtss.util.JsonUtils;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/resources/mybatis/mapper/PaperQuestionDAO.xml b/src/main/resources/mybatis/mapper/PaperQuestionDAO.xml
index 8b8db5270..522007b5a 100644
--- a/src/main/resources/mybatis/mapper/PaperQuestionDAO.xml
+++ b/src/main/resources/mybatis/mapper/PaperQuestionDAO.xml
@@ -1,7 +1,7 @@
 <?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="club.joylink.rtss.dao.PagerQuestionDAO">
-  <resultMap id="BaseResultMap" type="club.joylink.rtss.entity.question.PaperQuestion">
+<mapper namespace="club.joylink.rtss.dao.paper.PagerQuestionDAO">
+  <resultMap id="BaseResultMap" type="club.joylink.rtss.entity.paper.question.PaperQuestion">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
@@ -105,7 +105,7 @@
       </if>
     </if>
   </select>-->
-  <select id="selectByExample" parameterType="club.joylink.rtss.entity.question.PaperQuestionExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -141,13 +141,13 @@
     delete from paper_question
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.question.PaperQuestionExample">
+  <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionExample">
     delete from paper_question
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="club.joylink.rtss.entity.question.PaperQuestionWithBLOBs">
+  <insert id="insert" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs">
     insert into paper_question (id, `type`, create_user_id,
                                 create_time, project_code, company_id,
                                 race_lable, is_del, topic,
@@ -157,7 +157,7 @@
             #{raceLable,jdbcType=VARCHAR}, #{isDel,jdbcType=INTEGER}, #{topic,jdbcType=LONGVARCHAR},
             #{questions,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="club.joylink.rtss.entity.question.PaperQuestionWithBLOBs">
+  <insert id="insertSelective" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs">
     insert into paper_question
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -224,7 +224,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="club.joylink.rtss.entity.question.PaperQuestionExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionExample" resultType="java.lang.Long">
     select count(*) from paper_question
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -301,7 +301,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="club.joylink.rtss.entity.question.PaperQuestionWithBLOBs">
+  <update id="updateByPrimaryKeySelective" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs">
     update paper_question
     <set>
       <if test="type != null">
@@ -347,7 +347,7 @@
         questions = #{questions,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>-->
-  <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.question.PaperQuestion">
+  <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.paper.question.PaperQuestion">
     update paper_question
     set `type` = #{type,jdbcType=VARCHAR},
         create_user_id = #{createUserId,jdbcType=BIGINT},