perf: 统计里补充towerName, rebootCount, workingStatus等信息

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

@@ -348,12 +348,16 @@ public class TerminalExtController extends BaseController {
         ServiceBody<TerminalPhotoSelectListModel> serviceBody = photoService.getPhotoList(requestIp, vo, termList);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             TerminalPhotoSelectListModel model = serviceBody.getData();
-            this.buildPhotoStat(termList, model.getList(), vo);
-
             List<Integer> idList = new ArrayList<>();
             for (StatTerm st : termList) {
                 idList.add(st.getTermId());
             }
+            if (idList.size() < 1) {
+                idList.add(-1);
+            }
+
+            this.buildPhotoStat(termList, idList, model.getList(), vo);
+
             PageInfo<Weathers> weatherPage = weatherService.list(null, null, idList,
                     vo.getStarttime().getTime() / 1000, vo.getEndtime().getTime() / 1000, 1, 100000);
             if (!CollectionUtils.isEmpty(weatherPage.getList())) {
@@ -376,13 +380,29 @@ public class TerminalExtController extends BaseController {
         }
     }
 
-    private void buildPhotoStat(List<StatTerm> termList, List<TerminalPhotoSelectListModel.PhotoBean> list, TerminalPhotoSelectVo vo) throws Exception {
+    private void buildPhotoStat(List<StatTerm> termList, List<Integer> idList,
+                                List<TerminalPhotoSelectListModel.PhotoBean> list, TerminalPhotoSelectVo vo) throws Exception {
         for (StatTerm statTerm : termList) {
             List<CameraSchedule> scheduleList = cameraScheduleService.list(statTerm.getTermId());
             statTerm.initScheduleList(scheduleList, vo.getStarttime().getTime(), vo.getEndtime().getTime(), vo.getInterval());
+
+            long rebootCount = infoHistoryService.count(statTerm.getTermId(), vo.getStarttime().getTime() / 1000, vo.getEndtime().getTime() / 1000);
+            statTerm.setRebootCount(rebootCount);
             TerminalBasicInfoHistory info = infoHistoryService.getLast(statTerm.getTermId());
             statTerm.setLastInfo(info);
         }
+        TerminalStatusExample example = new TerminalStatusExample();
+        TerminalStatusExample.Criteria criteria = example.createCriteria();
+        criteria.andTermIdIn(idList);
+        List<TerminalStatus> terminalStatuses = terminalStatusDao.selectByExample(example);
+        for (StatTerm item : termList) {
+            for (TerminalStatus terminalStatus : terminalStatuses) {
+                if (item.getTermId() == terminalStatus.getTermId().intValue()) {
+                    item.setWorkingStatus(terminalStatus);
+                    break;
+                }
+            }
+        }
         if (list != null) {
             for (TerminalPhotoSelectListModel.PhotoBean photo : list) {
                 StatTerm term = this.findStatTerm(termList, photo.getTermid(), photo.getCmdid());

xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatTerm.java

@@ -2,10 +2,7 @@ package com.shxy.xymanager_common.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.shxy.xymanager_common.dto.ScheduleDetailsDto;
-import com.shxy.xymanager_common.entity.CameraSchedule;
-import com.shxy.xymanager_common.entity.LeadPulls;
-import com.shxy.xymanager_common.entity.TerminalBasicInfoHistory;
-import com.shxy.xymanager_common.entity.Weathers;
+import com.shxy.xymanager_common.entity.*;
 import com.shxy.xymanager_common.util.DateUtil;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
@@ -23,6 +20,9 @@ public class StatTerm implements Serializable {
     Object uploads;
     String cmdid;
     String devType;
+    String towerName;
+    Long rebootCount;
+    TerminalStatus workingStatus;
     List<StatChannel> channels = new ArrayList<>();
     List<ScheduleDetailsDto> weatherScheduleList = new ArrayList<>();
     List<Date> weatherTimeList = new ArrayList<>();

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

@@ -621,6 +621,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                 statTerm.setTermId(terminal.getId());
                 statTerm.setCmdid(terminal.getCmdid());
                 statTerm.setDevType(terminal.getDevType());
+                statTerm.setTowerName(terminal.getTowerName());
                 termList.add(statTerm);
             }
         } else {