From f9e8fafc10ccd1c2e5f6060b4cdc29559927aa16 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 30 十二月 2024 16:18:39 +0800
Subject: [PATCH] 修改bug
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 a959f5e..2b302b3 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
@@ -9,8 +9,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.stylefeng.guns.modular.system.model.enums.ImageModelEnum;
+import com.stylefeng.guns.modular.system.util.UUIDUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
import java.io.File;
import java.io.IOException;
@@ -31,8 +33,8 @@
/**
* 本地存储图片地址
*/
- @Value("${filePath}")
- private static String filePath;
+ private static String filePath = "/home/file/image/";
+// private static String filePath = "d:/file/";
/**
@@ -41,10 +43,11 @@
*/
private static List<String> closedTopModel(String url){
try {
+ String fileName = url.substring(url.lastIndexOf("."));
URLConnection urlConnection = new URL(url).openConnection();
urlConnection.connect();
InputStream inputStream = urlConnection.getInputStream();
- File file = FileUtil.writeFromStream(inputStream, filePath);
+ File file = FileUtil.writeFromStream(inputStream, filePath + UUIDUtil.getTimeStr() + fileName);
inputStream.close();
return closedTopModel(file);
} catch (MalformedURLException e) {
@@ -86,10 +89,11 @@
*/
private static List<String> cameraFaultModel(String url){
try {
+ String fileName = url.substring(url.lastIndexOf("."));
URLConnection urlConnection = new URL(url).openConnection();
urlConnection.connect();
InputStream inputStream = urlConnection.getInputStream();
- File file = FileUtil.writeFromStream(inputStream, filePath);
+ File file = FileUtil.writeFromStream(inputStream, filePath + UUIDUtil.getTimeStr() + fileName);
inputStream.close();
return cameraFaultModel(file);
} catch (MalformedURLException e) {
@@ -132,10 +136,11 @@
*/
private static List<String> constructionWasteLoadModel(String url){
try {
+ String fileName = url.substring(url.lastIndexOf("."));
URLConnection urlConnection = new URL(url).openConnection();
urlConnection.connect();
InputStream inputStream = urlConnection.getInputStream();
- File file = FileUtil.writeFromStream(inputStream, filePath);
+ File file = FileUtil.writeFromStream(inputStream, filePath + UUIDUtil.getTimeStr() + fileName);
inputStream.close();
return constructionWasteLoadModel(file);
} catch (MalformedURLException e) {
@@ -172,10 +177,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
@@ -186,7 +192,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