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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yujicun
2023-02-28 12:13:44 +08:00
parent 697ea8f7e3 d9f6f532f5
commit 74a82c21e2
16 changed files with 195 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
servers/boe-server-all/src/main/java/com/xboe/data/dto/UserOrgIds.java Normal file
View File

@@ -0,0 +1,21 @@
package com.xboe.data.dto;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.Data;
@Data
public class UserOrgIds {
/**
* 是否是超级管理员
*/
public static final String IsSystemAdminKey="isSystemAdmin";
private Map<String,Boolean> permissions=new HashMap<String,Boolean>();
private List<String> ids;
}

3
servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java
View File

@@ -4,6 +4,7 @@ import java.util.List;
import com.xboe.data.dto.AudienceUser;
import com.xboe.data.dto.UserData;
import com.xboe.data.dto.UserOrgIds;
public interface IOutSideDataService {
@@ -22,6 +23,6 @@ public interface IOutSideDataService {
/**
* 获取用户有权限的机构id
* */
List<String> getOrgIds();
UserOrgIds getOrgIds();
}

16
servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
View File

@@ -15,6 +15,7 @@ import com.xboe.core.api.TokenProxy;
import com.xboe.core.utils.OkHttpUtil;
import com.xboe.data.dto.AudienceUser;
import com.xboe.data.dto.UserData;
import com.xboe.data.dto.UserOrgIds;
import lombok.extern.slf4j.Slf4j;
@@ -164,8 +165,10 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
}
@Override
public List<String> getOrgIds() {
public UserOrgIds getOrgIds() {
UserOrgIds uids=new UserOrgIds();
List<String> orgIds = new ArrayList<>();
uids.setIds(orgIds);
String token = TokenProxy.getToken(request);
String type="application/json";
String[] headers=new String[] {"token",token,"Content-Type",type};
@@ -180,7 +183,14 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
log.error("获取当前用户拥有权限机构id错误："+responseStr);
return null;
}
//对权限进行检查
if(rootNode.has("permissions")) {
JsonNode isAdminNode = rootNode.get("permissions").get("isSystemAdmin");
if(isAdminNode!=null) {
uids.getPermissions().put(UserOrgIds.IsSystemAdminKey, isAdminNode.asBoolean());
}
}
if(rootNode.get("result")!=null & rootNode.get("result").isArray()) {
JsonNode result = rootNode.get("result");
Iterator<JsonNode> elements = result.elements();
@@ -191,7 +201,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
}catch (Exception e){
log.error("获取当前用户有权限的机构id错误",e);
}
return orgIds;
return uids;
}

2
servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java
View File

