From a8efbb27686d23bc3deda7776be1b2bea4c6452c Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Wed, 13 Aug 2025 10:40:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/status/jbq/AlarmStatusRule.java | 27 +++++++++++-------- .../device/status/jbq/BootLogoStatusRule.java | 8 ------ .../jbq/LaserModeSettingsStatusRule.java | 3 --- .../device/status/jbq/ModeStatusRule.java | 15 ++++------- .../jbq/RegisterPersonInfoStatusRule.java | 6 ----- .../status/jbq/SendMessageStatusRule.java | 25 ++++++++++------- .../aspectj/FunctionAccessAspect.java | 2 +- .../aspectj/FunctionAccessBatchAspect.java | 14 +++++++--- 8 files changed, 48 insertions(+), 52 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/AlarmStatusRule.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/AlarmStatusRule.java index 14956de..96a2360 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/AlarmStatusRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/AlarmStatusRule.java @@ -1,14 +1,17 @@ package com.fuyuanshen.app.service.device.status.jbq; +import cn.hutool.json.JSONObject; import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto; import com.fuyuanshen.app.service.device.status.DeviceStatusRule; import com.fuyuanshen.app.service.device.status.constants.DeviceTypeConstants; +import com.fuyuanshen.common.core.utils.StringUtils; import com.fuyuanshen.common.redis.utils.RedisUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY; @@ -30,21 +33,23 @@ public class AlarmStatusRule implements DeviceStatusRule { public Map getStatus(AppRealTimeStatusDto dto) { Map status = new HashMap<>(); String functionAccess = RedisUtils.getCacheObject( - - FUNCTION_ACCESS_KEY + dto.getDeviceImei()); - if(functionAccess==null){ + FUNCTION_ACCESS_KEY + dto.getBatchId()); + if(StringUtils.isBlank(functionAccess)){ + status.put("functionAccess", "OK"); + return status; + } + JSONObject jsonObj = new JSONObject(functionAccess); + AtomicBoolean isActive = new AtomicBoolean(false); + jsonObj.forEach((key, value) -> { + if(value.equals("ACTIVE")){ + isActive.set(true); + } + }); + if(!isActive.get()){ status.put("functionAccess", "OK"); }else{ status.put("functionAccess", "ACTIVE"); } - // - -// String alarmStatus = RedisUtils.getCacheObject( -// GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + dto.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX); -// -// if (StringUtils.isNotBlank(alarmStatus)) { -// status.put("alarmStatus", alarmStatus); -// } return status; } } \ No newline at end of file diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/BootLogoStatusRule.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/BootLogoStatusRule.java index 6eea5b3..2a9f1cc 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/BootLogoStatusRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/BootLogoStatusRule.java @@ -36,14 +36,6 @@ public class BootLogoStatusRule implements DeviceStatusRule { }else{ status.put("functionAccess", "ACTIVE"); } -// String location = RedisUtils.getCacheObject( -// GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + dto.getDeviceImei() + DEVICE_LOCATION_KEY_PREFIX); -// -// if (StringUtils.isNotBlank(location)) { -// JSONObject jsonObject = JSONObject.parseObject(location); -// status.put("latitude", jsonObject.getString("latitude")); -// status.put("longitude", jsonObject.getString("longitude")); -// } return status; } } \ No newline at end of file diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/LaserModeSettingsStatusRule.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/LaserModeSettingsStatusRule.java index 1004dba..1705e2c 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/LaserModeSettingsStatusRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/LaserModeSettingsStatusRule.java @@ -40,9 +40,6 @@ public class LaserModeSettingsStatusRule implements DeviceStatusRule { }else{ status.put("functionAccess", "ACTIVE"); } -// String onlineStatus = RedisUtils.getCacheObject( -// GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + dto.getDeviceImei() + DEVICE_ONLINE_STATUS_KEY_PREFIX); -// status.put("onlineStatus", StringUtils.isNotBlank(onlineStatus) ? 1 : 0); return status; } } \ No newline at end of file diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/ModeStatusRule.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/ModeStatusRule.java index a20c024..02fc9d0 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/ModeStatusRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/ModeStatusRule.java @@ -32,16 +32,11 @@ public class ModeStatusRule implements DeviceStatusRule { Map status = new HashMap<>(); String functionAccess = RedisUtils.getCacheObject( FUNCTION_ACCESS_KEY + dto.getDeviceImei()); - status.put("functionAccess", functionAccess); -// String deviceStatus = RedisUtils.getCacheObject( -// GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + dto.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX); -// -// if (StringUtils.isNotBlank(deviceStatus)) { -// JSONObject jsonObject = JSONObject.parseObject(deviceStatus); -// status.put("battery", jsonObject.getString("batteryPercentage")); -// } else { -// status.put("battery", "0"); -// } + if(functionAccess==null){ + status.put("functionAccess", "OK"); + }else{ + status.put("functionAccess", "ACTIVE"); + } return status; } } \ No newline at end of file diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/RegisterPersonInfoStatusRule.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/RegisterPersonInfoStatusRule.java index f7288fa..87cd180 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/RegisterPersonInfoStatusRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/RegisterPersonInfoStatusRule.java @@ -36,12 +36,6 @@ public class RegisterPersonInfoStatusRule implements DeviceStatusRule { }else{ status.put("functionAccess", "ACTIVE"); } -// String alarmStatus = RedisUtils.getCacheObject( -// GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + dto.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX); -// -// if (StringUtils.isNotBlank(alarmStatus)) { -// status.put("alarmStatus", alarmStatus); -// } return status; } } \ No newline at end of file diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/SendMessageStatusRule.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/SendMessageStatusRule.java index d4382ec..4c2f657 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/SendMessageStatusRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/device/status/jbq/SendMessageStatusRule.java @@ -1,15 +1,17 @@ package com.fuyuanshen.app.service.device.status.jbq; +import cn.hutool.json.JSONObject; import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto; import com.fuyuanshen.app.service.device.status.DeviceStatusRule; import com.fuyuanshen.app.service.device.status.constants.DeviceTypeConstants; +import com.fuyuanshen.common.core.utils.StringUtils; import com.fuyuanshen.common.redis.utils.RedisUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.HashMap; -import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY; @@ -30,19 +32,24 @@ public class SendMessageStatusRule implements DeviceStatusRule { @Override public Map getStatus(AppRealTimeStatusDto dto) { Map status = new HashMap<>(); - List functionAccess = RedisUtils.getCacheObject( + String functionAccess = RedisUtils.getCacheObject( FUNCTION_ACCESS_KEY + dto.getBatchId()); - if(functionAccess==null){ + if(StringUtils.isBlank(functionAccess)){ + status.put("functionAccess", "OK"); + return status; + } + JSONObject jsonObj = new JSONObject(functionAccess); + AtomicBoolean isActive = new AtomicBoolean(false); + jsonObj.forEach((key, value) -> { + if(value.equals("ACTIVE")){ + isActive.set(true); + } + }); + if(!isActive.get()){ status.put("functionAccess", "OK"); }else{ status.put("functionAccess", "ACTIVE"); } -// String alarmStatus = RedisUtils.getCacheObject( -// GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + dto.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX); -// -// if (StringUtils.isNotBlank(alarmStatus)) { -// status.put("alarmStatus", alarmStatus); -// } return status; } } \ No newline at end of file diff --git a/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessAspect.java b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessAspect.java index a46a17f..c6526cd 100644 --- a/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessAspect.java +++ b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessAspect.java @@ -36,7 +36,7 @@ public class FunctionAccessAspect { throw new ServiceException("设备已存在访问限制，请稍后再试", 500); } // 存储到Redis中，设置过期时间 - RedisUtils.setCacheObject(redisKey, "ACTIVE", Duration.ofMinutes(30)); + RedisUtils.setCacheObject(redisKey, "ACTIVE", Duration.ofSeconds(30)); log.info("设备Redis key已添加: {}", redisKey); } diff --git a/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessBatchAspect.java b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessBatchAspect.java index 0d6f79b..67405ae 100644 --- a/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessBatchAspect.java +++ b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessBatchAspect.java @@ -3,6 +3,7 @@ import cn.hutool.json.JSON; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.ObjectUtils; import com.fuyuanshen.common.core.utils.StringUtils; import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation; import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation; @@ -14,9 +15,7 @@ import org.aspectj.lang.annotation.Aspect; import org.springframework.stereotype.Component; import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY; @@ -43,8 +42,15 @@ public class FunctionAccessBatchAspect { if(StringUtils.isNotBlank(cacheKey) && "ACTIVE".equals(cacheKey)){ throw new ServiceException("设备已存在访问限制，请稍后再试", 500); } + Map deviceImeiMap = new HashMap<>(); + if(ObjectUtils.length(deviceImeiList)>0){ + deviceImeiList.forEach(item->{ + deviceImeiMap.put(item, "ACTIVE"); + }); + } + // 存储到Redis中，设置过期时间 - RedisUtils.setCacheObject(redisKey, JSONUtil.toJsonStr(deviceImeiList), Duration.ofMinutes(30)); + RedisUtils.setCacheObject(redisKey, JSONUtil.toJsonStr(deviceImeiMap), Duration.ofSeconds(15)); log.info("设备Redis key已添加: {}", redisKey); }