From 346bf9fc793f188caca408532265f8f862a23ff4 Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 26 Aug 2024 10:28:34 +0800
Subject: [PATCH] fix:设备分页查询接口修复
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 9aca9e7..37132e2 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -291,6 +291,9 @@
queryWrapper.eq("monitor_point_id", mpId);
}
+ //������������������������
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE);
+
//���������������mac������������
if (name != null && mac != null) {
queryWrapper.like("name", name).or().like("mac", mac);
@@ -306,7 +309,7 @@
} else {
queryWrapper.orderByDesc("create_time");
}
- queryWrapper.eq("is_delete", Constants.NOT_DELETE);
+
Page<Device> devicePage = new Page<>(page, size);
deviceMapper.selectPage(devicePage, queryWrapper);
List<Device> devices = devicePage.getRecords();
@@ -519,9 +522,10 @@
}
}
//������������������
- UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("id", device.getId()).set("state", String.valueOf(state));
- deviceMapper.update(null, updateWrapper);
+ Device device1 = new Device();
+ device1.setId(device.getId());
+ device1.setState(String.valueOf(state));
+ deviceMapper.updateById(device1);
}
@Override
--
Gitblit v1.8.0