Merge branch 'feature' into 'dev'

调整推送页面预警样式

See merge request !84

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

@@ -234,18 +234,23 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         // key4
         String key4;
         StringBuilder keyBuilder4 = new StringBuilder();
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < Math.min(datas.size(), 2); i++) {
             BaseMap baseMap = datas.get(i);
             String platform = baseMap.getPlatform();
             String source = baseMap.getSource();
             String title = baseMap.getTitle();
             keyBuilder4.append(platform).append("-").append(source).append("\r\n");
-            keyBuilder4.append(i + 1).append("、").append(title).append("\r\n");
+            // 最后一条
+            if (datas.size() == i + 1) {
+                keyBuilder4.append(i + 1).append("、").append(title);
+            } else {
+                keyBuilder4.append(i + 1).append("、").append(title).append("\r\n");
+            }
         }
         if (datas.size() > 2) {
             key4 = keyBuilder4.append("...").toString();
         } else {
-            key4 = keyBuilder4.substring(0, keyBuilder4.length() - 4);
+            key4 = keyBuilder4.toString();
         }
         List<BaseMapCompound> collect = datas.stream().map(baseMap -> BaseMapCompound.createFromBaseMap(baseMap, project.getId())).collect(Collectors.toList());
         return new BrandkbsWarnTemplate(firstCount, key1, key2, key3, key4, new BrandkbsYuQingWarn(collect));
@@ -270,18 +275,23 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         // key4
         String key4;
         StringBuilder keyBuilder4 = new StringBuilder();
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < Math.min(datas.size(), 2); i++) {
             BaseMap baseMap = datas.get(i);
             String platform = baseMap.getPlatform();
             String source = baseMap.getSource();
             String title = baseMap.getTitle();
             keyBuilder4.append(platform).append("-").append(source).append("\r\n");
-            keyBuilder4.append(i + 1).append("、").append(title).append("\r\n");
+            // 最后一条
+            if (datas.size() == i + 1) {
+                keyBuilder4.append(i + 1).append("、").append(title);
+            } else {
+                keyBuilder4.append(i + 1).append("、").append(title).append("\r\n");
+            }
         }
         if (datas.size() > 2) {
             key4 = keyBuilder4.append("...").toString();
         } else {
-            key4 = keyBuilder4.substring(0, keyBuilder4.length() - 4);
+            key4 = keyBuilder4.toString();
         }
         List<BaseMapCompound> collect = datas.stream().map(baseMap -> BaseMapCompound.createFromBaseMap(baseMap, project.getId())).collect(Collectors.toList());
         return new BrandkbsWarnTemplate(firstCount, key1, key2, key3, key4, new BrandkbsYuQingWarn(collect));
@@ -300,20 +310,27 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         // key4
         String key4;
         StringBuilder keyBuilder4 = new StringBuilder();
-        int limit = 2;
+        final int limit = 2;
+        int count = limit;
         out:
         for (List<Event> value : eventMap.values()) {
             for (Event event : value) {
-                keyBuilder4.append(event.getTitle()).append("\r\n");
-                if (--limit == 0) {
+                if (--count == 0) {
+                    if (firstCount <= limit) {
+                        keyBuilder4.append(event.getTitle());
+                    } else {
+                        keyBuilder4.append(event.getTitle()).append("\r\n");
+                    }
                     break out;
+                } else {
+                    keyBuilder4.append(event.getTitle()).append("\r\n");
                 }
             }
         }
-        if (firstCount > 2) {
+        if (firstCount > limit) {
             key4 = keyBuilder4.append("...").toString();
         } else {
-            key4 = keyBuilder4.substring(0, keyBuilder4.length() - 4);
+            key4 = keyBuilder4.toString();
         }
         List<BrandkbsHotEventWarn.HotEvent> collect = eventMap.entrySet().stream().map(entry -> entry.getValue().stream().map(event -> BrandkbsHotEventWarn.HotEvent.createFromEvent(entry.getKey(), event)).collect(Collectors.toList())).collect(Collectors.toList()).stream().flatMap(List::stream).collect(Collectors.toList());
         return new BrandkbsWarnTemplate(firstCount, key1, key2, key3, key4, new BrandkbsHotEventWarn(collect));
@@ -354,17 +371,22 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         // key4
         String key4;
         StringBuilder keyBuilder4 = new StringBuilder();
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < Math.min(datas.size(), 2); i++) {
             BrandkbsHotTopWarn.HotTop hotTop = datas.get(i);
             String topName = hotTop.getTopName() + "榜";
             String title = hotTop.getTitle();
             keyBuilder4.append(topName).append("\r\n");
-            keyBuilder4.append(i + 1).append("、").append(title).append("\r\n");
+            // 最后一条
+            if (datas.size() == i + 1) {
+                keyBuilder4.append(i + 1).append("、").append(title);
+            } else {
+                keyBuilder4.append(i + 1).append("、").append(title).append("\r\n");
+            }
         }
         if (datas.size() > 2) {
             key4 = keyBuilder4.append("...").toString();
         } else {
-            key4 = keyBuilder4.substring(0, keyBuilder4.length() - 4);
+            key4 = keyBuilder4.toString();
         }
         return new BrandkbsWarnTemplate(datas.size(), key1, key2, key3, key4, new BrandkbsHotTopWarn(config.getWarnKeyword(), config.getFilterKeyword(), datas));
     }
@@ -380,15 +402,20 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         // key4
         String key4;
         StringBuilder keyBuilder4 = new StringBuilder();
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < Math.min(datas.size(), 2); i++) {
             BrandkbsNewCaseWarn.NewCase newCase = datas.get(i);
             String title = newCase.getTitle();
-            keyBuilder4.append(title).append("\r\n");
+            // 最后一条
+            if (datas.size() == i + 1) {
+                keyBuilder4.append(title);
+            } else {
+                keyBuilder4.append(title).append("\r\n");
+            }
         }
         if (datas.size() > 2) {
             key4 = keyBuilder4.append("...").toString();
         } else {
-            key4 = keyBuilder4.substring(0, keyBuilder4.length() - 4);
+            key4 = keyBuilder4.toString();
         }
         return new BrandkbsWarnTemplate(firstCount, key1, key2, key3, key4, new BrandkbsNewCaseWarn(datas));
     }