From 661e56eb85e3bd0e35e94fca2d2ec59e77772da5 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 01 Feb 2024 15:30:57 +0800 Subject: [PATCH] fix:补充提交 --- screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 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 2b5f723..3810dd8 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,5 +1,6 @@ package com.moral.api.service; +import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO; import org.springframework.web.multipart.MultipartFile; import java.text.ParseException; @@ -9,6 +10,7 @@ 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.device.AppDeviceVo; import com.moral.api.pojo.vo.excel.DailyVo; /** @@ -25,7 +27,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������������������������ @@ -50,7 +54,7 @@ //������������ List<ExcelBO> selectDaily(Map<String, Object> params); - - + //������������������������ + List<AppDeviceVo> selectSpecialDevice(); } -- Gitblit v1.8.0