接口调整

portal-service-common/src/main/java/com/hfln/portal/common/dto/data/share/ShareDto.java

@@ -20,12 +20,26 @@ public class ShareDto extends BaseVO {
     private Long shareId;
 
     /**
-     * 设备ID
+     * 设备表主键ID
      */
-    @Schema(description = "设备ID")
+    @Schema(description = "设备表主键ID")
     private Long devId;
 
     /**
+     * 设备id
+     */
+    @Schema(description = "设备id")
+    private String clientId;
+
+    /**
+     * 设备名称
+     */
+    @Schema(description = "设备名称")
+    private String devName;
+
+
+
+    /**
      * 分享人userId
      */
     @Schema(description = "分享人userId")

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

@@ -730,6 +730,11 @@ public class DeviceGatewayImpl implements DeviceGateway {
             ShareDto dto = new ShareDto();
             BeanUtils.copyProperties(share, dto);
             dto.setShareTime(share.getCreateTime());
+
+            Long devId = share.getDevId();
+            DevInfo devInfo = devInfoService.getById(devId);
+            dto.setClientId(devInfo.getClientId());
+            dto.setDevName(devInfo.getDevName());
             res.add(dto);
         }
         return res;