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

Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers

Browse Source
This commit is contained in:
dongruihua
2022-11-15 22:19:14 +08:00
parent 0d0f119aa1 5f790dcd25
commit 2bec07c8d2
15 changed files with 344 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java
View File

@@ -12,6 +12,7 @@ import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.elasticsearch.action.DocWriteResponse;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.delete.DeleteResponse;
@@ -338,11 +339,15 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{
if(StringUtils.isNotBlank(params.getKeywords())) {
//boolQuery.must(QueryBuilders.queryStringQuery(params.getKeywords()).field("name", 8f));
String words=QueryParser.escape(params.getKeywords());
// System.out.println(params.getKeywords());
// System.out.println(words);
BoolQueryBuilder keywordQuery = QueryBuilders.boolQuery();
keywordQuery.should(QueryBuilders.wildcardQuery("name", "*"+params.getKeywords()+"*").boost(9f));
keywordQuery.should(QueryBuilders.queryStringQuery(params.getKeywords()).field("teacher", 8f));
keywordQuery.should(QueryBuilders.wildcardQuery("name", "*"+words+"*").boost(9f));
//keywordQuery.should(QueryBuilders.queryStringQuery(words).field("name", 9f));//用此方法无法查询出有转义符的处理
keywordQuery.should(QueryBuilders.queryStringQuery(words).field("teacher", 8f));
keywordQuery.minimumShouldMatch(1);
boolQuery.must(keywordQuery);
//boolQuery.must(QueryBuilders.wildcardQuery("name", "*"+params.getKeywords()+"*").boost(9f));
@@ -438,7 +443,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{
HighlightBuilder highlightBuilder = new HighlightBuilder();
highlightBuilder.requireFieldMatch(true);//是否多个字段都高亮
highlightBuilder.preTags("<span style='color:red'>");//前缀后缀
highlightBuilder.preTags("<span style='color:#3e7fff'>");//前缀后缀
highlightBuilder.postTags("</span>");
HighlightBuilder.Field nameHighlight=new HighlightBuilder.Field("name");
@@ -477,41 +482,42 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{
try {
CourseFullText cft =mapper.readValue(sourceAsString, CourseFullText.class);
cft.setEsId(hit.getId());
if(name!= null){
Text[] fragments = name.fragments();
StringBuffer fmtStr = new StringBuffer("");
for (Text fragment : fragments) {
fmtStr.append(fragment);
}
cft.setName(fmtStr.toString());
}
//以下不再加高亮显，高亮显在页面中去实现
// if(name!= null){
// Text[] fragments = name.fragments();
// StringBuffer fmtStr = new StringBuffer("");
// for (Text fragment : fragments) {
// fmtStr.append(fragment);
// }
// cft.setName(fmtStr.toString());
// }
//
// if(summary!= null){
// Text[] fragments = summary.fragments();
// StringBuffer fmtStr = new StringBuffer("");
// for (Text fragment : fragments) {
// fmtStr.append(fragment);
// }
// cft.setSummary(fmtStr.toString());
// }
//去掉老师的高亮显
// if(teacher!= null){
// Text[] fragments = teacher.fragments();
// StringBuffer fmtStr = new StringBuffer("");
// for (Text fragment : fragments) {
// fmtStr.append(fragment);
// }
// cft.setTeacher(fmtStr.toString());
// }
if(summary!= null){
Text[] fragments = summary.fragments();
StringBuffer fmtStr = new StringBuffer("");
for (Text fragment : fragments) {
fmtStr.append(fragment);
}
cft.setSummary(fmtStr.toString());
}
if(teacher!= null){
Text[] fragments = teacher.fragments();
StringBuffer fmtStr = new StringBuffer("");
for (Text fragment : fragments) {
fmtStr.append(fragment);
}
cft.setTeacher(fmtStr.toString());
}
if(keywords!= null){
Text[] fragments = keywords.fragments();
StringBuffer fmtStr = new StringBuffer("");
for (Text fragment : fragments) {
fmtStr.append(fragment);
}
cft.setKeywords(fmtStr.toString());
}
// if(keywords!= null){
// Text[] fragments = keywords.fragments();
// StringBuffer fmtStr = new StringBuffer("");
// for (Text fragment : fragments) {
// fmtStr.append(fragment);
// }
// cft.setKeywords(fmtStr.toString());
// }
list.add(cft);
}catch(Exception ee) {

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

@@ -12,6 +12,11 @@ import lombok.Data;
*/
@Data
public class CourseContentDto {
/**
* 类型，10无目录课程，20有目录课程
*/
private Integer type;//
private CourseContent content;

9
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
View File

@@ -52,13 +52,19 @@ public class CourseContentServiceImpl implements ICourseContentService {
CourseExam exam=dto.getExam();
CourseHomeWork homework=dto.getHomework();
if(StringUtils.isBlank(cc.getId())) {
//新增的情况
cc.setDeleted(false);
if(cc.getDuration()==null) {
cc.setDuration(0);
}
//如果是没有目录的，并具是课程内容
if(dto.getType()!=null && dto.getType()==10) {
if(cc.getSortIndex()==1) {
//先删除之前其它的
ccDao.deleteByField("courseId",cc.getCourseId());
}
}
ccDao.save(cc);
}else {
ccDao.update(cc);
@@ -113,6 +119,7 @@ public class CourseContentServiceImpl implements ICourseContentService {
List<CourseContent> list=ccDao.findList(OrderCondition.asc("sortIndex"),
FieldFilters.eq("courseId", courseId),
FieldFilters.eq("deleted", false));
return list;
}

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

@@ -695,8 +695,6 @@ public class CourseServiceImpl implements ICourseService {
hrbpAudit.setForward(CourseHRBPAudit.FORWARD_NONE);
hrbpAudit.setStatus(CourseHRBPAudit.STATUS_NONE);
courseHRBPAuditDao.save(hrbpAudit);
}
@Override

83
servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java Normal file
View File

@@ -0,0 +1,83 @@
package com.xboe.module.exam.api;
import com.xboe.common.PageList;
import com.xboe.common.Pagination;
import com.xboe.common.utils.StringUtil;
import com.xboe.core.JsonResponse;
import com.xboe.core.api.ApiBaseController;
import com.xboe.module.exam.entity.AloneExam;
import com.xboe.module.exam.entity.AloneExamAnswer;
import com.xboe.module.exam.service.IAloneExamService;
import com.xboe.module.exam.vo.AloneExamQuery;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 对于与第三方对接的扩展接口
*/
@RestController
@RequestMapping(value = "/xboe/m/exam/alone-extend")
public class AloneExamExtendApi extends ApiBaseController {
@Resource
IAloneExamService aloneExamService;
/**
* 添加考试任务，针对单个用户
* */
@PostMapping("/save")
public JsonResponse<AloneExam> save(@RequestBody AloneExam aloneExam){
if(StringUtil.isNotBlank(aloneExam.getAid())){
return badRequest("缺少用户参数");
}
if(StringUtil.isNotBlank(aloneExam.getTestId())){
return badRequest("缺少考试信息");
}
if(StringUtil.isNotBlank(aloneExam.getRefId())){
return badRequest("缺少关联信息");
}
if(StringUtil.isNotBlank(aloneExam.getRefType())){
return badRequest("缺少关联类型");
}
try {
aloneExamService.save(aloneExam);
return success(aloneExam);
} catch (Exception e) {
return error("保存考试任务失败",e.getMessage());
}
}
/**
* 根据考试id,refType,refId查询考试任务
* */
@PostMapping("/pagelist")
public JsonResponse<PageList<AloneExam>> pagelist(Pagination pager, AloneExamQuery aloneExamQuery){
try {
PageList<AloneExam> page = aloneExamService.findPage(pager.getPageIndex(), pager.getPageSize(), aloneExamQuery);
return success(page);
} catch (Exception e) {
return error("查询考试任务失败",e.getMessage());
}
}
/**
* 根据考试id，refType,refId 用户id 查询用户答卷信息
* */
@PostMapping("/anser-page")
public JsonResponse<PageList<AloneExamAnswer>> answerpage(Pagination pager,AloneExamQuery aloneExamQuery){
try {
PageList<AloneExamAnswer> pageList = aloneExamService.answerPage(pager.getPageIndex(), pager.getPageSize(), aloneExamQuery);
return success(pageList);
} catch (Exception e) {
return error("查询用户答卷失败",e.getMessage());
}
}
}

17
servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExam.java
View File

@@ -156,4 +156,21 @@ public class AloneExam extends IdBaseEntity {
this.endTime=endTime;
}
public AloneExam(String id,String aid,String testId,String testName,Integer testDuration,Integer times,Float score,Integer status,LocalDateTime taskTime,LocalDateTime startTime,LocalDateTime endTime,String refId,String refType) {
this.setId(id);
this.setAid(aid);
this.testId=testId;
this.testName=testName;
this.testDuration=testDuration;
this.times=times;
this.score=score;
this.status=status;
this.taskTime=taskTime;
this.startTime=startTime;
this.endTime=endTime;
this.refId=refId;
this.refType=refType;
}
}

36
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java
View File

@@ -6,6 +6,7 @@ import com.xboe.common.OrderCondition;
import com.xboe.common.PageList;
import com.xboe.module.exam.entity.AloneExam;
import com.xboe.module.exam.entity.AloneExamAnswer;
import com.xboe.module.exam.vo.AloneExamQuery;
/**
* 独立考试的处理。此信息无删除操作，更新也只是更新answerJson字段
@@ -21,7 +22,35 @@ public interface IAloneExamService {
* @return
*/
PageList<AloneExam> findPage(int pageIndex,int pageSize,AloneExam aea,OrderCondition oc);
/**
* 用于第三方对接
* 查询个人的考试任务 根据考试id，refId,refType 查询
* @param pageIndex
* @param pageSize
* @param testId
* @param refId
* @param refType
* @return
*/
PageList<AloneExam> findPage(int pageIndex, int pageSize, AloneExamQuery examQuery);
/**
* 用于第三方对接
* 查询用户的答卷
* @param pageIndex
* @param pageSize
* @param testId
* @param refId
* @param refType
* @param aid
* */
PageList<AloneExamAnswer> answerPage(int pageIndex,int pageSize,AloneExamQuery aloneExamQuery);
/**
* 获取独立考试的信息，检查是否有独立考试
* @param aid
@@ -98,5 +127,10 @@ public interface IAloneExamService {
List<AloneExamAnswer> findList(String testId);
/**
* 保存考试任务
* */
void save(AloneExam aloneExam);
}

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

@@ -5,6 +5,8 @@ import java.util.List;
import javax.annotation.Resource;
import com.xboe.common.utils.StringUtil;
import com.xboe.module.exam.vo.AloneExamQuery;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -153,6 +155,11 @@ public class AloneExamServiceImpl implements IAloneExamService{
return list;
}
@Override
public void save(AloneExam aloneExam) {
aeDao.save(aloneExam);
}
@Override
public AloneExamAnswer get(String id) {
return dao.get(id);
@@ -213,6 +220,78 @@ public class AloneExamServiceImpl implements IAloneExamService{
return aeDao.findPage(query.builder());
}
@Override
public PageList<AloneExam> findPage(int pageIndex, int pageSize, AloneExamQuery examQuery) {
QueryBuilder builder = QueryBuilder.from(AloneExam.class.getSimpleName()+" a,"+ExamTest.class.getSimpleName()+" t");
builder.addField("new AloneExam(a.id,a.aid,a.testId,a.testName,a.testDuration,a.times,a.score,a.status,a.taskTime,t.entranceTime,t.deadlineTime,a.refId,a.refType)");
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addFilter(FieldFilters.eqField("a.testId","t.id"));
if(examQuery!=null){
OrderCondition order=null;
if(StringUtils.isNotBlank(examQuery.getOrderField())) {
if(examQuery.getOrderAsc()==null|| examQuery.getOrderAsc()) {
order=OrderCondition.asc(examQuery.getOrderField());
}else {
order=OrderCondition.desc(examQuery.getOrderField());
}
}else {
order=OrderCondition.desc("a.sysCreateTime");
}
if(StringUtil.isNotBlank(examQuery.getTestId())){
builder.addFilter(FieldFilters.eq("a.testId",examQuery.getTestId()));
}
if(StringUtil.isNotBlank(examQuery.getRefId())){
builder.addFilter(FieldFilters.eq("a.refId",examQuery.getRefId()));
}
if(StringUtil.isNotBlank(examQuery.getRefType())){
builder.addFilter(FieldFilters.eq("a.refType",examQuery.getRefType()));
}
}
PageList<AloneExam> page = aeDao.findPage(builder.builder());
return page;
}
@Override
public PageList<AloneExamAnswer> answerPage(int pageIndex, int pageSize, AloneExamQuery aloneExamQuery) {
QueryBuilder builder=QueryBuilder.from(AloneExam.class.getSimpleName()+" a,"+AloneExamAnswer.class.getSimpleName()+" aa");
builder.addField("new AloneExamAnswer(aa.id,aa.aid,aa.name,aa.testId,aa.testName,aa.arrange,aa.passLine,aa.status,aa.startTime,aa.endTime,aa.lastTime,aa.clientIp,aa.ucode,aa.score,aa.totalScore,aa.realScore,aa.useSecond)");
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addFilter(FieldFilters.eqField("a.id","aa.aloneId"));
if(aloneExamQuery!=null){
OrderCondition order=null;
if(StringUtil.isNotBlank(aloneExamQuery.getOrderField())){
if(aloneExamQuery.getOrderAsc()==null || aloneExamQuery.getOrderAsc()){
order=OrderCondition.asc(aloneExamQuery.getOrderField());
}else{
order=OrderCondition.desc(aloneExamQuery.getOrderField());
}
}else {
order=OrderCondition.desc("aa.sysCreateTime");
}
if(StringUtil.isNotBlank(aloneExamQuery.getTestId())){
builder.addFilter(FieldFilters.eq("a.testId",aloneExamQuery.getTestId()));
}
if(StringUtil.isNotBlank(aloneExamQuery.getRefId())){
builder.addFilter(FieldFilters.eq("a.refId",aloneExamQuery.getRefId()));
}
if(StringUtil.isNotBlank(aloneExamQuery.getRefType())){
builder.addFilter(FieldFilters.eq("a.refType",aloneExamQuery.getRefType()));
}
if(StringUtil.isNotBlank(aloneExamQuery.getAid())){
builder.addFilter(FieldFilters.eq("a.aid",aloneExamQuery.getAid()));
}
}
PageList<AloneExamAnswer> page = dao.findPage(builder.builder());
return page;
}
@Override
public AloneExam getAloneByAidAndTestId(String aid, String testId) {
AloneExam ae=aeDao.findOne(FieldFilters.eq("aid", aid),FieldFilters.eq("testId", testId));

19
servers/boe-server-all/src/main/java/com/xboe/module/exam/vo/AloneExamQuery.java Normal file
View File

@@ -0,0 +1,19 @@
package com.xboe.module.exam.vo;
import lombok.Data;
@Data
public class AloneExamQuery {
private String testId;
private String refId;
private String refType;
private String orderField;
private Boolean orderAsc;
private String aid;
}

12
servers/boe-server-all/src/main/java/com/xboe/module/interaction/entity/Comments.java
View File

@@ -116,6 +116,18 @@ public class Comments extends IdBaseEntity {
@Column(name = "favorites")
private Integer favorites;
/**
* 页面类型
* */
@Column(name = "page_type",length = 1)
private Integer pageType;
/**
*页面参数 默认是id
* */
@Column(name = "page_params",length = 50)
private String pageParams;
// /**
// * 最后回答时间

12
servers/boe-server-all/src/main/java/com/xboe/module/interaction/entity/Favorites.java
View File

@@ -39,6 +39,18 @@ public class Favorites extends IdBaseEntity {
@MetaInfo("标题")
@Column(name = "title", nullable = false,length=100)
private String title;
/**
* 页面类型
* */
@Column(name = "page_type",length = 1)
private Integer pageType;
/**
*页面参数 默认是id
* */
@Column(name = "page_params",length = 50)
private String pageParams;
/**
* 用于显示内容信息

13
servers/boe-server-all/src/main/java/com/xboe/module/interaction/entity/Shares.java
View File

@@ -36,6 +36,19 @@ public class Shares extends IdBaseEntity {
private String objId;
/**
* 页面类型
* */
@Column(name = "page_type",length = 1)
private Integer pageType;
/**
*页面参数 默认是id
* */
@Column(name = "page_params",length = 50)
private String pageParams;
/**
* 分享内容

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

@@ -72,6 +72,8 @@ public class CommentsServiceImpl implements ICommentsService{
public void reply(Comments c) {
c.setDeleted(false);
c.setIsread(false);
c.setPraises(0);
c.setFavorites(0);
dao.save(c);
if(c.getParentRead()!=null && c.getParentRead()) {
dao.updateMultiFieldById(c.getParentId(),

12
servers/boe-server-all/src/main/java/com/xboe/system/user/entity/Message.java
View File

@@ -43,6 +43,18 @@ public class Message extends IdEntity {
/**跳转的url*/
@Column(name = "page_url",nullable = true,length=200)
private String pageUrl;
/**
* 页面类型
* */
@Column(name = "page_type",length = 1)
private Integer pageType;
/**
*页面参数 默认是id
* */
@Column(name = "page_params",length = 50)
private String pageParams;
/**
* 数据来源,1表新系统，2表外部系统

3
servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/UserServiceImpl.java
View File

@@ -105,6 +105,9 @@ public class UserServiceImpl implements IUserService {
if (user.getStudyTotal() == null) {
user.setStudyTotal(0);//新用户学习时长为0
}
if(user.getShowHome()==null) {
user.setShowHome(true);
}
dao.save(user);
}