mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-08 18:36:51 +08:00
消息列表移动端过滤掉案例和笔记
This commit is contained in:
@@ -9,12 +9,10 @@ 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 org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 对于与第三方对接的扩展接口
|
||||
@@ -31,16 +29,16 @@ public class AloneExamExtendApi extends ApiBaseController {
|
||||
* */
|
||||
@PostMapping("/save")
|
||||
public JsonResponse<AloneExam> save(@RequestBody AloneExam aloneExam){
|
||||
if(StringUtil.isNotBlank(aloneExam.getAid())){
|
||||
if(StringUtil.isBlank(aloneExam.getAid())){
|
||||
return badRequest("缺少用户参数");
|
||||
}
|
||||
if(StringUtil.isNotBlank(aloneExam.getTestId())){
|
||||
if(StringUtil.isBlank(aloneExam.getTestId())){
|
||||
return badRequest("缺少考试信息");
|
||||
}
|
||||
if(StringUtil.isNotBlank(aloneExam.getRefId())){
|
||||
if(StringUtil.isBlank(aloneExam.getRefId())){
|
||||
return badRequest("缺少关联信息");
|
||||
}
|
||||
if(StringUtil.isNotBlank(aloneExam.getRefType())){
|
||||
if(StringUtil.isBlank(aloneExam.getRefType())){
|
||||
return badRequest("缺少关联类型");
|
||||
}
|
||||
try {
|
||||
@@ -68,7 +66,7 @@ public class AloneExamExtendApi extends ApiBaseController {
|
||||
/**
|
||||
* 根据考试id,refType,refId 用户id 查询用户答卷信息
|
||||
* */
|
||||
@PostMapping("/anser-page")
|
||||
@PostMapping("/answer-page")
|
||||
public JsonResponse<PageList<AloneExamAnswer>> answerpage(Pagination pager,AloneExamQuery aloneExamQuery){
|
||||
try {
|
||||
PageList<AloneExamAnswer> pageList = aloneExamService.answerPage(pager.getPageIndex(), pager.getPageSize(), aloneExamQuery);
|
||||
@@ -78,6 +76,18 @@ public class AloneExamExtendApi extends ApiBaseController {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据考试任务id查询答卷
|
||||
* */
|
||||
@GetMapping("/answer")
|
||||
public JsonResponse<List<AloneExamAnswer>> answer(String aloneId){
|
||||
if(StringUtil.isBlank(aloneId)){
|
||||
return badRequest("参数异常");
|
||||
}
|
||||
List<AloneExamAnswer> answer = aloneExamService.findAnswer(aloneId);
|
||||
return success(answer);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -132,5 +132,10 @@ public interface IAloneExamService {
|
||||
* 保存考试任务
|
||||
* */
|
||||
void save(AloneExam aloneExam);
|
||||
|
||||
/**
|
||||
* 根据考试任务id 返回答卷信息
|
||||
* */
|
||||
List<AloneExamAnswer> findAnswer(String aloneId);
|
||||
|
||||
}
|
||||
|
||||
@@ -156,10 +156,21 @@ public class AloneExamServiceImpl implements IAloneExamService{
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void save(AloneExam aloneExam) {
|
||||
aeDao.save(aloneExam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<AloneExamAnswer> findAnswer(String aloneId) {
|
||||
QueryBuilder builder = QueryBuilder.from(AloneExamAnswer.class);
|
||||
builder.addFilter(FieldFilters.eq("aloneId",aloneId));
|
||||
builder.addOrder(OrderCondition.desc("sysCreateTime"));
|
||||
builder.addField("new AloneExamAnswer(id,aid,name,testId,testName,arrange,passLine,status,startTime,endTime,lastTime,clientIp,ucode,score,totalScore,realScore,useSecond)");
|
||||
List<AloneExamAnswer> list = dao.findList(builder.builder());
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AloneExamAnswer get(String id) {
|
||||
return dao.get(id);
|
||||
@@ -248,6 +259,9 @@ public class AloneExamServiceImpl implements IAloneExamService{
|
||||
if(StringUtil.isNotBlank(examQuery.getRefType())){
|
||||
builder.addFilter(FieldFilters.eq("a.refType",examQuery.getRefType()));
|
||||
}
|
||||
if(StringUtil.isNotBlank(examQuery.getAid())){
|
||||
builder.addFilter(FieldFilters.eq("a.aid",examQuery.getAid()));
|
||||
}
|
||||
|
||||
}
|
||||
PageList<AloneExam> page = aeDao.findPage(builder.builder());
|
||||
|
||||
@@ -45,6 +45,13 @@ public class MessageApi extends ApiBaseController {
|
||||
PageList<Message> list = service.query(pager.getPageIndex(), pager.getPageSize(), aid, isRead);
|
||||
return success(list);
|
||||
}
|
||||
|
||||
@PostMapping("/mobilelist")
|
||||
public JsonResponse<PageList<Message>> mobileList(Pagination pager,Boolean isRead){
|
||||
String aid = this.getCurrent().getAccountId();
|
||||
PageList<Message> list = service.queryMobile(pager.getPageIndex(), pager.getPageSize(), aid, isRead);
|
||||
return success(list);
|
||||
}
|
||||
/**
|
||||
* 删除消息
|
||||
* @param ids 所勾选的id集合
|
||||
@@ -210,6 +217,10 @@ public class MessageApi extends ApiBaseController {
|
||||
return success(messages);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* */
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -16,6 +16,11 @@ public interface IMessageService {
|
||||
* */
|
||||
PageList<Message> query(int pageIndex,int pageSize,String aid,Boolean isRead);
|
||||
|
||||
/**
|
||||
* 查看消息
|
||||
* */
|
||||
PageList<Message> queryMobile(int pageIndex,int pageSize,String aid,Boolean isRead);
|
||||
|
||||
/**
|
||||
* 删除消息
|
||||
* */
|
||||
|
||||
@@ -42,6 +42,22 @@ public class MessageServiceImpl implements IMessageService {
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageList<Message> queryMobile(int pageIndex, int pageSize, String aid, Boolean isRead) {
|
||||
QueryBuilder builder = QueryBuilder.from(Message.class);
|
||||
builder.addOrder(OrderCondition.desc("id"));
|
||||
builder.setPageIndex(pageIndex);
|
||||
builder.setPageSize(pageSize);
|
||||
builder.addFilter(FieldFilters.eq("acceptId",aid));
|
||||
builder.addFilter(FieldFilters.ne("refType",3));
|
||||
builder.addFilter(FieldFilters.ne("refType",6));
|
||||
if(isRead!=null){
|
||||
builder.addFilter(FieldFilters.eq("isRead",isRead));
|
||||
}
|
||||
PageList<Message> list = dao.findPage(builder.builder());
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(List<String> ids) {
|
||||
dao.deleteByFilter(FieldFilters.in("id",ids));
|
||||
|
||||
Reference in New Issue
Block a user