fys/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

WEB：分页查询设备列表

Browse Source
This commit is contained in:
daiyongfei
2025-07-04 15:42:10 +08:00
parent d456236599
commit 3947f9b6f0
10 changed files with 70 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.fuyuanshen.equipment.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.generator.SnowflakeGenerator;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -113,7 +114,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
@Transactional(rollbackFor = Exception.class)
public void addDevice(DeviceForm deviceForm) throws Exception {
DeviceTypeQueryCriteria queryCriteria = new DeviceTypeQueryCriteria();
queryCriteria.setDeviceTypeId(deviceForm.getId());
queryCriteria.setDeviceTypeId(deviceForm.getDeviceType());
queryCriteria.setCustomerId(LoginHelper.getUserId());
List<DeviceType> deviceTypes = deviceTypeMapper.findAll(queryCriteria);
if (deviceTypes.isEmpty()) {
@ -152,7 +153,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
public void update(DeviceForm deviceForm) throws Exception {
DeviceTypeQueryCriteria deviceTypeQueryCriteria = new DeviceTypeQueryCriteria();
deviceTypeQueryCriteria.setDeviceTypeId(deviceForm.getId());
deviceTypeQueryCriteria.setDeviceTypeId(deviceForm.getDeviceType());
deviceTypeQueryCriteria.setCustomerId(LoginHelper.getUserId());
List<DeviceType> deviceTypes = deviceTypeMapper.findAll(deviceTypeQueryCriteria);
if (deviceTypes.isEmpty()) {
@ -258,6 +259,11 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
invalidIds.add(id);
continue;
}
Device assignCustomer = deviceMapper.getAssignCustomer(device.getId());
if (assignCustomer != null) {
invalidIds.add(id);
continue;
}
device.setCustomerId(customerId);
device.setCustomerName(customer.getNickName());
devices.add(device);
@ -268,14 +274,24 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
}
devices.forEach((device) -> {
deviceMapper.updateById(device);
device.setId(null);
device.setCurrentOwnerId(customerId);
deviceMapper.insert(device);
DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
deviceType.setId(null);
deviceMapper.updateById(device);
device.setCurrentOwnerId(customerId);
if (device.getDeviceType() == null) {
throw new RuntimeException("设备类型有问题！！！ ");
}
DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
SnowflakeGenerator snowflakeGenerator = new SnowflakeGenerator();
device.setOriginalOwnerId(device.getId());
Long next = snowflakeGenerator.next();
device.setId(next);
device.setDeviceType(next);
deviceType.setOriginalOwnerId(deviceType.getId());
deviceType.setId(next);
deviceType.setOwnerCustomerId(customerId);
deviceMapper.insert(device);
deviceTypeMapper.insert(deviceType);
});

4
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java
View File

@ -125,11 +125,11 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
List<Long> invalidId2 = new ArrayList<>();
for (Long id : ids) {
DeviceType deviceType = deviceTypeMapper.selectById(id);
if (deviceType == null || !Objects.equals(deviceType.getCustomerId(), LoginHelper.getUserId())) {
if (deviceType == null || !Objects.equals(deviceType.getOwnerCustomerId(), LoginHelper.getUserId())) {
invalidIds.add(id);
}
DeviceQueryCriteria deviceQueryCriteria = new DeviceQueryCriteria();
deviceQueryCriteria.setDeviceTypeId(id);
deviceQueryCriteria.setDeviceType(id);
List<Device> devices = deviceMapper.findAll(deviceQueryCriteria);
if (!devices.isEmpty()) {
invalidId2.add(id);