From 2d0ba2ef450700c7b8b1c490d81a5978d185a592 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 29 八月 2024 11:42:18 +0800
Subject: [PATCH] 设备信息实时推送
---
src/main/java/com/whyc/service/DevInfService.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/DevInfService.java b/src/main/java/com/whyc/service/DevInfService.java
index 04017f6..1c83e84 100644
--- a/src/main/java/com/whyc/service/DevInfService.java
+++ b/src/main/java/com/whyc/service/DevInfService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.whyc.dto.Page;
+import com.whyc.dto.DevInfDto;
import com.whyc.dto.Response;
import com.whyc.mapper.A200RealstateMapper;
import com.whyc.mapper.ActmRealstateMapper;
@@ -12,8 +12,6 @@
import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
import com.whyc.pojo.db_lithium_ram_db.DevInf;
-import com.whyc.util.RSAUtil;
-import org.simpleframework.xml.Order;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -56,10 +54,10 @@
}
//鑾峰彇鎵�鏈夌殑璁惧淇℃伅
- public Response getAllInf(Integer uid, Page page) {
+ public Response getAllInf(Integer uid, DevInfDto devInfDto) {
Map<String, Object> allMap = new HashMap<>();
- PageHelper.startPage(page.getPageNum(),page.getPageSize());
- List<DevInf> list=mapper.getAllInf(uid);
+ PageHelper.startPage(devInfDto.getPageNum(), devInfDto.getPageSize());
+ List<DevInf> list=mapper.getAllInf(uid,devInfDto.getDevType());
Map<Integer, List<DevInf>> typeDevMap = list.stream().collect(Collectors.groupingBy(DevInf::getDevType));
Map<Integer, List<DevInf>> onlineDevMap = list.stream().collect(Collectors.groupingBy(DevInf::getDevOnline));
--
Gitblit v1.9.1