From 06b49617f43d36220649e81a7e4ac912356fd1b4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 23 Aug 2023 15:38:16 +0800
Subject: [PATCH] fix:监测站数据展示

---
 screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
index 240760d..4a8ab4e 100644
--- a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
@@ -1,10 +1,16 @@
 package com.moral.api.service;
 
+import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
 import com.moral.api.entity.SpecialDevice;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.pojo.bo.ExcelBO;
+import com.moral.api.pojo.vo.excel.DailyVo;
 
 /**
  * <p>
@@ -20,7 +26,9 @@
     List<Map<String, Object>> selectCruisers();
 
     //���������������
-    List<Map<String, Object>> carTrajectory(Map<String, Object> params);
+    List<Map<String, Object>> carTrajectory(Map<String, Object> params,boolean type);
+
+    List<HistorySecondCruiserResultDTO> carTrajectoryNewAvg(Map<String, Object> params);
 
     /**
     * @Description: ������mac������������������������
@@ -35,4 +43,17 @@
     //���������������������������������������
     List<String> getDatesByMac(String mac);
 
+    //���������������
+    ExcelBO getDaily(Map<String, Object> params, List<MultipartFile> files) throws ParseException;
+
+    //���������������������
+    DailyVo loadDaily(Integer id);
+
+
+    //������������
+    List<ExcelBO> selectDaily(Map<String, Object> params);
+
+
+
+
 }

--
Gitblit v1.8.0