From d075c6e617a5c86c3ba04cde88cfeb80c0f8bfb6 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 9 Nov 2022 12:34:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=A1=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/api/CasesApi.java | 14 +++-- .../xboe/module/boecase/dto/CasesFiledVo.java | 19 +++++++ .../module/boecase/service/ICasesService.java | 11 ++-- .../service/impl/CasesServiceImpl.java | 53 +++++++++++++++++-- .../com/xboe/module/exam/api/ExamTestApi.java | 6 +++ 5 files changed, 91 insertions(+), 12 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index e20c554e..55f50723 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -10,6 +10,7 @@ import javax.annotation.Resource; import com.xboe.core.orm.FieldFilters; import com.xboe.module.boecase.dao.CasesMajorTypeDao; +import com.xboe.module.boecase.dto.*; import com.xboe.module.boecase.entity.CasesMajorType; import com.xboe.module.dict.entity.DictItem; import org.springframework.web.bind.annotation.GetMapping; @@ -26,10 +27,6 @@ import com.xboe.core.api.ApiBaseController; import com.xboe.core.cache.IXaskCache; import com.xboe.core.cache.XaskCacheProvider; import com.xboe.core.log.AutoLog; -import com.xboe.module.boecase.dto.CaseDto; -import com.xboe.module.boecase.dto.CaseRankingDto; -import com.xboe.module.boecase.dto.CaseVo; -import com.xboe.module.boecase.dto.UsernameDto; import com.xboe.module.boecase.entity.Cases; import com.xboe.module.boecase.service.ICasesService; @@ -88,6 +85,15 @@ public class CasesApi extends ApiBaseController { PageList casesPageList = casesService.managerList(pager.getPageIndex(), pager.getPageSize(), caseVo); return success(casesPageList); } + + /** + * 案例分页 + * */ + @PostMapping("/pagelist") + public JsonResponse> pageList(Pagination pager, CaseVo caseVo){ + PageList pageList = casesService.queryList(pager.getPageIndex(), pager.getPageSize(), caseVo); + return success(pageList); + } /** * 设置置顶 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java new file mode 100644 index 00000000..0f425963 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java @@ -0,0 +1,19 @@ +package com.xboe.module.boecase.dto; + +import lombok.Data; + +@Data +public class CasesFiledVo { + + private String id; + + private String companyId; + + private String coverUrl; + + private String title; + + private String authorId; + + private String authorName; +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java index de67743a..be0818d1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java @@ -3,10 +3,7 @@ package com.xboe.module.boecase.service; import java.util.List; import com.xboe.common.PageList; -import com.xboe.module.boecase.dto.CaseDto; -import com.xboe.module.boecase.dto.CaseRankingDto; -import com.xboe.module.boecase.dto.CaseVo; -import com.xboe.module.boecase.dto.UsernameDto; +import com.xboe.module.boecase.dto.*; import com.xboe.module.boecase.entity.Cases; import com.xboe.module.dict.entity.DictItem; import com.xboe.school.vo.CasesVo; @@ -21,6 +18,12 @@ public interface ICasesService{ * 案例管理列表搜索 * */ PageList managerList(int pageIndex,int pageSize,CaseVo caseVo); + + /** + * 案例分页 + * */ + PageList queryList(int pageIndex,int pageSize,CaseVo caseVo); + /** * 设置置顶 * */ diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 9232312d..4e8cf2d1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -9,8 +9,7 @@ import javax.transaction.Transactional; import com.xboe.common.utils.IDGenerator; import com.xboe.module.boecase.dao.CasesMajorTypeDao; -import com.xboe.module.boecase.dto.CaseRankingDto; -import com.xboe.module.boecase.dto.CaseVo; +import com.xboe.module.boecase.dto.*; import com.xboe.module.boecase.entity.CasesMajorType; import com.xboe.module.dict.dao.SysDictionaryDao; import com.xboe.module.dict.entity.DictItem; @@ -29,8 +28,6 @@ import com.xboe.core.orm.LikeMatchMode; import com.xboe.core.orm.QueryBuilder; import com.xboe.core.orm.UpdateBuilder; import com.xboe.module.boecase.dao.CasesDao; -import com.xboe.module.boecase.dto.CaseDto; -import com.xboe.module.boecase.dto.UsernameDto; import com.xboe.module.boecase.entity.Cases; import com.xboe.module.boecase.service.ICasesService; @@ -170,6 +167,54 @@ public class CasesServiceImpl implements ICasesService { PageList page = casesDao.findPage(query.builder()); return page; } + + @Override + public PageList queryList(int pageIndex, int pageSize, CaseVo caseVo) { + PageList pageList = new PageList<>(); + pageList.setList(new ArrayList()); + QueryBuilder query=QueryBuilder.from(Cases.class); + query.addFilter(FieldFilters.eq("deleted",false)); + if(StringUtils.isNotBlank(caseVo.getKeyWord())){ + query.addFilter(FieldFilters.like("title", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); + } + if(caseVo.getIsTop()!=null) { + query.addFilter(FieldFilters.eq("isTop",caseVo.getIsTop())); + } + OrderCondition order=null; + if(StringUtils.isNotBlank(caseVo.getOrderField())) { + if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { + order=OrderCondition.asc(caseVo.getOrderField()); + }else { + order=OrderCondition.desc(caseVo.getOrderField()); + } + }else { + order=OrderCondition.desc("sysCreateTime"); + } + query.addOrder(order); + query.setPageIndex(pageIndex); + query.setPageSize(pageSize); + query.addFields("id","title","coverUrl","authorId","authorName","companyId"); + try { + PageList pageFields = casesDao.findPageFields(query.builder()); + for (Object[] o:pageFields.getList()) { + CasesFiledVo casesFiledVo = new CasesFiledVo(); + casesFiledVo.setId((String) o[0]); + casesFiledVo.setTitle((String) o[1]); + casesFiledVo.setCoverUrl((String) o[2]); + casesFiledVo.setAuthorId((String) o[3]); + casesFiledVo.setAuthorName((String) o[4]); + casesFiledVo.setCompanyId((String) o[5]); + pageList.getList().add(casesFiledVo); + } + pageList.setPageSize(pageSize); + pageList.setCount(pageFields.getCount()); + } catch (Exception e) { + e.printStackTrace(); + } + return pageList; + + } + /** * 设置置顶 * */ diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java index 48bf7559..66f787dc 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java @@ -38,6 +38,12 @@ public class ExamTestApi extends ApiBaseController { PageList examTestPageList = examTestService.pageList(pager.getPageIndex(), pager.getPageSize(), keyWord, examTest); return success(examTestPageList); } + + @PostMapping("/pagelist") + public JsonResponse> pagelist(Pagination pager, String keyWord, ExamTest examTest){ + PageList examTestPageList = examTestService.pageList(pager.getPageIndex(), pager.getPageSize(), keyWord, examTest); + return success(examTestPageList); + } /** * 新建考试