From b37794a5fc9eba1648b5e62bd4fb69c6464a07c5 Mon Sep 17 00:00:00 2001 From: GL65 <1297092748@qq.com> Date: Mon, 16 Jun 2025 15:24:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9EAI=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/uva/api/point/PointService.java | 3 +- .../java/com/uva/api/task/TaskService.java | 12 +- .../com/uva/api/task/mapper/TaskMapper.java | 14 ++- src/main/resources/mapper/task.xml | 113 +++++++++--------- 4 files changed, 73 insertions(+), 69 deletions(-) diff --git a/src/main/java/com/uva/api/point/PointService.java b/src/main/java/com/uva/api/point/PointService.java index 3a4b145..ba2fe4d 100644 --- a/src/main/java/com/uva/api/point/PointService.java +++ b/src/main/java/com/uva/api/point/PointService.java @@ -1,4 +1,4 @@ - package com.uva.api.point; +package com.uva.api.point; import com.alibaba.fastjson.JSONArray; @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject; import com.deepoove.poi.util.TableTools; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sun.org.apache.xpath.internal.operations.Bool; import com.uva.api.point.mapper.PointMapper; import com.uva.api.task.mapper.TaskMapper; import com.uva.api.util.DateUtil; diff --git a/src/main/java/com/uva/api/task/TaskService.java b/src/main/java/com/uva/api/task/TaskService.java index 8d2c1a4..f56513b 100644 --- a/src/main/java/com/uva/api/task/TaskService.java +++ b/src/main/java/com/uva/api/task/TaskService.java @@ -195,6 +195,7 @@ public class TaskService { String projectName = json.getString("project_name"); projectName = "%" + projectName + "%"; String taskName = json.getString("task_name"); + String picName = json.getString("pic_name"); // 获取图片名称参数 String organizationKey = ""; if (json.containsKey("organization_key")) { organizationKey = json.getString("organization_key"); @@ -210,15 +211,15 @@ public class TaskService { int size = Integer.parseInt(json.getString("size")); PageHelper.startPage(page, size); List> dataList = taskMapper.getDisResultInfo(organizationKey, projectName, lineName, - typeName, startTime, endTime); + typeName, startTime, endTime, picName); // 传入picName参数 for (Map map : dataList) { long lineId = (long) map.get("id"); - String picName = (String) map.get("pic_name"); + String picName1 = (String) map.get("pic_name"); String filePath = (String) map.get("file_path"); String fileName = filePath + File.separator + picName; map.put("pic", fileName); - List> picList = taskMapper.getDisResultInfoByIdAndPicName(lineId, picName, typeName); + List> picList = taskMapper.getDisResultInfoByIdAndPicName(lineId, picName1, typeName); JSONArray jsonArray = new JSONArray(); int count = 0; for (Map pic : picList) { @@ -227,7 +228,6 @@ public class TaskService { jsonObject.put("type_name", pic.get("type_name")); jsonArray.set(count, jsonObject); count++; - } map.put("data", jsonArray); if ("".equals(typeName)) { @@ -239,7 +239,7 @@ public class TaskService { return new PageInfo>(dataList); } - public List> getDisResultInfo(String data) { + /* public List> getDisResultInfo(String data) { JSONObject json = JSONObject.parseObject(data); String projectName = json.getString("project_name"); String taskName = json.getString("task_name"); @@ -259,7 +259,7 @@ public class TaskService { map.put("pic", fileName); } return dataList; - } + } */ public String execDisTask(String projectId, String projectName, String inputPath, int model_type) { PropertiesUtil propertiesUtil = new PropertiesUtil(); diff --git a/src/main/java/com/uva/api/task/mapper/TaskMapper.java b/src/main/java/com/uva/api/task/mapper/TaskMapper.java index 33d60bc..405c389 100644 --- a/src/main/java/com/uva/api/task/mapper/TaskMapper.java +++ b/src/main/java/com/uva/api/task/mapper/TaskMapper.java @@ -24,13 +24,15 @@ public interface TaskMapper { List> getDisResultInfo(@Param("organizationKey") String organizationKey, @Param("projectName") String projectName, @Param("taskName") String taskName, - @Param("typeName") String typeName, @Param("startTime") String startTime, - @Param("endTime") String endTime); + @Param("typeName") String typeName, + @Param("startTime") String startTime, + @Param("endTime") String endTime, + @Param("picName") String picName); List> getDisResultInfo2(@Param("organizationKey") String organizationKey, - @Param("projectName") String projectName, @Param("lineName") String lineName, - @Param("typeName") String typeName, @Param("startTime") String startTime,@Param("endTime") String endTime, - @Param("is_illegal") String is_illegal); + @Param("projectName") String projectName, @Param("lineName") String lineName, + @Param("typeName") String typeName, @Param("startTime") String startTime,@Param("endTime") String endTime, + @Param("is_illegal") String is_illegal); List> getEventResult(@Param("organizationKey")String organizationKey, @Param("taskId") int taskId, @Param("baseTaskId") int baseTaskId); @@ -47,7 +49,7 @@ public interface TaskMapper { @Param("endTime") String endTime); List> staticsTaskByMonth(@Param("lineName") String lineName, @Param("startTime") String startTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); int updateDistResult(@Param("tId") int tId, @Param("path") String path); diff --git a/src/main/resources/mapper/task.xml b/src/main/resources/mapper/task.xml index f91577a..1550fc8 100644 --- a/src/main/resources/mapper/task.xml +++ b/src/main/resources/mapper/task.xml @@ -5,7 +5,7 @@ select to_char(t1.ddatetime, 'yyyyMMddhh24miss') as "ddatetime", - t1.id, - t1.project_name, - t1.project_id, - t1.line_name, - t1.task_id, - t1.task_name, - t1.task_type, - t1.flight_duration, - t1.flyplan, - t1.file_path, - case when t1.dis_path is null then '' else t1.dis_path end, - case when t1.video_path is null then '' else t1.video_path end - from t_task_info t1 - where id = #{id} - - - + + select objectid, - image_path, - project_type, - is_illegal, - is_new, - task_id, - base_task_id, - b_box + image_path, + project_type, + is_illegal, + is_new, + task_id, + base_task_id, + b_box from t_uva_event_point where 1=1 and task_id = #{taskId} and base_task_id = #{baseTaskId} @@ -244,13 +247,13 @@ select - lon, - lat, - order_value + lon, + lat, + order_value from t_line_info where line_name=#{lineName} order by order_value @@ -329,7 +332,7 @@ -- Gitee From 233eac9c44596b599e813559df48f8bca49e5c00 Mon Sep 17 00:00:00 2001 From: GL65 <1297092748@qq.com> Date: Wed, 18 Jun 2025 15:09:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E4=BB=BB=E5=8A=A1=E9=80=89=E6=8B=A915?= =?UTF-8?q?=E6=97=A5=E4=B9=8B=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/task.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/task.xml b/src/main/resources/mapper/task.xml index 1550fc8..8870684 100644 --- a/src/main/resources/mapper/task.xml +++ b/src/main/resources/mapper/task.xml @@ -383,7 +383,7 @@ from t_task_info t where t.project_id=#{projectId} and t.task_type='四乱违法巡检-计划任务' and t.line_name=#{lineName} - and t.ddatetime (select t1.ddatetime from t_task_info t1 + and t.ddatetime (select t1.ddatetime - INTERVAL '15 days' from t_task_info t1 where t1.project_id=#{projectId} and t1.task_id=#{taskId} and t1.line_name=#{lineName}) -- Gitee