From 836df57f8158c86d0e4825b07cf745faa27d7389 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 21 一月 2025 11:35:17 +0800
Subject: [PATCH] 修改bug
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java | 56 ++++++++++++++++++++++++--------------------------------
1 files changed, 24 insertions(+), 32 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 99d72c3..9393b91 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
@@ -66,13 +66,14 @@
* @param file 图片文件
*/
private static List<String> closedTopModel(File file){
+ log.info("--------调用顶盖密闭模型开始--------");
HttpRequest post = HttpUtil.createPost("http://120.232.235.142:5000/predict");
post.form("file", file);
HttpResponse execute = post.execute();
int status = execute.getStatus();
if(200 != status){
log.error("顶盖密闭模型调用失败：" + execute.body());
- return null;
+ throw new RuntimeException("顶盖密闭模型调用失败：" + execute.body());
}
JSONObject result = JSON.parseObject(execute.body());
JSONArray predicted_labels = result.getJSONArray("predicted_labels");
@@ -80,6 +81,7 @@
for (int i = 0; i < predicted_labels.size(); i++) {
list.add(predicted_labels.getString(i));
}
+ log.info("--------调用顶盖密闭模型结束--------");
return list;
}
@@ -89,20 +91,14 @@
* @param url 图片网络地址
* @return
*/
- 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 + UUIDUtil.getTimeStr() + fileName);
- inputStream.close();
- return cameraFaultModel(file);
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ private static List<String> cameraFaultModel(String url) throws Exception{
+ String fileName = url.substring(url.lastIndexOf("."));
+ URLConnection urlConnection = new URL(url).openConnection();
+ urlConnection.connect();
+ InputStream inputStream = urlConnection.getInputStream();
+ File file = FileUtil.writeFromStream(inputStream, filePath + UUIDUtil.getTimeStr() + fileName);
+ inputStream.close();
+ return cameraFaultModel(file);
}
@@ -114,18 +110,20 @@
* @return
*/
private static List<String> cameraFaultModel(File file){
+ log.info("--------调用摄像头故障模型开始--------");
HttpRequest post = HttpUtil.createPost("http://120.232.235.142:4000/predict");
post.form("file", file);
HttpResponse execute = post.execute();
int status = execute.getStatus();
if(200 != status){
log.error("摄像头故障模型调用失败：" + execute.body());
- return null;
+ throw new RuntimeException("摄像头故障模型调用失败：" + execute.body());
}
JSONObject result = JSON.parseObject(execute.body());
String predicted_labels = result.getString("predicted_label");
List<String> list = new ArrayList<>();
list.add(predicted_labels);
+ log.info("--------调用摄像头故障模型结束--------");
return list;
}
@@ -136,20 +134,14 @@
* @param url 图片网络地址
* @return
*/
- 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 + UUIDUtil.getTimeStr() + fileName);
- inputStream.close();
- return constructionWasteLoadModel(file);
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ private static List<String> constructionWasteLoadModel(String url) throws Exception{
+ String fileName = url.substring(url.lastIndexOf("."));
+ URLConnection urlConnection = new URL(url).openConnection();
+ urlConnection.connect();
+ InputStream inputStream = urlConnection.getInputStream();
+ File file = FileUtil.writeFromStream(inputStream, filePath + UUIDUtil.getTimeStr() + fileName);
+ inputStream.close();
+ return constructionWasteLoadModel(file);
}
@@ -167,7 +159,7 @@
int status = execute.getStatus();
if(200 != status){
log.error("建筑垃圾装载模型调用失败：" + execute.body());
- return null;
+ throw new RuntimeException("建筑垃圾装载模型调用失败：" + execute.body());
}
JSONObject result = JSON.parseObject(execute.body());
String predicted_labels = result.getString("predicted_label");
@@ -189,7 +181,7 @@
* @param modelEnum
* @return
*/
- public static Map<String, Object> modelCheck(String url, ImageModelEnum modelEnum){
+ public static Map<String, Object> modelCheck(String url, ImageModelEnum modelEnum) throws Exception{
Map<String, Object> map = new HashMap<>();
switch (modelEnum){
case TOP_SEAL:
--
Gitblit v1.7.1