2022/09/16 17:30

src/main/java/com/zhiwei/brandkbs2/pojo/dto/MarkSearchDTO.java

@@ -22,13 +22,13 @@ public class MarkSearchDTO {
      * 页码
      */
     @ApiModelProperty("页码")
-    private int page;
+    private Integer page;
 
     /**
      * 大小
      */
     @ApiModelProperty("每页记录数")
-    private int pageSize;
+    private Integer pageSize;
 
     // postFilter
     @ApiModelProperty(value = "项目id")

src/main/java/com/zhiwei/brandkbs2/service/impl/ChannelServiceImpl.java

@@ -1433,8 +1433,8 @@ public class ChannelServiceImpl implements ChannelService {
         }
         // 添加模糊匹配
         channelDao.addKeywordFuzz(query, keyword, "source");
-        // 添加排序 TODO 2
-//        channelDao.addSort(query, sorter);
+        // 添加排序
+        channelDao.addSort(query, sorter);
         return query;
     }
 

src/main/java/com/zhiwei/brandkbs2/service/impl/EventServiceImpl.java

@@ -547,10 +547,13 @@ public class EventServiceImpl implements EventService {
             }
             query.addCriteria(volumeCriteria);
         }
-        mongoUtil.start(eventSearchDTO.getPage(), eventSearchDTO.getPageSize(), query);
         // 总数
         long total = eventDao.count(query);
+        mongoUtil.start(eventSearchDTO.getPage(), eventSearchDTO.getPageSize(), query);
         // 排序
+        if (eventSearchDTO.getSorter().isEmpty()) {
+            eventSearchDTO.setSorter(JSONObject.parseObject("{\"startTime\":\"descend\"}"));
+        }
         eventDao.addSort(query, eventSearchDTO.getSorter().toJSONString());
         // 数据
         List<Event> eventList = eventDao.findList(query);

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java

@@ -165,6 +165,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             ProjectVO project = projectService.getProjectVOById(UserThreadLocal.getProjectId());
             List<ExportAppYuqingDTO> returnList = new ArrayList<>();
             defaultMarkSearch(markSearchDTO);
+            markSearchDTO.setPageSize(null);
             Pair<SearchHits[], Map<String, Long>> hitsAndCounts = searchMarkHitsAndCount(markSearchDTO, false);
             for (SearchHits searchHits : hitsAndCounts.getLeft()) {
                 List<ExportAppYuqingDTO> collect = Arrays.stream(searchHits.getHits()).map(SearchHit::getSourceAsMap).map(ExportAppYuqingDTO::createFromEsMap).collect(Collectors.toList());
@@ -620,8 +621,10 @@ public class MarkDataServiceImpl implements MarkDataService {
         }
         helper.setSort(sort);
         // from size
+        if (null != dto.getPageSize()) {
             helper.setFrom((dto.getPage() - 1) * dto.getPageSize());
             helper.setSize(dto.getPageSize());
+        }
         // HighlightBuilder ???
         return helper;
     }
@@ -1473,6 +1476,11 @@ public class MarkDataServiceImpl implements MarkDataService {
         searchHelper.setPostFilter(filter);
         searchHelper.setSort(SortBuilders.fieldSort("time").order(SortOrder.ASC));
         searchHelper.setSize(1);
+        SearchHits hits = esClientDao.searchResponse(searchHelper).getHits();
+        if (0 == hits.getHits().length) {
+            log.info("getYuqingMarkFirstTime-debug:{}", searchHelper.getQuery());
+            return 1609430400000L;
+        }
         return Long.parseLong(esClientDao.searchResponse(searchHelper).getHits().getAt(0).getSourceAsMap().get("time") + "");
     }
 

src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java

@@ -228,7 +228,7 @@ public class UserServiceImpl implements UserService {
             userOldDao.updateOneByIdWithField(userOld.getId(), Update.update("bindUser", true));
             return projectServiceImpl.getProjectListByUser(user, true);
         }
-        List<UserProjectOldDaoImpl.UserProjectOld> userProjects = userProjectOldDao.findList(new Query(Criteria.where("userId").is(user.getId())));
+        List<UserProjectOldDaoImpl.UserProjectOld> userProjects = userProjectOldDao.findList(new Query(Criteria.where("userId").is(userOld.getId())));
         if (userProjects.isEmpty()) {
             ExceptionCast.cast(CommonCodeEnum.FAIL);
         }