userclass/UserclassService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消全部

Browse Source
This commit is contained in:
wanghu
2026-08-18 17:57:00 +08:00
parent d9aa173b3d
commit c71c334a84
12 changed files with 122 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yunhai/bschclassmanage/Repository/SchClassRepository.java
+4
View File
@@ -93,4 +93,8 @@ public interface SchClassRepository extends JpaRepository<SchClass, Integer>, Jp
@Query("UPDATE SchClass c SET c.graduate = true, c.updateDate = :now, c.updateUserId = 0 " +
"WHERE c.schId = :schId AND c.gradeId = :maxGrade AND c.graduate = false")
int batchGraduate(@Param("schId") Integer schId, @Param("maxGrade") Integer maxGrade, @Param("now") Date now);
Optional<SchClass> findByGroupId(Integer groupId);
}
src/main/java/com/yunhai/bschclassmanage/controller/oapi/sync/SyncGroupController.java
+6 -6
View File
@@ -24,15 +24,15 @@ public class SyncGroupController {
public void AddGroup(@RequestBody String jsonString) {
log.info("AddGroup jsonString="+jsonString);
//判断 2,"学校组" 4, "班级组"
SyncGroupDTO group = OtherUtil.jsonParseObject(jsonString, SyncGroupDTO.class);
syncGroupService.syncAddOrUpdate(group);
List<SyncGroupDTO> groupList = OtherUtil.jsonParseList(jsonString, SyncGroupDTO.class);
syncGroupService.syncAddOrUpdate(groupList);
}
@PostMapping("UpdateGroup")
public void UpdateGroup(@RequestBody String jsonString) {
log.info("UpdateGroup jsonString="+jsonString);
SyncGroupDTO group = OtherUtil.jsonParseObject(jsonString, SyncGroupDTO.class);
syncGroupService.syncAddOrUpdate(group);
List<SyncGroupDTO> groupList = OtherUtil.jsonParseList(jsonString, SyncGroupDTO.class);
syncGroupService.syncAddOrUpdate(groupList);
}
@PostMapping("DeleteGroup")
@@ -44,8 +44,8 @@ public class SyncGroupController {
@PostMapping("SyncGroup")
public void SyncGroup(@RequestBody String jsonString) {
log.info("SyncGroup jsonString="+jsonString);
SyncGroupDTO group = OtherUtil.jsonParseObject(jsonString, SyncGroupDTO.class);
syncGroupService.syncAddOrUpdate(group);
List<SyncGroupDTO> groupList= OtherUtil.jsonParseList(jsonString, SyncGroupDTO.class);
syncGroupService.syncAddOrUpdate(groupList);
}
}
src/main/java/com/yunhai/bschclassmanage/controller/oapi/sync/SyncUserController.java
+3 -3
View File
@@ -23,14 +23,14 @@ public class SyncUserController {
public void AddUser(@RequestBody String jsonString) {
log.info("AddUser jsonString="+jsonString);
List<SyncUserDTO> userlist = OtherUtil.jsonParseList(jsonString, SyncUserDTO.class);
syncUserService.syncAddOrUpdate(userlist);
syncUserService.syncAddOrUpdate(userlist,false);
}
@PostMapping("UpdateUser")
public void UpdateUser(@RequestBody String jsonString) {
log.info("UpdateUser jsonString="+jsonString);
List<SyncUserDTO> userList = OtherUtil.jsonParseList(jsonString, SyncUserDTO.class);
syncUserService.syncAddOrUpdate(userList);
syncUserService.syncAddOrUpdate(userList,false);
}
@PostMapping("DeleteUser")
@@ -44,6 +44,6 @@ public class SyncUserController {
public void SyncUser(@RequestBody String jsonString) {
log.info("SyncUser jsonString="+jsonString);
List<SyncUserDTO> userList = OtherUtil.jsonParseList(jsonString, SyncUserDTO.class);
syncUserService.syncAddOrUpdate(userList);
syncUserService.syncAddOrUpdate(userList,true);
}
}
src/main/java/com/yunhai/bschclassmanage/model/tool/SyncGroupDTO.java
+1
View File
@@ -5,6 +5,7 @@ import lombok.Data;
import java.util.List;
//[{"id":22,"name":"同步","code":null,"type":7,"pid":4,"no":6,"children":null}]
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class SyncGroupDTO {
src/main/java/com/yunhai/bschclassmanage/service/ISyncGroupService.java
+2 -2
View File
@@ -8,7 +8,7 @@ import java.util.List;
@Service
public interface ISyncGroupService {
void syncAddOrUpdate(SyncGroupDTO group);
void addOrUpdateSchool(SyncGroupDTO group);
void syncAddOrUpdate(List<SyncGroupDTO> group);
void addOrUpdateSchool(List<SyncGroupDTO> group);
}
src/main/java/com/yunhai/bschclassmanage/service/ISyncUserBaseService.java
+27
View File
@@ -0,0 +1,27 @@
package com.yunhai.bschclassmanage.service;
import com.yunhai.bschclassmanage.model.tool.DeleteUser;
import com.yunhai.bschclassmanage.model.tool.SyncUserDTO;
import com.yunhai.platform.utils.model.BoaGroup;
import com.yunhai.platform.utils.model.BoaUser;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public interface ISyncUserBaseService {
// BoaGroup addGroup();
//
// void deleteGroup(List<Integer> ids);
//
// BoaUser addUser(BoaUser user);
//
// void updateUser(BoaUser user);
//
// List<BoaUser> addUserList(List<BoaUser> user);
//
// void updateUserList(List<BoaUser> user);
//
// void deleteUserList(List<Integer> ids);
}
src/main/java/com/yunhai/bschclassmanage/service/ISyncUserService.java
+1 -1
View File
@@ -9,7 +9,7 @@ import java.util.List;
@Service
public interface ISyncUserService {
void syncAddOrUpdate(List<SyncUserDTO> userList);
void syncAddOrUpdate(List<SyncUserDTO> userList,boolean isAll);
void deleteUser(List<DeleteUser> deleteUserList);
}
src/main/java/com/yunhai/bschclassmanage/service/impl/SchBinSchsystemService.java
+2 -7
View File
@@ -245,13 +245,8 @@ public class SchBinSchsystemService implements ISchBinSchsystemService {
BoaGroup teaGroup= CreateGroup(NodeType.TEACHER.getId(),"教师组",schId,1);
BoaGroup stuGroup= CreateGroup(NodeType.STUDENT.getId(),"学生组",schId,2);
{
Integer scort=1;
List<String> deptNameSet = Arrays.asList("校长室","办公室","行政","信息");
for (String name : deptNameSet) {
CreateGroup(NodeType.NORMAL.getId(), name, teaGroup.getId(),scort);
}
}
//创建校长室
CreateGroup(NodeType.NORMAL.getId(),"校长室", teaGroup.getId(),1);
//获取学制
List<SchBinSchsystem> schsystemBinList=getSchBinSchsystemList(schId);
src/main/java/com/yunhai/bschclassmanage/service/impl/classes/SchClassQueryService.java
+2
View File
@@ -86,6 +86,8 @@ public class SchClassQueryService {
return list;
}
public List<SchClass> getSchAllClassCacheFilter(Integer schId, List<Integer> gradeIds, Integer classId) {
List<SchClass> list = getSchAllClassCacheList(schId);
if (schId != null && schId > 0)
src/main/java/com/yunhai/bschclassmanage/service/impl/sync/SyncGroupService.java
+22 -16
View File
@@ -1,19 +1,21 @@
package com.yunhai.bschclassmanage.service.impl.sync;
import com.yunhai.bschclassmanage.Repository.SchClassRepository;
import com.yunhai.bschclassmanage.Repository.SchInfoRepository;
import com.yunhai.bschclassmanage.entity.SchClass;
import com.yunhai.bschclassmanage.entity.SchInfo;
import com.yunhai.bschclassmanage.enums.NodeType;
import com.yunhai.bschclassmanage.model.tool.BaseGroup;
import com.yunhai.bschclassmanage.model.tool.SyncGroupDTO;
import com.yunhai.bschclassmanage.service.IBaseSchsystemGradeService;
import com.yunhai.bschclassmanage.service.ISchClassService;
import com.yunhai.bschclassmanage.service.ISyncGroupService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
import javax.xml.crypto.Data;
import java.util.*;
@Service
public class SyncGroupService implements ISyncGroupService {
@@ -21,27 +23,31 @@ public class SyncGroupService implements ISyncGroupService {
@Autowired
private SchInfoRepository schInfoRepository;
@Autowired
private ISchClassService schClassService;
public void syncAddOrUpdate(SyncGroupDTO group) {
@Autowired
private SchClassRepository schClassRepository;
//学校组-年级组-班级组
if(Objects.equals(group.getType(),NodeType.SCHOOL.getId())){
addOrUpdateSchool(group);
}
@Autowired
private IBaseSchsystemGradeService baseSchsystemGradeService;
if(Objects.equals(group.getType(),NodeType.CLASS.getId())){
{
//添加班级组 需要 年级组id
//判断是否绑定了学制
//判断年级组是哪个学制的 年级组名称（2026） 学制下的 年级id（grade_id）
public void syncAddOrUpdate(List<SyncGroupDTO> groupList) {
addOrUpdateSchool(groupList);
}
public void addOrUpdateSchool(List<SyncGroupDTO> groupList)
{
for (SyncGroupDTO group: groupList) {
if(Objects.equals(group.getType(),NodeType.SCHOOL.getId())){
addOrUpdateSchool(group);
}
}
}
public void addOrUpdateSchool(SyncGroupDTO group)
private void addOrUpdateSchool(SyncGroupDTO group)
{
Optional<SchInfo> schOpt=schInfoRepository.findBySchId(group.getId());
if(schOpt.isPresent()){
src/main/java/com/yunhai/bschclassmanage/service/impl/sync/SyncUserBaseService.java
+25
View File
@@ -0,0 +1,25 @@
package com.yunhai.bschclassmanage.service.impl.sync;
import com.yunhai.bschclassmanage.service.ISyncUserBaseService;
import com.yunhai.platform.utils.model.BoaGroup;
import com.yunhai.platform.utils.model.BoaUser;
public class SyncUserBaseService implements ISyncUserBaseService {
public BoaGroup addGroup(){
return new BoaGroup();
}
public void deleteGroup(){
}
public BoaUser addUserList(){
return new BoaUser();
}
public void deleteUserList(){
}
}
src/main/java/com/yunhai/bschclassmanage/service/impl/sync/SyncUserService.java
+27 -20
View File
@@ -48,7 +48,7 @@ public class SyncUserService implements ISyncUserService {
@Override
@Transactional(rollbackFor = Exception.class)
public void syncAddOrUpdate(List<SyncUserDTO> userList) {
public void syncAddOrUpdate(List<SyncUserDTO> userList,boolean isAll) {
if (userList == null || userList.isEmpty()) return;
// 按角色分组（每个用户只遍历一次 roleList）
@@ -69,10 +69,10 @@ public class SyncUserService implements ISyncUserService {
Date now = new Date();
if (!syncStudentList.isEmpty()) {
syncStudents(syncStudentList, now);
syncStudents(syncStudentList, now,isAll);
}
if (!syncTeacherList.isEmpty()) {
syncTeachers(syncTeacherList, now);
syncTeachers(syncTeacherList, now,isAll);
}
}
@@ -164,7 +164,7 @@ public class SyncUserService implements ISyncUserService {
// ==================== 学生同步 ====================
private void syncStudents(List<SyncUserDTO> studentUsers, Date now) {
private void syncStudents(List<SyncUserDTO> studentUsers, Date now,boolean isAll) {
List<Integer> stuIds = studentUsers.stream().map(SyncUserDTO::getId).distinct().collect(Collectors.toList());
// 已有学生记录 (stuId, groupId) -> SchStudent
@@ -205,14 +205,18 @@ public class SyncUserService implements ISyncUserService {
schStudentRepository.saveAll(saveList);
}
// 清理用户中心不存在的学生（与教师相同逻辑：标记转出，可逆向恢复）
Set<Integer> schIds = classKeys.keySet();
setTransferStudent(schIds, classKeys, incomingStudentKeys);
if(isAll)
{
// 清理用户中心不存在的学生（与教师相同逻辑：标记转出，可逆向恢复）
Set<Integer> schIds = classKeys.keySet();
setTransferStudent(schIds, classKeys, incomingStudentKeys);
// 同步后使受影响班级的学生缓存失效，避免读到旧数据
if (!classKeys.isEmpty()) {
classKeys.forEach((schId, classIds) -> schStudentCacheService.clearClassStudentCaches(schId, classIds));
// 同步后使受影响班级的学生缓存失效，避免读到旧数据
if (!classKeys.isEmpty()) {
classKeys.forEach((schId, classIds) -> schStudentCacheService.clearClassStudentCaches(schId, classIds));
}
}
}
/**
@@ -277,7 +281,7 @@ public class SyncUserService implements ISyncUserService {
// ==================== 教师同步 ====================
private void syncTeachers(List<SyncUserDTO> teacherUsers, Date now) {
private void syncTeachers(List<SyncUserDTO> teacherUsers, Date now,boolean isAll) {
List<Integer> teaIds = teacherUsers.stream().map(SyncUserDTO::getId).distinct().collect(Collectors.toList());
@@ -337,17 +341,20 @@ public class SyncUserService implements ISyncUserService {
schTeacherGroupRepository.saveAll(saveGroupList);
}
// 清理用户中心不存在的教师：
// 学校已存在、但用户中心（teacherUsers）已不存在的教师，需从活跃名单中清理。
// 对本次同步涉及的每所学校，将「当前为转入状态、但不在本次下发分组列表」的教师分组标记为转出（OUT）。
// 这样既把已从用户中心移除/调离的教师清理出活跃名单，又保留转出记录、可随下次同步逆向恢复（重新 IN）。
// 仅针对本次同步覆盖的学校，避免误删未参与本批次的其他学校教师。
setTransferTeacher(schIds,incomingGroupKeys);
if(isAll){
// 清理用户中心不存在的教师：
// 学校已存在、但用户中心（teacherUsers）已不存在的教师，需从活跃名单中清理。
// 对本次同步涉及的每所学校，将「当前为转入状态、但不在本次下发分组列表」的教师分组标记为转出（OUT）。
// 这样既把已从用户中心移除/调离的教师清理出活跃名单，又保留转出记录、可随下次同步逆向恢复（重新 IN）。
// 仅针对本次同步覆盖的学校，避免误删未参与本批次的其他学校教师。
setTransferTeacher(schIds,incomingGroupKeys);
// 同步后使受影响学校的教师缓存失效
if (!schIds.isEmpty()) {
schTeacherCacheService.clearTeacherCaches(schIds);
// 同步后使受影响学校的教师缓存失效
if (!schIds.isEmpty()) {
schTeacherCacheService.clearTeacherCaches(schIds);
}
}
}
private void setTransferTeacher( Set<Integer> schIds,Set<String> incomingGroupKeys)