From b5ad78ef20d012da5efe3a087646dc65217547c7 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 27 十二月 2024 15:42:00 +0800 Subject: [PATCH] 删除演示代码和新增加1模型结果 --- guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java index 2f324af..2b92474 100644 --- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java +++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java @@ -176,10 +176,11 @@ /** * 1号模型四类标签分别是 - * Loaded Cargo - Unsealed装载-未关闭 + * Loaded Cargo - Unsealed 装载-未关闭 * Empty Container - Sealed 空载-关闭 - * Empty Container - Unsealed空载-未关闭 - * Loaded Cargo - Sealed-装载-关闭 + * Empty Container - Unsealed 空载-未关闭 + * Loaded Cargo - Sealed 装载-关闭 + * ttt 未识别到货箱 * 2号模型四类分别是:'blurred'(模糊), 'no_video'(无视频),'normalcy'(正常), 'splash_screen(花屏)' * @param url * @param modelEnum @@ -190,7 +191,7 @@ case TOP_SEAL: List<String> list1 = closedTopModel(url); //其中包含装载未关闭,视为异常 - return !list1.contains("Loaded Cargo - Unsealed"); + return !(list1.contains("Loaded Cargo - Unsealed") || list1.contains("ttt")); case CAMERA_FAULT: List<String> list2 = cameraFaultModel(url); //其中包含正常,视为正常 -- Gitblit v1.7.1