From 0d3b48bbbb433f3aaa946b2d4af6a6a30f403b56 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Tue, 8 Jul 2025 15:25:45 +0800
Subject: [PATCH] =?UTF-8?q?web:=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/service/impl/DeviceServiceImpl.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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