From f05470e68d078dffd8ec8a9012fb654f7eb83b30 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 5 Jul 2025 11:10:11 +0800 Subject: [PATCH] =?UTF-8?q?review=EF=BC=9A=E3=80=90IoT=20=E7=89=A9?= =?UTF-8?q?=E8=81=94=E7=BD=91=E3=80=91=E8=AE=BE=E5=A4=87=20location=20?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/ratelimiter/core/aop/RateLimiterAspect.java | 2 +- .../admin/device/vo/device/IotDeviceRespVO.java | 4 +--- .../admin/product/vo/product/IotProductRespVO.java | 2 +- .../module/iot/dal/dataobject/device/IotDeviceDO.java | 1 - .../iocoder/yudao/module/iot/enums/DictTypeConstants.java | 7 ++++--- .../module/iot/enums/product/IotLocationTypeEnum.java | 8 +++++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/ratelimiter/core/aop/RateLimiterAspect.java b/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/ratelimiter/core/aop/RateLimiterAspect.java index d524349e01..085a0242b8 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/ratelimiter/core/aop/RateLimiterAspect.java +++ b/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/ratelimiter/core/aop/RateLimiterAspect.java @@ -39,7 +39,7 @@ public class RateLimiterAspect { @Before("@annotation(rateLimiter)") public void beforePointCut(JoinPoint joinPoint, RateLimiter rateLimiter) { - // 获得 RateLimiterKeyResolver 对象 + // 获得 RateLimiterKeyResolver 对象 RateLimiterKeyResolver keyResolver = keyResolvers.get(rateLimiter.keyResolver()); Assert.notNull(keyResolver, "找不到对应的 RateLimiterKeyResolver"); // 解析 Key diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceRespVO.java index 84ed311009..7b4e498802 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceRespVO.java @@ -1,10 +1,8 @@ package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device; -import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; import cn.iocoder.yudao.module.iot.enums.DictTypeConstants; -import cn.iocoder.yudao.module.iot.enums.product.IotLocationTypeEnum; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; @@ -88,7 +86,7 @@ public class IotDeviceRespVO { @Schema(description = "定位方式", example = "2") @ExcelProperty(value = "定位方式", converter = DictConvert.class) - @DictFormat(DictTypeConstants.LOACTION_TYPE) + @DictFormat(DictTypeConstants.LOCATION_TYPE) private Integer locationType; @Schema(description = "设备位置的纬度", example = "45.000000") diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductRespVO.java index 0fe48dec76..8c8f013215 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductRespVO.java @@ -63,7 +63,7 @@ public class IotProductRespVO { @Schema(description = "定位方式", example = "2") @ExcelProperty(value = "定位方式", converter = DictConvert.class) - @DictFormat(DictTypeConstants.LOACTION_TYPE) + @DictFormat(DictTypeConstants.LOCATION_TYPE) private Integer locationType; @Schema(description = "数据格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDO.java index 353435896f..46563b9229 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDO.java @@ -129,7 +129,6 @@ public class IotDeviceDO extends TenantBaseDO { // TODO @haohao：是不是要枚举哈 private String authType; - // TODO @芋艿：【待定 002】：1）设备维护的时候，设置位置？类似 tl？；2）设备上传的时候，设置位置，类似 it？ /** * 定位方式 *

diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/DictTypeConstants.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/DictTypeConstants.java index 532f9dcace..4f07ddfc1c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/DictTypeConstants.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/DictTypeConstants.java @@ -7,11 +7,12 @@ package cn.iocoder.yudao.module.iot.enums; */ public class DictTypeConstants { + public static final String NET_TYPE = "iot_net_type"; + public static final String LOCATION_TYPE = "iot_location_type"; + public static final String CODEC_TYPE = "iot_codec_type"; + public static final String PRODUCT_STATUS = "iot_product_status"; public static final String PRODUCT_DEVICE_TYPE = "iot_product_device_type"; - public static final String NET_TYPE = "iot_net_type"; - public static final String LOACTION_TYPE = "iot_loaction_type"; - public static final String CODEC_TYPE = "iot_codec_type"; public static final String DEVICE_STATE = "iot_device_state"; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotLocationTypeEnum.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotLocationTypeEnum.java index 49767f2855..11989ec714 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotLocationTypeEnum.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotLocationTypeEnum.java @@ -14,9 +14,10 @@ import java.util.Arrays; @AllArgsConstructor @Getter public enum IotLocationTypeEnum implements ArrayValuable { - MANUAL(0, "手动定位"), - IP(1, "IP定位"), - MODULE(2, "定位模块定位"); + + IP(1, "IP 定位"), + DEVICE(2, "设备上报"), + MANUAL(3, "手动定位"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(IotLocationTypeEnum::getType).toArray(Integer[]::new); @@ -33,4 +34,5 @@ public enum IotLocationTypeEnum implements ArrayValuable { public Integer[] array() { return ARRAYS; } + }