From f7a95fddddb0efd60abdab7550ae636c379a2a20 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 08 三月 2024 12:44:49 +0800
Subject: [PATCH] 功能调整

---
 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 0b055d1..17d7753 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -27,12 +27,12 @@
     private DeviceMapper deviceMapper;
 
     @Override
-    public Map<String, Object> selectDeviceParameter(Page page, Device itemParameter) {
+    public Map<String, Object> selectDeviceParameter(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, Device itemParameter) {
         Map<String, Object> map = new HashMap<>();
         map.put("head", PrintChina.printChina(Device.class));
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDeviceParameter");
         if (map1.get("look") == 1) itemParameter.setCreateUser(map1.get("userId"));
-        map.put("body", deviceMapper.selectDeviceParameter(page, QueryWrappers.queryWrappers(itemParameter)));
+        map.put("body", deviceMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter)));
         return map;
     }
 
@@ -53,7 +53,7 @@
 
     @Override
     public List<Device> selectEquipmentOverview() {
-        return deviceMapper.selectEquipmentOverview();
+        return deviceMapper.selectEquipmentOverview(new Page(1, 10), QueryWrappers.queryWrappers(new Device()));
     }
 
     @Override
@@ -66,5 +66,9 @@
         return deviceMapper.search(status, deviceName, specificationModel, largeCategory);
     }
 
+    @Override
+    public List<Device> selectDevicePrincipal() {
+        return deviceMapper.selectDevicePrincipal();
+    }
 }
 

--
Gitblit v1.9.3