diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java index 12a0c4c..8fb43ab 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java @@ -32,7 +32,7 @@ public class AppFileService { private final IAppBusinessFileService appBusinessFileService; public List list(AppBusinessFileBo bo) { - bo.setCreateBy(AppLoginHelper.getUserId()); +// bo.setCreateBy(AppLoginHelper.getUserId()); return appBusinessFileService.queryAppFileList(bo); } @@ -68,7 +68,7 @@ public class AppFileService { public Boolean delete(Long[] ids) { AppBusinessFileBo bo = new AppBusinessFileBo(); - bo.setCreateBy(AppLoginHelper.getUserId()); +// bo.setCreateBy(AppLoginHelper.getUserId()); bo.setIds(List.of(ids)); List appBusinessFileVos = appBusinessFileService.queryList(bo); List fileIds = appBusinessFileVos.stream().map(AppBusinessFileVo::getFileId).toList(); diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java index 75de5d3..7c8d2b2 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java @@ -66,6 +66,7 @@ public class BjqAlarmRule implements MqttMessageRule { }else if ("0".equals(convertValue)){ String sendMessageIng = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending"; RedisUtils.deleteObject(sendMessageIng); + RedisUtils.deleteObject(deviceRedisKey); } } RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20)); diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQBizService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQBizService.java index aff0209..aec329a 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQBizService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQBizService.java @@ -251,8 +251,8 @@ public class DeviceBJQBizService { ArrayList intData = new ArrayList<>(); intData.add(2); buildArr(convertHexToDecimal(unitName), intData); - buildArr(convertHexToDecimal(position), intData); buildArr(convertHexToDecimal(name), intData); + buildArr(convertHexToDecimal(position), intData); buildArr(convertHexToDecimal(id), intData); intData.add(0); intData.add(0);