From b96cc19f216ccd7451a5d2758055a4f174587ba9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 07 五月 2025 16:12:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java index 4ed6fa7..a87f967 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java @@ -658,6 +658,7 @@ MinitorDataSearchRequest param = new MinitorDataSearchRequest(); param.setResourceTypeCodes(new String[]{}); param.setRegionIndexCode("root000000"); + //60-娑蹭綅 61-姘村帇 param.setResourceTypeCodes("60,61".split(",")); param.setIncludeDown("1"); param.setUserId("admin"); @@ -681,6 +682,8 @@ if(model.getValues()!=null){ List<MonitorDataInfoVO> dataList = new ArrayList<>(); for(MonitorDataValResponse v : model.getValues()){ + //娑插帇鍥哄畾鍊硷細254001 + //姘村帇鍥哄畾鍊硷細253958 if(Constants.equalsInteger(model.getType(),60)){ if(v.getMonitorTypeCode().equals("254001")){ MonitorDataInfoVO vm = new MonitorDataInfoVO(); -- Gitblit v1.9.3