From f478e96d973f404f4a91b77c88fc8d76222c9b7c Mon Sep 17 00:00:00 2001 From: 16337 <1633794139@qq.com> Date: Wed, 29 Apr 2026 14:34:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=9E=83=E5=9C=BE=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E7=AE=97=E6=B3=95=E5=B9=B6=E4=BF=AE=E5=A4=8DROI?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=90=8E=E4=B8=8D=E6=8E=A8=E9=80=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题： 1. WVP 数据库没有 garbage 算法注册，前端无法选择 2. bindAlgo/unbindAlgo/updateAlgoParams 只写数据库，不触发配置推送到边缘端 3. bindAlgo 不校验 algo_code 是否存在 修复： - PRESET_ALGORITHMS 添加 garbage 算法注册（参数与边缘端对齐） - bindAlgo 添加算法存在性校验 - bindAlgo/unbindAlgo/updateAlgoParams 变更后自动推送配置到边缘端 - 新增 pushRoiConfig 辅助方法 Claude Opus 4.7 --- .../service/impl/AiAlgorithmServiceImpl.java | 4 ++ .../aiot/service/impl/AiRoiServiceImpl.java | 39 ++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiAlgorithmServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiAlgorithmServiceImpl.java index ae7543424..54cdc87c1 100644 --- a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiAlgorithmServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiAlgorithmServiceImpl.java @@ -74,6 +74,10 @@ public class AiAlgorithmServiceImpl implements IAiAlgorithmService { "非机动车违停检测", "bicycle,motorcycle", "检测禁停区域内是否有非机动车（自行车、电动车）违规停放。确认非机动车停留10秒后开始3分钟倒计时，超时触发告警。非机动车离开60秒后自动结束告警。", "{\"confirm_vehicle_sec\":{\"type\":\"int\",\"default\":10,\"min\":5},\"parking_countdown_sec\":{\"type\":\"int\",\"default\":180,\"min\":60},\"confirm_clear_sec\":{\"type\":\"int\",\"default\":60,\"min\":10},\"cooldown_sec\":{\"type\":\"int\",\"default\":900,\"min\":0}}" }); + PRESET_ALGORITHMS.put("garbage", new String[]{ + "垃圾检测", "garbage", "检测监控区域内散落垃圾的持续存在，确认60秒后触发告警，垃圾清理后30秒确认自动结束告警。", + "{\"confirm_garbage_sec\":{\"type\":\"int\",\"default\":60,\"min\":10,\"max\":600},\"confirm_clear_sec\":{\"type\":\"int\",\"default\":30,\"min\":10,\"max\":300},\"cooldown_sec\":{\"type\":\"int\",\"default\":600,\"min\":0}}" + }); } @PostConstruct diff --git a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiRoiServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiRoiServiceImpl.java index 89a43d65e..b134b542f 100644 --- a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiRoiServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiRoiServiceImpl.java @@ -5,6 +5,7 @@ import com.genersoft.iot.vmp.aiot.dao.AiAlgorithmMapper; import com.genersoft.iot.vmp.aiot.dao.AiRoiAlgoBindMapper; import com.genersoft.iot.vmp.aiot.dao.AiRoiMapper; import com.genersoft.iot.vmp.aiot.service.IAiConfigLogService; +import com.genersoft.iot.vmp.aiot.service.IAiRedisConfigService; import com.genersoft.iot.vmp.aiot.service.IAiRoiService; import com.genersoft.iot.vmp.streamProxy.dao.StreamProxyMapper; import com.github.pagehelper.PageHelper; @@ -40,6 +41,9 @@ public class AiRoiServiceImpl implements IAiRoiService { @Autowired private IAiConfigLogService configLogService; + @Autowired + private IAiRedisConfigService redisConfigService; + private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @Override @@ -157,6 +161,11 @@ public class AiRoiServiceImpl implements IAiRoiService { if (existing != null) { throw new IllegalArgumentException("该ROI已绑定此算法"); } + // 校验算法是否存在 + AiAlgorithm algo = algorithmMapper.queryByCode(bind.getAlgoCode()); + if (algo == null) { + throw new IllegalArgumentException("算法不存在: " + bind.getAlgoCode()); + } if (ObjectUtils.isEmpty(bind.getBindId())) { bind.setBindId(UUID.randomUUID().toString()); } @@ -170,17 +179,25 @@ public class AiRoiServiceImpl implements IAiRoiService { bind.setUpdateTime(now); bindMapper.add(bind); configLogService.addLog("BIND", bind.getBindId(), null, toJson(bind), null); + + // 推送配置到 Edge（绑定算法后） + pushRoiConfig(bind.getRoiId()); } @Override @Transactional public void unbindAlgo(String bindId) { AiRoiAlgoBind old = bindMapper.queryByBindId(bindId); + String roiId = null; if (old != null) { - String roiId = old.getRoiId(); + roiId = old.getRoiId(); bindMapper.deleteByBindId(bindId); configLogService.addLog("BIND", bindId, toJson(old), null, null); } + // 推送配置到 Edge（解绑算法后） + if (roiId != null) { + pushRoiConfig(roiId); + } } @Override @@ -200,6 +217,9 @@ public class AiRoiServiceImpl implements IAiRoiService { bind.setUpdateTime(now); bindMapper.updateByBindId(bind); configLogService.addLog("BIND", bind.getBindId(), toJson(old), toJson(bind), null); + + // 推送配置到 Edge（参数变更后） + pushRoiConfig(old.getRoiId()); } private String toJson(Object obj) { @@ -212,4 +232,21 @@ public class AiRoiServiceImpl implements IAiRoiService { return obj.toString(); } } + + /** + * 推送指定 ROI 所属设备的配置到边缘端 + */ + private void pushRoiConfig(String roiId) { + try { + AiRoi roi = roiMapper.queryByRoiId(roiId); + if (roi != null && roi.getDeviceId() != null && !roi.getDeviceId().isEmpty()) { + redisConfigService.writeDeviceAggregatedConfig(roi.getDeviceId(), "UPDATE"); + log.info("[AiRoi] ROI配置已推送到Edge，roiId={}, deviceId={}", roiId, roi.getDeviceId()); + } else { + log.warn("[AiRoi] 无法确定ROI所属设备，跳过推送，roiId={}", roiId); + } + } catch (Exception e) { + log.error("[AiRoi] 推送ROI配置失败，roiId={}", roiId, e); + } + } }