案例上新调整

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

@@ -36,6 +36,7 @@ public class ChannelIndex extends AbstractBaseMongo {
     /**
      * 关联项目组ID
      */
+    @Deprecated
     private String linkedGroupId;
 
     /**

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

@@ -787,19 +787,28 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
             String cursorKey = RedisUtil.getNewCrisisCaseCursor(projectId);
             String cursor = redisUtil.get(cursorKey);
             Set<String> keys = redisUtil.keys(RedisUtil.getNewCrisisCaseListAllKey());
-            int recordCursor = null == cursor ? 0 : Integer.parseInt(cursor);
-            List<BrandkbsNewCaseWarn.NewCase> resList = new ArrayList<>();
-            for (String key : keys) {
-                CrisisCaseWarnVO crisisCaseWarnVO = JSON.parseObject(redisUtil.get(key), CrisisCaseWarnVO.class);
-                // 符合条件并记录游标
-                if (recordCursor < crisisCaseWarnVO.getId()) {
-                    recordCursor = crisisCaseWarnVO.getId();
-                    resList.add(BrandkbsNewCaseWarn.NewCase.createFromCrisisCaseWarnVO(crisisCaseWarnVO,
-                            getCrisisEventUrlByCrisisEventId(crisisCaseWarnVO.getId())));
+            BrandkbsWarnTemplate brandkbsWarnTemplate = null;
+            if (CollectionUtils.isNotEmpty(keys)) {
+                int recordCursor;
+                // 不存在游标则记录最大值
+                if (null == cursor) {
+                    recordCursor = keys.stream().mapToInt(Integer::valueOf).max().getAsInt();
+                } else {
+                    recordCursor = Integer.parseInt(cursor);
+                    List<BrandkbsNewCaseWarn.NewCase> resList = new ArrayList<>();
+                    for (String key : keys) {
+                        CrisisCaseWarnVO crisisCaseWarnVO = JSON.parseObject(redisUtil.get(key), CrisisCaseWarnVO.class);
+                        // 符合条件并记录游标
+                        if (recordCursor < crisisCaseWarnVO.getId()) {
+                            recordCursor = crisisCaseWarnVO.getId();
+                            resList.add(BrandkbsNewCaseWarn.NewCase.createFromCrisisCaseWarnVO(crisisCaseWarnVO,
+                                    getCrisisEventUrlByCrisisEventId(crisisCaseWarnVO.getId())));
+                        }
+                    }
+                    brandkbsWarnTemplate = brandkbsWarnTemplate4NewCase(resList, time, project);
                 }
+                redisUtil.set(cursorKey, String.valueOf(recordCursor));
             }
-            BrandkbsWarnTemplate brandkbsWarnTemplate = brandkbsWarnTemplate4NewCase(resList, time, project);
-            redisUtil.set(cursorKey, String.valueOf(recordCursor));
             log.info("获取案例上新预警结束,project:{}", project.getProjectName());
             return ResponseResult.success(brandkbsWarnTemplate);
         } catch (Exception e) {
@@ -812,7 +821,7 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
     public void newCrisisCaseWarn(CrisisCaseWarnVO caseWarnVO) {
         // 存入redis缓存
         String listKey = RedisUtil.getNewCrisisCaseListKey(String.valueOf(caseWarnVO.getId()));
-        redisUtil.setExpire(listKey, JSON.toJSONString(caseWarnVO), Constant.ONE_DAY * 7, TimeUnit.DAYS);
+        redisUtil.setExpire(listKey, JSON.toJSONString(caseWarnVO), 7, TimeUnit.DAYS);
     }
 
     private String getCrisisEventUrlByCrisisEventId(int id) {