dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dyf:cc23f082a6425af22fa560dc33c97da4e62885ac
Branches Tags
dyf:main dyf:6170 dyf:dyf-device dyf:jingquan dyf:prod dyf:APP权限登录改造
...
compare: dyf:740a638444dbad550e3c4c21921fea5efbd0e3aa
Branches Tags
dyf:6170 dyf:dyf-device dyf:jingquan dyf:main dyf:prod dyf:APP权限登录改造

2 Commits
cc23f082a6 ... 740a638444

Author SHA1 Message Date
dyf
740a638444 Merge pull request 'fix(device):修复SOS报警类型判断逻辑' (#17) from liwenlong/fys-Multi-tenant:jingquan into jingquan 
Reviewed-on: #17
 2025-10-11 13:35:08 +08:00
DragonWenLong
a3d44a157a fix(device):修复SOS报警类型判断逻辑 
- 简化报警类型判断，固定为SOS类型
- 移除不必要的shake类型判断逻辑
 2025-10-11 13:23:51 +08:00
1 changed files with 1 additions and 1 deletions
Expand all files Collapse all files

2
fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java
View File

@ -633,7 +633,7 @@ public class DeviceXinghanBizService {
if (!"ins_SOSGrade".equals(payloadKey) || value == 0) { if (!"ins_SOSGrade".equals(payloadKey) || value == 0) {
return; return;
} }
AlarmTypeEnum type = value == 1 ? AlarmTypeEnum.SOS : AlarmTypeEnum.SHAKE; AlarmTypeEnum type = AlarmTypeEnum.SOS;
String redisKey = buildAlarmRedisKey(deviceImei, type); String redisKey = buildAlarmRedisKey(deviceImei, type);
Long alarmId = RedisUtils.getCacheObject(redisKey); Long alarmId = RedisUtils.getCacheObject(redisKey);
// 已存在未结束报警 -> 什么都不做（同一条报警） // 已存在未结束报警 -> 什么都不做（同一条报警）