From dba537b83fe324bcf4868abe37e8d87406428a91 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Tue, 30 Sep 2025 09:57:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E9=80=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E5=91=8A=E8=AD=A6=E6=95=85=E9=9A=9C5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java | 1 + 1 file changed, 1 insertion(+) 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)); From b0e51e73c7ac0b2142f4d5ec7add7cc976f15b79 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Tue, 30 Sep 2025 13:21:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E4=BF=A1=E6=81=AF1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/web/service/device/DeviceBJQBizService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From a1d66045207edaa63b3413547a6aed3a1d778e34 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Tue, 30 Sep 2025 15:42:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?app=E4=BA=A7=E5=93=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fuyuanshen/app/service/AppFileService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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();