hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-08 10:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

作业导出名称修改

Browse Source
This commit is contained in:
lu
2024-08-01 15:33:26 +08:00
parent f79a159e22
commit 7e3a3a5838
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
View File

@@ -15,23 +15,14 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.xboe.api.ThirdApi;
import com.xboe.api.vo.AuditList;
import com.xboe.api.vo.AuditListParam;
import com.xboe.api.vo.UserDynamic;
import com.xboe.api.vo.UserdynamicParam;
import com.xboe.common.OrderCondition;
import com.xboe.core.JsonResponseStatus;
import com.xboe.core.orm.FieldFilters;
import com.xboe.module.course.dao.CourseContentDao;
import com.xboe.module.course.dao.CourseDao;
import com.xboe.module.course.dao.CourseHomeWorkDao;
import com.xboe.module.course.dao.CourseSectionDao;
import com.xboe.module.course.entity.*;
import com.xboe.module.course.vo.TeacherVo;
import com.xboe.module.usergroup.entity.UserGroupItem;
import com.xboe.school.study.entity.StudyHomeWork;
import com.xboe.school.study.dao.StudySignupDao;
import com.xboe.school.study.entity.StudySignup;
import com.xboe.school.study.service.IStudyHomeWorkService;
import com.xboe.school.study.service.IStudyService;
import com.xboe.system.user.entity.User;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -106,6 +97,9 @@ public class CoursePortalApi extends ApiBaseController{
@Autowired
IStudyService studyService;
@Autowired
StudySignupDao signupDao;
@Autowired
StringRedisTemplate redisTemplate;
@@ -368,6 +362,11 @@ public class CoursePortalApi extends ApiBaseController{
@GetMapping("/export")
public JsonResponse export(String courseName,String courseId,String contentId,String name,Integer status,HttpServletResponse response) throws IOException {
Map<String, String>map=new HashMap<>();
List<String> userIds = signupDao.findList(FieldFilters.eq("courseId", courseId)).stream().filter(Objects::nonNull).map(StudySignup::getAid).collect(Collectors.toList());
if (userIds.isEmpty()){
return error("查询不到用户");
}
List<User>user=studyService.getUserNo(userIds);
try {
List<StudyCourseItem> list = studyService.getList(courseId, contentId, name, status);
if(list.isEmpty()){
@@ -375,10 +374,14 @@ public class CoursePortalApi extends ApiBaseController{
}
list.stream().filter(Objects::nonNull).forEach(s->{
shomeworkService.getByStudyIdAndContentId(s.getStudyId(),contentId).stream().filter(e-> !Objects.equals(e.getFilePath(), "")).filter(e->e.getFilePath()!=null).forEach(e->{
//取作业后缀名
int dotIndex = e.getFilePath().lastIndexOf('/'); // 查找最后一个'.'的位置
String extension = e.getFilePath().substring(dotIndex+1);
map.put(extension,"/home/www/elearning/upload"+e.getFilePath());
user.forEach(u->{
if(u.getId().equals(s.getAid())){
//取后缀
int dotIndex = e.getFilePath().lastIndexOf('.'); // 查找最后一个'.'的位置
String extension = e.getFilePath().substring(dotIndex);
map.put(u.getName()+"-"+u.getUserNo()+extension,"/home/www/elearning/upload"+e.getFilePath());
}
});
});
});

3
servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
View File

@@ -7,6 +7,7 @@ import com.xboe.common.PageList;
import com.xboe.school.study.dto.StudyContentDto;
import com.xboe.school.study.entity.StudyCourseItem;
import com.xboe.school.study.entity.StudyTime;
import com.xboe.system.user.entity.User;
/**
* 学习情况处理,比较综合一个处理类
@@ -97,4 +98,6 @@ public interface IStudyService {
PageList<StudyCourseItem> findItemPage(int pageIndex,int pageSize,String contentId,String courseId,String name,Integer status);
List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status);
List<User> getUserNo(List<String> userIds);
}

9
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
View File

@@ -5,11 +5,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.transaction.Transactional;
import com.xboe.api.ThirdApi;
import com.xboe.school.study.entity.StudyCourse;
import com.xboe.system.user.entity.User;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -221,6 +219,11 @@ public class StudyServiceImpl implements IStudyService{
return scItemDao.findList(query.builder());
}
@Override
public List<User> getUserNo(List<String> userIds) {
return userDao.findList(FieldFilters.in("id", userIds));
}
@Override
@Transactional
public void updateProcess(String studyContentId,String studyId, String courseId,Integer total, Integer progress,String token) {