From c8ce26aac0004e249a0cef35fe15b2ddb280ad25 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 27 四月 2022 15:51:10 +0800
Subject: [PATCH] 大气数据推送到LED
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index a1b421a..75d6590 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -117,7 +117,7 @@
);
for (LightReportData lightReportData : reportDataList) {
if (StrUtil.equals(lightBo.getDeviceCode(), lightReportData.getDeviceCode())) {
- lightBo.setReportTime(lightReportData.getCreateTime());
+ lightBo.setReportTime(lightReportData.getCreateTime1());
break;
}
}
@@ -471,15 +471,15 @@
/**
* 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
*/
- public CommonPage<String> listDeviceCode(int pageNo, int pageSize) {
+ public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {
List<String> list;
if (SecurityUtils.getClientId() != null) {
PageHelper.startPage(pageNo, pageSize);
- list = baseMapper.listCode(SecurityUtils.getUserId());
+ list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
} else {
PageHelper.startPage(pageNo, pageSize);
- list = baseMapper.listCode(null);
+ list = baseMapper.listCode(null, keyword, deviceCode);
}
return CommonPage.restPage(list);
--
Gitblit v1.9.3