From 15369bf819ca82896bbcada782e6babf2a7d64c9 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:49:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
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