diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java index 085919c5..1ae7b281 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java @@ -49,7 +49,9 @@ public class CasePageVo extends PageDto { private List notInIds; /** - * excellent 最佳案例 + * excellent 最佳 + * hot 最热 + * new 最新 * recommend 推荐 */ private String type; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java index 7d536917..69ac0a5a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java @@ -50,4 +50,12 @@ public class CasesRecommend extends BaseEntity { /**推荐组织名称*/ @Column(name = "recommend_org_name", length = 255) private String recommendOrgName; + + public CasesRecommend() { + } + + public CasesRecommend(String id, String recommendOrgName) { + this.setId(id); + this.recommendOrgName = recommendOrgName; + } } 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 55eddf4d..eacce0ee 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 @@ -185,13 +185,13 @@ public class CasesServiceImpl implements ICasesService { List filters = new ArrayList<>(); filters.add(FieldFilters.eq("deleted", false)); List likes = new ArrayList(); - likes.add(FieldFilters.like("title", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("authorName", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword1", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword2", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword3", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword4", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); - likes.add(FieldFilters.like("keyword5", LikeMatchMode.ANYWHERE, caseVo.getKeyWord())); + likes.add(FieldFilters.like("title", LikeMatchMode.ANYWHERE, keyword)); + likes.add(FieldFilters.like("authorName", LikeMatchMode.ANYWHERE, keyword)); + likes.add(FieldFilters.like("keyword1", LikeMatchMode.ANYWHERE, keyword)); + likes.add(FieldFilters.like("keyword2", LikeMatchMode.ANYWHERE, keyword)); + likes.add(FieldFilters.like("keyword3", LikeMatchMode.ANYWHERE, keyword)); + likes.add(FieldFilters.like("keyword4", LikeMatchMode.ANYWHERE, keyword)); + likes.add(FieldFilters.like("keyword5", LikeMatchMode.ANYWHERE, keyword)); List notInIds = caseVo.getNotInIds(); if (CollUtil.isNotEmpty(notInIds)) { filters.add(FieldFilters.notIn("id", notInIds)); diff --git a/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java b/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java index 66279968..764c8079 100644 --- a/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java +++ b/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java @@ -26,32 +26,11 @@ class CasesServiceImplTest { @Test void queryPageCasesV2() throws JsonProcessingException { - String jsonStr = "{\n" + - "\t\"pageIndex\": 1,\n" + - "\t\"pageSize\": 10,\n" + - "\t\"isTop\": false,\n" + - "\t\"orderField\": \"excellent\",\n" + - "\t\"majorType\": \"\",\n" + - "\t\"orgDomainDtos\": [],\n" + - "\t\"orderAsc\": false,\n" + - "\t\"excellent\": true,\n" + - "\t\"years\": [2023],\n" + - "\t\"breCommend\": true,\n" + - "\t\"caseType\": \"\",\n" + - "\t\"authorName\": \"\",\n" + - "\t\"notInIds\": [],\n" + - "\t\"type\": \"recommend\",\n" + - "\t\"userId\": \"\",\n" + - "\t\"parent\": \"\",\n" + - "\t\"children\": [],\n" + - "\t\"name\": \"\",\n" + - "\t\"firstId\": \"\",\n" + - "\t\"secondId\": \"\",\n" + - "\t\"threeId\": \"\"\n" + - "}"; + String jsonStr = "{\"pageIndex\":1,\"pageSize\":10,\"orderField\":\"excellent\",\"majorType\":\"\",\"orgDomainDtos\":[],\"orderAsc\":false,\"excellent\":true,\"breCommend\":true,\"caseType\":\"\",\"authorName\":\"\",\"notInIds\":[],\"type\":\"recommend\",\"userId\":\"\",\"parent\":\"\",\"children\":[],\"name\":\"\",\"years\":[2023,2022,2020,2021]}"; ObjectMapper mapper = new ObjectMapper(); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false); CasePageVo pageVo = mapper.readValue(jsonStr, CasePageVo.class); + pageVo.setUserId("965342027497607168"); PageList casesV2 = casesService.queryPageCasesV2(pageVo); System.out.println(casesV2); }