From 68e750bf109efb0469704e54e48a29649512358c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 18 Dec 2023 13:31:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

---
 screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java b/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java
index 1c31213..a943310 100644
--- a/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java
+++ b/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java
@@ -1,11 +1,21 @@
 package com.moral.api.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.moral.api.entity.HistoryAqi;
 
 public interface HistoryAqiService extends IService<HistoryAqi> {
 
-    //������aqi������insert
-    void insertHistoryAqi();
+    //aqi������������������������
+    void insertHistoryAqi(String time1);
+
+    HistoryAqi getHistoryApiByTimeAndGuid(String guid,String time);
+
+    //������������history_aqi������
+    List<HistoryAqi> getHistoryAqi();
+
+
+    void insertHCHistoryAqi();
 
 }

--
Gitblit v1.8.0