From 11cc20222a7c20b9dc436f7c879834035882f431 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 26 四月 2022 16:15:44 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 c3fd704..a1b421a 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,13 +471,18 @@
/**
* 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
*/
- public List<String> listDeviceCode(int start, int end) {
+ public CommonPage<String> listDeviceCode(int pageNo, int pageSize) {
+ List<String> list;
if (SecurityUtils.getClientId() != null) {
- PageHelper.startPage(start, end);
- return baseMapper.listCode(SecurityUtils.getUserId());
+ PageHelper.startPage(pageNo, pageSize);
+ list = baseMapper.listCode(SecurityUtils.getUserId());
+ } else {
+
+ PageHelper.startPage(pageNo, pageSize);
+ list = baseMapper.listCode(null);
}
- PageHelper.startPage(start, end);
- return baseMapper.listCode(null);
+
+ return CommonPage.restPage(list);
}
public boolean setPower(List<Long> ids, Integer power1, Integer power2) {
--
Gitblit v1.9.3