Big-Data-Lab
/
CEES-CMD
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Big-Data-Lab:190a89dc1a9d244d0f12216f4bf79a8803c4181e
Branches Tags
Big-Data-Lab:master
Big-Data-Lab:new-1.0
Big-Data-Lab:dev
...
compare: Big-Data-Lab:07fb50c39d0c3dbe8e8cc936aec3080915f9fef9
Branches Tags
Big-Data-Lab:new-1.0
Big-Data-Lab:master
Big-Data-Lab:dev

2 Commits
190a89dc1a ... 07fb50c39d

Author SHA1 Message Date
YuNan 07fb50c39d Merge branch 'master' of http://62.234.217.137:3000/Big-Data-Lab/CEES-CMD 
# Conflicts:
#	src/main/java/com/github/niefy/modules/h5/service/impl/H5LocalTeacherServiceImpl.java
 2025-02-23 13:03:37 +08:00
YuNan 57937bf704 修改外校、本校老师和研究生管理的list接口，实现学科过滤查询功能 2025-02-23 12:39:42 +08:00
3 changed files with 62 additions and 36 deletions
Show Stats Expand all files Collapse all files

61
src/main/java/com/github/niefy/modules/h5/service/impl/H5LocalTeacherServiceImpl.java
View File

@ -6,33 +6,38 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.niefy.common.utils.PageUtils;
import com.github.niefy.common.utils.Query;
import com.github.niefy.common.utils.R;
import com.github.niefy.modules.h5.entity.H5LocalTeacher;
import com.github.niefy.modules.h5.entity.H5Student;
import com.github.niefy.modules.h5.entity.H5User;
import com.github.niefy.modules.h5.mapper.H5LocalTeacherMapper;
import com.github.niefy.modules.h5.entity.H5WaiTeacher;
import com.github.niefy.modules.h5.service.H5LocalTeacherService;
import com.github.niefy.modules.h5.mapper.H5LocalTeacherMapper;
import com.github.niefy.modules.h5.service.H5UserService;
import com.github.niefy.modules.h5.util.H5Util;
import com.github.niefy.modules.sys.service.impl.ShiroServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.*;
/**
* @author 27428
* @description 针对表【h5_local_teacher】的数据库操作Service实现
* @createDate 2024-04-09 00:52:17
*/
* @author 27428
* @description 针对表【h5_local_teacher】的数据库操作Service实现
* @createDate 2024-04-09 00:52:17
*/
@Service
public class H5LocalTeacherServiceImpl extends ServiceImpl<H5LocalTeacherMapper, H5LocalTeacher>
implements H5LocalTeacherService {
implements H5LocalTeacherService{
private final ShiroServiceImpl shiroServiceImpl;
private final H5LocalTeacherMapper localTeacherMapper;
private final H5UserService h5UserService;
@Autowired
public H5LocalTeacherServiceImpl(H5UserService h5UserService, H5LocalTeacherMapper localTeacherMapper, ShiroServiceImpl shiroServiceImpl) {
public H5LocalTeacherServiceImpl( H5UserService h5UserService,H5LocalTeacherMapper localTeacherMapper, ShiroServiceImpl shiroServiceImpl) {
this.shiroServiceImpl = shiroServiceImpl;
this.localTeacherMapper = localTeacherMapper;
this.h5UserService = h5UserService;
@ -46,26 +51,27 @@ public class H5LocalTeacherServiceImpl extends ServiceImpl<H5LocalTeacherMapper,
String sortOrder = (String) params.get("sort");
// 排序字段
String sortField = (String) params.get("prop");
String arr = (String) params.get("arr");
Set<String> userPermissions = shiroServiceImpl.getUserPermissions(PUserId);
boolean containsy = userPermissions.contains("wai:user:listy");
boolean containsd = userPermissions.contains("wai:user:listd");
boolean containsl = userPermissions.contains("wai:user:listl");
boolean containsz = userPermissions.contains("wai:user:listz");
// 如果是管理员看到所有人
if (userPermissions.size() > 30) {
return queryPageUser(params, userName, 0, sortOrder, sortField);
} else if (containsy) {
//查看语文学科人
return queryPageUser(params, userName, 1, sortOrder, sortField);
} else if (containsd) {
//地理学科
return queryPageUser(params, userName, 4, sortOrder, sortField);
} else if (containsl) {
//历史
return queryPageUser(params, userName, 7, sortOrder, sortField);
} else if (containsz) {
//政治
return queryPageUser(params, userName, 8, sortOrder, sortField);
if (userPermissions.size()>30){
return queryPageUser(params, userName,0,sortOrder,sortField,arr);
}else if(containsy){
// 查看语文学科人
return queryPageUser(params, userName,1,sortOrder,sortField,arr);
// 地理学科
}else if (containsd){
return queryPageUser(params, userName,4,sortOrder,sortField,arr);
// 历史
}else if (containsl){
return queryPageUser(params, userName,7,sortOrder,sortField,arr);
// 政治
}else if (containsz){
return queryPageUser(params, userName,8,sortOrder,sortField,arr);
}
return null;
@ -121,9 +127,10 @@ public class H5LocalTeacherServiceImpl extends ServiceImpl<H5LocalTeacherMapper,
// return new PageUtils(page);
// }
public PageUtils queryPageUser(Map<String, Object> params, String userName, Integer majorId, String sortOrder, String sortField) {
public PageUtils queryPageUser(Map<String, Object> params, String userName, Integer majorId, String sortOrder, String sortField, String arr) {
QueryWrapper<H5LocalTeacher> queryWrapper = new QueryWrapper<>();
// 按照,来分隔
String[] list = arr.split(",");
if (majorId == 0) {
if (StringUtils.isNotBlank(userName)) {
queryWrapper.like("user_name", userName);
@ -139,7 +146,15 @@ public class H5LocalTeacherServiceImpl extends ServiceImpl<H5LocalTeacherMapper,
queryWrapper.like("user_name", userName);
}
}
//todo 这是啥？？？？
// 判断数组list不等于null并且第一个元素非空串
if (list.length > 0 && list[0] != null && !list[0].equals("")) {
// params.put("limit", "400");
}
for (String s : list) {
queryWrapper.like("major_id", s);
}
// 字段映射
String s = H5Util.mapSortField(sortField);

34
src/main/java/com/github/niefy/modules/h5/service/impl/H5StudentServiceImpl.java
View File

@ -50,26 +50,27 @@ public class H5StudentServiceImpl extends ServiceImpl<H5StudentMapper, H5Student
String sortOrder = (String) params.get("sort");
// 排序字段
String sortField = (String) params.get("prop");
String arr = (String) params.get("arr");
Set<String> userPermissions = shiroServiceImpl.getUserPermissions(PUserId);
boolean containsy = userPermissions.contains("wai:user:listy");
boolean containsd = userPermissions.contains("wai:user:listd");
boolean containsl = userPermissions.contains("wai:user:listl");
boolean containsz = userPermissions.contains("wai:user:listz");
// 如果是管理源看到所有人
if (userPermissions.size()>30){
return queryPageUser(params, userName,0,sortOrder,sortField);
}else if(containsy){
if (userPermissions.size() > 30) {
return queryPageUser(params, userName, 0, sortOrder, sortField, arr);
} else if (containsy) {
// 查看语文学科人
return queryPageUser(params, userName,1,sortOrder,sortField);
return queryPageUser(params, userName, 1, sortOrder, sortField, arr);
// 地理学科
}else if (containsd){
return queryPageUser(params, userName,4,sortOrder,sortField);
} else if (containsd) {
return queryPageUser(params, userName, 4, sortOrder, sortField, arr);
// 历史
}else if (containsl){
return queryPageUser(params, userName,7,sortOrder,sortField);
} else if (containsl) {
return queryPageUser(params, userName, 7, sortOrder, sortField, arr);
// 政治
}else if (containsz){
return queryPageUser(params, userName,8,sortOrder,sortField);
} else if (containsz) {
return queryPageUser(params, userName, 8, sortOrder, sortField, arr);
}
return null;
@ -104,9 +105,10 @@ public class H5StudentServiceImpl extends ServiceImpl<H5StudentMapper, H5Student
// return new PageUtils(page);
// }
public PageUtils queryPageUser(Map<String, Object> params, String userName, Integer majorId, String sortOrder, String sortField) {
public PageUtils queryPageUser(Map<String, Object> params, String userName, Integer majorId, String sortOrder, String sortField, String arr) {
QueryWrapper<H5Student> queryWrapper = new QueryWrapper<>();
// 按照,来分隔
String[] list = arr.split(",");
// 添加条件查询
if (majorId != null && majorId != 0) {
queryWrapper.eq("major_id", majorId);
@ -119,7 +121,15 @@ public class H5StudentServiceImpl extends ServiceImpl<H5StudentMapper, H5Student
if (major != null) {
queryWrapper.like("major_id", major);
}
//todo 这是啥？？？？
// 判断数组list不等于null并且第一个元素非空串
if (list.length > 0 && list[0] != null && !list[0].equals("")) {
// params.put("limit", "5");
}
for (String s : list) {
queryWrapper.like("major_id", s);
}
// 字段映射
String s = H5Util.mapSortField(sortField);

3
src/main/java/com/github/niefy/modules/h5/service/impl/H5WaiTeacherServiceImpl.java
View File

@ -237,9 +237,10 @@ public class H5WaiTeacherServiceImpl extends ServiceImpl<H5WaiTeacherMapper, H5W
queryWrapper.like("user_name", userName);
}
}
//todo 这是啥？？？？
// 判断数组list不等于null并且第一个元素非空串
if (list.length > 0 && list[0] != null && !list[0].equals("")) {
params.put("limit", "400");
// params.put("limit", "400");
}
for (String s : list) {