diff --git a/src/main/java/com/yunhai/bschclassmanage/controller/api/SchUserGroupController.java b/src/main/java/com/yunhai/bschclassmanage/controller/api/SchUserGroupController.java index 8790fee..839e559 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/api/SchUserGroupController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/api/SchUserGroupController.java @@ -39,6 +39,12 @@ public class SchUserGroupController { sendUserBaseService.editGroup(groupdto.getId(),groupdto.getName(),groupdto.getParentId(),groupdto.getSort(),NodeType.NORMAL,UserContext.getSchId()); } + @PostMapping("moveGroup") + public void moveGroup(@Valid @RequestBody SendMoveUserGroupDTO groupdto) { + sendUserBaseService.moveGroup(groupdto.getMoveId(),groupdto.getPid(),UserContext.getSchId()); + } + + @PostMapping("deleteGroup") public void deleteGroup(@RequestParam Integer id) { sendUserBaseService.deleteGroup(id,UserContext.getSchId()); diff --git a/src/main/java/com/yunhai/bschclassmanage/enums/SyncDataType.java b/src/main/java/com/yunhai/bschclassmanage/enums/SyncDataType.java index 34d685e..b3f5cca 100644 --- a/src/main/java/com/yunhai/bschclassmanage/enums/SyncDataType.java +++ b/src/main/java/com/yunhai/bschclassmanage/enums/SyncDataType.java @@ -25,6 +25,7 @@ public enum SyncDataType //推送 SEND_ADD_GROUP("Send-AddGroup","添加组"), SEND_EDIT_GROUP("Send-EditGroup","编辑组"), + SEND_MOVE_GROUP("Send-MoveGroup","移动组"), SEND_DELETE_GROUP("Send-DeleteGroup","删除组"), SEND_ADD_TEACHER("Send-AddTeaacher","添加教师"), diff --git a/src/main/java/com/yunhai/bschclassmanage/model/dto/SendMoveUserGroupDTO.java b/src/main/java/com/yunhai/bschclassmanage/model/dto/SendMoveUserGroupDTO.java index 8198671..093d4e7 100644 --- a/src/main/java/com/yunhai/bschclassmanage/model/dto/SendMoveUserGroupDTO.java +++ b/src/main/java/com/yunhai/bschclassmanage/model/dto/SendMoveUserGroupDTO.java @@ -10,8 +10,8 @@ import java.util.List; */ @Data public class SendMoveUserGroupDTO { - @NotNull(message = "用户称不能为空") - private Integer userId; + @NotNull(message = "移动组称不能为空") + private Integer moveId; @NotNull(message = "请选择移动组") - private Integer groupId; + private Integer pid; } diff --git a/src/main/java/com/yunhai/bschclassmanage/service/ISendUserBaseService.java b/src/main/java/com/yunhai/bschclassmanage/service/ISendUserBaseService.java index d5d8380..dec4e3d 100644 --- a/src/main/java/com/yunhai/bschclassmanage/service/ISendUserBaseService.java +++ b/src/main/java/com/yunhai/bschclassmanage/service/ISendUserBaseService.java @@ -20,6 +20,8 @@ public interface ISendUserBaseService { void editGroup(Integer id,String name,Integer parentId,Integer sort, NodeType type,Integer schId); + void moveGroup(Integer moveId,Integer pid,Integer schId); + void deleteGroup(Integer id,Integer schId); BoaUser addTeacher(SchTeacher teacher, String pwd, Integer groupId); 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 6f0b665..775cb61 100644 --- a/src/main/java/com/yunhai/bschclassmanage/service/impl/SchClassService.java +++ b/src/main/java/com/yunhai/bschclassmanage/service/impl/SchClassService.java @@ -57,7 +57,6 @@ public class SchClassService implements ISchClassService { } - @Override public List getSchClassCacheList(Integer schId) { return queryService.getSchClassCacheList(schId); @@ -83,7 +82,6 @@ public class SchClassService implements ISchClassService { return queryService.getSchAllClassCacheFilter(schId, gradeId, classId); } - @Override public List searcBaseSchClass(Integer schId, Integer schsystemId, Integer gradeId, Integer classId) { return queryService.searcBaseSchClass(schId, schsystemId, gradeId, classId); 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 d342478..1f9277d 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 @@ -9,6 +9,7 @@ import com.yunhai.bschclassmanage.enums.SyncDataType; import com.yunhai.bschclassmanage.service.IComSchTreeService; import com.yunhai.bschclassmanage.service.ISendUserBaseService; import com.yunhai.platform.openapi.client.YschBaseOpenApi; +import com.yunhai.platform.openapi.model.SysGroupMoveRequest; import com.yunhai.platform.openapi.model.SysGroupRequest; import com.yunhai.platform.openapi.model.SysUserGroupDeleteItem; import com.yunhai.platform.openapi.model.SysUserRequest; @@ -53,6 +54,15 @@ public class SendUserBaseService implements ISendUserBaseService { YschBaseOpenApi.editGroup(id,group); } + @SyncOpLog(SyncDataType.SEND_MOVE_GROUP) + public void moveGroup(Integer moveId,Integer pid,Integer schId){ + comSchTreeService.clearCache(); + SysGroupMoveRequest group=new SysGroupMoveRequest(); + group.setMoveId(moveId); + group.setPid(pid); + YschBaseOpenApi.moveGroup(schId,group); + } + @SyncOpLog(SyncDataType.SEND_DELETE_GROUP) public void deleteGroup(Integer id,Integer schId){ comSchTreeService.clearCache();