Browse Source

替换包名

yangfeng 1 year ago
parent
commit
a0407daf5c
100 changed files with 371 additions and 361 deletions
  1. 3 3
      core/pom.xml
  2. 1 1
      core/src/main/java/org/jeecg/common/aspect/DictAspect.java
  3. 2 3
      core/src/main/java/org/jeecg/config/Swagger2Config.java
  4. 1 1
      core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
  5. 5 5
      pom.xml
  6. 3 3
      system/pom.xml
  7. 3 3
      system/system-api/pom.xml
  8. 2 2
      system/system-api/system-local-api/pom.xml
  9. 3 3
      system/system-biz/pom.xml
  10. 3 3
      web/Dockerfile
  11. 5 5
      web/pom.xml
  12. 2 2
      web/src/main/java/com/ynfy/Application.java
  13. 9 9
      web/src/main/java/com/ynfy/buss/exam/exam/controller/ExamController.java
  14. 1 1
      web/src/main/java/com/ynfy/buss/exam/exam/dto/AnswerCardDTO.java
  15. 1 1
      web/src/main/java/com/ynfy/buss/exam/exam/dto/BlankAnswerResultDTO.java
  16. 1 1
      web/src/main/java/com/ynfy/buss/exam/exam/dto/ExamAnswerDTO.java
  17. 1 1
      web/src/main/java/com/ynfy/buss/exam/exam/dto/ExamSubmitDTO.java
  18. 1 3
      web/src/main/java/com/ynfy/buss/exam/exam/dto/QuestionTypeCountDTO.java
  19. 2 2
      web/src/main/java/com/ynfy/buss/exam/exam/dto/UserExamDTO.java
  20. 4 4
      web/src/main/java/com/ynfy/buss/exam/exam/entity/Exam.java
  21. 1 1
      web/src/main/java/com/ynfy/buss/exam/exam/enums/ExamOpenType.java
  22. 1 1
      web/src/main/java/com/ynfy/buss/exam/exam/enums/ExamState.java
  23. 1 1
      web/src/main/java/com/ynfy/buss/exam/exam/enums/PaperState.java
  24. 6 6
      web/src/main/java/com/ynfy/buss/exam/exam/job/BreakExamJob.java
  25. 3 3
      web/src/main/java/com/ynfy/buss/exam/exam/job/ExamStatisticsJob.java
  26. 2 2
      web/src/main/java/com/ynfy/buss/exam/exam/mapper/ExamMapper.java
  27. 4 4
      web/src/main/java/com/ynfy/buss/exam/exam/mapper/xml/ExamMapper.xml
  28. 5 5
      web/src/main/java/com/ynfy/buss/exam/exam/service/IExamService.java
  29. 29 30
      web/src/main/java/com/ynfy/buss/exam/exam/service/impl/ExamServiceImpl.java
  30. 4 4
      web/src/main/java/com/ynfy/buss/exam/examreview/controller/ExamReviewController.java
  31. 1 1
      web/src/main/java/com/ynfy/buss/exam/examreview/dto/ExamPreviewDTO.java
  32. 1 1
      web/src/main/java/com/ynfy/buss/exam/examreview/dto/PreviewSubmitDTO.java
  33. 1 3
      web/src/main/java/com/ynfy/buss/exam/examreview/entity/ExamReview.java
  34. 2 2
      web/src/main/java/com/ynfy/buss/exam/examreview/mapper/ExamReviewMapper.java
  35. 3 3
      web/src/main/java/com/ynfy/buss/exam/examreview/mapper/xml/ExamReviewMapper.xml
  36. 3 3
      web/src/main/java/com/ynfy/buss/exam/examreview/service/IExamReviewService.java
  37. 13 13
      web/src/main/java/com/ynfy/buss/exam/examreview/service/impl/ExamReviewServiceImpl.java
  38. 3 3
      web/src/main/java/com/ynfy/buss/exam/examstatistics/controller/ExamStatisticsController.java
  39. 1 1
      web/src/main/java/com/ynfy/buss/exam/examstatistics/dto/ExamStatisticsDTO.java
  40. 1 1
      web/src/main/java/com/ynfy/buss/exam/examstatistics/entity/ExamStatistics.java
  41. 3 3
      web/src/main/java/com/ynfy/buss/exam/examstatistics/mapper/ExamStatisticsMapper.java
  42. 2 2
      web/src/main/java/com/ynfy/buss/exam/examstatistics/mapper/xml/ExamStatisticsMapper.xml
  43. 3 3
      web/src/main/java/com/ynfy/buss/exam/examstatistics/service/IExamStatisticsService.java
  44. 12 12
      web/src/main/java/com/ynfy/buss/exam/examstatistics/service/impl/ExamStatisticsServiceImpl.java
  45. 3 3
      web/src/main/java/com/ynfy/buss/exam/examuserstatistics/controller/ExamUserStatisticsController.java
  46. 1 1
      web/src/main/java/com/ynfy/buss/exam/examuserstatistics/entity/ExamUserStatistics.java
  47. 2 2
      web/src/main/java/com/ynfy/buss/exam/examuserstatistics/mapper/ExamUserStatisticsMapper.java
  48. 5 0
      web/src/main/java/com/ynfy/buss/exam/examuserstatistics/mapper/xml/ExamUserStatisticsMapper.xml
  49. 2 2
      web/src/main/java/com/ynfy/buss/exam/examuserstatistics/service/IExamUserStatisticsService.java
  50. 4 4
      web/src/main/java/com/ynfy/buss/exam/examuserstatistics/service/impl/ExamUserStatisticsServiceImpl.java
  51. 6 6
      web/src/main/java/com/ynfy/buss/exam/job/BreakExamJob.java
  52. 3 3
      web/src/main/java/com/ynfy/buss/exam/job/ExamStatisticsJob.java
  53. 5 5
      web/src/main/java/com/ynfy/buss/exam/paper/controller/PaperController.java
  54. 13 0
      web/src/main/java/com/ynfy/buss/exam/paper/dto/PaperDTO.java
  55. 1 1
      web/src/main/java/com/ynfy/buss/exam/paper/enmus/JoinType.java
  56. 1 1
      web/src/main/java/com/ynfy/buss/exam/paper/enmus/LevelType.java
  57. 1 1
      web/src/main/java/com/ynfy/buss/exam/paper/entity/Paper.java
  58. 2 2
      web/src/main/java/com/ynfy/buss/exam/paper/mapper/PaperMapper.java
  59. 1 1
      web/src/main/java/com/ynfy/buss/exam/paper/mapper/xml/PaperMapper.xml
  60. 4 4
      web/src/main/java/com/ynfy/buss/exam/paper/service/IPaperService.java
  61. 22 22
      web/src/main/java/com/ynfy/buss/exam/paper/service/impl/PaperServiceImpl.java
  62. 1 1
      web/src/main/java/com/ynfy/buss/exam/paperquestion/entity/PaperQuestion.java
  63. 2 2
      web/src/main/java/com/ynfy/buss/exam/paperquestion/mapper/PaperQuestionMapper.java
  64. 2 2
      web/src/main/java/com/ynfy/buss/exam/paperquestion/mapper/xml/PaperQuestionMapper.xml
  65. 3 3
      web/src/main/java/com/ynfy/buss/exam/paperquestion/service/IPaperQuestionService.java
  66. 9 9
      web/src/main/java/com/ynfy/buss/exam/paperquestion/service/impl/PaperQuestionServiceImpl.java
  67. 1 8
      web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/entity/PaperQuestionAnswer.java
  68. 2 2
      web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/mapper/PaperQuestionAnswerMapper.java
  69. 5 0
      web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/mapper/xml/PaperQuestionAnswerMapper.xml
  70. 3 3
      web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/service/IPaperQuestionAnswerService.java
  71. 6 6
      web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/service/impl/PaperQuestionAnswerServiceImpl.java
  72. 1 1
      web/src/main/java/com/ynfy/buss/exam/paperruledetail/dto/RuleDetailDTO.java
  73. 1 1
      web/src/main/java/com/ynfy/buss/exam/paperruledetail/entity/PaperRuleDetail.java
  74. 2 2
      web/src/main/java/com/ynfy/buss/exam/paperruledetail/mapper/PaperRuleDetailMapper.java
  75. 1 1
      web/src/main/java/com/ynfy/buss/exam/paperruledetail/mapper/xml/PaperRuleDetailMapper.xml
  76. 3 3
      web/src/main/java/com/ynfy/buss/exam/paperruledetail/service/IPaperRuleDetailService.java
  77. 5 5
      web/src/main/java/com/ynfy/buss/exam/paperruledetail/service/impl/PaperRuleDetailServiceImpl.java
  78. 3 3
      web/src/main/java/com/ynfy/buss/exam/paperrulegroup/entity/PaperRuleGroup.java
  79. 3 3
      web/src/main/java/com/ynfy/buss/exam/paperrulegroup/mapper/PaperRuleGroupMapper.java
  80. 4 4
      web/src/main/java/com/ynfy/buss/exam/paperrulegroup/mapper/xml/PaperRuleGroupMapper.xml
  81. 4 4
      web/src/main/java/com/ynfy/buss/exam/paperrulegroup/service/IPaperRuleGroupService.java
  82. 13 13
      web/src/main/java/com/ynfy/buss/exam/paperrulegroup/service/impl/PaperRuleGroupServiceImpl.java
  83. 10 10
      web/src/main/java/com/ynfy/buss/exam/question/controller/QuestionController.java
  84. 1 1
      web/src/main/java/com/ynfy/buss/exam/question/dto/QuestionConditionDTO.java
  85. 1 1
      web/src/main/java/com/ynfy/buss/exam/question/dto/QuestionDTO.java
  86. 2 2
      web/src/main/java/com/ynfy/buss/exam/question/dto/QuestionDetailDTO.java
  87. 2 2
      web/src/main/java/com/ynfy/buss/exam/question/entity/Question.java
  88. 1 1
      web/src/main/java/com/ynfy/buss/exam/question/enums/QuestionType.java
  89. 4 4
      web/src/main/java/com/ynfy/buss/exam/question/mapper/QuestionMapper.java
  90. 8 8
      web/src/main/java/com/ynfy/buss/exam/question/mapper/xml/QuestionMapper.xml
  91. 4 4
      web/src/main/java/com/ynfy/buss/exam/question/service/IQuestionService.java
  92. 12 12
      web/src/main/java/com/ynfy/buss/exam/question/service/impl/QuestionServiceImpl.java
  93. 1 1
      web/src/main/java/com/ynfy/buss/exam/questionanswer/entity/QuestionAnswer.java
  94. 2 2
      web/src/main/java/com/ynfy/buss/exam/questionanswer/mapper/QuestionAnswerMapper.java
  95. 1 1
      web/src/main/java/com/ynfy/buss/exam/questionanswer/mapper/xml/QuestionAnswerMapper.xml
  96. 2 2
      web/src/main/java/com/ynfy/buss/exam/questionanswer/service/IQuestionAnswerService.java
  97. 6 6
      web/src/main/java/com/ynfy/buss/exam/questionanswer/service/impl/QuestionAnswerServiceImpl.java
  98. 3 3
      web/src/main/java/com/ynfy/buss/exam/repository/controller/RepositoryController.java
  99. 1 1
      web/src/main/java/com/ynfy/buss/exam/repository/entity/Repository.java
  100. 2 2
      web/src/main/java/com/ynfy/buss/exam/repository/mapper/RepositoryMapper.java

