From 0f2d1bcc387707f36fefdda6a7f9870383dd8c26 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Wed, 17 Dec 2025 17:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BigScreenWebSocketServer.java     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java
index 94abc378..edd266c8 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java
@@ -248,17 +248,18 @@ public class BigScreenWebSocketServer {
                 //先获取左边坐标得到map
                 Map<String, String> infoData = busAttendanceService.getRyglOnlineUserInfoData(projectId);
                 //获取右边数据
-                busAttendanceService.getAttendanceInfo(projectId, Long.valueOf(timeType) , infoData);
+                busAttendanceService.getAttendanceInfo(projectId, Long.valueOf(timeType), infoData);
                 //返回数据
                 maps.add(infoData);
                 break;
             case 3:
 //                质安管理
-                jxzagl(projectId,message,maps);
+                jxzagl(projectId, message, maps);
 
                 break;
             case 4:
                 // 进度管理大屏
+                getProgressBigScreenData(maps, projectId);
                 break;
             case 5:
                 //物资管理大屏
@@ -273,7 +274,7 @@ public class BigScreenWebSocketServer {
 
         try {
             message = JSONUtil.toJsonStr(maps);
-            session.getBasicRemote().sendText( message);
+            session.getBasicRemote().sendText(message);
         } catch (IOException e) {
             log.error("📤 回复会话[{}]失败：{}", session.getId(), e.getMessage());
         }
@@ -392,7 +393,7 @@ public class BigScreenWebSocketServer {
     /**
      * 查询大屏-质量管理-接收消息
      */
-    private void jxzagl(Long projectId, String message,List<Map<String, String>> maps) {
+    private void jxzagl(Long projectId, String message, List<Map<String, String>> maps) {
         DpzaglService dpzaglService = SpringUtils.getBean(DpzaglService.class);
 
         ObjectMapper objectMapper = new ObjectMapper();
@@ -400,7 +401,8 @@ public class BigScreenWebSocketServer {
         try {
             Map<String, String> dateMap = objectMapper.readValue(
                 message,
-                new TypeReference<Map<String, String>>() {}
+                new TypeReference<Map<String, String>>() {
+                }
             );
 
             // 3. 获取数据（两种方式）
@@ -410,15 +412,13 @@ public class BigScreenWebSocketServer {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.CHINA);
 
             DpznglBo dpznglBo = new DpznglBo();
-            if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)){
+            if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)) {
                 dpznglBo.setStartDate(LocalDate.parse(startDate, formatter));
                 dpznglBo.setEndDate(LocalDate.parse(endDate, formatter));
 
             }
             dpznglBo.setProjectId(projectId);
 
-
-
             //  查询大屏-质安管理-安全员分布情况
 
             List<DpznglAqyVo> dpznglAqyVos = dpzaglService.listByAqy(dpznglBo);
@@ -465,11 +465,11 @@ public class BigScreenWebSocketServer {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.CHINA);
 
 
-        if (startDate != null && startDate.size() > 0){
+        if (startDate != null && startDate.size() > 0) {
             String first = startDate.getFirst();
             dpznglBo.setStartDate(LocalDate.parse(first, formatter));
         }
-        if (endDate != null && endDate.size() > 0){
+        if (endDate != null && endDate.size() > 0) {
             String first = endDate.getFirst();
             dpznglBo.setEndDate(LocalDate.parse(first, formatter));
         }