feat: 查询1和2状态进行统计

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java

@@ -312,9 +312,9 @@ public class TerminalServiceImpl implements TerminalService {
         int i = terminalsDao.deleteById(list, vo.getNewStatus(), new Date());
         cacheService.updateTerminalMap();
         if (i != 0) {
-            return Asserts.success("删除成功");
+            return Asserts.success("成功");
         } else {
-            return Asserts.error("删除失败");
+            return Asserts.error("失败");
         }
     }
 
@@ -597,18 +597,23 @@ public class TerminalServiceImpl implements TerminalService {
         int totalnum = 0;
         double onlinePercent = 0;
         double offlinePercent = 0;
-        List<TerminalsAndStatusDto> list = terminalsDao.selectTermAndStatusStatisticsList(CommonStatus.EFFECTIVE.value());
+        List<TerminalsAndStatusDto> list = terminalsDao.selectTermAndStatusStatisticsList(null);
         boolean empty = CollectionUtil.isEmpty(list);
         if (!empty) {
-            totalnum = list.size();
             for (int i = 0; i < list.size(); i++) {
                 TerminalsAndStatusDto bean = list.get(i);
-                BigInteger lastheartbeat = bean.getLastHeartbeat();
-                boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat);
-                if (b) {
+                if (bean.getStatus() == 1) {
+                    totalnum++;
+                    BigInteger lastheartbeat = bean.getLastHeartbeat();
+                    boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat);
+                    if (b) {
+                        onlinenum++;
+                    } else {
+                        offlinenum++;
+                    }
+                } else if (bean.getStatus() == 2) {
+                    totalnum++;
                     onlinenum++;
-                } else {
-                    offlinenum++;
                 }
             }
             onlinePercent = XyNumberUtils.div(onlinenum, totalnum);