接口复查

portal-service-application/src/test/java/com/hfln/portal/application/controller/wap/DeviceControllerTest.java

@@ -132,7 +132,7 @@ class DeviceControllerTest {
         // 准备测试数据
         DeviceBandingParams request = new DeviceBandingParams();
         request.setUserId(TEST_USER_ID);
-        request.setClientId(TEST_CLIENT_ID);
+        request.setDevId(TEST_CLIENT_ID);
         request.setDevName("测试设备");
         
         // 模拟Gateway行为
@@ -154,7 +154,7 @@ class DeviceControllerTest {
         // 准备测试数据
         DeviceBandingParams request = new DeviceBandingParams();
         request.setUserId(TEST_USER_ID);
-        request.setClientId(TEST_CLIENT_ID);
+        request.setDevId(TEST_CLIENT_ID);
         request.setDevName("测试设备");
         
         // 模拟Gateway行为
@@ -228,7 +228,7 @@ class DeviceControllerTest {
         // 准备测试数据
         DeviceBandingParams request = new DeviceBandingParams();
         request.setUserId(TEST_USER_ID);
-        request.setClientId(TEST_CLIENT_ID);
+        request.setDevId(TEST_CLIENT_ID);
         request.setDevName("更新后的设备名称");
         
         // 模拟Gateway行为
@@ -250,7 +250,7 @@ class DeviceControllerTest {
         // 准备测试数据
         DeviceBandingParams request = new DeviceBandingParams();
         request.setUserId(TEST_USER_ID);
-        request.setClientId(TEST_CLIENT_ID);
+        request.setDevId(TEST_CLIENT_ID);
         request.setDevName("更新后的设备名称");
         
         // 模拟Gateway行为

portal-service-common/src/main/java/com/hfln/portal/common/request/device/DeviceBandingParams.java

@@ -17,7 +17,7 @@ public class DeviceBandingParams extends BaseVO {
 
     @NotEmpty(message = "设备Id不能为空")
     @ApiModelProperty(value = "设备ID",required = true)
-    private String clientId;
+    private String devId;
 
     @NotNull(message = "用户Id不能为空")
     @ApiModelProperty(value = "用户Id",required = true)

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

@@ -191,7 +191,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
         // 1. 检查设备是否存在
         DevInfo devInfo = devInfoService.getOne(
                 Wrappers.<DevInfo>lambdaQuery()
-                        .eq(DevInfo::getDevId, request.getClientId())
+                        .eq(DevInfo::getDevId, request.getDevId())
         );
         if (Objects.isNull(devInfo)) {
             throw new BizException(ErrorEnum.DEVICE_IS_NOT_EXIST.getErrorCode(), ErrorEnum.DEVICE_IS_NOT_EXIST.getErrorMessage());
@@ -283,10 +283,10 @@ public class DeviceGatewayImpl implements DeviceGateway {
         setIfNull(request::getYEnd, () -> halfWidth, request::setYEnd);
 
 
-        Boolean flag = devInfoService.updateDevice(request.getClientId(), request);
+        Boolean flag = devInfoService.updateDevice(request.getDevId(), request);
         DevInfo devInfo = devInfoService.getOne(
                 Wrappers.<DevInfo>lambdaQuery()
-                        .eq(DevInfo::getDevId, request.getClientId()));
+                        .eq(DevInfo::getDevId, request.getDevId()));
 
         //检查parts.length >= 2确保数组有足够元素,提供默认值"2.0"
         String result = Optional.ofNullable(devInfo.getSoftware())

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

@@ -88,7 +88,7 @@ public class DevInfoServiceImpl extends ServiceImpl<DevInfoMapper, DevInfo> impl
 
         // 构建更新条件
         UpdateWrapperBuilder<DevInfo> builder = UpdateWrapperBuilder.<DevInfo>create()
-                .setIfNotNull(DevInfo::getDevId, request.getClientId())
+                .setIfNotNull(DevInfo::getDevId, request.getDevId())
                 .setIfNotNull(DevInfo::getUserId, request.getUserId())
                 .setIfNotBlank(DevInfo::getDevName, request.getDevName())
                 .setIfNotNull(DevInfo::getLength, request.getLength())