From d2bf8caa38cc592cf5516bf64da27ad1ec8ea308 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 17 十二月 2021 17:30:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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..5a79a77 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,15 @@
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.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
@@ -28,4 +32,14 @@
return save(lightReportData);
}
+
+ /**
+ * 鑾峰彇璺伅鍒楄〃
+ * @return 杩斿洖缁勫悎鏁版嵁dto
+ */
+ public List<LightDataDto> listLight(int pageNo, int pageSize, String keyword) {
+ PageHelper.startPage(pageNo,pageSize);
+
+ return null;
+ }
}
--
Gitblit v1.9.3