fix:

1、标签卡返回数据增加用户类型、用户状态
2、按键报警新增批量发送

app/src/main/java/com/yiring/app/service/key/impl/KeyAlarmLogServiceImpl.java

@@ -93,10 +93,10 @@ public class KeyAlarmLogServiceImpl implements KeyAlarmLogService {
             .stream()
             .filter(keyAlarmLog -> !keyAlarmLog.getStatus())
             .forEach(keyAlarmLog -> {
-                switch (keyAlarmLog.getTypes()) {
-                    case PushMessage.Type.APP.text() -> log.info("APP 信息发送中---");
-                    case PushMessage.Type.SMS.text() -> log.info("SMS 信息发送中---");
-                    case PushMessage.Type.EMAIL.text() -> log.info("EMAIL 信息发送中---");
+                switch (PushMessage.Type.valueOf(keyAlarmLog.getTypes())) {
+                    case APP -> log.info("APP 信息发送中---");
+                    case SMS -> log.info("SMS 信息发送中---");
+                    case EMAIL -> log.info("EMAIL 信息发送中---");
                 }
             });
 

app/src/main/java/com/yiring/app/service/location/tag/impl/LocationTagServiceImpl.java

@@ -274,7 +274,13 @@ public class LocationTagServiceImpl implements LocationTagService {
                 LocationTagVo locationTagVo = LocationTagVo.transform(locationTag);
                 if (ObjectUtil.isNotEmpty(locationTag.getUser())) {
                     User user = locationTag.getUser();
-                    UserVo userVo = UserVo.builder().id(user.getId()).realName(user.getRealName()).build();
+                    UserVo userVo = UserVo
+                        .builder()
+                        .id(user.getId())
+                        .realName(user.getRealName())
+                        .type(user.getType())
+                        .isSpecial(user.getIsSpecial())
+                        .build();
                     locationTagVo.setUserVo(userVo);
                 } else if (ObjectUtil.isNotEmpty(locationTag.getCar())) {
                     Car car = locationTag.getCar();
@@ -311,7 +317,13 @@ public class LocationTagServiceImpl implements LocationTagService {
         LocationTagVo locationTagVo = LocationTagVo.transform(locationTag);
         if (ObjectUtil.isNotEmpty(locationTag.getUser())) {
             User user = locationTag.getUser();
-            UserVo userVo = UserVo.builder().id(user.getId()).realName(user.getRealName()).build();
+            UserVo userVo = UserVo
+                .builder()
+                .id(user.getId())
+                .realName(user.getRealName())
+                .type(user.getType())
+                .isSpecial(user.getIsSpecial())
+                .build();
             locationTagVo.setUserVo(userVo);
         } else if (ObjectUtil.isNotEmpty(locationTag.getCar())) {
             Car car = locationTag.getCar();

app/src/main/java/com/yiring/app/vo/location/beacon/LocationBeaconVo.java

@@ -41,7 +41,11 @@ public class LocationBeaconVo implements Serializable {
     @ApiModelProperty(value = "最后一次在线时间", example = "BTI88888888")
     LocalDateTime time;
 
-    @ApiModelProperty(value = "坐标", example = "01010000805C8FC2F528D4734033333333335B7D400000000000000000")
+    @ApiModelProperty(
+        value = "坐标",
+        example = "01010000805C8FC2F528D4734033333333335B7D400000000000000000",
+        dataType = "java.lang.String"
+    )
     Point point;
 
     @JsonSerialize(using = ToStringSerializer.class)