From 00468b1382e4e61d23b8388f97a8f64bc7aad3ad Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 9 Jul 2024 11:11:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B4=BB=E5=8A=A8=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E8=A3=85=E7=BD=AE=E8=A1=A5=E4=B8=8A=E5=BF=83=E8=B7=B3=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shxy/xymanager_service/impl/ActivitiesServiceImpl.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java
index f05f188..6b788da 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java
@@ -4,6 +4,7 @@ import com.shxy.xymanager_common.entity.*;
 import com.shxy.xymanager_common.exception.ApiException;
 import com.shxy.xymanager_dao.dao.MntnActivityTerminalsMapper;
 import com.shxy.xymanager_dao.dao.MntnActivitiesMapper;
+import com.shxy.xymanager_dao.dao.TerminalStatusDao;
 import com.shxy.xymanager_service.service.ActivitiesService;
 import com.shxy.xymanager_service.service.NewCacheService;
 import com.shxy.xymanager_service.service.TerminalExtService;
@@ -32,6 +33,8 @@ public class ActivitiesServiceImpl implements ActivitiesService {
     TerminalExtService terminalExtService;
     @Resource
     NewCacheService cacheService;
+    @Resource
+    TerminalStatusDao terminalStatusDao;
 
     @Override
     public List<MntnActivities> listAll() {
@@ -160,6 +163,8 @@ public class ActivitiesServiceImpl implements ActivitiesService {
                         t.setLineName(line.getName());
                     }
                 }
+                TerminalStatus status = terminalStatusDao.selectByPrimaryKey(t.getId());
+                t.setLastheartbeat(status.getLastHeartbeat());
             }
         }
         item.setTerms(terms);