From ce4cb64be9fefb791b7c3e01b1cb3c011a8f7d15 Mon Sep 17 00:00:00 2001 From: GL65 <1297092748@qq.com> Date: Tue, 24 Jun 2025 14:43:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/uva/api/task/TaskService.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/uva/api/task/TaskService.java b/src/main/java/com/uva/api/task/TaskService.java index f56513b..c4fcd36 100644 --- a/src/main/java/com/uva/api/task/TaskService.java +++ b/src/main/java/com/uva/api/task/TaskService.java @@ -195,7 +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 ser_picName = json.getString("pic_name"); // 获取图片名称参数 String organizationKey = ""; if (json.containsKey("organization_key")) { organizationKey = json.getString("organization_key"); @@ -211,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, picName); // 传入picName参数 + typeName, startTime, endTime, ser_picName); // 传入picName参数 for (Map map : dataList) { long lineId = (long) map.get("id"); - String picName1 = (String) map.get("pic_name"); + String picName = (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, picName1, typeName); + List> picList = taskMapper.getDisResultInfoByIdAndPicName(lineId, picName, typeName); JSONArray jsonArray = new JSONArray(); int count = 0; for (Map pic : picList) { @@ -239,11 +239,12 @@ 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"); String organizationKey = ""; + String ser_picName = json.getString("pic_name"); // 获取图片名称参数 if (json.containsKey("organization_key")) { organizationKey = json.getString("organization_key"); } @@ -251,7 +252,7 @@ public class TaskService { String startTime = json.getString("start_time"); String endTime = json.getString("end_time"); List> dataList = taskMapper.getDisResultInfo(organizationKey, - projectName, taskName, typeName, startTime, endTime); + projectName, taskName, typeName, startTime, endTime,ser_picName); for (Map map : dataList) { String filePath = (String) map.get("file_path"); String picName = (String) map.get("pic_name"); @@ -259,7 +260,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(); @@ -1068,7 +1069,7 @@ public class TaskService { PropertiesUtil propertiesUtil = new PropertiesUtil(); String url = propertiesUtil.getProperty("changeCheckURL"); String result = HttpUtil.sendPostUrl(url, param); - log.info("返回对比结果"); + log.info("返回对3比结果"); JSONObject resultJson = JSONObject.parseObject(result); int code = resultJson.getInteger("code"); if (200 != code) { -- Gitee From 3516d6d6c995500aaf1a2d44b8ce74d033675b9e Mon Sep 17 00:00:00 2001 From: GL65 <1297092748@qq.com> Date: Tue, 24 Jun 2025 15:41:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=A1=86=E6=95=B0=E5=AD=97=E6=A0=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/uva/api/point/PointService.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/uva/api/point/PointService.java b/src/main/java/com/uva/api/point/PointService.java index ba2fe4d..ec8ba91 100644 --- a/src/main/java/com/uva/api/point/PointService.java +++ b/src/main/java/com/uva/api/point/PointService.java @@ -1304,11 +1304,6 @@ public class PointService { graphics2D.setColor(Color.RED); graphics2D.setStroke(new BasicStroke(10)); graphics2D.drawPolygon(polygon); - // 添加标注文字 - graphics2D.setColor(Color.blue); - graphics2D.setFont(new Font("宋体", Font.BOLD, 150)); -// graphics2D.drawString("增加", lon1, lat2); - graphics2D.drawString(count + "", lon1, lat1); if (status == 0) { if (flag) { String mark = count + ":增加 类型:" + nameMap.get(type) + " 面积:" + area + "m²"; -- Gitee From 80a4c06591caaf34005e33ccad07346f9e229976 Mon Sep 17 00:00:00 2001 From: GL65 <1297092748@qq.com> Date: Wed, 25 Jun 2025 14:00:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=8A=A5=E5=91=8A=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/uva/api/point/PointService.java | 4 +--- src/main/resources/mapper/changePoint.xml | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/uva/api/point/PointService.java b/src/main/java/com/uva/api/point/PointService.java index b27adb3..fa01f2d 100644 --- a/src/main/java/com/uva/api/point/PointService.java +++ b/src/main/java/com/uva/api/point/PointService.java @@ -18,6 +18,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblGrid; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -34,9 +35,6 @@ import java.io.*; import java.math.BigInteger; import java.util.List; import java.util.*; - -import org.slf4j.Logger; - import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; diff --git a/src/main/resources/mapper/changePoint.xml b/src/main/resources/mapper/changePoint.xml index 4bca131..cc72eb2 100644 --- a/src/main/resources/mapper/changePoint.xml +++ b/src/main/resources/mapper/changePoint.xml @@ -407,11 +407,9 @@ WHEN t.changed = TRUE THEN '是' ELSE '否' -- 处理 NULL 或其他情况 END AS changed - from t_uva_change_point_word t, - (select t.id, t.task_name,t.line_name from t_task_info t, t_uva_change_point_word t1 where t.id=t1.id1)t2, - (select t.id, t.task_name from t_task_info t, t_uva_change_point_word t1 where t.id=t1.id2)t3 - where t.id1=t2."id" - and t.id2=t3."id" + FROM t_uva_change_point_word t + JOIN t_task_info t2 ON t.id1 = t2.id + JOIN t_task_info t3 ON t.id2 = t3.id and t.organization_id = (select tu.organization_id from t_user_organization tu where tu.organization_key=#{organizationKey}) -- Gitee From a6bc5e9ec77a1eb51a5795dbe965097df4d3b807 Mon Sep 17 00:00:00 2001 From: GL65 <1297092748@qq.com> Date: Mon, 7 Jul 2025 22:28:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.=E6=8A=A5=E5=91=8A=E4=B8=AD=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E6=A1=86=E9=A2=9C=E8=89=B2=E6=9B=B4=E6=94=B9=202.?= =?UTF-8?q?=E9=99=8C=E7=94=9F=E8=88=AA=E7=BA=BF=E9=BB=98=E8=AE=A4=E5=9B=9B?= =?UTF-8?q?=E4=B9=B1=E6=A8=A1=E5=9E=8B=203.=E7=94=A8=E6=88=B7=E5=8F=AF?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=87=AA=E5=8A=A8=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=AF=B9=E6=AF=94=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/uva/api/point/PointService.java | 7 +++++- .../com/uva/api/uvadata/UvaDataControl.java | 25 ++++++++++++++++--- .../com/uva/api/uvadata/UvaDataService.java | 23 ++++++++++++----- .../uva/api/uvadata/mapper/UvaDataMapper.java | 4 +++ src/main/resources/mapper/task.xml | 10 +++++--- src/main/resources/mapper/uvadata.xml | 10 +++++++- 6 files changed, 64 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/uva/api/point/PointService.java b/src/main/java/com/uva/api/point/PointService.java index fa01f2d..c462695 100644 --- a/src/main/java/com/uva/api/point/PointService.java +++ b/src/main/java/com/uva/api/point/PointService.java @@ -1309,7 +1309,12 @@ public class PointService { int[] x = {lon1, lon2, lon3, lon4}; int[] y = {lat1, lat2, lat3, lat4}; Polygon polygon = new Polygon(x, y, 4); - graphics2D.setColor(Color.RED); + // 动态设置颜色 + if (status == 0) { + graphics2D.setColor(Color.GREEN); // 新增=绿色 + } else { + graphics2D.setColor(Color.RED); // 消失=红色 + } graphics2D.setStroke(new BasicStroke(10)); graphics2D.drawPolygon(polygon); if (status == 0) { diff --git a/src/main/java/com/uva/api/uvadata/UvaDataControl.java b/src/main/java/com/uva/api/uvadata/UvaDataControl.java index bdd20e9..ef339dc 100644 --- a/src/main/java/com/uva/api/uvadata/UvaDataControl.java +++ b/src/main/java/com/uva/api/uvadata/UvaDataControl.java @@ -1,16 +1,13 @@ package com.uva.api.uvadata; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.uva.api.entity.ReturnT; -import com.uva.api.task.TaskService; import com.uva.api.util.DataUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.Arrays; @@ -60,6 +57,28 @@ public class UvaDataControl { return ReturnT.success(result); } + @RequestMapping(value = "/updateChangeTime", method = RequestMethod.POST) + @ApiOperation(value = "更新 changetime 字段", httpMethod = "POST") + @ApiImplicitParam( + paramType = "body", + name = "data", + dataType = "String", + required = true, + dataTypeClass = String.class, + value = "JSON 格式：{\"changetime\": 数字}" + ) + public ReturnT updateChangeTime(@RequestBody String data) { + String result = uvaDataService.updateChangeTime(data); + return ReturnT.success(result); + } + + @RequestMapping(value = "/getChangeTime", method = RequestMethod.GET) + @ApiOperation(value = "获取当前changetime值", httpMethod = "GET") + public ReturnT getChangeTime() { + Integer result = uvaDataService.getChangeTime(); + return ReturnT.success(result); + } + /** * 删除 */ diff --git a/src/main/java/com/uva/api/uvadata/UvaDataService.java b/src/main/java/com/uva/api/uvadata/UvaDataService.java index 7ac3e66..1c7fe0a 100644 --- a/src/main/java/com/uva/api/uvadata/UvaDataService.java +++ b/src/main/java/com/uva/api/uvadata/UvaDataService.java @@ -2,11 +2,6 @@ package com.uva.api.uvadata; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.common.auth.CredentialsProviderFactory; -import com.aliyun.oss.common.auth.EnvironmentVariableCredentialsProvider; -import com.aliyun.oss.model.GetObjectRequest; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.uva.api.util.HttpUtil; @@ -16,7 +11,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.File; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -88,6 +82,23 @@ public class UvaDataService { } } + public String updateChangeTime(String data) { + JSONObject json = JSONObject.parseObject(data); + Integer changetime = json.getInteger("changetime"); // 从 JSON 中提取数字 + + int result = uvaDataMapper.updateChangeTime(changetime); + if (result > 0) { + return "success"; + } else { + return "fail"; + } + } + + public Integer getChangeTime() { + // 直接查询单字段值 + return uvaDataMapper.getChangeTime(); + } + public String removeWayLineByIds(List ids) { int result = uvaDataMapper.removeWayLineByIds(ids); if (0 <= result) { diff --git a/src/main/java/com/uva/api/uvadata/mapper/UvaDataMapper.java b/src/main/java/com/uva/api/uvadata/mapper/UvaDataMapper.java index bbf5c12..68ecd79 100644 --- a/src/main/java/com/uva/api/uvadata/mapper/UvaDataMapper.java +++ b/src/main/java/com/uva/api/uvadata/mapper/UvaDataMapper.java @@ -26,6 +26,10 @@ public interface UvaDataMapper { int updateWaylineById(@Param("id") Integer id, @Param("model_type") Integer model_type); + int updateChangeTime(@Param("changetime") Integer changetime); + + int getChangeTime(); + // 删除要素 int removeWayLineByIds(@Param("ids") List ids); diff --git a/src/main/resources/mapper/task.xml b/src/main/resources/mapper/task.xml index 8870684..a132ef1 100644 --- a/src/main/resources/mapper/task.xml +++ b/src/main/resources/mapper/task.xml @@ -383,13 +383,15 @@ 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 - INTERVAL '15 days' from t_task_info t1 - where t1.project_id=#{projectId} - and t1.task_id=#{taskId} - and t1.line_name=#{lineName}) + and t.ddatetime (select (select t1.ddatetime from t_task_info t1 + where t1.project_id=#{projectId} + and t1.task_id=#{taskId} + and t1.line_name=#{lineName}) + - (select changetime from example_table limit 1) * interval '1 day') ORDER BY t.ddatetime desc limit 1; + + SELECT changetime FROM example_table LIMIT 1 + + delete from t_wayline_info @@ -96,7 +104,7 @@ SELECT CASE WHEN COUNT(*) > 0 THEN (SELECT model_type FROM public.t_wayline_info WHERE uuid = #{uuid} limit 1) - ELSE 1 + ELSE 0 END AS model_type FROM public.t_wayline_info WHERE uuid = #{uuid} -- Gitee From 98f21d5525ddb76e89e6189fd985cf5c47df1a4c Mon Sep 17 00:00:00 2001 From: GL65 <1297092748@qq.com> Date: Wed, 16 Jul 2025 16:01:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E9=87=8D=E5=A4=8D=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=A3=80=E6=B5=8B=E7=AE=97=E6=B3=95=E6=97=B6?= =?UTF-8?q?=20=20=E5=88=A0=E9=99=A4=E4=B8=8A=E4=B8=80=E6=AC=A1=E5=8F=98?= =?UTF-8?q?=E5=8C=96=E6=A3=80=E6=B5=8B=E8=AE=B0=E5=BD=95=202.=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=8A=A5=E5=91=8A=E5=86=85=E6=95=B0=E5=AD=97=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=8F=8A=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/uva/api/point/PointService.java | 15 +++++++++++---- src/main/resources/mapper/changePoint.xml | 6 ++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/uva/api/point/PointService.java b/src/main/java/com/uva/api/point/PointService.java index c462695..f515d0a 100644 --- a/src/main/java/com/uva/api/point/PointService.java +++ b/src/main/java/com/uva/api/point/PointService.java @@ -86,6 +86,7 @@ public class PointService { String url = propertiesUtil.getProperty("changeCheckURL"); String result = HttpUtil.sendPostUrl(url, param); log.info("返回对比结果"); + log.info("算法返回结果: {}", result); JSONObject resultJson = JSONObject.parseObject(result); int code = resultJson.getInteger("code"); //组织id @@ -128,8 +129,9 @@ public class PointService { String picNameNum1 = picName1.split("\\.")[0].split("_")[2]; String picNameNum2 = picName2.split("\\.")[0].split("_")[2]; String changePointId = id1 + "-" + picNameNum1 + "-" + id2 + "-" + picNameNum2; - pointMapper.deleteChangePointResultBychangePointId(changePointId); - pointMapper.deleteChangePointTaskListBychangePointId(changePointId); + String changePointId1 = String.valueOf(id1); + pointMapper.deleteChangePointResultBychangePointId(changePointId1); + pointMapper.deleteChangePointTaskListBychangePointId(changePointId1); Map taskMap = new HashMap<>(); taskMap.put("CHANGEPOINT_ID", changePointId); taskMap.put("ID1", id1); @@ -1311,12 +1313,17 @@ public class PointService { Polygon polygon = new Polygon(x, y, 4); // 动态设置颜色 if (status == 0) { - graphics2D.setColor(Color.GREEN); // 新增=绿色 + graphics2D.setColor(Color.RED); // 新增=绿色 } else { - graphics2D.setColor(Color.RED); // 消失=红色 + graphics2D.setColor(Color.GREEN); // 消失=红色 } graphics2D.setStroke(new BasicStroke(10)); graphics2D.drawPolygon(polygon); + // 添加标注文字 + graphics2D.setColor(Color.blue); + graphics2D.setFont(new Font("宋体", Font.BOLD, 90)); +// graphics2D.drawString("增加", lon1, lat2); + graphics2D.drawString(count + "", lon1 - 20, lat1 - 20); if (status == 0) { if (flag) { String mark = count + ":增加 类型:" + nameMap.get(type) + " 面积:" + area + "m²"; diff --git a/src/main/resources/mapper/changePoint.xml b/src/main/resources/mapper/changePoint.xml index cc72eb2..7215985 100644 --- a/src/main/resources/mapper/changePoint.xml +++ b/src/main/resources/mapper/changePoint.xml @@ -374,12 +374,14 @@ from t_uva_change_point_info t + - delete from t_uva_change_point_result where changepointid=#{changePointId} + DELETE FROM t_uva_change_point_result + WHERE changepointid LIKE CONCAT(#{changePointId}, '%') - delete from t_uva_change_point_tasklist where changepointid=#{changePointId} + delete from t_uva_change_point_tasklist where changepointid LIKE CONCAT(#{changePointId}, '%') -- Gitee