考试集成兼容

pom.xml

@@ -327,5 +327,22 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profile.active>dev</profile.active>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>local</id>
+            <properties>
+                <profile.active>local</profile.active>
+            </properties>
+        </profile>
+    </profiles>
 
 </project>

ruoyi-auth/src/main/resources/bootstrap-local.yml

@@ -7,7 +7,7 @@ spring:
         server-addr: 192.168.3.222:8848
         username: nacos
         password: nacos
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
+        namespace: local
       config:
         # 配置中心地址
         server-addr: 192.168.3.222:8848
@@ -18,4 +18,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
+        namespace: local

ruoyi-gateway/src/main/resources/bootstrap-local.yml

@@ -7,7 +7,7 @@ spring:
         server-addr: 192.168.3.222:8848
         username: nacos
         password: nacos
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
+        namespace: local
       config:
         # 配置中心地址
         username: nacos
@@ -18,7 +18,7 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
+        namespace: local
     sentinel:
       # 取消控制台懒加载
       eager: true

ruoyi-modules/airport-exam/pom.xml

@@ -48,7 +48,18 @@
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-datasource</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.pagehelper</groupId>
+                    <artifactId>pagehelper-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.jsqlparser</groupId>-->
+<!--            <artifactId>jsqlparser</artifactId>-->
+<!--            <version>4.9</version>-->
+<!--        </dependency>-->
 
         <!-- RuoYi Common DataScope -->
         <dependency>
@@ -70,7 +81,17 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.6</version>
+            <version>3.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/IdUtils.java

@@ -0,0 +1,33 @@
+package com.sundot.airport.common;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Component
+public class IdUtils {
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    // 生成带指定前缀的唯一编号
+    public String generateId(String prefix) {
+        // 获取当前日期作为基础部分（格式：YYMMDD）
+        String datePart = new SimpleDateFormat("yyMMdd").format(new Date());
+
+        // 使用Redis递增计数器，key为prefix+日期
+        Long count = stringRedisTemplate.opsForValue().increment(prefix + ":" + datePart);
+
+        // 如果计数器不存在，则初始化为1
+        if (count == null) {
+            stringRedisTemplate.opsForValue().set(prefix + ":" + datePart, "1");
+            count = 1L;
+        }
+
+        // 组装编号（前缀 + 日期 + 6位自增数，不足补0）
+        return prefix + datePart + String.format("%06d", count);
+    }
+}
+

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/ExamRecOptServiceImpl.java

@@ -10,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -27,10 +28,12 @@ public class ExamRecOptServiceImpl extends ServiceImpl<ExamRecOptMapper, ExamRec
 
     private static final Logger log = LoggerFactory.getLogger(ExamRecOptServiceImpl.class);
 
+    @Resource
+    private com.sundot.airport.common.IdUtils idUtils;
     @Override
     public void setServiceId(ExamRecOpt entity) {
 
-        entity.setEroId(IdUtils.fastUUID());
+        entity.setEroId(idUtils.generateId("ERO"));
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/ExamRecServiceImpl.java

@@ -17,6 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -34,10 +35,12 @@ public class ExamRecServiceImpl extends ServiceImpl<ExamRecMapper, ExamRec> impl
 
     private static final Logger log = LoggerFactory.getLogger(ExamRecServiceImpl.class);
 
+    @Resource
+    private com.sundot.airport.common.IdUtils idUtils;
     @Override
     public void setServiceId(ExamRec entity) {
 
-        entity.setErId(IdUtils.fastUUID());
+        entity.setErId(idUtils.generateId("ER"));
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/ExamServiceImpl.java

@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -34,10 +35,11 @@ import java.util.Optional;
 public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements ExamService {
 
     private static final Logger log = LoggerFactory.getLogger(ExamServiceImpl.class);
-
+    @Resource
+    private com.sundot.airport.common.IdUtils idUtils;
     @Override
     public void setServiceId(Exam entity) {
-        entity.setExId(IdUtils.fastUUID());
+        entity.setExId(idUtils.generateId("EX"));
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/QuesCatServiceImpl.java

@@ -3,7 +3,8 @@ package com.sundot.airport.common.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.core.utils.uuid.IdUtils;
+
+import com.sundot.airport.common.IdUtils;
 import com.sundot.airport.common.model.result.QuesCatPageResult;
 import com.sundot.airport.common.service.QuesCatService;
 import com.sundot.airport.entity.QuesCat;
@@ -14,6 +15,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -32,10 +34,12 @@ public class QuesCatServiceImpl extends ServiceImpl<QuesCatMapper, QuesCat> impl
 
     private static final Logger log = LoggerFactory.getLogger(QuesCatServiceImpl.class);
 
+    @Resource
+    private IdUtils idUtils;
     @Override
     public void setServiceId(QuesCat entity) {
 
-        entity.setQcId(IdUtils.fastUUID());
+        entity.setQcId(idUtils.generateId("QC"));
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/QuesOptServiceImpl.java

@@ -11,6 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -28,10 +29,12 @@ public class QuesOptServiceImpl extends ServiceImpl<QuesOptMapper, QuesOpt> impl
 
     private static final Logger log = LoggerFactory.getLogger(QuesOptServiceImpl.class);
 
+    @Resource
+    private com.sundot.airport.common.IdUtils idUtils;
     @Override
     public void setServiceId(QuesOpt entity) {
 
-        entity.setQoId(IdUtils.fastUUID());
+        entity.setQoId(idUtils.generateId("QO"));
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/QuesServiceImpl.java

@@ -17,6 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -34,9 +35,11 @@ public class QuesServiceImpl extends ServiceImpl<QuesMapper, Ques> implements Qu
 
     private static final Logger log = LoggerFactory.getLogger(QuesServiceImpl.class);
 
+    @Resource
+    private com.sundot.airport.common.IdUtils idUtils;
     @Override
     public void setServiceId(Ques entity) {
-        entity.setQuId(IdUtils.fastUUID());
+        entity.setQuId("Q");
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/TestPaperCatServiceImpl.java

@@ -14,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -32,9 +33,11 @@ public class TestPaperCatServiceImpl extends ServiceImpl<TestPaperCatMapper, Tes
 
     private static final Logger log = LoggerFactory.getLogger(TestPaperCatServiceImpl.class);
 
+    @Resource
+    private com.sundot.airport.common.IdUtils idUtils;
     @Override
     public void setServiceId(TestPaperCat entity) {
-        entity.setTpcId(IdUtils.fastUUID());
+        entity.setTpcId(idUtils.generateId("TPC"));
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/TestPaperQuesServiceImpl.java

@@ -12,6 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -29,10 +30,12 @@ public class TestPaperQuesServiceImpl extends ServiceImpl<TestPaperQuesMapper, T
 
     private static final Logger log = LoggerFactory.getLogger(TestPaperQuesServiceImpl.class);
 
+    @Resource
+    private com.sundot.airport.common.IdUtils idUtils;
     @Override
     public void setServiceId(TestPaperQues entity) {
 
-        entity.setTpqId(IdUtils.fastUUID());
+        entity.setTpqId(idUtils.generateId("TPQ"));
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/TestPaperServiceImpl.java

@@ -19,6 +19,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Optional;
 
@@ -35,10 +36,12 @@ public class TestPaperServiceImpl extends ServiceImpl<TestPaperMapper, TestPaper
 
     private static final Logger log = LoggerFactory.getLogger(TestPaperServiceImpl.class);
 
+    @Resource
+    private com.sundot.airport.common.IdUtils idUtils;
     @Override
     public void setServiceId(TestPaper entity) {
 
-        entity.setTpId(IdUtils.fastUUID());
+        entity.setTpId(idUtils.generateId("TP"));
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/logic/manage/model/params/ExamAddParam.java

@@ -25,13 +25,13 @@ public class ExamAddParam {
     /**
      * 背景图片资源
      */
-    @NotBlank(message = "背景图片不能为空")
+   // @NotBlank(message = "背景图片不能为空")
     private String exBgImg;
 
     /**
      * 详情介绍图片资源
      */
-    @NotBlank(message = "详情介绍图片不能为空")
+    //@NotBlank(message = "详情介绍图片不能为空")
     private String exDetailImg;
 
     /**

ruoyi-modules/airport-exam/src/main/resources/logback.xml

@@ -61,8 +61,14 @@
 	<logger name="com.ruoyi" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
+    <logger name="org.mybatis" level="DEBUG" additivity="false">
+        <appender-ref ref="console" />
+    </logger>
+    <logger name="java.sql" level="DEBUG" additivity="false">
+        <appender-ref ref="console" />
+    </logger>
 
-	<root level="info">
+	<root level="debug">
 		<appender-ref ref="console" />
 	</root>
 	

ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-local.yml

@@ -7,7 +7,8 @@ spring:
         server-addr: 192.168.3.222:8848
         username: nacos
         password: nacos
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
+        namespace: local
+
       config:
         # 配置中心地址
         username: nacos
@@ -18,5 +19,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
+        namespace: local