1.调整 根据设备主键ID查询设备对应的客户端ID 接口 增加devName反参

portal-service-application/src/main/java/com/hfln/portal/application/controller/pub/PubController.java

@@ -4,6 +4,7 @@ package com.hfln.portal.application.controller.pub;
 
 import cn.hfln.framework.catchlog.CatchAndLog;
 import cn.hfln.framework.dto.ApiResult;
+import com.hfln.portal.common.dto.data.device.DevInfoDTO;
 import com.hfln.portal.common.dto.data.oss.OtaFileDTO;
 import com.hfln.portal.common.dto.data.pub.DicItemDto;
 import com.hfln.portal.common.request.web.UpdateOTAParams;
@@ -47,8 +48,8 @@ public class PubController {
     }
 
     @GetMapping("/queryClientIdByDevId")
-    @Operation(summary = "根据设备主键ID查询设备对应的客户端ID")
-    public ApiResult<String> queryClientIdByDeviD(@RequestParam Long devId) {
+    @Operation(summary = "根据设备主键ID查询设备相关信息")
+    public ApiResult<DevInfoDTO> queryClientIdByDeviD(@RequestParam Long devId) {
         return ApiResult.success(pubGateway.queryClientIdByDeviD(devId));
     }
 }

portal-service-application/src/main/java/com/hfln/portal/application/controller/web/WebDictController.java

@@ -32,7 +32,7 @@ public class WebDictController {
     @Autowired
     private WebGateway webGateway;
 
-    // todo 增删改 dic
+
 
     @PostMapping("/addDic")
     @Operation(summary = "添加字典类值")

portal-service-common/src/main/java/com/hfln/portal/common/dto/data/device/DevInfoDTO.java

@@ -0,0 +1,14 @@
+package com.hfln.portal.common.dto.data.device;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class DevInfoDTO {
+
+    @Schema(description = "客户端ID")
+    private String clientId;
+
+    @Schema(description = "设备名称")
+    private String devName;
+}

portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/PubGateway.java

@@ -1,5 +1,6 @@
 package com.hfln.portal.domain.gateway;
 
+import com.hfln.portal.common.dto.data.device.DevInfoDTO;
 import com.hfln.portal.common.dto.data.oss.OtaFileDTO;
 import com.hfln.portal.common.dto.data.pub.DicItemDto;
 import com.hfln.portal.common.request.web.UpdateOTAParams;
@@ -17,7 +18,7 @@ public interface PubGateway {
 
     void updateOTA(UpdateOTAParams params);
 
-    String queryClientIdByDeviD(Long devId);
+    DevInfoDTO queryClientIdByDeviD(Long devId);
 
 
 }

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

@@ -3,6 +3,7 @@ package com.hfln.portal.infrastructure.gateway.impl;
 import cn.hfln.framework.extension.BizException;
 import com.alibaba.fastjson2.JSONObject;
 import com.hfln.portal.common.constant.mqtt.topic.TopicConstants;
+import com.hfln.portal.common.dto.data.device.DevInfoDTO;
 import com.hfln.portal.common.dto.data.oss.OtaFileDTO;
 import com.hfln.portal.common.dto.data.pub.DicItemDto;
 import com.hfln.portal.common.request.web.UpdateOTAParams;
@@ -98,12 +99,15 @@ public class PubGatewayImpl implements PubGateway {
 
 
     @Override
-    public String queryClientIdByDeviD(Long devId) {
+    public DevInfoDTO queryClientIdByDeviD(Long devId) {
         DevInfo devInfo = devInfoService.getById(devId);
         if (devInfo == null) {
             throw new BizException(ErrorEnum.DEVICE_IS_NOT_EXIST.getErrorCode(), ErrorEnum.DEVICE_IS_NOT_EXIST.getErrorMessage());
         }
-        return devInfo.getClientId();
+        DevInfoDTO dto = new DevInfoDTO();
+        dto.setClientId(devInfo.getClientId());
+        dto.setDevName(devInfo.getDevName());
+        return dto;
     }
 }