+ 3 - 3
core/pom.xml

@@ -2,12 +2,12 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
   <parent>
-    <groupId>com.yntravelsky</groupId>
-    <artifactId>smis</artifactId>
+    <groupId>com.ynfy</groupId>
+    <artifactId>exam</artifactId>
     <version>3.4.4</version>
     <version>3.4.4</version>
   </parent>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.yntravelsky</groupId>
+  <groupId>com.ynfy</groupId>
   <artifactId>core</artifactId>
   <artifactId>core</artifactId>
 
 
   <dependencies>
   <dependencies>

+ 1 - 1
core/src/main/java/org/jeecg/common/aspect/DictAspect.java

@@ -54,7 +54,7 @@ public class DictAspect {
     /**
     /**
      * 定义切点Pointcut
      * 定义切点Pointcut
      */
      */
-    @Pointcut("execution(public * com.yntravelsky..*.*Controller.*(..)) || execution(public * org.jeecg.modules..*.*Controller.*(..)) " +
+    @Pointcut("execution(public * com.ynfy..*.*Controller.*(..)) || execution(public * org.jeecg.modules..*.*Controller.*(..)) " +
             "|| @annotation(org.jeecg.common.aspect.annotation.AutoDict) || @annotation(org.jeecg.common.aspect.annotation.Dict)")
             "|| @annotation(org.jeecg.common.aspect.annotation.AutoDict) || @annotation(org.jeecg.common.aspect.annotation.Dict)")
     public void excudeService() {
     public void excudeService() {
     }
     }

+ 2 - 3
core/src/main/java/org/jeecg/config/Swagger2Config.java

@@ -144,14 +144,13 @@ public class Swagger2Config implements WebMvcConfigurer {
     private ApiInfo apiInfo() {
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
         return new ApiInfoBuilder()
                 // //大标题
                 // //大标题
-                .title("smis 后台服务API接口文档")
+                .title("在线考试服务API接口文档")
                 // 版本号
                 // 版本号
                 .version("1.0")
                 .version("1.0")
 //				.termsOfServiceUrl("NO terms of service")
 //				.termsOfServiceUrl("NO terms of service")
                 // 描述
                 // 描述
                 .description("后台API接口")
                 .description("后台API接口")
                 // 作者
                 // 作者
-                .contact(new Contact("yntravelsky","www.yntravelsky.net.cn",""))
                 .build();
                 .build();
     }
     }
     /**
     /**
@@ -169,7 +168,7 @@ public class Swagger2Config implements WebMvcConfigurer {
                 // 描述
                 // 描述
                 .description(moduleName + "API接口")
                 .description(moduleName + "API接口")
                 // 作者
                 // 作者
-                .contact(new Contact("yntravelsky","www.yntravelsky.net.cn",""))
+                .contact(new Contact("ynfy","www.ynfy.net.cn",""))
                 .build();
                 .build();
     }
     }
     /**
     /**

+ 1 - 1
core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java

@@ -26,7 +26,7 @@ import net.sf.jsqlparser.expression.LongValue;
  *
  *
  */
  */
 @Configuration
 @Configuration
-@MapperScan(value={"com.yntravelsky.buss.**.mapper*","org.jeecg.modules.**.mapper*"})
+@MapperScan(value={"com.ynfy.buss.**.mapper*","org.jeecg.modules.**.mapper*"})
 public class MybatisPlusSaasConfig {
 public class MybatisPlusSaasConfig {
     /**
     /**
      * tenant_id 字段名
      * tenant_id 字段名

+ 5 - 5
pom.xml

@@ -2,8 +2,8 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.yntravelsky</groupId>
-  <artifactId>smis</artifactId>
+  <groupId>com.ynfy</groupId>
+  <artifactId>exam</artifactId>
   <version>3.4.4</version>
   <version>3.4.4</version>
   <packaging>pom</packaging>
   <packaging>pom</packaging>
 
 
@@ -129,7 +129,7 @@
       </dependency>
       </dependency>
       <!-- system 模块-->
       <!-- system 模块-->
       <dependency>
       <dependency>
-        <groupId>com.yntravelsky</groupId>
+        <groupId>com.ynfy</groupId>
         <artifactId>system-biz</artifactId>
         <artifactId>system-biz</artifactId>
         <version>${jeecgboot.version}</version>
         <version>${jeecgboot.version}</version>
       </dependency>
       </dependency>
@@ -142,13 +142,13 @@
       </dependency>
       </dependency>
       <!-- jeecg core -->
       <!-- jeecg core -->
       <dependency>
       <dependency>
-        <groupId>com.yntravelsky</groupId>
+        <groupId>com.ynfy</groupId>
         <artifactId>core</artifactId>
         <artifactId>core</artifactId>
         <version>${jeecgboot.version}</version>
         <version>${jeecgboot.version}</version>
       </dependency>
       </dependency>
       <!-- system 单体 api -->
       <!-- system 单体 api -->
       <dependency>
       <dependency>
-        <groupId>com.yntravelsky</groupId>
+        <groupId>com.ynfy</groupId>
         <artifactId>system-local-api</artifactId>
         <artifactId>system-local-api</artifactId>
         <version>${jeecgboot.version}</version>
         <version>${jeecgboot.version}</version>
       </dependency>
       </dependency>

+ 3 - 3
system/pom.xml

@@ -3,12 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
     <parent>
-        <groupId>com.yntravelsky</groupId>
-        <artifactId>smis</artifactId>
+        <groupId>com.ynfy</groupId>
+        <artifactId>exam</artifactId>
         <version>3.4.4</version>
         <version>3.4.4</version>
     </parent>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.yntravelsky</groupId>
+    <groupId>com.ynfy</groupId>
     <artifactId>system</artifactId>
     <artifactId>system</artifactId>
     <packaging>pom</packaging>
     <packaging>pom</packaging>
 
 

+ 3 - 3
system/system-api/pom.xml

@@ -3,12 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
     <parent>
-        <groupId>com.yntravelsky</groupId>
+        <groupId>com.ynfy</groupId>
         <artifactId>system</artifactId>
         <artifactId>system</artifactId>
         <version>3.4.4</version>
         <version>3.4.4</version>
     </parent>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.yntravelsky</groupId>
+    <groupId>com.ynfy</groupId>
     <artifactId>system-api</artifactId>
     <artifactId>system-api</artifactId>
     <packaging>pom</packaging>
     <packaging>pom</packaging>
 
 
@@ -18,7 +18,7 @@
 
 
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
-            <groupId>com.yntravelsky</groupId>
+            <groupId>com.ynfy</groupId>
             <artifactId>core</artifactId>
             <artifactId>core</artifactId>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>

+ 2 - 2
system/system-api/system-local-api/pom.xml

@@ -4,11 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
     <parent>
         <artifactId>system-api</artifactId>
         <artifactId>system-api</artifactId>
-        <groupId>com.yntravelsky</groupId>
+        <groupId>com.ynfy</groupId>
         <version>3.4.4</version>
         <version>3.4.4</version>
     </parent>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.yntravelsky</groupId>
+    <groupId>com.ynfy</groupId>
     <artifactId>system-local-api</artifactId>
     <artifactId>system-local-api</artifactId>
 
 
 </project>
 </project>

+ 3 - 3
system/system-biz/pom.xml

@@ -2,12 +2,12 @@
 		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
 	<parent>
-		<groupId>com.yntravelsky</groupId>
+		<groupId>com.ynfy</groupId>
 		<artifactId>system</artifactId>
 		<artifactId>system</artifactId>
 		<version>3.4.4</version>
 		<version>3.4.4</version>
 	</parent>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.yntravelsky</groupId>
+	<groupId>com.ynfy</groupId>
 	<artifactId>system-biz</artifactId>
 	<artifactId>system-biz</artifactId>
 
 
 	<dependencies>
 	<dependencies>
@@ -16,7 +16,7 @@
 			<artifactId>hutool-all</artifactId>
 			<artifactId>hutool-all</artifactId>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
-			<groupId>com.yntravelsky</groupId>
+			<groupId>com.ynfy</groupId>
 			<artifactId>system-local-api</artifactId>
 			<artifactId>system-local-api</artifactId>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>

+ 3 - 3
web/Dockerfile

@@ -1,6 +1,6 @@
 FROM anapsix/alpine-java:8_server-jre_unlimited
 FROM anapsix/alpine-java:8_server-jre_unlimited
 
 
-MAINTAINER yntravelsky
+MAINTAINER ynfy
 
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
 
@@ -11,6 +11,6 @@ WORKDIR /jeecg-boot
 EXPOSE 8080
 EXPOSE 8080
 
 
 #ADD ./src/main/resources/jeecg ./config/jeecg
 #ADD ./src/main/resources/jeecg ./config/jeecg
-ADD ./target/smis.jar ./
+ADD ./target/exam.jar ./
 
 
-CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar smis.jar
+CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar exam.jar

+ 5 - 5
web/pom.xml

@@ -3,23 +3,23 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
     <parent>
-        <groupId>com.yntravelsky</groupId>
-        <artifactId>smis</artifactId>
+        <groupId>com.ynfy</groupId>
+        <artifactId>exam</artifactId>
         <version>3.4.4</version>
         <version>3.4.4</version>
     </parent>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.yntravelsky</groupId>
+    <groupId>com.ynfy</groupId>
     <artifactId>web</artifactId>
     <artifactId>web</artifactId>
 
 
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
-            <groupId>com.yntravelsky</groupId>
+            <groupId>com.ynfy</groupId>
             <artifactId>core</artifactId>
             <artifactId>core</artifactId>
         </dependency>
         </dependency>
 
 
         <!-- SYSTEM 系统管理模块 -->
         <!-- SYSTEM 系统管理模块 -->
         <dependency>
         <dependency>
-            <groupId>com.yntravelsky</groupId>
+            <groupId>com.ynfy</groupId>
             <artifactId>system-biz</artifactId>
             <artifactId>system-biz</artifactId>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>

+ 2 - 2
web/src/main/java/com/yntravelsky/Application.java → web/src/main/java/com/ynfy/Application.java

@@ -1,4 +1,4 @@
-package com.yntravelsky;
+package com.ynfy;
 
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
@@ -19,7 +19,7 @@ import java.net.UnknownHostException;
 */
 */
 @Slf4j
 @Slf4j
 @SpringBootApplication
 @SpringBootApplication
-@ComponentScan(basePackages = {"org.jeecg","com.yntravelsky"})
+@ComponentScan(basePackages = {"org.jeecg", "com.ynfy"})
 //@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
 //@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
 public class Application extends SpringBootServletInitializer {
 public class Application extends SpringBootServletInitializer {
 
 

+ 9 - 9
web/src/main/java/com/yntravelsky/buss/exam/exam/controller/ExamController.java → web/src/main/java/com/ynfy/buss/exam/exam/controller/ExamController.java

@@ -1,16 +1,16 @@
-package com.yntravelsky.buss.exam.exam.controller;
+package com.ynfy.buss.exam.exam.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yntravelsky.buss.exam.exam.dto.ExamSubmitDTO;
-import com.yntravelsky.buss.exam.exam.dto.QuestionTypeCountDTO;
-import com.yntravelsky.buss.exam.exam.entity.Exam;
-import com.yntravelsky.buss.exam.exam.service.IExamService;
-import com.yntravelsky.buss.exam.paperrulegroup.service.IPaperRuleGroupService;
-import com.yntravelsky.buss.exam.question.enums.QuestionType;
-import com.yntravelsky.buss.exam.userexam.entity.UserExam;
-import com.yntravelsky.buss.exam.userexam.service.IUserExamService;
+import com.ynfy.buss.exam.exam.dto.ExamSubmitDTO;
+import com.ynfy.buss.exam.exam.dto.QuestionTypeCountDTO;
+import com.ynfy.buss.exam.exam.entity.Exam;
+import com.ynfy.buss.exam.exam.service.IExamService;
+import com.ynfy.buss.exam.paperrulegroup.service.IPaperRuleGroupService;
+import com.ynfy.buss.exam.question.enums.QuestionType;
+import com.ynfy.buss.exam.userexam.entity.UserExam;
+import com.ynfy.buss.exam.userexam.service.IUserExamService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/exam/dto/AnswerCardDTO.java → web/src/main/java/com/ynfy/buss/exam/exam/dto/AnswerCardDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.exam.dto;
+package com.ynfy.buss.exam.exam.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/exam/dto/BlankAnswerResultDTO.java → web/src/main/java/com/ynfy/buss/exam/exam/dto/BlankAnswerResultDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.exam.dto;
+package com.ynfy.buss.exam.exam.dto;
 
 
 
 
 import lombok.Data;
 import lombok.Data;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/exam/dto/ExamAnswerDTO.java → web/src/main/java/com/ynfy/buss/exam/exam/dto/ExamAnswerDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.exam.dto;
+package com.ynfy.buss.exam.exam.dto;
 
 
 
 
 import lombok.Data;
 import lombok.Data;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/exam/dto/ExamSubmitDTO.java → web/src/main/java/com/ynfy/buss/exam/exam/dto/ExamSubmitDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.exam.dto;
+package com.ynfy.buss.exam.exam.dto;
 
 
 
 
 import lombok.Data;
 import lombok.Data;

+ 1 - 3
web/src/main/java/com/yntravelsky/buss/exam/exam/dto/QuestionTypeCountDTO.java → web/src/main/java/com/ynfy/buss/exam/exam/dto/QuestionTypeCountDTO.java

@@ -1,9 +1,7 @@
-package com.yntravelsky.buss.exam.exam.dto;
+package com.ynfy.buss.exam.exam.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
-import java.util.List;
-
 /**
 /**
  * 题型数量
  * 题型数量
  */
  */

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/exam/dto/UserExamDTO.java → web/src/main/java/com/ynfy/buss/exam/exam/dto/UserExamDTO.java

@@ -1,6 +1,6 @@
-package com.yntravelsky.buss.exam.exam.dto;
+package com.ynfy.buss.exam.exam.dto;
 
 
-import com.yntravelsky.buss.exam.userexam.entity.UserExam;
+import com.ynfy.buss.exam.userexam.entity.UserExam;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.List;
 import java.util.List;

+ 4 - 4
web/src/main/java/com/yntravelsky/buss/exam/exam/entity/Exam.java → web/src/main/java/com/ynfy/buss/exam/exam/entity/Exam.java

@@ -1,10 +1,10 @@
-package com.yntravelsky.buss.exam.exam.entity;
+package com.ynfy.buss.exam.exam.entity;
 
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yntravelsky.buss.exam.exam.dto.QuestionTypeCountDTO;
-import com.yntravelsky.buss.exam.exam.enums.ExamState;
-import com.yntravelsky.buss.exam.paper.entity.Paper;
+import com.ynfy.buss.exam.exam.dto.QuestionTypeCountDTO;
+import com.ynfy.buss.exam.exam.enums.ExamState;
+import com.ynfy.buss.exam.paper.entity.Paper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/exam/enums/ExamOpenType.java → web/src/main/java/com/ynfy/buss/exam/exam/enums/ExamOpenType.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.exam.enums;
+package com.ynfy.buss.exam.exam.enums;
 
 
 
 
 /**
 /**

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/exam/enums/ExamState.java → web/src/main/java/com/ynfy/buss/exam/exam/enums/ExamState.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.exam.enums;
+package com.ynfy.buss.exam.exam.enums;
 
 
 
 
 /**
 /**

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/exam/enums/PaperState.java → web/src/main/java/com/ynfy/buss/exam/exam/enums/PaperState.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.exam.enums;
+package com.ynfy.buss.exam.exam.enums;
 
 
 
 
 /**
 /**

+ 6 - 6
web/src/main/java/com/yntravelsky/buss/exam/exam/job/BreakExamJob.java → web/src/main/java/com/ynfy/buss/exam/exam/job/BreakExamJob.java

@@ -1,11 +1,11 @@
-package com.yntravelsky.buss.exam.exam.job;
+package com.ynfy.buss.exam.exam.job;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
-import com.yntravelsky.buss.exam.exam.dto.ExamSubmitDTO;
-import com.yntravelsky.buss.exam.exam.enums.PaperState;
-import com.yntravelsky.buss.exam.exam.service.IExamService;
-import com.yntravelsky.buss.exam.userexam.entity.UserExam;
-import com.yntravelsky.buss.exam.userexam.service.IUserExamService;
+import com.ynfy.buss.exam.exam.dto.ExamSubmitDTO;
+import com.ynfy.buss.exam.exam.enums.PaperState;
+import com.ynfy.buss.exam.exam.service.IExamService;
+import com.ynfy.buss.exam.userexam.entity.UserExam;
+import com.ynfy.buss.exam.userexam.service.IUserExamService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.quartz.Job;
 import org.quartz.Job;

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/job/ExamStatisticsJob.java → web/src/main/java/com/ynfy/buss/exam/exam/job/ExamStatisticsJob.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.job;
+package com.ynfy.buss.exam.exam.job;
 
 
-import com.yntravelsky.buss.exam.exam.service.IExamService;
-import com.yntravelsky.buss.exam.examstatistics.service.IExamStatisticsService;
+import com.ynfy.buss.exam.exam.service.IExamService;
+import com.ynfy.buss.exam.examstatistics.service.IExamStatisticsService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionContext;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/exam/mapper/ExamMapper.java → web/src/main/java/com/ynfy/buss/exam/exam/mapper/ExamMapper.java

@@ -1,8 +1,8 @@
-package com.yntravelsky.buss.exam.exam.mapper;
+package com.ynfy.buss.exam.exam.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yntravelsky.buss.exam.exam.entity.Exam;
+import com.ynfy.buss.exam.exam.entity.Exam;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 
 

+ 4 - 4
web/src/main/java/com/yntravelsky/buss/exam/exam/mapper/xml/ExamMapper.xml → web/src/main/java/com/ynfy/buss/exam/exam/mapper/xml/ExamMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yntravelsky.buss.exam.exam.mapper.ExamMapper">
+<mapper namespace="com.ynfy.buss.exam.exam.mapper.ExamMapper">
     <select id="detail" resultMap="examMap">
     <select id="detail" resultMap="examMap">
         SELECT
         SELECT
                 e.id,
                 e.id,
@@ -38,7 +38,7 @@
         </where>
         </where>
     </select>
     </select>
 
 
-    <resultMap id="examMap" type="com.yntravelsky.buss.exam.exam.entity.Exam">
+    <resultMap id="examMap" type="com.ynfy.buss.exam.exam.entity.Exam">
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="title" property="title" jdbcType="VARCHAR"/>
         <result column="title" property="title" jdbcType="VARCHAR"/>
         <result column="open_type" property="openType" jdbcType="INTEGER"/>
         <result column="open_type" property="openType" jdbcType="INTEGER"/>
@@ -58,7 +58,7 @@
         <result column="reviewer" property="reviewer" jdbcType="VARCHAR"/>
         <result column="reviewer" property="reviewer" jdbcType="VARCHAR"/>
         <result column="reviewer_type" property="reviewerType" jdbcType="INTEGER"/>
         <result column="reviewer_type" property="reviewerType" jdbcType="INTEGER"/>
 
 
-        <association property="paper" javaType="com.yntravelsky.buss.exam.paper.entity.Paper">
+        <association property="paper" javaType="com.ynfy.buss.exam.paper.entity.Paper">
             <id column="paper_id" property="id" jdbcType="VARCHAR"/>
             <id column="paper_id" property="id" jdbcType="VARCHAR"/>
             <result column="paperName" property="title" jdbcType="VARCHAR"/>
             <result column="paperName" property="title" jdbcType="VARCHAR"/>
             <result column="total_score" property="totalScore" jdbcType="VARCHAR"/>
             <result column="total_score" property="totalScore" jdbcType="VARCHAR"/>
@@ -70,7 +70,7 @@
         </association>
         </association>
     </resultMap>
     </resultMap>
 
 
-    <select id="selectExamList"  resultType="com.yntravelsky.buss.exam.exam.entity.Exam">
+    <select id="selectExamList"  resultType="com.ynfy.buss.exam.exam.entity.Exam">
         SELECT
         SELECT
                tmp.*
                tmp.*
         FROM
         FROM

+ 5 - 5
web/src/main/java/com/yntravelsky/buss/exam/exam/service/IExamService.java → web/src/main/java/com/ynfy/buss/exam/exam/service/IExamService.java

@@ -1,11 +1,11 @@
-package com.yntravelsky.buss.exam.exam.service;
+package com.ynfy.buss.exam.exam.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.exam.dto.ExamSubmitDTO;
-import com.yntravelsky.buss.exam.exam.dto.UserExamDTO;
-import com.yntravelsky.buss.exam.exam.entity.Exam;
-import com.yntravelsky.buss.exam.userexam.entity.UserExam;
+import com.ynfy.buss.exam.exam.dto.ExamSubmitDTO;
+import com.ynfy.buss.exam.exam.dto.UserExamDTO;
+import com.ynfy.buss.exam.exam.entity.Exam;
+import com.ynfy.buss.exam.userexam.entity.UserExam;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 29 - 30
web/src/main/java/com/yntravelsky/buss/exam/exam/service/impl/ExamServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/exam/service/impl/ExamServiceImpl.java

@@ -1,6 +1,5 @@
-package com.yntravelsky.buss.exam.exam.service.impl;
+package com.ynfy.buss.exam.exam.service.impl;
 
 
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
@@ -10,34 +9,34 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.exam.dto.*;
-import com.yntravelsky.buss.exam.exam.entity.Exam;
-import com.yntravelsky.buss.exam.exam.enums.ExamState;
-import com.yntravelsky.buss.exam.exam.enums.PaperState;
-import com.yntravelsky.buss.exam.exam.mapper.ExamMapper;
-import com.yntravelsky.buss.exam.exam.service.IExamService;
-import com.yntravelsky.buss.exam.job.BreakExamJob;
-import com.yntravelsky.buss.exam.paper.enmus.JoinType;
-import com.yntravelsky.buss.exam.paper.entity.Paper;
-import com.yntravelsky.buss.exam.paper.service.IPaperService;
-import com.yntravelsky.buss.exam.paperquestion.entity.PaperQuestion;
-import com.yntravelsky.buss.exam.paperquestion.service.IPaperQuestionService;
-import com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup;
-import com.yntravelsky.buss.exam.paperrulegroup.service.IPaperRuleGroupService;
-import com.yntravelsky.buss.exam.question.entity.Question;
-import com.yntravelsky.buss.exam.question.enums.QuestionType;
-import com.yntravelsky.buss.exam.question.service.IQuestionService;
-import com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer;
-import com.yntravelsky.buss.exam.userexam.entity.UserExam;
-import com.yntravelsky.buss.exam.userexam.service.IUserExamService;
-import com.yntravelsky.buss.exam.userexamquestion.entity.UserExamQuestion;
-import com.yntravelsky.buss.exam.userexamquestion.service.IUserExamQuestionService;
-import com.yntravelsky.buss.exam.userexamquestionanswer.entity.UserExamQuestionAnswer;
-import com.yntravelsky.buss.exam.userexamquestionanswer.service.IUserExamQuestionAnswerService;
-import com.yntravelsky.buss.exam.userexamresult.service.IUserExamResultService;
-import com.yntravelsky.common.utils.CharUtil;
-import com.yntravelsky.common.utils.CronUtils;
-import com.yntravelsky.common.utils.ThreadPoolUtil;
+import com.ynfy.buss.exam.exam.dto.*;
+import com.ynfy.buss.exam.exam.entity.Exam;
+import com.ynfy.buss.exam.exam.enums.ExamState;
+import com.ynfy.buss.exam.exam.enums.PaperState;
+import com.ynfy.buss.exam.exam.mapper.ExamMapper;
+import com.ynfy.buss.exam.exam.service.IExamService;
+import com.ynfy.buss.exam.job.BreakExamJob;
+import com.ynfy.buss.exam.paper.enmus.JoinType;
+import com.ynfy.buss.exam.paper.entity.Paper;
+import com.ynfy.buss.exam.paper.service.IPaperService;
+import com.ynfy.buss.exam.paperquestion.entity.PaperQuestion;
+import com.ynfy.buss.exam.paperquestion.service.IPaperQuestionService;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import com.ynfy.buss.exam.paperrulegroup.service.IPaperRuleGroupService;
+import com.ynfy.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.question.enums.QuestionType;
+import com.ynfy.buss.exam.question.service.IQuestionService;
+import com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer;
+import com.ynfy.buss.exam.userexam.entity.UserExam;
+import com.ynfy.buss.exam.userexam.service.IUserExamService;
+import com.ynfy.buss.exam.userexamquestion.entity.UserExamQuestion;
+import com.ynfy.buss.exam.userexamquestion.service.IUserExamQuestionService;
+import com.ynfy.buss.exam.userexamquestionanswer.entity.UserExamQuestionAnswer;
+import com.ynfy.buss.exam.userexamquestionanswer.service.IUserExamQuestionAnswerService;
+import com.ynfy.buss.exam.userexamresult.service.IUserExamResultService;
+import com.ynfy.common.utils.CharUtil;
+import com.ynfy.common.utils.CronUtils;
+import com.ynfy.common.utils.ThreadPoolUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;

+ 4 - 4
web/src/main/java/com/yntravelsky/buss/exam/examreview/controller/ExamReviewController.java → web/src/main/java/com/ynfy/buss/exam/examreview/controller/ExamReviewController.java

@@ -1,10 +1,10 @@
-package com.yntravelsky.buss.exam.examreview.controller;
+package com.ynfy.buss.exam.examreview.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yntravelsky.buss.exam.examreview.dto.PreviewSubmitDTO;
-import com.yntravelsky.buss.exam.examreview.entity.ExamReview;
-import com.yntravelsky.buss.exam.examreview.service.IExamReviewService;
+import com.ynfy.buss.exam.examreview.dto.PreviewSubmitDTO;
+import com.ynfy.buss.exam.examreview.entity.ExamReview;
+import com.ynfy.buss.exam.examreview.service.IExamReviewService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/examreview/dto/ExamPreviewDTO.java → web/src/main/java/com/ynfy/buss/exam/examreview/dto/ExamPreviewDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.examreview.dto;
+package com.ynfy.buss.exam.examreview.dto;
 
 
 
 
 import lombok.Data;
 import lombok.Data;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/examreview/dto/PreviewSubmitDTO.java → web/src/main/java/com/ynfy/buss/exam/examreview/dto/PreviewSubmitDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.examreview.dto;
+package com.ynfy.buss.exam.examreview.dto;
 
 
 
 
 import lombok.Data;
 import lombok.Data;

+ 1 - 3
web/src/main/java/com/yntravelsky/buss/exam/examreview/entity/ExamReview.java → web/src/main/java/com/ynfy/buss/exam/examreview/entity/ExamReview.java

@@ -1,7 +1,5 @@
-package com.yntravelsky.buss.exam.examreview.entity;
+package com.ynfy.buss.exam.examreview.entity;
 
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/examreview/mapper/ExamReviewMapper.java → web/src/main/java/com/ynfy/buss/exam/examreview/mapper/ExamReviewMapper.java

@@ -1,8 +1,8 @@
-package com.yntravelsky.buss.exam.examreview.mapper;
+package com.ynfy.buss.exam.examreview.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yntravelsky.buss.exam.examreview.entity.ExamReview;
+import com.ynfy.buss.exam.examreview.entity.ExamReview;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 
 

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/examreview/mapper/xml/ExamReviewMapper.xml → web/src/main/java/com/ynfy/buss/exam/examreview/mapper/xml/ExamReviewMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yntravelsky.buss.exam.examreview.mapper.ExamReviewMapper">
-    <select id="selectPageList"  resultType="com.yntravelsky.buss.exam.examreview.entity.ExamReview">
+<mapper namespace="com.ynfy.buss.exam.examreview.mapper.ExamReviewMapper">
+    <select id="selectPageList"  resultType="com.ynfy.buss.exam.examreview.entity.ExamReview">
         SELECT
         SELECT
                 er.*
                 er.*
         FROM
         FROM
@@ -29,7 +29,7 @@
         </where>
         </where>
     </select>
     </select>
 
 
-    <select id="calcReview" resultType="com.yntravelsky.buss.exam.examreview.entity.ExamReview">
+    <select id="calcReview" resultType="com.ynfy.buss.exam.examreview.entity.ExamReview">
         SELECT
         SELECT
             em.ID as id,
             em.ID as id,
             em.title,
             em.title,

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/examreview/service/IExamReviewService.java → web/src/main/java/com/ynfy/buss/exam/examreview/service/IExamReviewService.java

@@ -1,9 +1,9 @@
-package com.yntravelsky.buss.exam.examreview.service;
+package com.ynfy.buss.exam.examreview.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.examreview.dto.PreviewSubmitDTO;
-import com.yntravelsky.buss.exam.examreview.entity.ExamReview;
+import com.ynfy.buss.exam.examreview.dto.PreviewSubmitDTO;
+import com.ynfy.buss.exam.examreview.entity.ExamReview;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 
 
 import java.util.List;
 import java.util.List;

+ 13 - 13
web/src/main/java/com/yntravelsky/buss/exam/examreview/service/impl/ExamReviewServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/examreview/service/impl/ExamReviewServiceImpl.java

@@ -1,20 +1,20 @@
-package com.yntravelsky.buss.exam.examreview.service.impl;
+package com.ynfy.buss.exam.examreview.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.exam.enums.PaperState;
-import com.yntravelsky.buss.exam.examreview.dto.ExamPreviewDTO;
-import com.yntravelsky.buss.exam.examreview.dto.PreviewSubmitDTO;
-import com.yntravelsky.buss.exam.examreview.entity.ExamReview;
-import com.yntravelsky.buss.exam.examreview.mapper.ExamReviewMapper;
-import com.yntravelsky.buss.exam.examreview.service.IExamReviewService;
-import com.yntravelsky.buss.exam.question.enums.QuestionType;
-import com.yntravelsky.buss.exam.userexam.entity.UserExam;
-import com.yntravelsky.buss.exam.userexam.service.IUserExamService;
-import com.yntravelsky.buss.exam.userexamquestion.entity.UserExamQuestion;
-import com.yntravelsky.buss.exam.userexamquestion.service.IUserExamQuestionService;
-import com.yntravelsky.buss.exam.userexamresult.service.IUserExamResultService;
+import com.ynfy.buss.exam.exam.enums.PaperState;
+import com.ynfy.buss.exam.examreview.dto.ExamPreviewDTO;
+import com.ynfy.buss.exam.examreview.dto.PreviewSubmitDTO;
+import com.ynfy.buss.exam.examreview.entity.ExamReview;
+import com.ynfy.buss.exam.examreview.mapper.ExamReviewMapper;
+import com.ynfy.buss.exam.examreview.service.IExamReviewService;
+import com.ynfy.buss.exam.question.enums.QuestionType;
+import com.ynfy.buss.exam.userexam.entity.UserExam;
+import com.ynfy.buss.exam.userexam.service.IUserExamService;
+import com.ynfy.buss.exam.userexamquestion.entity.UserExamQuestion;
+import com.ynfy.buss.exam.userexamquestion.service.IUserExamQuestionService;
+import com.ynfy.buss.exam.userexamresult.service.IUserExamResultService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.exception.JeecgBootException;

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/examstatistics/controller/ExamStatisticsController.java → web/src/main/java/com/ynfy/buss/exam/examstatistics/controller/ExamStatisticsController.java

@@ -1,10 +1,10 @@
-package com.yntravelsky.buss.exam.examstatistics.controller;
+package com.ynfy.buss.exam.examstatistics.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yntravelsky.buss.exam.examstatistics.entity.ExamStatistics;
-import com.yntravelsky.buss.exam.examstatistics.service.IExamStatisticsService;
+import com.ynfy.buss.exam.examstatistics.entity.ExamStatistics;
+import com.ynfy.buss.exam.examstatistics.service.IExamStatisticsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/examstatistics/dto/ExamStatisticsDTO.java → web/src/main/java/com/ynfy/buss/exam/examstatistics/dto/ExamStatisticsDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.examstatistics.dto;
+package com.ynfy.buss.exam.examstatistics.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.aspect.annotation.Dict;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/examstatistics/entity/ExamStatistics.java → web/src/main/java/com/ynfy/buss/exam/examstatistics/entity/ExamStatistics.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.examstatistics.entity;
+package com.ynfy.buss.exam.examstatistics.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/examstatistics/mapper/ExamStatisticsMapper.java → web/src/main/java/com/ynfy/buss/exam/examstatistics/mapper/ExamStatisticsMapper.java

@@ -1,8 +1,8 @@
-package com.yntravelsky.buss.exam.examstatistics.mapper;
+package com.ynfy.buss.exam.examstatistics.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yntravelsky.buss.exam.examstatistics.dto.ExamStatisticsDTO;
-import com.yntravelsky.buss.exam.examstatistics.entity.ExamStatistics;
+import com.ynfy.buss.exam.examstatistics.dto.ExamStatisticsDTO;
+import com.ynfy.buss.exam.examstatistics.entity.ExamStatistics;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/examstatistics/mapper/xml/ExamStatisticsMapper.xml → web/src/main/java/com/ynfy/buss/exam/examstatistics/mapper/xml/ExamStatisticsMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yntravelsky.buss.exam.examstatistics.mapper.ExamStatisticsMapper">
-    <resultMap id="examDimensionMap" type="com.yntravelsky.buss.exam.examstatistics.dto.ExamStatisticsDTO">
+<mapper namespace="com.ynfy.buss.exam.examstatistics.mapper.ExamStatisticsMapper">
+    <resultMap id="examDimensionMap" type="com.ynfy.buss.exam.examstatistics.dto.ExamStatisticsDTO">
         <id column="id" property="userExamId" jdbcType="VARCHAR"/>
         <id column="id" property="userExamId" jdbcType="VARCHAR"/>
         <result column="user_id" property="userId" jdbcType="VARCHAR"/>
         <result column="user_id" property="userId" jdbcType="VARCHAR"/>
         <result column="username" property="username" jdbcType="VARCHAR"/>
         <result column="username" property="username" jdbcType="VARCHAR"/>

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/examstatistics/service/IExamStatisticsService.java → web/src/main/java/com/ynfy/buss/exam/examstatistics/service/IExamStatisticsService.java

@@ -1,8 +1,8 @@
-package com.yntravelsky.buss.exam.examstatistics.service;
+package com.ynfy.buss.exam.examstatistics.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.examstatistics.dto.ExamStatisticsDTO;
-import com.yntravelsky.buss.exam.examstatistics.entity.ExamStatistics;
+import com.ynfy.buss.exam.examstatistics.dto.ExamStatisticsDTO;
+import com.ynfy.buss.exam.examstatistics.entity.ExamStatistics;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 12 - 12
web/src/main/java/com/yntravelsky/buss/exam/examstatistics/service/impl/ExamStatisticsServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/examstatistics/service/impl/ExamStatisticsServiceImpl.java

@@ -1,19 +1,19 @@
-package com.yntravelsky.buss.exam.examstatistics.service.impl;
+package com.ynfy.buss.exam.examstatistics.service.impl;
 
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.exam.entity.Exam;
-import com.yntravelsky.buss.exam.exam.enums.ExamOpenType;
-import com.yntravelsky.buss.exam.exam.service.IExamService;
-import com.yntravelsky.buss.exam.examstatistics.dto.ExamStatisticsDTO;
-import com.yntravelsky.buss.exam.examstatistics.entity.ExamStatistics;
-import com.yntravelsky.buss.exam.examstatistics.mapper.ExamStatisticsMapper;
-import com.yntravelsky.buss.exam.examstatistics.service.IExamStatisticsService;
-import com.yntravelsky.buss.exam.examuserstatistics.entity.ExamUserStatistics;
-import com.yntravelsky.buss.exam.examuserstatistics.service.IExamUserStatisticsService;
-import com.yntravelsky.buss.exam.userexamquestion.entity.UserExamQuestion;
-import com.yntravelsky.buss.exam.userexamquestion.service.IUserExamQuestionService;
+import com.ynfy.buss.exam.exam.entity.Exam;
+import com.ynfy.buss.exam.exam.enums.ExamOpenType;
+import com.ynfy.buss.exam.exam.service.IExamService;
+import com.ynfy.buss.exam.examstatistics.dto.ExamStatisticsDTO;
+import com.ynfy.buss.exam.examstatistics.entity.ExamStatistics;
+import com.ynfy.buss.exam.examstatistics.mapper.ExamStatisticsMapper;
+import com.ynfy.buss.exam.examstatistics.service.IExamStatisticsService;
+import com.ynfy.buss.exam.examuserstatistics.entity.ExamUserStatistics;
+import com.ynfy.buss.exam.examuserstatistics.service.IExamUserStatisticsService;
+import com.ynfy.buss.exam.userexamquestion.entity.UserExamQuestion;
+import com.ynfy.buss.exam.userexamquestion.service.IUserExamQuestionService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.service.ISysUserService;

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/examuserstatistics/controller/ExamUserStatisticsController.java → web/src/main/java/com/ynfy/buss/exam/examuserstatistics/controller/ExamUserStatisticsController.java

@@ -1,10 +1,10 @@
-package com.yntravelsky.buss.exam.examuserstatistics.controller;
+package com.ynfy.buss.exam.examuserstatistics.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yntravelsky.buss.exam.examuserstatistics.entity.ExamUserStatistics;
-import com.yntravelsky.buss.exam.examuserstatistics.service.IExamUserStatisticsService;
+import com.ynfy.buss.exam.examuserstatistics.entity.ExamUserStatistics;
+import com.ynfy.buss.exam.examuserstatistics.service.IExamUserStatisticsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/examuserstatistics/entity/ExamUserStatistics.java → web/src/main/java/com/ynfy/buss/exam/examuserstatistics/entity/ExamUserStatistics.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.examuserstatistics.entity;
+package com.ynfy.buss.exam.examuserstatistics.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/examuserstatistics/mapper/ExamUserStatisticsMapper.java → web/src/main/java/com/ynfy/buss/exam/examuserstatistics/mapper/ExamUserStatisticsMapper.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.examuserstatistics.mapper;
+package com.ynfy.buss.exam.examuserstatistics.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yntravelsky.buss.exam.examuserstatistics.entity.ExamUserStatistics;
+import com.ynfy.buss.exam.examuserstatistics.entity.ExamUserStatistics;
 
 
 /**
 /**
  * @Description: 考试用户统计
  * @Description: 考试用户统计

+ 5 - 0
web/src/main/java/com/ynfy/buss/exam/examuserstatistics/mapper/xml/ExamUserStatisticsMapper.xml

@@ -0,0 +1,5 @@
+<?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.ynfy.buss.exam.examuserstatistics.mapper.ExamUserStatisticsMapper">
+
+</mapper>

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/examuserstatistics/service/IExamUserStatisticsService.java → web/src/main/java/com/ynfy/buss/exam/examuserstatistics/service/IExamUserStatisticsService.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.examuserstatistics.service;
+package com.ynfy.buss.exam.examuserstatistics.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.examuserstatistics.entity.ExamUserStatistics;
+import com.ynfy.buss.exam.examuserstatistics.entity.ExamUserStatistics;
 
 
 /**
 /**
  * @Description: 考试用户统计
  * @Description: 考试用户统计

+ 4 - 4
web/src/main/java/com/yntravelsky/buss/exam/examuserstatistics/service/impl/ExamUserStatisticsServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/examuserstatistics/service/impl/ExamUserStatisticsServiceImpl.java

@@ -1,10 +1,10 @@
-package com.yntravelsky.buss.exam.examuserstatistics.service.impl;
+package com.ynfy.buss.exam.examuserstatistics.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.examuserstatistics.entity.ExamUserStatistics;
-import com.yntravelsky.buss.exam.examuserstatistics.mapper.ExamUserStatisticsMapper;
-import com.yntravelsky.buss.exam.examuserstatistics.service.IExamUserStatisticsService;
+import com.ynfy.buss.exam.examuserstatistics.entity.ExamUserStatistics;
+import com.ynfy.buss.exam.examuserstatistics.mapper.ExamUserStatisticsMapper;
+import com.ynfy.buss.exam.examuserstatistics.service.IExamUserStatisticsService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 /**
 /**

+ 6 - 6
web/src/main/java/com/yntravelsky/buss/exam/job/BreakExamJob.java → web/src/main/java/com/ynfy/buss/exam/job/BreakExamJob.java

@@ -1,11 +1,11 @@
-package com.yntravelsky.buss.exam.job;
+package com.ynfy.buss.exam.job;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
-import com.yntravelsky.buss.exam.exam.dto.ExamSubmitDTO;
-import com.yntravelsky.buss.exam.exam.enums.PaperState;
-import com.yntravelsky.buss.exam.exam.service.IExamService;
-import com.yntravelsky.buss.exam.userexam.entity.UserExam;
-import com.yntravelsky.buss.exam.userexam.service.IUserExamService;
+import com.ynfy.buss.exam.exam.dto.ExamSubmitDTO;
+import com.ynfy.buss.exam.exam.enums.PaperState;
+import com.ynfy.buss.exam.exam.service.IExamService;
+import com.ynfy.buss.exam.userexam.entity.UserExam;
+import com.ynfy.buss.exam.userexam.service.IUserExamService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.quartz.Job;
 import org.quartz.Job;

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/exam/job/ExamStatisticsJob.java → web/src/main/java/com/ynfy/buss/exam/job/ExamStatisticsJob.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.exam.job;
+package com.ynfy.buss.exam.job;
 
 
-import com.yntravelsky.buss.exam.exam.service.IExamService;
-import com.yntravelsky.buss.exam.examstatistics.service.IExamStatisticsService;
+import com.ynfy.buss.exam.exam.service.IExamService;
+import com.ynfy.buss.exam.examstatistics.service.IExamStatisticsService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionContext;

+ 5 - 5
web/src/main/java/com/yntravelsky/buss/exam/paper/controller/PaperController.java → web/src/main/java/com/ynfy/buss/exam/paper/controller/PaperController.java

@@ -1,12 +1,12 @@
-package com.yntravelsky.buss.exam.paper.controller;
+package com.ynfy.buss.exam.paper.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yntravelsky.buss.exam.exam.service.IExamService;
-import com.yntravelsky.buss.exam.paper.dto.PaperDTO;
-import com.yntravelsky.buss.exam.paper.entity.Paper;
-import com.yntravelsky.buss.exam.paper.service.IPaperService;
+import com.ynfy.buss.exam.exam.service.IExamService;
+import com.ynfy.buss.exam.paper.dto.PaperDTO;
+import com.ynfy.buss.exam.paper.entity.Paper;
+import com.ynfy.buss.exam.paper.service.IPaperService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

+ 13 - 0
web/src/main/java/com/ynfy/buss/exam/paper/dto/PaperDTO.java

@@ -0,0 +1,13 @@
+package com.ynfy.buss.exam.paper.dto;
+
+import com.ynfy.buss.exam.paper.entity.Paper;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PaperDTO extends Paper {
+
+    public List<PaperRuleGroup> groupList;
+}

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/paper/enmus/JoinType.java → web/src/main/java/com/ynfy/buss/exam/paper/enmus/JoinType.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.paper.enmus;
+package com.ynfy.buss.exam.paper.enmus;
 
 
 /**
 /**
  * 组卷方式
  * 组卷方式

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/paper/enmus/LevelType.java → web/src/main/java/com/ynfy/buss/exam/paper/enmus/LevelType.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.paper.enmus;
+package com.ynfy.buss.exam.paper.enmus;
 
 
 
 
 /**
 /**

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/paper/entity/Paper.java → web/src/main/java/com/ynfy/buss/exam/paper/entity/Paper.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.paper.entity;
+package com.ynfy.buss.exam.paper.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/paper/mapper/PaperMapper.java → web/src/main/java/com/ynfy/buss/exam/paper/mapper/PaperMapper.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.paper.mapper;
+package com.ynfy.buss.exam.paper.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yntravelsky.buss.exam.paper.entity.Paper;
+import com.ynfy.buss.exam.paper.entity.Paper;
 
 
 /**
 /**
  * @Description: paper
  * @Description: paper

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/paper/mapper/xml/PaperMapper.xml → web/src/main/java/com/ynfy/buss/exam/paper/mapper/xml/PaperMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yntravelsky.buss.exam.paper.mapper.PaperMapper">
+<mapper namespace="com.ynfy.buss.exam.paper.mapper.PaperMapper">
 
 
 </mapper>
 </mapper>

+ 4 - 4
web/src/main/java/com/yntravelsky/buss/exam/paper/service/IPaperService.java → web/src/main/java/com/ynfy/buss/exam/paper/service/IPaperService.java

@@ -1,9 +1,9 @@
-package com.yntravelsky.buss.exam.paper.service;
+package com.ynfy.buss.exam.paper.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.paper.dto.PaperDTO;
-import com.yntravelsky.buss.exam.paper.entity.Paper;
-import com.yntravelsky.buss.exam.paperquestion.entity.PaperQuestion;
+import com.ynfy.buss.exam.paper.dto.PaperDTO;
+import com.ynfy.buss.exam.paper.entity.Paper;
+import com.ynfy.buss.exam.paperquestion.entity.PaperQuestion;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 22 - 22
web/src/main/java/com/yntravelsky/buss/exam/paper/service/impl/PaperServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/paper/service/impl/PaperServiceImpl.java

@@ -1,27 +1,27 @@
-package com.yntravelsky.buss.exam.paper.service.impl;
+package com.ynfy.buss.exam.paper.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.paper.dto.PaperDTO;
-import com.yntravelsky.buss.exam.paper.enmus.JoinType;
-import com.yntravelsky.buss.exam.paper.enmus.LevelType;
-import com.yntravelsky.buss.exam.paper.entity.Paper;
-import com.yntravelsky.buss.exam.paper.mapper.PaperMapper;
-import com.yntravelsky.buss.exam.paper.service.IPaperService;
-import com.yntravelsky.buss.exam.paperquestion.entity.PaperQuestion;
-import com.yntravelsky.buss.exam.paperquestion.service.IPaperQuestionService;
-import com.yntravelsky.buss.exam.paperquestionanswer.entity.PaperQuestionAnswer;
-import com.yntravelsky.buss.exam.paperquestionanswer.service.IPaperQuestionAnswerService;
-import com.yntravelsky.buss.exam.paperruledetail.entity.PaperRuleDetail;
-import com.yntravelsky.buss.exam.paperruledetail.service.IPaperRuleDetailService;
-import com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup;
-import com.yntravelsky.buss.exam.paperrulegroup.service.IPaperRuleGroupService;
-import com.yntravelsky.buss.exam.question.dto.QuestionConditionDTO;
-import com.yntravelsky.buss.exam.question.entity.Question;
-import com.yntravelsky.buss.exam.question.enums.QuestionType;
-import com.yntravelsky.buss.exam.question.service.IQuestionService;
-import com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer;
-import com.yntravelsky.buss.exam.repository.service.IRepositoryService;
-import com.yntravelsky.common.utils.ThreadPoolUtil;
+import com.ynfy.buss.exam.paper.dto.PaperDTO;
+import com.ynfy.buss.exam.paper.enmus.JoinType;
+import com.ynfy.buss.exam.paper.enmus.LevelType;
+import com.ynfy.buss.exam.paper.entity.Paper;
+import com.ynfy.buss.exam.paper.mapper.PaperMapper;
+import com.ynfy.buss.exam.paper.service.IPaperService;
+import com.ynfy.buss.exam.paperquestion.entity.PaperQuestion;
+import com.ynfy.buss.exam.paperquestion.service.IPaperQuestionService;
+import com.ynfy.buss.exam.paperquestionanswer.entity.PaperQuestionAnswer;
+import com.ynfy.buss.exam.paperquestionanswer.service.IPaperQuestionAnswerService;
+import com.ynfy.buss.exam.paperruledetail.entity.PaperRuleDetail;
+import com.ynfy.buss.exam.paperruledetail.service.IPaperRuleDetailService;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import com.ynfy.buss.exam.paperrulegroup.service.IPaperRuleGroupService;
+import com.ynfy.buss.exam.question.dto.QuestionConditionDTO;
+import com.ynfy.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.question.enums.QuestionType;
+import com.ynfy.buss.exam.question.service.IQuestionService;
+import com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer;
+import com.ynfy.buss.exam.repository.service.IRepositoryService;
+import com.ynfy.common.utils.ThreadPoolUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.exception.JeecgBootException;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/paperquestion/entity/PaperQuestion.java → web/src/main/java/com/ynfy/buss/exam/paperquestion/entity/PaperQuestion.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.paperquestion.entity;
+package com.ynfy.buss.exam.paperquestion.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/paperquestion/mapper/PaperQuestionMapper.java → web/src/main/java/com/ynfy/buss/exam/paperquestion/mapper/PaperQuestionMapper.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.paperquestion.mapper;
+package com.ynfy.buss.exam.paperquestion.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yntravelsky.buss.exam.paperquestion.entity.PaperQuestion;
+import com.ynfy.buss.exam.paperquestion.entity.PaperQuestion;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/paperquestion/mapper/xml/PaperQuestionMapper.xml → web/src/main/java/com/ynfy/buss/exam/paperquestion/mapper/xml/PaperQuestionMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yntravelsky.buss.exam.paperquestion.mapper.PaperQuestionMapper">
-    <select id="listByPaperId" resultType="com.yntravelsky.buss.exam.paperquestion.entity.PaperQuestion">
+<mapper namespace="com.ynfy.buss.exam.paperquestion.mapper.PaperQuestionMapper">
+    <select id="listByPaperId" resultType="com.ynfy.buss.exam.paperquestion.entity.PaperQuestion">
         SELECT
         SELECT
             pq.*
             pq.*
         FROM
         FROM

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/paperquestion/service/IPaperQuestionService.java → web/src/main/java/com/ynfy/buss/exam/paperquestion/service/IPaperQuestionService.java

@@ -1,8 +1,8 @@
-package com.yntravelsky.buss.exam.paperquestion.service;
+package com.ynfy.buss.exam.paperquestion.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.paperquestion.entity.PaperQuestion;
-import com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import com.ynfy.buss.exam.paperquestion.entity.PaperQuestion;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 9 - 9
web/src/main/java/com/yntravelsky/buss/exam/paperquestion/service/impl/PaperQuestionServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/paperquestion/service/impl/PaperQuestionServiceImpl.java

@@ -1,16 +1,16 @@
-package com.yntravelsky.buss.exam.paperquestion.service.impl;
+package com.ynfy.buss.exam.paperquestion.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.paperquestion.entity.PaperQuestion;
-import com.yntravelsky.buss.exam.paperquestion.mapper.PaperQuestionMapper;
-import com.yntravelsky.buss.exam.paperquestion.service.IPaperQuestionService;
-import com.yntravelsky.buss.exam.paperquestionanswer.service.IPaperQuestionAnswerService;
-import com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup;
-import com.yntravelsky.buss.exam.question.entity.Question;
-import com.yntravelsky.buss.exam.question.enums.QuestionType;
-import com.yntravelsky.buss.exam.userexamquestion.service.IUserExamQuestionService;
+import com.ynfy.buss.exam.paperquestion.entity.PaperQuestion;
+import com.ynfy.buss.exam.paperquestion.mapper.PaperQuestionMapper;
+import com.ynfy.buss.exam.paperquestion.service.IPaperQuestionService;
+import com.ynfy.buss.exam.paperquestionanswer.service.IPaperQuestionAnswerService;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import com.ynfy.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.question.enums.QuestionType;
+import com.ynfy.buss.exam.userexamquestion.service.IUserExamQuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;

+ 1 - 8
web/src/main/java/com/yntravelsky/buss/exam/paperquestionanswer/entity/PaperQuestionAnswer.java → web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/entity/PaperQuestionAnswer.java

@@ -1,19 +1,12 @@
-package com.yntravelsky.buss.exam.paperquestionanswer.entity;
+package com.ynfy.buss.exam.paperquestionanswer.entity;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/paperquestionanswer/mapper/PaperQuestionAnswerMapper.java → web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/mapper/PaperQuestionAnswerMapper.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.paperquestionanswer.mapper;
+package com.ynfy.buss.exam.paperquestionanswer.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yntravelsky.buss.exam.paperquestionanswer.entity.PaperQuestionAnswer;
+import com.ynfy.buss.exam.paperquestionanswer.entity.PaperQuestionAnswer;
 
 
 /**
 /**
  * @Description: 试卷试题答案
  * @Description: 试卷试题答案

+ 5 - 0
web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/mapper/xml/PaperQuestionAnswerMapper.xml

@@ -0,0 +1,5 @@
+<?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.ynfy.buss.exam.paperquestionanswer.mapper.PaperQuestionAnswerMapper">
+
+</mapper>

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/paperquestionanswer/service/IPaperQuestionAnswerService.java → web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/service/IPaperQuestionAnswerService.java

@@ -1,8 +1,8 @@
-package com.yntravelsky.buss.exam.paperquestionanswer.service;
+package com.ynfy.buss.exam.paperquestionanswer.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.paperquestionanswer.entity.PaperQuestionAnswer;
-import com.yntravelsky.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.paperquestionanswer.entity.PaperQuestionAnswer;
+import com.ynfy.buss.exam.question.entity.Question;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 6 - 6
web/src/main/java/com/yntravelsky/buss/exam/paperquestionanswer/service/impl/PaperQuestionAnswerServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/paperquestionanswer/service/impl/PaperQuestionAnswerServiceImpl.java

@@ -1,12 +1,12 @@
-package com.yntravelsky.buss.exam.paperquestionanswer.service.impl;
+package com.ynfy.buss.exam.paperquestionanswer.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.paperquestionanswer.entity.PaperQuestionAnswer;
-import com.yntravelsky.buss.exam.paperquestionanswer.mapper.PaperQuestionAnswerMapper;
-import com.yntravelsky.buss.exam.paperquestionanswer.service.IPaperQuestionAnswerService;
-import com.yntravelsky.buss.exam.question.entity.Question;
-import com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer;
+import com.ynfy.buss.exam.paperquestionanswer.entity.PaperQuestionAnswer;
+import com.ynfy.buss.exam.paperquestionanswer.mapper.PaperQuestionAnswerMapper;
+import com.ynfy.buss.exam.paperquestionanswer.service.IPaperQuestionAnswerService;
+import com.ynfy.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/paperruledetail/dto/RuleDetailDTO.java → web/src/main/java/com/ynfy/buss/exam/paperruledetail/dto/RuleDetailDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.paperruledetail.dto;
+package com.ynfy.buss.exam.paperruledetail.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/paperruledetail/entity/PaperRuleDetail.java → web/src/main/java/com/ynfy/buss/exam/paperruledetail/entity/PaperRuleDetail.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.paperruledetail.entity;
+package com.ynfy.buss.exam.paperruledetail.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/paperruledetail/mapper/PaperRuleDetailMapper.java → web/src/main/java/com/ynfy/buss/exam/paperruledetail/mapper/PaperRuleDetailMapper.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.paperruledetail.mapper;
+package com.ynfy.buss.exam.paperruledetail.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yntravelsky.buss.exam.paperruledetail.entity.PaperRuleDetail;
+import com.ynfy.buss.exam.paperruledetail.entity.PaperRuleDetail;
 
 
 /**
 /**
  * @Description: paper_rule_detail
  * @Description: paper_rule_detail

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/paperruledetail/mapper/xml/PaperRuleDetailMapper.xml → web/src/main/java/com/ynfy/buss/exam/paperruledetail/mapper/xml/PaperRuleDetailMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yntravelsky.buss.exam.paperruledetail.mapper.PaperRuleDetailMapper">
+<mapper namespace="com.ynfy.buss.exam.paperruledetail.mapper.PaperRuleDetailMapper">
 
 
 </mapper>
 </mapper>

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/paperruledetail/service/IPaperRuleDetailService.java → web/src/main/java/com/ynfy/buss/exam/paperruledetail/service/IPaperRuleDetailService.java

@@ -1,8 +1,8 @@
-package com.yntravelsky.buss.exam.paperruledetail.service;
+package com.ynfy.buss.exam.paperruledetail.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.paperruledetail.entity.PaperRuleDetail;
-import com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import com.ynfy.buss.exam.paperruledetail.entity.PaperRuleDetail;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 5 - 5
web/src/main/java/com/yntravelsky/buss/exam/paperruledetail/service/impl/PaperRuleDetailServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/paperruledetail/service/impl/PaperRuleDetailServiceImpl.java

@@ -1,11 +1,11 @@
-package com.yntravelsky.buss.exam.paperruledetail.service.impl;
+package com.ynfy.buss.exam.paperruledetail.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.paperruledetail.entity.PaperRuleDetail;
-import com.yntravelsky.buss.exam.paperruledetail.mapper.PaperRuleDetailMapper;
-import com.yntravelsky.buss.exam.paperruledetail.service.IPaperRuleDetailService;
-import com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import com.ynfy.buss.exam.paperruledetail.entity.PaperRuleDetail;
+import com.ynfy.buss.exam.paperruledetail.mapper.PaperRuleDetailMapper;
+import com.ynfy.buss.exam.paperruledetail.service.IPaperRuleDetailService;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/paperrulegroup/entity/PaperRuleGroup.java → web/src/main/java/com/ynfy/buss/exam/paperrulegroup/entity/PaperRuleGroup.java

@@ -1,11 +1,11 @@
-package com.yntravelsky.buss.exam.paperrulegroup.entity;
+package com.ynfy.buss.exam.paperrulegroup.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yntravelsky.buss.exam.paperruledetail.entity.PaperRuleDetail;
-import com.yntravelsky.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.paperruledetail.entity.PaperRuleDetail;
+import com.ynfy.buss.exam.question.entity.Question;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/paperrulegroup/mapper/PaperRuleGroupMapper.java → web/src/main/java/com/ynfy/buss/exam/paperrulegroup/mapper/PaperRuleGroupMapper.java

@@ -1,8 +1,8 @@
-package com.yntravelsky.buss.exam.paperrulegroup.mapper;
+package com.ynfy.buss.exam.paperrulegroup.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yntravelsky.buss.exam.exam.dto.QuestionTypeCountDTO;
-import com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import com.ynfy.buss.exam.exam.dto.QuestionTypeCountDTO;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 4 - 4
web/src/main/java/com/yntravelsky/buss/exam/paperrulegroup/mapper/xml/PaperRuleGroupMapper.xml → web/src/main/java/com/ynfy/buss/exam/paperrulegroup/mapper/xml/PaperRuleGroupMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yntravelsky.buss.exam.paperrulegroup.mapper.PaperRuleGroupMapper">
+<mapper namespace="com.ynfy.buss.exam.paperrulegroup.mapper.PaperRuleGroupMapper">
 
 
-    <resultMap id="groupMap" type="com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup">
+    <resultMap id="groupMap" type="com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup">
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="title" property="title" jdbcType="VARCHAR"/>
         <result column="title" property="title" jdbcType="VARCHAR"/>
         <result column="paper_id" property="paperId" jdbcType="VARCHAR"/>
         <result column="paper_id" property="paperId" jdbcType="VARCHAR"/>
@@ -14,7 +14,7 @@
         <result column="can_miss_option" property="canMissOption" jdbcType="BOOLEAN"/>
         <result column="can_miss_option" property="canMissOption" jdbcType="BOOLEAN"/>
         <result column="can_blank_option" property="canBlankOption" jdbcType="BOOLEAN"/>
         <result column="can_blank_option" property="canBlankOption" jdbcType="BOOLEAN"/>
 
 
-        <collection property="ruleList" ofType="com.yntravelsky.buss.exam.paperruledetail.entity.PaperRuleDetail">
+        <collection property="ruleList" ofType="com.ynfy.buss.exam.paperruledetail.entity.PaperRuleDetail">
             <id column="prd_id" property="id" jdbcType="VARCHAR"/>
             <id column="prd_id" property="id" jdbcType="VARCHAR"/>
             <result column="repository_id" property="repositoryId" jdbcType="VARCHAR"/>
             <result column="repository_id" property="repositoryId" jdbcType="VARCHAR"/>
             <result column="level" property="level" jdbcType="INTEGER"/>
             <result column="level" property="level" jdbcType="INTEGER"/>
@@ -54,7 +54,7 @@
             prg.sort ASC
             prg.sort ASC
     </select>
     </select>
 
 
-    <select id="sumQuestionCount" resultType="com.yntravelsky.buss.exam.exam.dto.QuestionTypeCountDTO">
+    <select id="sumQuestionCount" resultType="com.ynfy.buss.exam.exam.dto.QuestionTypeCountDTO">
         SELECT
         SELECT
             question_type,
             question_type,
             SUM ( question_count ) as question_count
             SUM ( question_count ) as question_count

+ 4 - 4
web/src/main/java/com/yntravelsky/buss/exam/paperrulegroup/service/IPaperRuleGroupService.java → web/src/main/java/com/ynfy/buss/exam/paperrulegroup/service/IPaperRuleGroupService.java

@@ -1,9 +1,9 @@
-package com.yntravelsky.buss.exam.paperrulegroup.service;
+package com.ynfy.buss.exam.paperrulegroup.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.exam.dto.QuestionTypeCountDTO;
-import com.yntravelsky.buss.exam.paper.entity.Paper;
-import com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import com.ynfy.buss.exam.exam.dto.QuestionTypeCountDTO;
+import com.ynfy.buss.exam.paper.entity.Paper;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 13 - 13
web/src/main/java/com/yntravelsky/buss/exam/paperrulegroup/service/impl/PaperRuleGroupServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/paperrulegroup/service/impl/PaperRuleGroupServiceImpl.java

@@ -1,20 +1,20 @@
-package com.yntravelsky.buss.exam.paperrulegroup.service.impl;
+package com.ynfy.buss.exam.paperrulegroup.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.exam.dto.QuestionTypeCountDTO;
-import com.yntravelsky.buss.exam.paper.enmus.JoinType;
-import com.yntravelsky.buss.exam.paper.entity.Paper;
-import com.yntravelsky.buss.exam.paper.service.IPaperService;
-import com.yntravelsky.buss.exam.paperquestion.service.IPaperQuestionService;
-import com.yntravelsky.buss.exam.paperquestionanswer.service.IPaperQuestionAnswerService;
-import com.yntravelsky.buss.exam.paperruledetail.entity.PaperRuleDetail;
-import com.yntravelsky.buss.exam.paperruledetail.service.IPaperRuleDetailService;
-import com.yntravelsky.buss.exam.paperrulegroup.entity.PaperRuleGroup;
-import com.yntravelsky.buss.exam.paperrulegroup.mapper.PaperRuleGroupMapper;
-import com.yntravelsky.buss.exam.paperrulegroup.service.IPaperRuleGroupService;
-import com.yntravelsky.buss.exam.question.enums.QuestionType;
+import com.ynfy.buss.exam.exam.dto.QuestionTypeCountDTO;
+import com.ynfy.buss.exam.paper.enmus.JoinType;
+import com.ynfy.buss.exam.paper.entity.Paper;
+import com.ynfy.buss.exam.paper.service.IPaperService;
+import com.ynfy.buss.exam.paperquestion.service.IPaperQuestionService;
+import com.ynfy.buss.exam.paperquestionanswer.service.IPaperQuestionAnswerService;
+import com.ynfy.buss.exam.paperruledetail.entity.PaperRuleDetail;
+import com.ynfy.buss.exam.paperruledetail.service.IPaperRuleDetailService;
+import com.ynfy.buss.exam.paperrulegroup.entity.PaperRuleGroup;
+import com.ynfy.buss.exam.paperrulegroup.mapper.PaperRuleGroupMapper;
+import com.ynfy.buss.exam.paperrulegroup.service.IPaperRuleGroupService;
+import com.ynfy.buss.exam.question.enums.QuestionType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;

+ 10 - 10
web/src/main/java/com/yntravelsky/buss/exam/question/controller/QuestionController.java → web/src/main/java/com/ynfy/buss/exam/question/controller/QuestionController.java

@@ -1,19 +1,19 @@
-package com.yntravelsky.buss.exam.question.controller;
+package com.ynfy.buss.exam.question.controller;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yntravelsky.buss.exam.paperquestion.service.IPaperQuestionService;
-import com.yntravelsky.buss.exam.paperruledetail.dto.RuleDetailDTO;
-import com.yntravelsky.buss.exam.paperruledetail.entity.PaperRuleDetail;
-import com.yntravelsky.buss.exam.question.dto.QuestionDTO;
-import com.yntravelsky.buss.exam.question.entity.Question;
-import com.yntravelsky.buss.exam.question.service.IQuestionService;
-import com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer;
-import com.yntravelsky.buss.exam.questionanswer.service.IQuestionAnswerService;
-import com.yntravelsky.buss.exam.userexamquestion.service.IUserExamQuestionService;
+import com.ynfy.buss.exam.paperquestion.service.IPaperQuestionService;
+import com.ynfy.buss.exam.paperruledetail.dto.RuleDetailDTO;
+import com.ynfy.buss.exam.paperruledetail.entity.PaperRuleDetail;
+import com.ynfy.buss.exam.question.dto.QuestionDTO;
+import com.ynfy.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.question.service.IQuestionService;
+import com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer;
+import com.ynfy.buss.exam.questionanswer.service.IQuestionAnswerService;
+import com.ynfy.buss.exam.userexamquestion.service.IUserExamQuestionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/question/dto/QuestionConditionDTO.java → web/src/main/java/com/ynfy/buss/exam/question/dto/QuestionConditionDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.question.dto;
+package com.ynfy.buss.exam.question.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/question/dto/QuestionDTO.java → web/src/main/java/com/ynfy/buss/exam/question/dto/QuestionDTO.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.question.dto;
+package com.ynfy.buss.exam.question.dto;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/question/dto/QuestionDetailDTO.java → web/src/main/java/com/ynfy/buss/exam/question/dto/QuestionDetailDTO.java

@@ -1,6 +1,6 @@
-package com.yntravelsky.buss.exam.question.dto;
+package com.ynfy.buss.exam.question.dto;
 
 
-import com.yntravelsky.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.question.entity.Question;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.Data;
 
 

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/question/entity/Question.java → web/src/main/java/com/ynfy/buss/exam/question/entity/Question.java

@@ -1,11 +1,11 @@
-package com.yntravelsky.buss.exam.question.entity;
+package com.ynfy.buss.exam.question.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer;
+import com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/question/enums/QuestionType.java → web/src/main/java/com/ynfy/buss/exam/question/enums/QuestionType.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.question.enums;
+package com.ynfy.buss.exam.question.enums;
 
 
 
 
 /**
 /**

+ 4 - 4
web/src/main/java/com/yntravelsky/buss/exam/question/mapper/QuestionMapper.java → web/src/main/java/com/ynfy/buss/exam/question/mapper/QuestionMapper.java

@@ -1,10 +1,10 @@
-package com.yntravelsky.buss.exam.question.mapper;
+package com.ynfy.buss.exam.question.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yntravelsky.buss.exam.question.dto.QuestionConditionDTO;
-import com.yntravelsky.buss.exam.question.dto.QuestionDTO;
-import com.yntravelsky.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.question.dto.QuestionConditionDTO;
+import com.ynfy.buss.exam.question.dto.QuestionDTO;
+import com.ynfy.buss.exam.question.entity.Question;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;

+ 8 - 8
web/src/main/java/com/yntravelsky/buss/exam/question/mapper/xml/QuestionMapper.xml → web/src/main/java/com/ynfy/buss/exam/question/mapper/xml/QuestionMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yntravelsky.buss.exam.question.mapper.QuestionMapper">
+<mapper namespace="com.ynfy.buss.exam.question.mapper.QuestionMapper">
 
 
-    <select id="selectPageList" resultType="com.yntravelsky.buss.exam.question.entity.Question">
+    <select id="selectPageList" resultType="com.ynfy.buss.exam.question.entity.Question">
         SELECT
         SELECT
                q.*,
                q.*,
                p.title as repositoryName
                p.title as repositoryName
@@ -25,7 +25,7 @@
         ORDER BY q.create_time DESC
         ORDER BY q.create_time DESC
     </select>
     </select>
 
 
-    <resultMap id="QuestionMap" type="com.yntravelsky.buss.exam.question.entity.Question">
+    <resultMap id="QuestionMap" type="com.ynfy.buss.exam.question.entity.Question">
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="type" property="type" jdbcType="INTEGER"/>
         <result column="type" property="type" jdbcType="INTEGER"/>
         <result column="level" property="level" jdbcType="INTEGER"/>
         <result column="level" property="level" jdbcType="INTEGER"/>
@@ -35,7 +35,7 @@
         <result column="analysis" property="analysis" jdbcType="VARCHAR"/>
         <result column="analysis" property="analysis" jdbcType="VARCHAR"/>
         <result column="answer_order" property="answerOrder" jdbcType="BOOLEAN"/>
         <result column="answer_order" property="answerOrder" jdbcType="BOOLEAN"/>
 
 
-        <collection property="answerList" ofType="com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer">
+        <collection property="answerList" ofType="com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer">
             <id column="qa_id" property="id" jdbcType="VARCHAR"/>
             <id column="qa_id" property="id" jdbcType="VARCHAR"/>
             <result column="qa_content" property="content" jdbcType="VARCHAR"/>
             <result column="qa_content" property="content" jdbcType="VARCHAR"/>
             <result column="qa_analysis" property="analysis" jdbcType="VARCHAR"/>
             <result column="qa_analysis" property="analysis" jdbcType="VARCHAR"/>
@@ -176,7 +176,7 @@
         </choose>
         </choose>
     </select>
     </select>
 
 
-    <select id="groupLevelById" resultType="com.yntravelsky.buss.exam.question.dto.QuestionDTO">
+    <select id="groupLevelById" resultType="com.ynfy.buss.exam.question.dto.QuestionDTO">
         SELECT
         SELECT
                     tmp.*,
                     tmp.*,
                     r.title as repositoryName
                     r.title as repositoryName
@@ -208,7 +208,7 @@
        order by tmp.repository_id,tmp.level
        order by tmp.repository_id,tmp.level
     </select>
     </select>
 
 
-    <select id="listByPaperId" resultType="com.yntravelsky.buss.exam.question.entity.Question">
+    <select id="listByPaperId" resultType="com.ynfy.buss.exam.question.entity.Question">
         SELECT
         SELECT
              q.*
              q.*
         FROM question q
         FROM question q
@@ -220,7 +220,7 @@
         </where>
         </where>
     </select>
     </select>
 
 
-    <select id="groupCount" resultType="com.yntravelsky.buss.exam.question.entity.Question">
+    <select id="groupCount" resultType="com.ynfy.buss.exam.question.entity.Question">
         SELECT
         SELECT
             repository_id,
             repository_id,
             TYPE,
             TYPE,
@@ -249,7 +249,7 @@
             LEVEL
             LEVEL
     </select>
     </select>
 
 
-    <select id="listQuestionByCondition" parameterType="java.util.List" resultType="com.yntravelsky.buss.exam.question.entity.Question">
+    <select id="listQuestionByCondition" parameterType="java.util.List" resultType="com.ynfy.buss.exam.question.entity.Question">
         <foreach collection="list" item="item" index="index" separator="union">
         <foreach collection="list" item="item" index="index" separator="union">
             SELECT
             SELECT
                     *
                     *

+ 4 - 4
web/src/main/java/com/yntravelsky/buss/exam/question/service/IQuestionService.java → web/src/main/java/com/ynfy/buss/exam/question/service/IQuestionService.java

@@ -1,10 +1,10 @@
-package com.yntravelsky.buss.exam.question.service;
+package com.ynfy.buss.exam.question.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.question.dto.QuestionConditionDTO;
-import com.yntravelsky.buss.exam.question.dto.QuestionDTO;
-import com.yntravelsky.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.question.dto.QuestionConditionDTO;
+import com.ynfy.buss.exam.question.dto.QuestionDTO;
+import com.ynfy.buss.exam.question.entity.Question;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;

+ 12 - 12
web/src/main/java/com/yntravelsky/buss/exam/question/service/impl/QuestionServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/question/service/impl/QuestionServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.question.service.impl;
+package com.ynfy.buss.exam.question.service.impl;
 
 
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.IdUtil;
@@ -7,17 +7,17 @@ import cn.hutool.poi.excel.ExcelUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.question.dto.QuestionConditionDTO;
-import com.yntravelsky.buss.exam.question.dto.QuestionDTO;
-import com.yntravelsky.buss.exam.question.entity.Question;
-import com.yntravelsky.buss.exam.question.enums.QuestionType;
-import com.yntravelsky.buss.exam.question.mapper.QuestionMapper;
-import com.yntravelsky.buss.exam.question.service.IQuestionService;
-import com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer;
-import com.yntravelsky.buss.exam.questionanswer.service.IQuestionAnswerService;
-import com.yntravelsky.buss.exam.repository.entity.Repository;
-import com.yntravelsky.buss.exam.repository.service.IRepositoryService;
-import com.yntravelsky.common.utils.CharUtil;
+import com.ynfy.buss.exam.question.dto.QuestionConditionDTO;
+import com.ynfy.buss.exam.question.dto.QuestionDTO;
+import com.ynfy.buss.exam.question.entity.Question;
+import com.ynfy.buss.exam.question.enums.QuestionType;
+import com.ynfy.buss.exam.question.mapper.QuestionMapper;
+import com.ynfy.buss.exam.question.service.IQuestionService;
+import com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer;
+import com.ynfy.buss.exam.questionanswer.service.IQuestionAnswerService;
+import com.ynfy.buss.exam.repository.entity.Repository;
+import com.ynfy.buss.exam.repository.service.IRepositoryService;
+import com.ynfy.common.utils.CharUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.exception.JeecgBootException;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/questionanswer/entity/QuestionAnswer.java → web/src/main/java/com/ynfy/buss/exam/questionanswer/entity/QuestionAnswer.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.questionanswer.entity;
+package com.ynfy.buss.exam.questionanswer.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/questionanswer/mapper/QuestionAnswerMapper.java → web/src/main/java/com/ynfy/buss/exam/questionanswer/mapper/QuestionAnswerMapper.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.questionanswer.mapper;
+package com.ynfy.buss.exam.questionanswer.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer;
+import com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer;
 
 
 /**
 /**
  * @Description: question_answer
  * @Description: question_answer

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/questionanswer/mapper/xml/QuestionAnswerMapper.xml → web/src/main/java/com/ynfy/buss/exam/questionanswer/mapper/xml/QuestionAnswerMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yntravelsky.buss.exam.questionanswer.mapper.QuestionAnswerMapper">
+<mapper namespace="com.ynfy.buss.exam.questionanswer.mapper.QuestionAnswerMapper">
 
 
 </mapper>
 </mapper>

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/questionanswer/service/IQuestionAnswerService.java → web/src/main/java/com/ynfy/buss/exam/questionanswer/service/IQuestionAnswerService.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.questionanswer.service;
+package com.ynfy.buss.exam.questionanswer.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer;
+import com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 6 - 6
web/src/main/java/com/yntravelsky/buss/exam/questionanswer/service/impl/QuestionAnswerServiceImpl.java → web/src/main/java/com/ynfy/buss/exam/questionanswer/service/impl/QuestionAnswerServiceImpl.java

@@ -1,13 +1,13 @@
-package com.yntravelsky.buss.exam.questionanswer.service.impl;
+package com.ynfy.buss.exam.questionanswer.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yntravelsky.buss.exam.question.enums.QuestionType;
-import com.yntravelsky.buss.exam.questionanswer.entity.QuestionAnswer;
-import com.yntravelsky.buss.exam.questionanswer.mapper.QuestionAnswerMapper;
-import com.yntravelsky.buss.exam.questionanswer.service.IQuestionAnswerService;
-import com.yntravelsky.common.utils.CharUtil;
+import com.ynfy.buss.exam.question.enums.QuestionType;
+import com.ynfy.buss.exam.questionanswer.entity.QuestionAnswer;
+import com.ynfy.buss.exam.questionanswer.mapper.QuestionAnswerMapper;
+import com.ynfy.buss.exam.questionanswer.service.IQuestionAnswerService;
+import com.ynfy.common.utils.CharUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 

+ 3 - 3
web/src/main/java/com/yntravelsky/buss/exam/repository/controller/RepositoryController.java → web/src/main/java/com/ynfy/buss/exam/repository/controller/RepositoryController.java

@@ -1,10 +1,10 @@
-package com.yntravelsky.buss.exam.repository.controller;
+package com.ynfy.buss.exam.repository.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yntravelsky.buss.exam.repository.entity.Repository;
-import com.yntravelsky.buss.exam.repository.service.IRepositoryService;
+import com.ynfy.buss.exam.repository.entity.Repository;
+import com.ynfy.buss.exam.repository.service.IRepositoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
web/src/main/java/com/yntravelsky/buss/exam/repository/entity/Repository.java → web/src/main/java/com/ynfy/buss/exam/repository/entity/Repository.java

@@ -1,4 +1,4 @@
-package com.yntravelsky.buss.exam.repository.entity;
+package com.ynfy.buss.exam.repository.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 2 - 2
web/src/main/java/com/yntravelsky/buss/exam/repository/mapper/RepositoryMapper.java → web/src/main/java/com/ynfy/buss/exam/repository/mapper/RepositoryMapper.java

@@ -1,7 +1,7 @@
-package com.yntravelsky.buss.exam.repository.mapper;
+package com.ynfy.buss.exam.repository.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yntravelsky.buss.exam.repository.entity.Repository;
+import com.ynfy.buss.exam.repository.entity.Repository;
 
 
 /**
 /**
  * @Description: repository
  * @Description: repository

Some files were not shown because too many files changed in this diff