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 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);