@@ -51,9 +51,7 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{
if(user.getDeleted()!=null) {
a.setDeleted(user.getDeleted());
}
a.setLoginName(user.getCode());
}else {
//新账户
a=new Account();

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

@@ -37,6 +37,7 @@ import com.xboe.core.orm.FieldFilters;
import com.xboe.core.orm.IFieldFilter;
import com.xboe.core.orm.LikeMatchMode;
import com.xboe.core.upload.XFileUploader;
import com.xboe.data.dto.UserOrgIds;
import com.xboe.data.outside.IOutSideDataService;
import com.xboe.module.course.entity.CourseFile;
import com.xboe.module.course.service.ICourseFileService;
@@ -106,14 +107,23 @@ public class CourseFileApi extends ApiBaseController {
}
//增加权限的过滤,只要看到自己或有权限的机构的
if(TempFilterConfig.Manager_CourseFile_ByOrgIds) {
List<String> orgIds = outSideDataService.getOrgIds();
UserOrgIds userOrgIds=outSideDataService.getOrgIds();
List<String> orgIds = userOrgIds.getIds();
String aid=getCurrent().getAccountId();
if(!orgIds.isEmpty()){
//filters.add(FieldFilters.in("orgId", orgIds));
filters.add(FieldFilters.or(FieldFilters.eq("sysCreateAid", aid),FieldFilters.in("orgId", orgIds)));
}else {
filters.add(FieldFilters.eq("sysCreateAid", aid));
//如果是超级管理员，就不按机构过滤了
boolean isSystemAdmin=false;
if(userOrgIds.getPermissions().containsKey(UserOrgIds.IsSystemAdminKey)) {
isSystemAdmin=userOrgIds.getPermissions().get(UserOrgIds.IsSystemAdminKey);
}
if(!isSystemAdmin) {
if(!orgIds.isEmpty()){
//filters.add(FieldFilters.in("orgId", orgIds));
filters.add(FieldFilters.or(FieldFilters.eq("sysCreateAid", aid),FieldFilters.in("orgId", orgIds)));
}else {
filters.add(FieldFilters.eq("sysCreateAid", aid));
}
}
}
//默认是查询自己的课件。

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

@@ -26,6 +26,7 @@ import com.xboe.core.CurrentUser;
import com.xboe.core.JsonResponse;
import com.xboe.core.api.ApiBaseController;
import com.xboe.core.log.AutoLog;
import com.xboe.data.dto.UserOrgIds;
import com.xboe.data.outside.IOutSideDataService;
import com.xboe.externalinterface.system.service.IFwUserService;
import com.xboe.module.assistance.service.IEmailService;
@@ -112,9 +113,20 @@ public class CourseManageApi extends ApiBaseController{
public JsonResponse<PageList<Course>> findPage(Pagination pager,CourseQueryDto dto){
//增加权限的过滤,只要看到自己或有权限的机构的
//getCurrent().get
try {
List<String> orgIds = outSideDataService.getOrgIds();
String ids= StringUtils.join(orgIds,",");
UserOrgIds userOrgIds=outSideDataService.getOrgIds();
List<String> orgIds = userOrgIds.getIds();
if(userOrgIds.getPermissions().containsKey(UserOrgIds.IsSystemAdminKey)) {
dto.setIsSystemAdmin(userOrgIds.getPermissions().get(UserOrgIds.IsSystemAdminKey));
}else {
dto.setIsSystemAdmin(false);
}
String ids="";
if(userOrgIds.getIds()!=null && !userOrgIds.getIds().isEmpty())
{
ids= StringUtils.join(orgIds,",");
}
//log.info("获取到的用户的组织机构权限ids",ids);
String aid=getCurrent().getAccountId();
//如果前端查询当前人的，这里去掉

5
servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java
View File

@@ -104,4 +104,9 @@ public class CourseQueryDto {
/**用户权限的查询*/
private String orgAid;
/**
* 是否是超级管理员
*/
private Boolean isSystemAdmin;
}

10
servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTaskApi.java
View File

@@ -71,12 +71,16 @@ public class ExamTaskApi extends ApiBaseController {
if(hasTask!=null) {
//return badRequest("此受众已推送过了，不能重复推送");
num=service.rePushTask(task);
if(num==0) {
return error("推送完成，已推送过，不需要重复推送","未推送任何人员");
}
}else {
num=service.addTask(task);
if(num==0) {
return error("推送完成，已推送过的不再推送","未推送任何人员");
}
}
if(num==0) {
return error("推送失败，未找到受众人员","请检查日志");
}
return success(true);
} catch (Exception e) {
log.error("推送考试错误",e);

4
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java
View File

@@ -114,6 +114,8 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{
aloneExamDao.save(aloneExam);
num++;
}
}else {
throw new RuntimeException("无受众人员");
}
//examUserTask.setStatus(ExamUserTask.STATUS_FINISH);
@@ -177,6 +179,8 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{
aloneExamDao.save(aloneExam);
num++;
}
}else {
throw new RuntimeException("无受众人员");
}
// examUserTask.setStatus(ExamUserTask.STATUS_FINISH);

3
servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java
View File

@@ -10,7 +10,6 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +37,6 @@ import com.xboe.system.logs.entity.SysLogLogin;
import com.xboe.system.logs.service.ISysLogLoginService;
import com.xboe.system.user.entity.User;
import com.xboe.system.user.service.IUserService;
import com.xboe.system.user.vo.UserVo;
import lombok.extern.slf4j.Slf4j;
@@ -207,6 +205,7 @@ public class PortalLoginApi extends ApiBaseController {
if (StringUtil.isBlank(token)) {
return wrap(JsonResponseStatus.TOKEN_NOPASS, "token error 1");
}
Map<String, String> tokenInfo = authorizationToken.readToken(token);
if (tokenInfo == null) {
return wrap(JsonResponseStatus.TOKEN_NOPASS, "token error 2");

24
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
View File

@@ -306,19 +306,19 @@ public class StudyCourseApi extends ApiBaseController{
if(StringUtils.isBlank(sci.getContentId())){
return error("参数错误:内容");
}
LocalDateTime now=LocalDateTime.now();
// LocalDateTime now=LocalDateTime.now();
CurrentUser cuser=getCurrent();
//下面的学习时长应该去掉了，不需要
StudyTime st=new StudyTime();
st.setContentId(sci.getContentId());
st.setCourseId(sci.getCourseId());
st.setDuration(5);//增加5秒的学习时长
st.setEndTime(now);
st.setStartTime(now);
st.setStudentId(cuser.getAccountId());
st.setStudentName(cuser.getName());
st.setStudyId(sci.getStudyId());
// StudyTime st=new StudyTime();
// st.setContentId(sci.getContentId());
// st.setCourseId(sci.getCourseId());
// st.setDuration(5);//增加5秒的学习时长
// st.setEndTime(now);
// st.setStartTime(now);
// st.setStudentId(cuser.getAccountId());
// st.setStudentName(cuser.getName());
// st.setStudyId(sci.getStudyId());
//检查是否已存在
StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
@@ -328,7 +328,7 @@ public class StudyCourseApi extends ApiBaseController{
studyService.updateProcess(item.getId(),sci.getStudyId(),sci.getCourseId(), sci.getContentTotal(),sci.getProgress());
}
//追加学习时长
studyService.appendStudyDuration(st);
//studyService.appendStudyDuration(st);
return success(item.getId());
}
@@ -337,7 +337,7 @@ public class StudyCourseApi extends ApiBaseController{
sci.setAname(cuser.getName());
studyService.saveStudyInfo(sci);
//学习记录成功后处理
studyService.appendStudyDuration(st);
//studyService.appendStudyDuration(st);
return success(sci.getStudyItemId());
}catch(Exception e) {
log.error("记录学习课程内容完成错误",e);

4
servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java
View File

@@ -10,6 +10,7 @@ import com.xboe.core.orm.FieldFilters;
import com.xboe.core.orm.UpdateBuilder;
import com.xboe.module.course.dao.CourseContentDao;
import com.xboe.school.study.entity.StudyCourse;
import com.xboe.school.study.entity.StudyCourseItem;
@Repository
public class StudyCourseDao extends BaseDao<StudyCourse> {
@@ -27,7 +28,8 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
* @param total
*/
public void finishCheck(String studyId,String courseId,Integer total){
int n=scItemDao.count(FieldFilters.eq("studyId",studyId));
//已完成的内容
int n=scItemDao.count(FieldFilters.eq("studyId",studyId),FieldFilters.eq("status",StudyCourseItem.STATUS_FINISH));
if(total==null) {
total=courseContentDao.count(FieldFilters.eq("courseId", courseId),FieldFilters.eq("deleted",false));
}

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

@@ -30,7 +30,7 @@ public interface IStudyService {
* @param studyContentId
* @param progress
*/
void updateProcess(String studyContentId,String studyId, String courseId,int total,Integer progress);
void updateProcess(String studyContentId,String studyId, String courseId,Integer total,Integer progress);
/**
* 更新最后的学习时间，及学习时间点

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

@@ -61,24 +61,36 @@ public class StudyServiceImpl implements IStudyService{
@Override
@Transactional
public void saveStudyInfo(StudyContentDto dto) {
//记录课程学习信息
StudyCourseItem sci=new StudyCourseItem();
StudyCourseItem sci = scItemDao.findOne(FieldFilters.eq("studyId", dto.getStudyId()),FieldFilters.eq("contentId", dto.getContentId()),FieldFilters.eq("aid", dto.getAid()));
LocalDateTime ldt=LocalDateTime.now();
sci.setStudyId(dto.getStudyId());
sci.setContentId(dto.getContentId());
sci.setContentName(dto.getContentName());
sci.setCourseId(dto.getCourseId());
sci.setCsectionId(dto.getCsectionId());
sci.setProgress(100);//直接设置为学习完成
sci.setStartTime(ldt);
sci.setAid(dto.getAid());
sci.setAname(dto.getAname());
sci.setFinishTime(LocalDateTime.now());
sci.setLastStudyTime(0);//此项用户记录视频内容当前学习的时间点
if(sci==null) {
sci=new StudyCourseItem();
sci.setStartTime(ldt);
sci.setAid(dto.getAid());
sci.setAname(dto.getAname());
sci.setLastStudyTime(0);//此项用户记录视频内容当前学习的时间点
sci.setStudyId(dto.getStudyId());
sci.setContentId(dto.getContentId());
sci.setContentName(dto.getContentName());
sci.setCourseId(dto.getCourseId());
sci.setCsectionId(dto.getCsectionId());
}
//进度状态
if(dto.getProgress()==null) {
sci.setProgress(1);
sci.setStatus(StudyCourseItem.STATUS_STUDYING);
}else if(dto.getProgress().intValue()==100) {
sci.setStatus(StudyCourseItem.STATUS_FINISH);
sci.setProgress(100);
}else {
sci.setStatus(StudyCourseItem.STATUS_STUDYING);
sci.setProgress(dto.getProgress());
}
//sci.setProgress(100);//直接设置为学习完成
sci.setFinishTime(ldt);
sci.setLastTime(ldt);
sci.setStatus(StudyCourseItem.STATUS_FINISH);
scItemDao.save(sci);
scItemDao.saveOrUpdate(sci);
dto.setStudyItemId(sci.getId());
//检查是否全部学习完成
scDao.finishCheck(dto.getStudyId(),dto.getCourseId(),dto.getContentTotal());
@@ -144,8 +156,12 @@ public class StudyServiceImpl implements IStudyService{
@Override
@Transactional
public void updateProcess(String studyContentId,String studyId, String courseId,int total, Integer progress) {
scItemDao.updateMultiFieldById(studyContentId, UpdateBuilder.create("progress",progress));
public void updateProcess(String studyContentId,String studyId, String courseId,Integer total, Integer progress) {
int status=StudyCourseItem.STATUS_STUDYING;
if(progress.intValue()==100) {
status=StudyCourseItem.STATUS_FINISH;
}
scItemDao.updateMultiFieldById(studyContentId,UpdateBuilder.create("progress",progress),UpdateBuilder.create("status",status));
//检查是否全部学习完成
scDao.finishCheck(studyId,courseId,total);