舆情库聚合修复,用户行为修复

src/main/java/com/zhiwei/brandkbs2/pojo/MarkFlowEntity.java

@@ -61,12 +61,12 @@ public class MarkFlowEntity implements Serializable {
         return entity;
     }
 
-    public static MarkFlowEntity getAggreeInstance(List<MarkFlowEntity> entities,int size) {
+    public static MarkFlowEntity getAggreeInstance(List<MarkFlowEntity> entities, Integer size) {
         // 首条数据为主
         MarkFlowEntity entity = Tools.copyByJson(entities.get(0), MarkFlowEntity.class);
-        if (size > 1) {
+        if (null != size && size > 1) {
             entity.getType().put("fold", true);
-            entity.getType().put("size",size);
+            entity.getType().put("size", size);
         }
         return entity;
     }

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

@@ -76,7 +76,7 @@ public class BehaviorServiceImpl implements BehaviorService {
         Date end = new Date(endTime);
         String[] collectionNames = behaviorDao.generateCollectionNames(start, end);
         Query query = new Query();
-        query.addCriteria(Criteria.where("cTime").gte(start).lt(end).and("backstage").is(backstage));
+        query.addCriteria(Criteria.where("cTime").gte(startTime).lt(endTime).and("backstage").is(backstage));
         if (StringUtils.isNotEmpty(nickname)) {
             List<User> userList = userDao.findList(Query.query(Criteria.where("nickname").regex(Pattern.compile("^.*" + nickname + ".*$", Pattern.CASE_INSENSITIVE))));
             // 根据nickname未查询
@@ -102,7 +102,7 @@ public class BehaviorServiceImpl implements BehaviorService {
         Date start = new Date(startTime);
         Date end = new Date(endTime);
         Query query = new Query();
-        query.addCriteria(Criteria.where("cTime").gte(start).lt(end).and("backstage").is(backstage));
+        query.addCriteria(Criteria.where("cTime").gte(startTime).lt(endTime).and("backstage").is(backstage));
         List<Behavior> behaviorList = behaviorDao.findList(query, behaviorDao.generateCollectionNames(start, end));
         List<ExportBehaviorDTO> resList = new ArrayList<>(behaviorList.size());
         behaviorList.forEach(behavior -> {

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

@@ -531,6 +531,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             linkedGroupId = projectService.getProjectVOById(projectId).getBrandLinkedGroupId();
             markSearchDTO.setLinkedGroupId(linkedGroupId);
         }
+        markSearchDTO.setPage(1);
         markSearchDTO.setPageSize(10000);
         return markSearchDTO;
     }