lts
/
auto_score
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	AES-front/src/api/admin.js
#	AES/src/main/java/com/example/aes/user/controller/ClassesController.java
#	AES/src/main/java/com/example/aes/user/service/ClassesServiceI.java
#	AES/src/main/java/com/example/aes/user/service/impl/ClassesServiceImpl.java
This commit is contained in:
zlm133588 2025-03-12 21:54:56 +08:00
parent 8663ca199f c2e3f85866
commit dcb98abc28
4 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AES-front/src/api/admin.js
View File

@ -34,6 +34,10 @@ export default {
findAllClassPage: (data) => request.post('/classes/findAllClassPage', data), findAllClassPage: (data) => request.post('/classes/findAllClassPage', data),
findAllShoolsInAdminusers: () => request.post('/school/findAllShoolsInAdminusers'), findAllShoolsInAdminusers: () => request.post('/school/findAllShoolsInAdminusers'),
deleteClass: (data) => request.post('/classes/deleteClass', data), deleteClass: (data) => request.post('/classes/deleteClass', data),
addClass: (data) => request.post('/classes/addClass', data),
findAllClassPage: (data) => request.post('/classes/findAllClassPage', data),
findAllShoolsInAdminusers: () => request.post('/school/findAllShoolsInAdminusers'),
deleteClass: (data) => request.post('/classes/deleteClass', data),
findAllCoursesPage: (data) => request.post('/course/findAllCoursesPage', data), findAllCoursesPage: (data) => request.post('/course/findAllCoursesPage', data),
Addcourse: (data) => request.post('/course/addCourse', data), Addcourse: (data) => request.post('/course/addCourse', data),
getCourseById: (data) => request.post('/course/findCourseById', data), getCourseById: (data) => request.post('/course/findCourseById', data),

6
AES/src/main/java/com/example/aes/user/controller/ClassesController.java
View File

@ -106,6 +106,12 @@ public class ClassesController{
return RespBean.error("删除班级失败", result); return RespBean.error("删除班级失败", result);
} }
} }
@PostMapping("/addClass")
public RespBean addClass(@RequestBody PMClasses pmclasses) // 添加班级
{
classesServiceI.addClass(pmclasses);
return RespBean.ok("添加班级成功");
}
@PostMapping("/findClassNotInCourse") @PostMapping("/findClassNotInCourse")
public RespBean findClassNotInCourse(@RequestBody UClass uClass, HttpServletRequest request) // 查看参与课程的班级 public RespBean findClassNotInCourse(@RequestBody UClass uClass, HttpServletRequest request) // 查看参与课程的班级
{ {

4
AES/src/main/java/com/example/aes/user/service/ClassesServiceI.java
View File

@ -13,12 +13,14 @@ public interface ClassesServiceI {
public Json takeOneClass(String inviteCode, int studentID); public Json takeOneClass(String inviteCode, int studentID);
public DataGrid findClassesByConditionPage(int teacherId, String role, int pageNum, int pageSize); public DataGrid findClassesByConditionPage(int teacherId, String role, int pageNum, int pageSize);
public DataGrid findClassesByConditionPage(PMClasses pmclasses, int pageNum, int pageSize); public DataGrid findClassesByConditionPage(PMClasses pmclasses, int pageNum, int pageSize);
public boolean deleteClass(int id); // 删除班级 public boolean deleteClass(int id); // 删除班级
public void addClass(PMClasses pclass); // 添加班级
public DataGrid findClassNotInCourse(UClass uClass, int pageNum, int pageSize); // 获取未参加课程的班级 public DataGrid findClassNotInCourse(UClass uClass, int pageNum, int pageSize); // 获取未参加课程的班级
public DataGrid findClassNotInCourse(int courseId, int teacherId, int pageNum, int pageSize, boolean history); // 获取未参加课程的班级 public DataGrid findClassNotInCourse(int courseId, int teacherId, int pageNum, int pageSize, boolean history); // 获取未参加课程的班级

48
AES/src/main/java/com/example/aes/user/service/impl/ClassesServiceImpl.java
View File

@ -8,7 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.UUID;
@Service @Service
public class ClassesServiceImpl implements ClassesServiceI { public class ClassesServiceImpl implements ClassesServiceI {
@ -151,4 +153,50 @@ public void setclassstudentsDao(ClassstudentsDaoI classstudentsDao) {
dg.setList(pmClassesList); dg.setList(pmClassesList);
return dg; return dg;
} }
@Override
public void addClass(PMClasses pclass) {
// TODO Auto-generated method stub
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// 1.<EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD>
List<Classes> classes = classesDao.findAllClass();
HashMap<String, Integer> inviteCodeMap = new HashMap<>();
int i=0;
for (Classes classes2 : classes) {
i+=1;
// System.out.println(i+"_"+classes2.getId());
try {
inviteCodeMap.put(classes2.getInviteCode(), classes2.getId());
} catch (Exception e) {
System.out.println(classes2.getId());
e.printStackTrace();
// TODO: handle exception
}
}
// 2.<EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD><EFBFBD>Ψһ<EFBFBD><EFBFBD>
while (true) {
String inviteCode = getInviteCode();
if (!inviteCodeMap.containsKey(inviteCode)) {
pclass.setInviteCode(inviteCode);
break;
}
}
classesDao.addClass(pclass);
}
// addclass要用的方法
public String getInviteCode() {
// 1.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD>룬2.<EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>
String[] chars = new String[] { "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F",
"G", "H", "J", "K", "L", "M", "N", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
StringBuffer shortBuffer = new StringBuffer();
String uuid = UUID.randomUUID().toString().replace("-", "");
for (int j = 0; j < 8; j++) {
String str = uuid.substring(j * 4, j * 4 + 4);
int par = Integer.parseInt(str, 16);
shortBuffer.append(chars[par % 32]);
}
return shortBuffer.toString();
}
} }