diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/ExamSpecialtyController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/ExamSpecialtyController.java index 6d0041eb..59984cde 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/ExamSpecialtyController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/ExamSpecialtyController.java @@ -36,13 +36,17 @@ public class ExamSpecialtyController{ @GetMapping("/list") @Operation(summary = "获取专业列表") - public CommonResult> getDeptList(SpecialtListReqVo reqVO) { + public CommonResult> getSpecialtyList(SpecialtListReqVo reqVO) { List list = examSpecialtyService.selectExamSpecialtyList(reqVO); return success(BeanUtils.toBean(list, SpecialtyQueryVo.class)); } - - + @GetMapping("/part") + @Operation(summary = "获取专业列表(不包含题型)") + public CommonResult> getSpecialtyPart() { + List list = examSpecialtyService.selectExamSpecialtyPart(); + return success(BeanUtils.toBean(list, SpecialtyQueryVo.class)); + } /** * 获取全部数据详细信息 */ diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java index 4c51a00b..631178f3 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java @@ -40,6 +40,13 @@ public interface ExamSpecialtyMapper extends BaseMapperX */ public List selectExamSpecialtyListVo(SpecialtListReqVo reqVo); + /** + * 查询部分数据信息 + * + * @return 数据集合 + */ + public List selectExamSpecialtyPart(); + /** * 查询数据信息列表 * @@ -71,4 +78,6 @@ public interface ExamSpecialtyMapper extends BaseMapperX * @return 结果 */ public int deleteExamSpecialtyBySpIds(Long[] spIds); + + } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyService.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyService.java index 50c564a3..38e5ef24 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyService.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyService.java @@ -30,6 +30,13 @@ public interface ExamSpecialtyService */ public List selectExamSpecialtyList(SpecialtListReqVo reqVO); + /** + * 查询部分数据信息 + * + * @return 全部信息集合 + */ + public List selectExamSpecialtyPart(); + /** * 根据主键查询 * diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyServiceImpl.java index 87154be1..aefe3375 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyServiceImpl.java @@ -46,6 +46,11 @@ public class ExamSpecialtyServiceImpl implements ExamSpecialtyService { return examSpecialtyMapper.selectExamSpecialtyListVo(reqVo); } + @Override + public List selectExamSpecialtyPart() { + return examSpecialtyMapper.selectExamSpecialtyPart(); + } + /** * 根据主键列表查询 * diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml index 16b6c467..76dbf730 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml +++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml @@ -28,6 +28,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + SELECT + su.username, + su.nickname, + ec.`name` AS className, + su.remark + FROM + system_users su + LEFT JOIN system_teacher_class stc ON stc.class_id = su.class_id + LEFT JOIN exam_class ec ON ec.id = su.class_id + WHERE stc.user_id = #{id} + + + \ No newline at end of file diff --git a/exam-server/src/main/resources/application-dev.yaml b/exam-server/src/main/resources/application-dev.yaml index e8565e08..7cae1b11 100644 --- a/exam-server/src/main/resources/application-dev.yaml +++ b/exam-server/src/main/resources/application-dev.yaml @@ -44,22 +44,22 @@ spring: primary: master datasource: master: - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 - username: root - password: 123456 + url: jdbc:mysql://47.101.60.131:3306/pc-exam?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + username: pc-exam + password: YGsyBWH3KdGpz8C7 slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改 lazy: true # 开启懒加载,保证启动速度 - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 - username: root - password: 123456 + url: jdbc:mysql://47.101.60.131:3306/pc-exam?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + username: pc-exam + password: YGsyBWH3KdGpz8C7 # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 data: redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 47.101.60.131 # 地址 port: 6379 # 端口 - database: 1 # 数据库索引 -# password: 123456 # 密码,建议生产环境开启 + database: 0 # 数据库索引 + password: sadjklasnfasd # 密码,建议生产环境开启 --- #################### 定时任务相关配置 #################### @@ -101,10 +101,10 @@ rocketmq: spring: # RabbitMQ 配置项,对应 RabbitProperties 配置类 rabbitmq: - host: 127.0.0.1 # RabbitMQ 服务的地址 + host: 47.101.60.131 # RabbitMQ 服务的地址 port: 5672 # RabbitMQ 服务的端口 - username: guest # RabbitMQ 服务的账号 - password: guest # RabbitMQ 服务的密码 + username: admin # RabbitMQ 服务的账号 + password: KkbxwDnD # RabbitMQ 服务的密码 # Kafka 配置项,对应 KafkaProperties 配置类 kafka: bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址,可以设置多个,以逗号分隔 diff --git a/exam-server/src/main/resources/application.yaml b/exam-server/src/main/resources/application.yaml index 284bac56..50434bec 100644 --- a/exam-server/src/main/resources/application.yaml +++ b/exam-server/src/main/resources/application.yaml @@ -63,9 +63,15 @@ flowable: check-process-definitions: false # 设置为 false,禁用 /resources/processes 自动部署 BPMN XML 流程 history-level: audit # full:保存历史数据的最高级别,可保存全部流程相关细节,包括流程流转各节点参数 +mybatis: + # 搜索指定包别名 + type-aliases-package: pc.exam.pp.module.**.dal.dataobject + # 配置mapper的扫描,找到所有的mapper.xml映射文件 + mapper-locations: classpath*:mapper/**/*Mapper.xml + # MyBatis Plus 的配置项 mybatis-plus: - mapper-locations: "classpath:/mapper/**/**/*.xml" + mapper-locations: classpath*:mapper/**/*Mapper.xml configuration: map-underscore-to-camel-case: true # 虽然默认为 true ,但是还是显示去指定下。 global-config: