From 702b1a008a5be2868116a733e777de1d792e9b9f Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Tue, 29 Apr 2025 08:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/Kafka/KafkaMessageListener.java | 12 +++++++++---
 .../java/com/zcloud/task/UserPositionInfoTask.java  | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/review_repo/src/main/java/com/zcloud/Kafka/KafkaMessageListener.java b/review_repo/src/main/java/com/zcloud/Kafka/KafkaMessageListener.java
index 675838c..2483072 100644
--- a/review_repo/src/main/java/com/zcloud/Kafka/KafkaMessageListener.java
+++ b/review_repo/src/main/java/com/zcloud/Kafka/KafkaMessageListener.java
@@ -50,7 +50,13 @@ public class KafkaMessageListener {
             combinedMap.putAll(subMap);
         }
         if(combinedMap.containsKey(terminalNo)) {
-            jsonObject.put("MAP_POINT_NAME", combinedMap.get(terminalNo));
+            String[] userAndStaffNo = combinedMap.get(terminalNo).split("@");
+            jsonObject.put("MAP_POINT_NAME", userAndStaffNo[0]);
+            jsonObject.put("staffNo", userAndStaffNo[1]);
+            jsonObject.put("orgName", userAndStaffNo[2]);
+            jsonObject.put("name", userAndStaffNo[3]);
+        }else {
+            return;
         }
         // 根据 terminalNo 设备号  找到redis里存在的 如果不存在  直接追加
         // 如果存在  比对时间  以时间新的为准 更新redis
@@ -64,11 +70,11 @@ public class KafkaMessageListener {
             Long b = Long.parseLong(str3);
             if(a<b){
                 redisTemplate.opsForValue().set("Kafka@"+terminalNo, jsonObject.toJSONString());
-                redisTemplate.expire("Kafka@"+terminalNo, 5, TimeUnit.MINUTES);
+                redisTemplate.expire("Kafka@"+terminalNo, 30, TimeUnit.SECONDS);
             }
         }else {
             redisTemplate.opsForValue().set("Kafka@"+terminalNo, jsonObject.toJSONString());
-            redisTemplate.expire("Kafka@"+terminalNo, 5, TimeUnit.MINUTES);
+            redisTemplate.expire("Kafka@"+terminalNo, 30, TimeUnit.SECONDS);
         }
     }
 }
diff --git a/review_repo/src/main/java/com/zcloud/task/UserPositionInfoTask.java b/review_repo/src/main/java/com/zcloud/task/UserPositionInfoTask.java
index 5e65ced..b044e93 100644
--- a/review_repo/src/main/java/com/zcloud/task/UserPositionInfoTask.java
+++ b/review_repo/src/main/java/com/zcloud/task/UserPositionInfoTask.java
@@ -2,10 +2,13 @@ package com.zcloud.task;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zcloud.common.utils.DateUtil;
+import com.zcloud.common.utils.DateUtils;
 import com.zcloud.modules.job.task.ITask;
 import com.zcloud.util.personnelPositioning.OpenAPI;
 import com.zcloud.util.personnelPositioning.sendAPI;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
@@ -38,6 +41,10 @@ public class UserPositionInfoTask implements ITask {
         JSONObject dataJson = JSONObject.parseObject(redisValueJson.getString("data"));
         JSONArray data = dataJson.getJSONArray("data");
         JSONArray jsonArray = new JSONArray();
+        String newDateStr = DateUtil.date2Str(new Date(), "yyyy-MM-dd HH:mm:ss");
+        if(StringUtils.contains(newDateStr,"00:00:00")){
+
+        }
         for (int i = 0; i < data.size(); i++) {
             JSONObject item = data.getJSONObject(i);
             JSONObject terminal = JSONObject.parseObject(item.getString("terminal"));
@@ -45,7 +52,11 @@ public class UserPositionInfoTask implements ITask {
                 JSONObject redisJson = new JSONObject();
                 String terminalNo = terminal.getString("terminalNo");
                 String userName = item.getString("staffName");
-                redisJson.put(terminalNo,userName);
+                String staffNo = item.getString("staffNo");
+                String orgName = item.getString("orgName");
+                JSONObject bizObject = JSONObject.parseObject(item.getString("biz"));
+                String name = bizObject.getString("name");
+                redisJson.put(terminalNo,userName+"@"+staffNo+"@"+orgName+"@"+name);
                 jsonArray.add(redisJson);
             }
         }