移动组
This commit is contained in:
@@ -39,6 +39,12 @@ public class SchUserGroupController {
|
|||||||
sendUserBaseService.editGroup(groupdto.getId(),groupdto.getName(),groupdto.getParentId(),groupdto.getSort(),NodeType.NORMAL,UserContext.getSchId());
|
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")
|
@PostMapping("deleteGroup")
|
||||||
public void deleteGroup(@RequestParam Integer id) {
|
public void deleteGroup(@RequestParam Integer id) {
|
||||||
sendUserBaseService.deleteGroup(id,UserContext.getSchId());
|
sendUserBaseService.deleteGroup(id,UserContext.getSchId());
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ public enum SyncDataType
|
|||||||
//推送
|
//推送
|
||||||
SEND_ADD_GROUP("Send-AddGroup","添加组"),
|
SEND_ADD_GROUP("Send-AddGroup","添加组"),
|
||||||
SEND_EDIT_GROUP("Send-EditGroup","编辑组"),
|
SEND_EDIT_GROUP("Send-EditGroup","编辑组"),
|
||||||
|
SEND_MOVE_GROUP("Send-MoveGroup","移动组"),
|
||||||
SEND_DELETE_GROUP("Send-DeleteGroup","删除组"),
|
SEND_DELETE_GROUP("Send-DeleteGroup","删除组"),
|
||||||
|
|
||||||
SEND_ADD_TEACHER("Send-AddTeaacher","添加教师"),
|
SEND_ADD_TEACHER("Send-AddTeaacher","添加教师"),
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class SendMoveUserGroupDTO {
|
public class SendMoveUserGroupDTO {
|
||||||
@NotNull(message = "用户称不能为空")
|
@NotNull(message = "移动组称不能为空")
|
||||||
private Integer userId;
|
private Integer moveId;
|
||||||
@NotNull(message = "请选择移动组")
|
@NotNull(message = "请选择移动组")
|
||||||
private Integer groupId;
|
private Integer pid;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ public interface ISendUserBaseService {
|
|||||||
|
|
||||||
void editGroup(Integer id,String name,Integer parentId,Integer sort, NodeType type,Integer schId);
|
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);
|
void deleteGroup(Integer id,Integer schId);
|
||||||
|
|
||||||
BoaUser addTeacher(SchTeacher teacher, String pwd, Integer groupId);
|
BoaUser addTeacher(SchTeacher teacher, String pwd, Integer groupId);
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ public class SchClassService implements ISchClassService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<SchClass> getSchClassCacheList(Integer schId) {
|
public List<SchClass> getSchClassCacheList(Integer schId) {
|
||||||
return queryService.getSchClassCacheList(schId);
|
return queryService.getSchClassCacheList(schId);
|
||||||
@@ -83,7 +82,6 @@ public class SchClassService implements ISchClassService {
|
|||||||
return queryService.getSchAllClassCacheFilter(schId, gradeId, classId);
|
return queryService.getSchAllClassCacheFilter(schId, gradeId, classId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<BaseSchClassVO> searcBaseSchClass(Integer schId, Integer schsystemId, Integer gradeId, Integer classId) {
|
public List<BaseSchClassVO> searcBaseSchClass(Integer schId, Integer schsystemId, Integer gradeId, Integer classId) {
|
||||||
return queryService.searcBaseSchClass(schId, schsystemId, gradeId, classId);
|
return queryService.searcBaseSchClass(schId, schsystemId, gradeId, classId);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.yunhai.bschclassmanage.enums.SyncDataType;
|
|||||||
import com.yunhai.bschclassmanage.service.IComSchTreeService;
|
import com.yunhai.bschclassmanage.service.IComSchTreeService;
|
||||||
import com.yunhai.bschclassmanage.service.ISendUserBaseService;
|
import com.yunhai.bschclassmanage.service.ISendUserBaseService;
|
||||||
import com.yunhai.platform.openapi.client.YschBaseOpenApi;
|
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.SysGroupRequest;
|
||||||
import com.yunhai.platform.openapi.model.SysUserGroupDeleteItem;
|
import com.yunhai.platform.openapi.model.SysUserGroupDeleteItem;
|
||||||
import com.yunhai.platform.openapi.model.SysUserRequest;
|
import com.yunhai.platform.openapi.model.SysUserRequest;
|
||||||
@@ -53,6 +54,15 @@ public class SendUserBaseService implements ISendUserBaseService {
|
|||||||
YschBaseOpenApi.editGroup(id,group);
|
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)
|
@SyncOpLog(SyncDataType.SEND_DELETE_GROUP)
|
||||||
public void deleteGroup(Integer id,Integer schId){
|
public void deleteGroup(Integer id,Integer schId){
|
||||||
comSchTreeService.clearCache();
|
comSchTreeService.clearCache();
|
||||||
|
|||||||
Reference in New Issue
Block a user