feat: 增加lastInfo信息

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java

@@ -75,6 +75,8 @@ public class TerminalExtController extends BaseController {
                 terminal.setPositions(positions);
                 long rebootCount = infoHistoryService.count(terminal.getId(), start, end);
                 terminal.setRebootCount(rebootCount);
+                TerminalBasicInfoHistory info = infoHistoryService.getLast(terminal.getId());
+                terminal.setLastInfo(info);
             }
         }
         return ResponseReult.success(result);

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java

@@ -131,4 +131,5 @@ public class View_Dy_Line_Tower_Terminals implements Serializable {
     private TerminalStatus workingStatus;
     private TerminalPositions positions;
     private Long rebootCount;
+    private TerminalBasicInfoHistory lastInfo;
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalBasicInfoHistoryServiceImpl.java

@@ -1,12 +1,16 @@
 package com.shxy.xymanager_service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.shxy.xymanager_common.entity.TerminalBasicInfoHistory;
 import com.shxy.xymanager_common.entity.TerminalBasicInfoHistoryExample;
 import com.shxy.xymanager_dao.dao.TerminalBasicInfoHistoryDao;
 import com.shxy.xymanager_service.service.TerminalBasicInfoHistoryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -28,4 +32,19 @@ public class TerminalBasicInfoHistoryServiceImpl implements TerminalBasicInfoHis
         }
         return terminalBasicInfoHistoryDao.countByExample(example);
     }
+
+    @Override
+    public TerminalBasicInfoHistory getLast(Integer termId) {
+        PageHelper.startPage(1, 1);
+        TerminalBasicInfoHistoryExample example = new TerminalBasicInfoHistoryExample();
+        TerminalBasicInfoHistoryExample.Criteria criteria = example.createCriteria();
+        criteria.andTermIdEqualTo(termId);
+
+        List<TerminalBasicInfoHistory> list = terminalBasicInfoHistoryDao.selectByExample(example);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        } else {
+            return list.get(0);
+        }
+    }
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalBasicInfoHistoryService.java

@@ -1,5 +1,10 @@
 package com.shxy.xymanager_service.service;
 
+import com.shxy.xymanager_common.entity.TerminalBasicInfoHistory;
+
 public interface TerminalBasicInfoHistoryService {
+
     long count(Integer termId, Long start, Long end);
+
+    TerminalBasicInfoHistory getLast(Integer termId);
 }