From feac6e0c2db4e60d55417fde1971a0bc6d703566 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 15:58:28 +0800
Subject: [PATCH] fix
---
dao/src/main/java/com/sandu/ximon/dao/mapper/LightReportDataMapper.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightReportDataMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightReportDataMapper.java
index 40ea701..5ee7ab5 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightReportDataMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightReportDataMapper.java
@@ -1,9 +1,12 @@
package com.sandu.ximon.dao.mapper;
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.domain.LightReportData;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -15,6 +18,7 @@
/**
* 鑾峰彇鎸囧畾璁惧鍚楁渶鏂颁笂鎶ョ殑涓�鏉℃暟鎹�
+ *
* @param deviceCodeList 鎸囧畾璁惧鐮�
* @return 涓婃姤鏁版嵁
*/
@@ -23,11 +27,25 @@
/**
* 鑾峰彇涓婃姤鏁版嵁鍒楄〃
- * @param keyword 鍏抽敭璇�
+ *
+ * @param keyword 鍏抽敭璇�
* @param deviceCode 璁惧鐮�
* @return 涓婃姤鏁版嵁
*/
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
List<LightReportDataBo> listReportData(String keyword, String deviceCode);
+
+ /**
+ * 甯︾敤鎴稩D鏌ヨ
+ *
+ * @param keyword
+ * @param deviceCode
+ * @param userid
+ * @return
+ */
+ List<LightReportDataBo> listReportDataByUserid(String keyword, String deviceCode, Long userid);
+
+ List<LightReportDataBo> reportDataList(List<String> deviceCodeList, DateTime startDate, DateTime endDate);
}
--
Gitblit v1.9.3