From d57d96ce51231734aa0b4979abeea17271660c1e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 26 四月 2022 17:10:46 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 9232559..bc087e1 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
@@ -5,6 +5,7 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -470,8 +471,27 @@
/**
* 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
*/
- public List<String> listDeviceCode(/*int start, int end*/) {
- return baseMapper.listCode(/*start,end,*/SecurityUtils.getClientId());
+ 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(), keyword, deviceCode);
+ } else {
+
+ PageHelper.startPage(pageNo, pageSize);
+ list = baseMapper.listCode(null, keyword, deviceCode);
+ }
+
+ return CommonPage.restPage(list);
}
+ public boolean setPower(List<Long> ids, Integer power1, Integer power2) {
+ List<Light> lights = listByIds(ids);
+ lights.forEach(light -> {
+ light.setPower1(power1);
+ light.setPower2(power2);
+ }
+ );
+ return updateBatchById(lights);
+ }
}
--
Gitblit v1.9.3