From 500255c1c04b15b8e2c24ffb5607ed9220cd49e2 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Fri, 24 Apr 2026 09:35:32 +0800
Subject: [PATCH] 优化
---
ard-admin/src/main/resources/application-dev-druid.yml | 4 ++--
ard-system/src/main/java/com/ard/data/region/utils/RegionCoordinateUtils.java | 4 +++-
ard-system/src/main/resources/mapper/data/ArdDeptRegionMapper.xml | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ard-admin/src/main/resources/application-dev-druid.yml b/ard-admin/src/main/resources/application-dev-druid.yml
index 50a4bbd..8e4b37f 100644
--- a/ard-admin/src/main/resources/application-dev-druid.yml
+++ b/ard-admin/src/main/resources/application-dev-druid.yml
@@ -6,9 +6,9 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://localhost:3306/ard-uav?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.1.15:3306/ard-uav?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: root
+ password: password
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ard-system/src/main/java/com/ard/data/region/utils/RegionCoordinateUtils.java b/ard-system/src/main/java/com/ard/data/region/utils/RegionCoordinateUtils.java
index 602ad4d..9fd1591 100644
--- a/ard-system/src/main/java/com/ard/data/region/utils/RegionCoordinateUtils.java
+++ b/ard-system/src/main/java/com/ard/data/region/utils/RegionCoordinateUtils.java
@@ -134,7 +134,9 @@
double lat = coordinates.get(0).getLat();
double meterPerDegree = 111000 * Math.cos(Math.toRadians(lat));
- return area * meterPerDegree * 111000;
+ double result = area * meterPerDegree * 111000;
+ // 保留2位小数（平方米）
+ return Math.round(result * 100) / 100.0;
}
/**
diff --git a/ard-system/src/main/resources/mapper/data/ArdDeptRegionMapper.xml b/ard-system/src/main/resources/mapper/data/ArdDeptRegionMapper.xml
index d9bb961..59731c1 100644
--- a/ard-system/src/main/resources/mapper/data/ArdDeptRegionMapper.xml
+++ b/ard-system/src/main/resources/mapper/data/ArdDeptRegionMapper.xml
@@ -173,6 +173,7 @@
<update id="updateArdDeptRegion" parameterType="ArdDeptRegion">
UPDATE ard_dept_region
<set>
+ <if test="deptId != null">dept_id = #{deptId},</if>
<if test="regionName != null">region_name = #{regionName},</if>
<if test="regionColor != null">region_color = #{regionColor},</if>
<if test="boundaryWkt != null">region_boundary = ST_GeomFromText(#{boundaryWkt}, 4326),</if>
--
Gitblit v1.9.3