From 78e810397bc7976eec46d55031facf120fd12f57 Mon Sep 17 00:00:00 2001 From: lizhengwei <171332584@qq.com> Date: Tue, 7 Jan 2025 14:11:39 +0800 Subject: [PATCH] =?UTF-8?q?tams=20=E4=BB=A3=E7=A0=81=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-site/ruoyi-tams/pom.xml | 28 +++++++------- .../lhd/tams/module/Report2Controller.java | 37 ------------------- .../module/classroom/dao/ClassroomMapper.java | 2 + .../tams/module/color/dao/ColorMapper.java | 2 + .../tams/module/course/dao/CourseMapper.java | 2 + .../dao/CourseSchedulingMapper.java | 2 + .../registration/dao/RegistrationMapper.java | 2 + .../module/student/dao/StudentMapper.java | 2 + .../module/teacher/dao/TeacherMapper.java | 2 + .../src/main/resources/application-dev.yaml | 32 +++++++++++----- .../src/main/resources/application-local.yaml | 36 +++++++++++++----- .../ruoyi-tams/CourseSchedulingMapper.xml | 10 ++--- .../mapper/ruoyi-tams/RegistrationMapper.xml | 2 +- .../src/main/resources/mybatis-config.xml | 0 14 files changed, 83 insertions(+), 76 deletions(-) delete mode 100644 ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/Report2Controller.java create mode 100644 ruoyi-site/ruoyi-tams/src/main/resources/mybatis-config.xml diff --git a/ruoyi-site/ruoyi-tams/pom.xml b/ruoyi-site/ruoyi-tams/pom.xml index 411387d9c..925c9ca04 100644 --- a/ruoyi-site/ruoyi-tams/pom.xml +++ b/ruoyi-site/ruoyi-tams/pom.xml @@ -39,11 +39,11 @@ ruoyi-common-doc - - - org.dromara - ruoyi-api-system - + + + + + org.dromara @@ -67,16 +67,16 @@ spring-boot-starter-web - - - org.apache.dubbo - dubbo-spring-boot-starter - + + + + + - - org.apache.dubbo - dubbo-nacos-spring-boot-starter - + + + + diff --git a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/Report2Controller.java b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/Report2Controller.java deleted file mode 100644 index ce508265b..000000000 --- a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/Report2Controller.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lhd.tams.module; - -import com.lhd.tams.common.base.BaseController; -import com.lhd.tams.common.model.ApiResult; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - - -/** - * 测试feign 用的，后面删除 - */ -@Tag(name = "报表") -@RequestMapping() -@RestController -public class Report2Controller extends BaseController { - - @Autowired - private TenantRpc tenantRpc; - - //todo 测试rpc、然后在测试免权限rpc、在测试传递租户信息、用户信息、链路追踪id - - @GetMapping("/resource/sms/code") - public ResponseEntity> getReportTeacherCount() { - return success(tenantRpc.emailCode()); - } - - @GetMapping("/system/client/{id}") - public ResponseEntity> getReportTeacherCount2(@PathVariable Long id) { - return success(tenantRpc.getInfo(id)); - } - -} diff --git a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/classroom/dao/ClassroomMapper.java b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/classroom/dao/ClassroomMapper.java index 773405fd1..65ea92d91 100644 --- a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/classroom/dao/ClassroomMapper.java +++ b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/classroom/dao/ClassroomMapper.java @@ -2,6 +2,8 @@ package com.lhd.tams.module.classroom.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lhd.tams.module.classroom.model.data.ClassroomDO; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface ClassroomMapper extends BaseMapper { } diff --git a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/color/dao/ColorMapper.java b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/color/dao/ColorMapper.java index 993d5fee2..2f20091ac 100644 --- a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/color/dao/ColorMapper.java +++ b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/color/dao/ColorMapper.java @@ -2,6 +2,8 @@ package com.lhd.tams.module.color.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lhd.tams.module.color.model.data.ColorDO; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface ColorMapper extends BaseMapper { } diff --git a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/course/dao/CourseMapper.java b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/course/dao/CourseMapper.java index 350079c32..895765151 100644 --- a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/course/dao/CourseMapper.java +++ b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/course/dao/CourseMapper.java @@ -2,6 +2,8 @@ package com.lhd.tams.module.course.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lhd.tams.module.course.model.data.CourseDO; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface CourseMapper extends BaseMapper { } diff --git a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/coursescheduling/dao/CourseSchedulingMapper.java b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/coursescheduling/dao/CourseSchedulingMapper.java index c77830fdb..38982b757 100644 --- a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/coursescheduling/dao/CourseSchedulingMapper.java +++ b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/coursescheduling/dao/CourseSchedulingMapper.java @@ -7,12 +7,14 @@ import com.lhd.tams.module.coursescheduling.model.data.CourseSchedulingDO; import com.lhd.tams.module.coursescheduling.model.vo.CourseSchedulingExportVO; import com.lhd.tams.module.coursescheduling.model.vo.CourseSchedulingListVO; import com.lhd.tams.module.coursescheduling.model.vo.CourseSchedulingReportVO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.time.LocalDate; import java.util.List; import java.util.Map; +@Mapper public interface CourseSchedulingMapper extends BaseMapper { List selectCourseSchedulingList(@Param(Constants.WRAPPER) Wrapper queryWrapper); diff --git a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/registration/dao/RegistrationMapper.java b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/registration/dao/RegistrationMapper.java index 260cced50..0929e4567 100644 --- a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/registration/dao/RegistrationMapper.java +++ b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/registration/dao/RegistrationMapper.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lhd.tams.module.registration.model.data.RegistrationDO; import com.lhd.tams.module.registration.model.dto.RegistrationPageQuery; import com.lhd.tams.module.registration.model.vo.RegistrationListVO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface RegistrationMapper extends BaseMapper { List selectRegistrationMapperSum(@Param("params") RegistrationPageQuery params); } diff --git a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/student/dao/StudentMapper.java b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/student/dao/StudentMapper.java index 3e0bcbb07..ecc9763b5 100644 --- a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/student/dao/StudentMapper.java +++ b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/student/dao/StudentMapper.java @@ -2,6 +2,8 @@ package com.lhd.tams.module.student.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lhd.tams.module.student.model.data.StudentDO; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface StudentMapper extends BaseMapper { } diff --git a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/teacher/dao/TeacherMapper.java b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/teacher/dao/TeacherMapper.java index 3a3280446..263c3328e 100644 --- a/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/teacher/dao/TeacherMapper.java +++ b/ruoyi-site/ruoyi-tams/src/main/java/com/lhd/tams/module/teacher/dao/TeacherMapper.java @@ -2,6 +2,8 @@ package com.lhd.tams.module.teacher.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lhd.tams.module.teacher.model.data.TeacherDO; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface TeacherMapper extends BaseMapper { } diff --git a/ruoyi-site/ruoyi-tams/src/main/resources/application-dev.yaml b/ruoyi-site/ruoyi-tams/src/main/resources/application-dev.yaml index 5fe6481bd..4097edbe1 100644 --- a/ruoyi-site/ruoyi-tams/src/main/resources/application-dev.yaml +++ b/ruoyi-site/ruoyi-tams/src/main/resources/application-dev.yaml @@ -12,17 +12,31 @@ spring: stat-view-servlet: #访问监控网页的登录用户名和密码 login-username: druid login-password: druid - redis: - host: localhost # Redis服务器地址 - database: 0 # Redis数据库索引（默认为0） - port: 6379 # Redis服务器连接端口 - password: Lzw8800580/ # Redis服务器连接密码（默认为空） - timeout: 3000ms # 连接超时时间（毫秒） + data: + redis: + # Redis数据库索引（默认为0） + database: 0 + # Redis服务器地址 + host: 127.0.0.1 + # Redis服务器连接端口 + port: 6379 + # Redis服务器连接密码（默认为空） + password: Lzw8800580/ + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池最大连接数 + max-active: 200 + # 连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + # 连接池中的最大空闲连接 + max-idle: 10 + # 连接池中的最小空闲连接 + min-idle: 0 + jackson: time-zone: GMT+8 - mvc: - pathmatch: - matching-strategy: ant_path_matcher management: #开启SpringBoot Admin的监控 diff --git a/ruoyi-site/ruoyi-tams/src/main/resources/application-local.yaml b/ruoyi-site/ruoyi-tams/src/main/resources/application-local.yaml index 60a9f2881..4097edbe1 100644 --- a/ruoyi-site/ruoyi-tams/src/main/resources/application-local.yaml +++ b/ruoyi-site/ruoyi-tams/src/main/resources/application-local.yaml @@ -12,17 +12,31 @@ spring: stat-view-servlet: #访问监控网页的登录用户名和密码 login-username: druid login-password: druid - redis: - host: localhost # Redis服务器地址 - database: 0 # Redis数据库索引（默认为0） - port: 6379 # Redis服务器连接端口 - password: Lzw8800580/ # Redis服务器连接密码（默认为空） - timeout: 3000ms # 连接超时时间（毫秒） + data: + redis: + # Redis数据库索引（默认为0） + database: 0 + # Redis服务器地址 + host: 127.0.0.1 + # Redis服务器连接端口 + port: 6379 + # Redis服务器连接密码（默认为空） + password: Lzw8800580/ + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池最大连接数 + max-active: 200 + # 连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + # 连接池中的最大空闲连接 + max-idle: 10 + # 连接池中的最小空闲连接 + min-idle: 0 + jackson: time-zone: GMT+8 - mvc: - pathmatch: - matching-strategy: ant_path_matcher management: #开启SpringBoot Admin的监控 @@ -86,11 +100,13 @@ tenant: - sys_tenant_package - sys_saas_user_role + + # MyBatisPlus配置 # https://baomidou.com/config/ mybatis-plus: # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper - mapperPackage: com.lhd.tams.module.**.dao + mapperPackage: com.luban.api.dao # # 实体扫描，多个package用逗号或者分号分隔 # typeAliasesPackage: com.luban.api.entity global-config: diff --git a/ruoyi-site/ruoyi-tams/src/main/resources/mapper/ruoyi-tams/CourseSchedulingMapper.xml b/ruoyi-site/ruoyi-tams/src/main/resources/mapper/ruoyi-tams/CourseSchedulingMapper.xml index c024f8108..120f4008d 100644 --- a/ruoyi-site/ruoyi-tams/src/main/resources/mapper/ruoyi-tams/CourseSchedulingMapper.xml +++ b/ruoyi-site/ruoyi-tams/src/main/resources/mapper/ruoyi-tams/CourseSchedulingMapper.xml @@ -9,7 +9,7 @@ cs.date, cs.attend_time attendTime, cs.finish_time finishTime - select from t_course_scheduling cs @@ -22,7 +22,7 @@ - select from t_course_scheduling cs @@ -55,7 +55,7 @@ order by time - select date, concat(date_format(cs.attend_time, '%H:%i'), '-', date_format(cs.finish_time, '%H:%i')) time, classroom.name classroomName, @@ -72,7 +72,7 @@ order by date, time - select teacher.id, teacher.name, count(cs.id) count from t_teacher teacher left join t_course_scheduling cs on teacher.id = cs.teacher_id @@ -81,7 +81,7 @@ order by count desc; - select course.id, course.name, course.background_color color, count(cs.id) count from t_course course left join t_course_scheduling cs on course.id = cs.course_id diff --git a/ruoyi-site/ruoyi-tams/src/main/resources/mapper/ruoyi-tams/RegistrationMapper.xml b/ruoyi-site/ruoyi-tams/src/main/resources/mapper/ruoyi-tams/RegistrationMapper.xml index 1c8836194..a6cc778aa 100644 --- a/ruoyi-site/ruoyi-tams/src/main/resources/mapper/ruoyi-tams/RegistrationMapper.xml +++ b/ruoyi-site/ruoyi-tams/src/main/resources/mapper/ruoyi-tams/RegistrationMapper.xml @@ -1,7 +1,7 @@ - select r.student_id, s.name student_name, s.phone student_phone, diff --git a/ruoyi-site/ruoyi-tams/src/main/resources/mybatis-config.xml b/ruoyi-site/ruoyi-tams/src/main/resources/mybatis-config.xml new file mode 100644 index 000000000..e69de29bb