fix: 修正运维过滤逻辑

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnStatus.java

@@ -313,7 +313,7 @@ public class MntnStatus {
         this.lastRawReport = lastRawReport;
     }
 
-    private HashMap<String, Object> reportMap;
+    private HashMap<String, Object> reportMap = new HashMap<>();
 
     public HashMap<String, Object> getReportMap() {
         return reportMap;
@@ -330,11 +330,9 @@ public class MntnStatus {
     }
 
     public boolean match(TerminalSelectVo vo) {
-        if (reportMap != null) {
-            if (this.matchVersion(vo) && this.matchCma(vo) &&
-                    this.matchOid(vo) && this.matchOnline(vo)) {
-                return true;
-            }
+        if (this.matchVersion(vo) && this.matchCma(vo) &&
+                this.matchOid(vo) && this.matchOnline(vo)) {
+            return true;
         }
         return false;
     }

xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java

@@ -77,7 +77,7 @@ public class RawReportUtil {
             return map;
         } catch (Exception e) {
             log.error("buildRawReportMap error, rawReport=" + rawReport, e);
-            return null;
+            return new HashMap<>();
         }
     }
 }

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

@@ -141,6 +141,10 @@ public class TerminalExtServiceImpl implements TerminalExtService {
         Map<Integer, Protocols> protocolMap = cacheService.getProtocolMap();
         List<View_Dy_Line_Tower_Terminals> result = new ArrayList<>();
         for (View_Dy_Line_Tower_Terminals item : list) {
+            Protocols protocols = protocolMap.get(item.getProtocol());
+            if (protocols != null) {
+                item.setProtocolName(protocols.getName());
+            }
             MntnStatus status = statusMapper.selectByPrimaryKey(item.getId());
             if (status != null) {
                 item.setMntnStatus(status);
@@ -148,23 +152,15 @@ public class TerminalExtServiceImpl implements TerminalExtService {
                 if (status.getRawReportTime() != null) {
                     item.setLastHeartbeat(BigInteger.valueOf(status.getRawReportTime()));
                 }
+            } else {
+                status = new MntnStatus();
             }
             if (vo.needMatch()) {
-                if (status != null) {
-                    if (status.match(vo)) {
-                        result.add(item);
-                        Protocols protocols = protocolMap.get(item.getProtocol());
-                        if (protocols != null) {
-                            item.setProtocolName(protocols.getName());
-                        }
-                    }
+                if (status.match(vo)) {
+                    result.add(item);
                 }
             } else {
                 result.add(item);
-                Protocols protocols = protocolMap.get(item.getProtocol());
-                if (protocols != null) {
-                    item.setProtocolName(protocols.getName());
-                }
             }
         }
         return result;