Browse Source

修改集团报警

xujiaheng 3 years ago
parent
commit
c1ebb74f6a

+ 3 - 18
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/impl/ProjectAlarmRuleServiceImpl.java

@@ -580,24 +580,9 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
      */
     @Override
     public List<ProjectAlarmRuleListItemVO> pageBySubList(List<ProjectAlarmRuleListItemVO> list, int pagesize, int currentPage) {
-        int totalcount = list.size();
-        int pagecount = 0;
-        List<ProjectAlarmRuleListItemVO> subList;
-        int m = totalcount % pagesize;
-        if (m > 0) {
-            pagecount = totalcount / pagesize + 1;
-        } else {
-            pagecount = totalcount / pagesize;
+        if ((currentPage - 1) * pagesize > list.size()) {
+            return new ArrayList<>();
         }
-        if (m == 0) {
-            subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
-        } else {
-            if (currentPage == pagecount) {
-                subList = list.subList((currentPage - 1) * pagesize, totalcount);
-            } else {
-                subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
-            }
-        }
-        return subList;
+        return list.subList((currentPage - 1) * pagesize, Math.min(currentPage * pagesize, list.size()));
     }
 }

+ 3 - 0
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/service/impl/ProjectAlarmRuleObjRelServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.text.Collator;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -389,6 +390,8 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
             resultList = ConvertProjectAlarmRuleObjRelTool.INSTANCE.convert2List(relList);
 
         }
+        resultList = resultList.stream().sorted(Comparator.comparing(ProjectAlarmRuleObjRelListItemVO::getObjName,
+                Collator.getInstance(java.util.Locale.CHINA))).collect(Collectors.toList());
         return resultList;
     }