Merge remote-tracking branch 'origin/master' into master

whycxzp

2025-06-11 5da72b5cb4340856d7986954b36cba7d0f79cac8

Merge remote-tracking branch 'origin/master' into master

 src/main/java/com/whyc/webSocket/RealTimeSocket.java

@@ -445,6 +445,9 @@
            //实时获取电源信息
            PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
            map.put("pwrdevAcdcdata",pwrdevAcdcdata!=null?pwrdevAcdcdata:"");
            //电源对象(整流器使用情况)
            PowerInf powerInf = powerInfService.getPowerInfById(realDto.getPowerId());
            map.put("powerInf",powerInf!=null?powerInf:"");
            map.put("pageType",realDto.getPageType());
            return new Response().setII(1,true,map,"电源界面信息推送");
        }catch (Exception e){