From 83326b4b2a8a10d11ae18dcedd2e6904dd69d2b2 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 二月 2022 12:32:11 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
index 213eaeb..3ce83ab 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
@@ -1,11 +1,17 @@
package com.sandu.ximon.admin.service;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.dto.LightDataDto;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightHeartbeatReportInnerFrame;
+import com.sandu.ximon.dao.bo.LightBo;
+import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.mapper.LightReportDataMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @author chenjiantian
@@ -15,17 +21,36 @@
@Service
public class LightReportDataService extends BaseServiceImpl<LightReportDataMapper, LightReportData> {
+
/**
* 淇濆瓨涓婃姤鐨勭伅蹇冭烦鏁版嵁
*
* @return 鏄惁鎴愬姛
*/
public boolean saveReportData(String deviceName, A5LightHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
-
LightReportData lightReportData = new LightReportData();
BeanUtils.copyProperties(heartBeatDataPackage, lightReportData);
- lightReportData.setDeviceMac(deviceName);
+ lightReportData.setDeviceCode(deviceName);
return save(lightReportData);
}
+
+ /**
+ * 鑾峰彇鎸囧畾璁惧鐮佹渶鏂扮殑涓�澶╀笂鎶ユ暟鎹�
+ * @param deviceCodeList 璁惧鐮佸垪琛�
+ * @return 涓婃姤鏁版嵁
+ */
+ public List<LightReportData> getNewestReportByDeviceCode(List<String> deviceCodeList) {
+ return baseMapper.getNewestReportByDeviceCode(deviceCodeList);
+ }
+
+ /**
+ * 鑾峰彇涓婃姤鏁版嵁
+ * @param keyword 鍏抽敭璇�
+ * @param deviceCode 璁惧鐮�
+ */
+ public List<LightReportDataBo> listReportData(int pageNo, int pageSize, String keyword, String deviceCode) {
+ PageHelper.startPage(pageNo,pageSize);
+ return baseMapper.listReportData(keyword,deviceCode);
+ }
}
--
Gitblit v1.9.3