From 922de4e688e18f508070972876002fa6a3810135 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 10 三月 2025 14:31:31 +0800
Subject: [PATCH] 修改导出bug
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml | 2 +-
guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/imageModel/ImageModelUtil.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml
index b2bcfee..bb066cb 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml
@@ -75,7 +75,7 @@
from t_task_detail_vehicles a
left join t_task_detail b on (a.task_detail_id = b.id)
left join t_patrol_task c on (a.patrol_task_id = c.id)
- left join t_task_detail_vehicles_channel d on (a.id = d.task_detail_vehicles_id and d.video_channel = 1)
+ left join t_task_detail_vehicles_channel d on (a.id = d.task_detail_vehicles_id)
left join sys_user e on (d.artificial_user_id = e.id)
where b.del_flag = 0
<if test="null != ids and ids.size() > 0">
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 9393b91..b2717c2 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
@@ -75,6 +75,7 @@
log.error("顶盖密闭模型调用失败：" + execute.body());
throw new RuntimeException("顶盖密闭模型调用失败：" + execute.body());
}
+ log.info("调用顶盖密闭模型结果：{}", execute.body());
JSONObject result = JSON.parseObject(execute.body());
JSONArray predicted_labels = result.getJSONArray("predicted_labels");
List<String> list = new ArrayList<>();
@@ -112,15 +113,16 @@
private static List<String> cameraFaultModel(File file){
log.info("--------调用摄像头故障模型开始--------");
HttpRequest post = HttpUtil.createPost("http://120.232.235.142:4000/predict");
- post.form("file", file);
+ post.form("file1", file);
HttpResponse execute = post.execute();
int status = execute.getStatus();
if(200 != status){
log.error("摄像头故障模型调用失败：" + execute.body());
throw new RuntimeException("摄像头故障模型调用失败：" + execute.body());
}
- JSONObject result = JSON.parseObject(execute.body());
- String predicted_labels = result.getString("predicted_label");
+ log.info("调用摄像头故障模型结果：{}", execute.body());
+ JSONArray result = JSON.parseArray(execute.body());
+ String predicted_labels = result.getJSONObject(0).getString("predicted_label");
List<String> list = new ArrayList<>();
list.add(predicted_labels);
log.info("--------调用摄像头故障模型结束--------");
--
Gitblit v1.7.1