From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
index 793721b..b2d3cc1 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
@@ -1,12 +1,6 @@
package com.moral.api.mapper;
-import org.apache.ibatis.annotations.Param;
-
import java.util.Map;
-
-import com.moral.api.entity.HistoryHourly;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
/**
* <p>
@@ -16,13 +10,11 @@
* @author moral
* @since 2021-06-04
*/
-public interface HistoryHourlyMapper extends BaseMapper<HistoryHourly> {
+public interface HistoryHourlyMapper {
- void insertHistoryHourlyUnAdjust(Map<String, Object> params);
+ void insertHistoryHourly(Map<String, Object> params);
- int getCountByMacAndTime(@Param("mac") String mac, @Param("time") String time);
- void insertHistoryHourlyTransition(Map<String, Object> params);
+ Map<String,Object> selectHistoryHourly(Map<String, Object> params);
- void updateHistoryTransition(@Param("mac") String mac, @Param("time") String time);
}
--
Gitblit v1.8.0