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

Merge branch 'preview' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers into release

Browse Source 
# Conflicts:
#	servers/boe-server-all/src/main/resources/application-pre.properties
This commit is contained in:
dongruihua
2022-10-23 20:11:46 +08:00
parent 441936aa65 c8987c3c69
commit b1f715c267
15 changed files with 113 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java
View File

@@ -279,7 +279,7 @@ public class ArticleServiceImpl implements IArticleService{
usernameDto.setShares((Integer) o[6]);
usernameDto.setComments((Integer) o[7]);
usernameDto.setViews((Integer) o[8]);
usernameDto.setSysCreateAid((String) o[9]);
usernameDto.setSysCreateAid(o[9].toString());
usernameDtos.add(usernameDto);
}

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

@@ -134,6 +134,8 @@ public class CourseFullTextApi extends ApiBaseController{
paras.setSysType2(dto.getSysType2());//专业分类二级
paras.setSysType3(dto.getSysType3());//专业分类三级
paras.setDevice(dto.getDevice());
//用户的companyId
paras.setCompanyId(dto.getCompanyId());
//paras.setAudience(dto.getAudiences());
if(StringUtils.isNotBlank(dto.getAudiences())) {
paras.setAudiences(dto.getAudiences().split(","));

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

@@ -60,6 +60,9 @@ public class CourseQueryDto {
/**排序顺序*/
private Boolean orderAsc;
/**companyId 主要是老系统的权限*/
private String companyId;
/**
* 置顶
*/

44
servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/FavoritesApi.java
View File

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
import com.xboe.core.CurrentUser;
import com.xboe.module.interaction.dto.*;
import com.xboe.school.study.service.IStudyCourseService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +40,9 @@ public class FavoritesApi extends ApiBaseController {
@Autowired
ICourseTeacherService ctService;
@Autowired
IStudyCourseService studyCourseService;
/**
* 此处的查询需要再讨论一下，因为有不同的内容，前端呈现的也不一样
*
@@ -112,12 +116,12 @@ public class FavoritesApi extends ApiBaseController {
public JsonResponse<PageList<FavoriteDto>> findCoursePage(Pagination pager, Favorites favorites, Integer type, String keyword) {
String aid = this.getCurrent().getAccountId();
PageList<FavoriteDto> coursePage = service.findCoursePage(pager.getPageIndex(), pager.getPageSize(), favorites, type, keyword,aid);
Set<String> cids = new HashSet<String>();
for(FavoriteDto dto : coursePage.getList()) {
if(!cids.contains(dto.getObjId())) {
cids.add(dto.getObjId());
}
}
// Set<String> cids = new HashSet<String>();
// for(FavoriteDto dto : coursePage.getList()) {
// if(!cids.contains(dto.getObjId())) {
// cids.add(dto.getObjId());
// }
// }
// if(cids.size()>0) {
//// List<CourseTeacherDto> teachers = ctService.queryTeacher(cids);
//// for(FavoriteDto fdto : coursePage.getList()){
@@ -128,7 +132,19 @@ public class FavoritesApi extends ApiBaseController {
//// }
//// }
// }
List<String> courseIds = coursePage.getList().stream().map(FavoriteDto::getObjId).collect(Collectors.toList());
List<Object[]> progress = studyCourseService.progress(aid, courseIds);
if(!coursePage.getList().isEmpty() && !progress.isEmpty()) {
for (FavoriteDto dto : coursePage.getList()) {
for (Object[] o : progress) {
if (dto.getObjId().equals(o[0])) {
dto.setProgress((Float) o[1]);
}
}
}
}
return success(coursePage);
}
@@ -206,6 +222,20 @@ public class FavoritesApi extends ApiBaseController {
public JsonResponse<PageList<FavoriteTotalDto>> queryAll(Pagination pager,String keyword){
String aid = this.getCurrent().getAccountId();
PageList<FavoriteTotalDto> favoriteTotalDtoPageList = service.queryAll(pager.getPageIndex(), pager.getPageSize(), aid, keyword);
List<String> courseIds = favoriteTotalDtoPageList.getList().stream().filter(favoriteTotalDto -> favoriteTotalDto.getType() == 1).
map(FavoriteTotalDto::getId).collect(Collectors.toList());
List<Object[]> progress = studyCourseService.progress(aid, courseIds);
if(!favoriteTotalDtoPageList.getList().isEmpty() && !progress.isEmpty()) {
for (FavoriteTotalDto dto : favoriteTotalDtoPageList.getList()) {
for (Object[] o : progress) {
if (dto.getId().equals(o[0])) {
dto.setProgress((Float) o[1]);
}
}
}
}
return success(favoriteTotalDtoPageList);
}

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

@@ -65,5 +65,10 @@ public class FavoriteDto {
/**针对于问题是否已解决*/
private Boolean isResolve;
/**
* 学习进度
* */
private Float progress;
}

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

@@ -81,6 +81,11 @@ public class FavoriteTotalDto {
* */
private Integer breCommend;
/**
* 学习进度
* */
private Float progress;
public FavoriteTotalDto() {
}

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

@@ -91,6 +91,7 @@ public class PortalConsoleApi extends ApiBaseController{
map.put("aid",account.getId());
map.put("sysId",user.getSysId());
map.put("companyId",user.getCompanyId());
map.put("name",user.getName());
map.put("sex",user.getGender());
map.put("userNo",user.getUserNo());

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

@@ -1,12 +1,20 @@
package com.xboe.school.api;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import com.xboe.common.PageList;
import com.xboe.common.Pagination;
import com.xboe.core.JsonResponse;
import com.xboe.core.api.ApiBaseController;
import com.xboe.module.article.entity.Article;
import com.xboe.module.article.service.IArticleService;
import com.xboe.module.boecase.service.ICasesService;
@@ -17,30 +25,9 @@ import com.xboe.module.course.service.ICourseService;
import com.xboe.module.qa.entity.Question;
import com.xboe.module.qa.service.IQuestionService;
import com.xboe.school.vo.CasesVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import com.xboe.account.entity.Account;
import com.xboe.account.service.IAccountService;
import com.xboe.common.utils.StringUtil;
import com.xboe.core.CurrentUser;
import com.xboe.core.IAuthorizationToken;
import com.xboe.core.JsonResponse;
import com.xboe.core.api.ApiBaseController;
import com.xboe.module.teacher.entity.Teacher;
import com.xboe.module.teacher.service.ITeacherService;
import com.xboe.system.organization.entity.Organization;
import com.xboe.system.organization.service.IOrganizationService;
import com.xboe.system.user.entity.User;
import com.xboe.system.user.service.IUserService;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
/**
* 门户首页接口
*

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

@@ -74,4 +74,9 @@ public interface IStudyCourseService {
* */
List<StudyCourse> followids(StudyCourseQuery studyCourseQuery);
/**
* 查询课程最新学习记录的进度
* */
List<Object[]> progress(String aid,List<String> courseIds);
}

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

@@ -266,8 +266,8 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
// List<StudyCouseDto> studyCouseDtos = new ArrayList<>();
QueryBuilder builder = QueryBuilder.from(StudyCourse.class.getSimpleName()+" sc,"+ Course.class.getSimpleName()+" c");
builder.addFilter(FieldFilters.eqField("sc.courseId","c.id"));
builder.addFilter(FieldFilters.eq("c.enabled",true));
builder.addFilter(FieldFilters.eq("c.deleted",false));
// builder.addFilter(FieldFilters.eq("c.enabled",true));
// builder.addFilter(FieldFilters.eq("c.deleted",false));
builder.addFilter(FieldFilters.eq("sc.aid",studyCourseQuery.getAid()));
builder.addFilter(FieldFilters.in("sc.courseId",studyCourseQuery.getIds()));
builder.addOrder(OrderCondition.desc("sc.lastTime"));
@@ -297,8 +297,8 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
public List<StudyCourse> followids(StudyCourseQuery studyCourseQuery) {
QueryBuilder builder = QueryBuilder.from(StudyCourse.class.getSimpleName()+" sc,"+ Course.class.getSimpleName()+" c");
builder.addFilter(FieldFilters.eqField("sc.courseId","c.id"));
builder.addFilter(FieldFilters.eq("c.enabled",true));
builder.addFilter(FieldFilters.eq("c.deleted",false));
// builder.addFilter(FieldFilters.eq("c.enabled",true));
// builder.addFilter(FieldFilters.eq("c.deleted",false));
builder.addFilter(FieldFilters.in("sc.aid",studyCourseQuery.getAids()));
builder.addFilter(FieldFilters.in("sc.courseId",studyCourseQuery.getIds()));
builder.addOrder(OrderCondition.desc("sc.lastTime"));
@@ -307,6 +307,25 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
return list;
}
@Override
public List<Object[]> progress(String aid, List<String> courseIds) {
List<Object> floats = new ArrayList<>();
QueryBuilder builder = QueryBuilder.from(StudyCourse.class);
builder.addFilter(FieldFilters.eq("aid",aid));
builder.addFilter(FieldFilters.in("courseId",courseIds));
builder.addOrder(OrderCondition.desc("lastTime"));
// builder.setPageSize(1);
// builder.addGroupBy("aid");
builder.addFields("courseId","progress");
try {
List<Object[]> listFields = studyCourseDao.findListFields(builder.builder());
return listFields;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
@Override
public StudyCourse has(String courseId, String aid) {
List<StudyCourse> list=studyCourseDao.findList(1,OrderCondition.desc("id"),FieldFilters.eq("courseId", courseId),FieldFilters.eq("aid", aid));

3
servers/boe-server-all/src/main/resources/application-pre.properties
View File

@@ -35,6 +35,9 @@ xboe.externalinterface.url.system=http://127.0.0.1:9091
## 新增加的教师的内部调用接口
xboe.old.base.url=https://u.boe.com
## 用户统计接口的api地址
xboe.stat.base.url=http://127.0.0.1:9080
#加密盐
#jasypt.encryptor.password=jasypt
jasypt.encryptor.algorithm=PBEWithMD5AndDES

3
servers/boe-server-all/src/main/resources/application-pro.properties
View File

@@ -72,6 +72,9 @@ xboe.externalinterface.url.system=http://localhost:9091
## 新增加的教师的内部调用接口
xboe.old.base.url=https://u.boe.com
## 用户统计接口的api地址
xboe.stat.base.url=http://127.0.0.1:9080
#加密盐
#jasypt.encryptor.password=jasypt
jasypt.encryptor.algorithm=PBEWithMD5AndDES

3
servers/boe-server-all/src/main/resources/application-test.properties
View File

@@ -47,6 +47,9 @@ xboe.externalinterface.url.system=http://127.0.0.1:9091
## 新增加的教师的内部调用接口
xboe.old.base.url=https://u-pre.boe.com
## 用户统计接口的api地址
xboe.stat.base.url=http://127.0.0.1:9080
#加密盐
#jasypt.encryptor.password=jasypt
jasypt.encryptor.algorithm=PBEWithMD5AndDES

3
servers/boe-server-task/src/main/java/com/xboe/BoeServerAllApplication.java
View File

@@ -26,7 +26,6 @@ public class BoeServerAllApplication {
File file = new File("application.pid");
new ApplicationPid().write(file);
file.deleteOnExit();
}
}
}