群组部分 + 用户注销 + 解决冲突

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/DeviceGatewayImpl.java

@@ -155,8 +155,8 @@ public class DeviceGatewayImpl implements DeviceGateway {
 
     @Override
     @Transactional
-    public Boolean deviceUnBind(Long userId, String clientId) {
-        List<DevInfo> devInfos = devInfoService.queryDevices(userId, deviceId);
+    public Boolean deviceUnBind(Long userId, String devId) {
+        List<DevInfo> devInfos = devInfoService.queryDevices(userId, devId);
         boolean updateFlag;
         // 绑定人解绑
         if (CollectionUtils.isNotEmpty(devInfos) && !devInfos.isEmpty()) {
@@ -164,13 +164,13 @@ public class DeviceGatewayImpl implements DeviceGateway {
             boolean flag = devInfoService.update(null,
                     Wrappers.<DevInfo>lambdaUpdate()
                             .set(DevInfo::getUserId, null)
-                            .eq(DevInfo::getDevId, clientId));
+                            .eq(DevInfo::getDevId, devId));
             //更新设备分享表
             boolean flagV2 = devShareService.update(null,
                     Wrappers.<DevShare>lambdaUpdate()
                             .set(DevShare::getState, 0)
                             .set(DevShare::getIsDeleted, 1)
-                            .eq(DevShare::getClientId, clientId));
+                            .eq(DevShare::getDevId,devId));
             updateFlag = flag && flagV2;
         } else {
             // 被分享者解绑
@@ -178,7 +178,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
                     Wrappers.<DevShare>lambdaUpdate()
                             .set(DevShare::getState, 0)
                             .set(DevShare::getIsDeleted, 1)
-                            .eq(DevShare::getClientId, clientId)
+                            .eq(DevShare::getDevId, devId)
                             .eq(DevShare::getSharedUserId, userId));
         }
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/GroupGatewayImpl.java

@@ -234,7 +234,7 @@ public class GroupGatewayImpl implements GroupGateway {
         }
 
         // 2. 提取设备ID列表
-        List<String> devIds = devMaps.stream()
+        List<Long> devIds = devMaps.stream()
                 .map(GroupDevMap::getDevId)
                 .collect(Collectors.toList());
 
@@ -286,10 +286,10 @@ public class GroupGatewayImpl implements GroupGateway {
         
         // 4. 不存在记录，创建新的映射关系
         GroupDevMap newMap = new GroupDevMap();
-        newMap.setDevGroupId(params.getGroupId());
+        newMap.setGroupId(params.getGroupId());
         newMap.setGroupUuid(devGroup.getGroupUuid());
-        newMap.setDevInfoId(params.getDevId());
-        newMap.setDevId(devInfo.getClientId());
+        newMap.setDevId(params.getDevId());
+        newMap.setClientId(devInfo.getClientId());
         newMap.setIsDeleted(0);
         
         return groupDevMapMapper.insert(newMap) > 0;
@@ -306,7 +306,7 @@ public class GroupGatewayImpl implements GroupGateway {
         // 1. 直接查询设备与群组的关联关系
         LambdaQueryWrapper<GroupDevMap> queryWrapper = Wrappers.<GroupDevMap>lambdaQuery()
                 .eq(GroupDevMap::getDevId, request.getDevId())
-                .eq(GroupDevMap::getDevGroupId, request.getGroupId())
+                .eq(GroupDevMap::getGroupId, request.getGroupId())
                 .eq(GroupDevMap::getIsDeleted, 0);
         
         GroupDevMap groupDevMap = groupDevMapMapper.selectOne(queryWrapper);

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/DevShare.java

@@ -23,7 +23,7 @@ public class DevShare extends BasePO {
     /**
      * 设备表（dev_info）主键
      */
-    private String devId;
+    private long devId;
 
     /**
      * 分享人userId

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/DevShareServiceImpl.java

@@ -22,7 +22,7 @@ public class DevShareServiceImpl extends ServiceImpl<DevShareMapper, DevShare> i
         }
         List<Long> deviceIds = this.baseMapper.selectObjs(
                         new LambdaQueryWrapper<DevShare>()
-                                .select(DevShare::getClientId)
+                                .select(DevShare::getDevId)
                                 .eq(DevShare::getSharedUserId, userId)
                                 .eq(DevShare::getState, 1)
                                 .eq(DevShare::getIsDeleted, 0)