diff --git a/src/main/java/com/yunhai/bschclassmanage/service/impl/SchBinSchsystemService.java b/src/main/java/com/yunhai/bschclassmanage/service/impl/SchBinSchsystemService.java index 0bc6050..b9929c9 100644 --- a/src/main/java/com/yunhai/bschclassmanage/service/impl/SchBinSchsystemService.java +++ b/src/main/java/com/yunhai/bschclassmanage/service/impl/SchBinSchsystemService.java @@ -38,7 +38,7 @@ public class SchBinSchsystemService implements ISchBinSchsystemService { private IBaseSchsystemService baseSchsystemService; @Autowired - private ISendUserBaseService syncUserBaseService; + private ISendUserBaseService sendUserBaseService; @Autowired private RedisUtil redisUtil; @@ -118,7 +118,7 @@ public class SchBinSchsystemService implements ISchBinSchsystemService { schBinSchsystemRepository.deleteAll(existingList); } - List newList = new ArrayList<>(schsystemIds.length); + List newList = new ArrayList<>(); for (Integer systemId : schsystemIds) { if (systemId == null) { continue; @@ -134,8 +134,8 @@ public class SchBinSchsystemService implements ISchBinSchsystemService { schBinSchsystemRepository.saveAll(newList); } String cacheKey = RedisConstants.SCHOOL_GRAGE+"_"+schId; - SchGroupInitialization(schId); redisUtil.del(cacheKey); + SchGroupInitialization(schId,newList); } @@ -239,27 +239,28 @@ public class SchBinSchsystemService implements ISchBinSchsystemService { return list; } - private void SchGroupInitialization(Integer schId) + private void SchGroupInitialization(Integer schId,List newList) { //添加学生组 - BoaGroup teaGroup= syncUserBaseService.addGroup("教师组",schId,1,NodeType.TEACHER); - BoaGroup stuGroup= syncUserBaseService.addGroup("学生组",schId,2,NodeType.STUDENT); + BoaGroup teaGroup= sendUserBaseService.addGroup("教师组",schId,1,NodeType.TEACHER); + BoaGroup stuGroup= sendUserBaseService.addGroup("学生组",schId,2,NodeType.STUDENT); //创建校长室 - syncUserBaseService.addGroup("校长室", teaGroup.getId(),1,NodeType.NORMAL); + sendUserBaseService.addGroup("校长室", teaGroup.getId(),1,NodeType.NORMAL); //获取学制 - List schsystemBinList=getSchBinSchsystemList(schId); + Map schsystemMap=getSchBinSchsystemMap(schId); - if(schsystemBinList.size()==1) + + if(newList.size()==1) { - }else if(schsystemBinList.size()>1) + }else if(newList.size()>1) { Integer scort=1; - for (SchBinSchsystem schsystem:schsystemBinList) { + for (SchBinSchsystem schsystem:newList) { //添加学段组 - BoaGroup sectionGroup= syncUserBaseService.addGroup(schsystemMap.get(schsystem.getId()),stuGroup.getId(),scort,NodeType.SECTION); + BoaGroup sectionGroup= sendUserBaseService.addGroup(schsystemMap.get(schsystem.getId()),stuGroup.getId(),scort,NodeType.SECTION); schsystem.setGroupId(sectionGroup.getId()); scort++; } diff --git a/src/main/java/com/yunhai/bschclassmanage/service/impl/SchClassService.java b/src/main/java/com/yunhai/bschclassmanage/service/impl/SchClassService.java index 802ea3c..c62657b 100644 --- a/src/main/java/com/yunhai/bschclassmanage/service/impl/SchClassService.java +++ b/src/main/java/com/yunhai/bschclassmanage/service/impl/SchClassService.java @@ -25,8 +25,6 @@ import java.util.*; @Service public class SchClassService implements ISchClassService { - - @Autowired private SchClassQueryService queryService; diff --git a/src/main/java/com/yunhai/bschclassmanage/service/impl/com/SendUserBaseService.java b/src/main/java/com/yunhai/bschclassmanage/service/impl/com/SendUserBaseService.java index fc4fb1a..057cbb5 100644 --- a/src/main/java/com/yunhai/bschclassmanage/service/impl/com/SendUserBaseService.java +++ b/src/main/java/com/yunhai/bschclassmanage/service/impl/com/SendUserBaseService.java @@ -25,7 +25,7 @@ import java.util.List; @Service public class SendUserBaseService implements ISendUserBaseService { - @SyncOpLog(SyncDataType.SEND_EDIT_GROUP) + @SyncOpLog(SyncDataType.SEND_ADD_GROUP) public BoaGroup addGroup(String name, Integer parentId, Integer sort, NodeType type){ SysGroupRequest group=new SysGroupRequest(); group.setName(name);