From fbd2186aafb368cb6a93ef26012443c997eaa551 Mon Sep 17 00:00:00 2001
From: Timer <@>
Date: Mon, 9 Mar 2026 17:09:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96redis=E7=82=B9=E4=BD=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=80=E6=96=B0=E5=80=BC=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=B0=B1=E6=98=AF0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/work/MPointController.java     | 21 ++++++++++++++++++-
 .../sipai/entity/alarm/PipelineAreaEnum.java  |  4 ++--
 .../sipai/entity/pipeline/PipelineData.java   |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sipai/controller/work/MPointController.java b/src/main/java/com/sipai/controller/work/MPointController.java
index 89628041..5843dbb8 100644
--- a/src/main/java/com/sipai/controller/work/MPointController.java
+++ b/src/main/java/com/sipai/controller/work/MPointController.java
@@ -66,6 +66,8 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
 import org.apache.log4j.Logger;
+import org.redisson.api.RMapCache;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -88,9 +90,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 @Controller
 @RequestMapping("/work/mpoint")
@@ -164,6 +168,8 @@ public class MPointController {
     private UserService userService;
     @Autowired
     private MPointRepo mPointRepo;
+    @Resource
+    private RedissonClient redissonClient;
 
     /**
      * 从数据库查数据
@@ -583,7 +589,20 @@ public class MPointController {
                     mp.setProcessSection(processSections.get(0));
                 }
             }
-
+            // 取redis点位数据最新值，没有就是0
+            for (MPoint mPoint : list) {
+                String id = mPoint.getId();
+                int num = mPoint.getId().hashCode() % 25;
+                RMapCache<String, String> map_redis_data = redissonClient.getMapCache(CommString.RedisMpointFlag + num);
+                if (map_redis_data.get(id) != null && !"".equals(map_redis_data.get(id))) {
+                    String[] str = map_redis_data.get(id).split(";");
+                    if (str.length >= 3 && str[1] != null && !str[1].isEmpty() && !"null".equals(str[1])) {
+                        mPoint.setParmvalue(new BigDecimal(str[1]));
+                    } else {
+                        mPoint.setParmvalue(BigDecimal.ZERO);
+                    }
+                }
+            }
             JSONArray json = JSONArray.fromObject(list.getContent());
             result = "{\"total\":" + list.getTotalElements() + ",\"rows\":" + json + "}";
         }
diff --git a/src/main/java/com/sipai/entity/alarm/PipelineAreaEnum.java b/src/main/java/com/sipai/entity/alarm/PipelineAreaEnum.java
index 5a81ff4f..11bd740d 100644
--- a/src/main/java/com/sipai/entity/alarm/PipelineAreaEnum.java
+++ b/src/main/java/com/sipai/entity/alarm/PipelineAreaEnum.java
@@ -2,8 +2,8 @@ package com.sipai.entity.alarm;
 
 public enum PipelineAreaEnum {
 
-    PipelineArea_Out_Side("OUT_SIDE", "场外管道"),
-    PipelineArea_In_Side("In_SIDE", "场内管道");
+    PipelineArea_Out_Side("OUT_SIDE", "厂外管道"),
+    PipelineArea_In_Side("In_SIDE", "厂内管道");
 
     private String code;
     private String description;
diff --git a/src/main/java/com/sipai/entity/pipeline/PipelineData.java b/src/main/java/com/sipai/entity/pipeline/PipelineData.java
index 13692478..e1e05f72 100644
--- a/src/main/java/com/sipai/entity/pipeline/PipelineData.java
+++ b/src/main/java/com/sipai/entity/pipeline/PipelineData.java
@@ -72,7 +72,7 @@ public class PipelineData extends SQLAdapter implements Serializable {
     private BigDecimal pipelineInvertElevationM;
 
     /**
-     * 管道场内场外标识（场外管道/场内管道）
+     * 管道场内场外标识（厂外管道/厂内管道）
      */
     @Column(name = "pipeline_area", length = 20)
     private String pipelineArea;