xgxt_sd/zhxg_java
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
MDSMO
2025-08-28 15:10:14 +08:00
parent 1ef1bb05ab 1d17ec90ef
commit f317087ea2
35 changed files with 358 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srs-admin/src/main/java/com/srs/web/controller/common/WeChatMentalAlertController.java
View File

@@ -113,14 +113,14 @@ public class WeChatMentalAlertController extends BaseController {
"学生姓名：%s\n" +
"学号：%s\n" +
"问题描述：%s\n" +
"AI建议：%s\n" +
"心理问题评级：%s",
"心理问题评级：%s\n"+
"复制链接登陆学工系统PC端查看更多：" +
"zhxg.gxsdxy.cn/srs/#/aitutor/chatwarning",
teacherName,
teacher.getUserName(),
request.getUserName(),
request.getUserId(),
request.getStudentQuestion(),
request.getAiAnswer(),
request.getRating()
);
}

1
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodApplyController.java
View File

@@ -94,7 +94,6 @@ public class CphGoodApplyController extends BaseController {
Object total = ajaxResult.get("data");
Page page = (Page) total;
list.add("rwgl-" + page.getTotal());
String username = new String();
return AjaxResult.success(list);
}

19
srs-admin/src/main/java/com/srs/web/controller/stureg/SrsOrderController.java
View File

@@ -162,15 +162,16 @@ public class SrsOrderController extends BaseController
stuReg.setRegStatus("1");
_stuRegService.updateSrsStuReg(stuReg);
srsStuTodoService.confirmTask(getUsername(),"ZXJF");
String classCode = stuReg.getBJDM();
QueryWrapper<SrsClass> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("class_code",classCode);
SrsClass srsClass = srcClassMapper.selectOne(queryWrapper);
Long teacherId = srsClass.getTeacherId();
CphTeacher cphTeacher = cphTeacherMapper.selectCphTeacherByTeacherId(teacherId);
String employeeId = cphTeacher.getEmployeeId();
// 自动分配宿舍
srsDormitoryStudentService.assignDormitoryByTeacher(employeeId);
// 分配宿舍逻辑
// String classCode = stuReg.getBJDM();
// QueryWrapper<SrsClass> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("class_code",classCode);
// SrsClass srsClass = srcClassMapper.selectOne(queryWrapper);
// Long teacherId = srsClass.getTeacherId();
// CphTeacher cphTeacher = cphTeacherMapper.selectCphTeacherByTeacherId(teacherId);
// String employeeId = cphTeacher.getEmployeeId();
// // 自动分配宿舍
// srsDormitoryStudentService.assignDormitoryByTeacher(employeeId);
return AjaxResult.success("已缴费");
}else {

14
srs-admin/src/main/resources/application.yml
View File

@@ -21,7 +21,7 @@ srs:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080 正式：8085 测试：8088
port: 8088
port: 8085
servlet:
# 应用的访问路径
context-path: /
@@ -62,8 +62,8 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
# active: druid #正式环境
active: dev #测试环境
active: druid #正式环境
# active: dev #测试环境
# 文件上传
servlet:
multipart:
@@ -79,15 +79,15 @@ spring:
# redis 配置
redis:
# 地址
# host: localhost #正式环境redis
host: 47.112.118.149 #测试开发地址
host: localhost #正式环境redis
# host: 47.112.118.149 #测试开发地址
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码SSSS
password: Houpuyfb #测试开发密码
# password: #正式环境密码
# password: Houpuyfb #测试开发密码
password: #正式环境密码
# 连接超时时间
timeout: 10s
lettuce: