BJ_ZTEITS-Developers / parking-cloud-yudao

Commit f05470e68d078dffd8ec8a9012fb654f7eb83b30

Authored by YunaiV
1 parent 66c45100

review：【IoT 物联网】设备 location 逻辑

Inline Side-by-side
Showing 6 changed files with 12 additions and 12 deletions
yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/ratelimiter/core/aop/RateLimiterAspect.java
  View file @f05470e
@@ -39,7 +39,7 @@ public class RateLimiterAspect { @@ -39,7 +39,7 @@ public class RateLimiterAspect {
39 39
40 @Before("@annotation(rateLimiter)") 40 @Before("@annotation(rateLimiter)")
41 public void beforePointCut(JoinPoint joinPoint, RateLimiter rateLimiter) { 41 public void beforePointCut(JoinPoint joinPoint, RateLimiter rateLimiter) {
42 - // 获得 RateLimiterKeyResolver 对象 42 + // 获得 RateLimiterKeyResolver 对象
43 RateLimiterKeyResolver keyResolver = keyResolvers.get(rateLimiter.keyResolver()); 43 RateLimiterKeyResolver keyResolver = keyResolvers.get(rateLimiter.keyResolver());
44 Assert.notNull(keyResolver, "找不到对应的 RateLimiterKeyResolver"); 44 Assert.notNull(keyResolver, "找不到对应的 RateLimiterKeyResolver");
45 // 解析 Key 45 // 解析 Key
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceRespVO.java
  View file @f05470e
1 package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device; 1 package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device;
2 2
3 -import cn.iocoder.yudao.framework.common.validation.InEnum;  
4 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
5 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
6 import cn.iocoder.yudao.module.iot.enums.DictTypeConstants; 5 import cn.iocoder.yudao.module.iot.enums.DictTypeConstants;
7 -import cn.iocoder.yudao.module.iot.enums.product.IotLocationTypeEnum;  
8 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; 6 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
9 import com.alibaba.excel.annotation.ExcelProperty; 7 import com.alibaba.excel.annotation.ExcelProperty;
10 import io.swagger.v3.oas.annotations.media.Schema; 8 import io.swagger.v3.oas.annotations.media.Schema;
@@ -88,7 +86,7 @@ public class IotDeviceRespVO { @@ -88,7 +86,7 @@ public class IotDeviceRespVO {
88 86
89 @Schema(description = "定位方式", example = "2") 87 @Schema(description = "定位方式", example = "2")
90 @ExcelProperty(value = "定位方式", converter = DictConvert.class) 88 @ExcelProperty(value = "定位方式", converter = DictConvert.class)
91 - @DictFormat(DictTypeConstants.LOACTION_TYPE) 89 + @DictFormat(DictTypeConstants.LOCATION_TYPE)
92 private Integer locationType; 90 private Integer locationType;
93 91
94 @Schema(description = "设备位置的纬度", example = "45.000000") 92 @Schema(description = "设备位置的纬度", example = "45.000000")
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductRespVO.java
  View file @f05470e
@@ -63,7 +63,7 @@ public class IotProductRespVO { @@ -63,7 +63,7 @@ public class IotProductRespVO {
63 63
64 @Schema(description = "定位方式", example = "2") 64 @Schema(description = "定位方式", example = "2")
65 @ExcelProperty(value = "定位方式", converter = DictConvert.class) 65 @ExcelProperty(value = "定位方式", converter = DictConvert.class)
66 - @DictFormat(DictTypeConstants.LOACTION_TYPE) 66 + @DictFormat(DictTypeConstants.LOCATION_TYPE)
67 private Integer locationType; 67 private Integer locationType;
68 68
69 @Schema(description = "数据格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") 69 @Schema(description = "数据格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDO.java
  View file @f05470e
@@ -129,7 +129,6 @@ public class IotDeviceDO extends TenantBaseDO { @@ -129,7 +129,6 @@ public class IotDeviceDO extends TenantBaseDO {
129 // TODO @haohao：是不是要枚举哈 129 // TODO @haohao：是不是要枚举哈
130 private String authType; 130 private String authType;
131 131
132 - // TODO @芋艿：【待定 002】：1）设备维护的时候，设置位置？类似 tl？；2）设备上传的时候，设置位置，类似 it？  
133 /** 132 /**
134 * 定位方式 133 * 定位方式
135 * <p> 134 * <p>
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/DictTypeConstants.java
  View file @f05470e
@@ -7,12 +7,13 @@ package cn.iocoder.yudao.module.iot.enums; @@ -7,12 +7,13 @@ package cn.iocoder.yudao.module.iot.enums;
7 */ 7 */
8 public class DictTypeConstants { 8 public class DictTypeConstants {
9 9
10 - public static final String PRODUCT_STATUS = "iot_product_status";  
11 - public static final String PRODUCT_DEVICE_TYPE = "iot_product_device_type";  
12 public static final String NET_TYPE = "iot_net_type"; 10 public static final String NET_TYPE = "iot_net_type";
13 - public static final String LOACTION_TYPE = "iot_loaction_type"; 11 + public static final String LOCATION_TYPE = "iot_location_type";
14 public static final String CODEC_TYPE = "iot_codec_type"; 12 public static final String CODEC_TYPE = "iot_codec_type";
15 13
  14 + public static final String PRODUCT_STATUS = "iot_product_status";
  15 + public static final String PRODUCT_DEVICE_TYPE = "iot_product_device_type";
  16 +
16 public static final String DEVICE_STATE = "iot_device_state"; 17 public static final String DEVICE_STATE = "iot_device_state";
17 18
18 public static final String ALERT_LEVEL = "iot_alert_level"; 19 public static final String ALERT_LEVEL = "iot_alert_level";
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotLocationTypeEnum.java
  View file @f05470e
@@ -14,9 +14,10 @@ import java.util.Arrays; @@ -14,9 +14,10 @@ import java.util.Arrays;
14 @AllArgsConstructor 14 @AllArgsConstructor
15 @Getter 15 @Getter
16 public enum IotLocationTypeEnum implements ArrayValuable<Integer> { 16 public enum IotLocationTypeEnum implements ArrayValuable<Integer> {
17 - MANUAL(0, "手动定位"),  
18 - IP(1, "IP定位"),  
19 - MODULE(2, "定位模块定位"); 17 +
  18 + IP(1, "IP 定位"),
  19 + DEVICE(2, "设备上报"),
  20 + MANUAL(3, "手动定位");
20 21
21 public static final Integer[] ARRAYS = Arrays.stream(values()).map(IotLocationTypeEnum::getType).toArray(Integer[]::new); 22 public static final Integer[] ARRAYS = Arrays.stream(values()).map(IotLocationTypeEnum::getType).toArray(Integer[]::new);
22 23
@@ -33,4 +34,5 @@ public enum IotLocationTypeEnum implements ArrayValuable&lt;Integer&gt; { @@ -33,4 +34,5 @@ public enum IotLocationTypeEnum implements ArrayValuable&lt;Integer&gt; {
33 public Integer[] array() { 34 public Integer[] array() {
34 return ARRAYS; 35 return ARRAYS;
35 } 36 }
  37 +
36 } 38 }