dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web:设备管理

Browse Source
This commit is contained in:
daiyongfei
2025-07-08 15:25:45 +08:00
parent ca47160c92
commit 0d3b48bbbb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ import com.fuyuanshen.equipment.enums.BindingStatusEnum;
import com.fuyuanshen.equipment.enums.CommunicationModeEnum; import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum; import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum;
import com.fuyuanshen.equipment.enums.DeviceStatusEnum; import com.fuyuanshen.equipment.enums.DeviceStatusEnum;
import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
import com.fuyuanshen.equipment.mapper.DeviceMapper; import com.fuyuanshen.equipment.mapper.DeviceMapper;
import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper; import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper;
import com.fuyuanshen.equipment.mapper.DeviceTypeMapper; import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
@ -73,6 +74,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
private final ISysOssService ossService; private final ISysOssService ossService;
private final DeviceAssignmentsService deviceAssignmentsService; private final DeviceAssignmentsService deviceAssignmentsService;
private final DeviceAssignmentsMapper deviceAssignmentsMapper;
private final DeviceTypeGrantsMapper deviceTypeGrantsMapper; private final DeviceTypeGrantsMapper deviceTypeGrantsMapper;
@ -225,9 +227,10 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void update(DeviceForm deviceForm) throws Exception { public void update(DeviceForm deviceForm) throws Exception {
DeviceAssignments deviceAssignments = deviceAssignmentsMapper.selectById(deviceForm.getId());
DeviceTypeQueryCriteria deviceTypeQueryCriteria = new DeviceTypeQueryCriteria(); DeviceTypeQueryCriteria deviceTypeQueryCriteria = new DeviceTypeQueryCriteria();
deviceTypeQueryCriteria.setDeviceTypeId(deviceForm.getDeviceType()); deviceTypeQueryCriteria.setDeviceTypeId(deviceAssignments.getDeviceId());
deviceTypeQueryCriteria.setCustomerId(LoginHelper.getUserId()); deviceTypeQueryCriteria.setCustomerId(LoginHelper.getUserId());
List<DeviceType> deviceTypes = deviceTypeMapper.findAll(deviceTypeQueryCriteria); List<DeviceType> deviceTypes = deviceTypeMapper.findAll(deviceTypeQueryCriteria);
if (deviceTypes.isEmpty()) { if (deviceTypes.isEmpty()) {
@ -235,8 +238,9 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
} }
DeviceQueryCriteria queryCriteria = new DeviceQueryCriteria(); DeviceQueryCriteria queryCriteria = new DeviceQueryCriteria();
queryCriteria.setDeviceId(deviceForm.getId()); queryCriteria.setDeviceId(deviceAssignments.getDeviceId());
queryCriteria.setCustomerId(LoginHelper.getUserId()); queryCriteria.setCustomerId(LoginHelper.getUserId());
queryCriteria.setCurrentOwnerId(LoginHelper.getUserId());
List<Device> devices = deviceMapper.findAll(queryCriteria); List<Device> devices = deviceMapper.findAll(queryCriteria);
if (devices.isEmpty()) { if (devices.isEmpty()) {
throw new Exception("设备不存在!!!"); throw new Exception("设备不存在!!!");
@ -244,7 +248,6 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
Device device = devices.get(0); Device device = devices.get(0);
// 处理上传的图片 // 处理上传的图片
// String imageUrl = saveDeviceImage(deviceForm.getFile(), device.getDeviceName());
if (deviceForm.getFile() != null) { if (deviceForm.getFile() != null) {
SysOssVo upload = ossService.upload(deviceForm.getFile()); SysOssVo upload = ossService.upload(deviceForm.getFile());
// 设置图片路径 // 设置图片路径
@ -253,6 +256,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
// 更新字段 // 更新字段
BeanUtil.copyProperties(deviceForm, device, true); BeanUtil.copyProperties(deviceForm, device, true);
device.setId(deviceAssignments.getDeviceId());
device.setUpdateTime(new Timestamp(System.currentTimeMillis())); device.setUpdateTime(new Timestamp(System.currentTimeMillis()));
deviceMapper.updateById(device); deviceMapper.updateById(device);
} }
@ -297,7 +301,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
public void deleteAll(List<Long> ids) { public void deleteAll(List<Long> ids) {
List<Long> invalidIds = new ArrayList<>(); List<Long> invalidIds = new ArrayList<>();
deviceTypeGrantsMapper.deleteByIds(ids); deviceAssignmentsMapper.deleteByIds(ids);
// //
// for (Long id : ids) { // for (Long id : ids) {
// //