From 7b473e5e366da7009e96b083798d433e764a5d43 Mon Sep 17 00:00:00 2001
From: lianlonggang <lianlonggang@qq.com>
Date: Wed, 24 Dec 2025 16:51:58 +0800
Subject: [PATCH] =?UTF-8?q?AED=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E6=8C=87=E5=AE=9Asheet=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E6=94=AF=E6=8C=81=E7=BA=AF=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E9=AB=98=E5=BE=B7=E5=9D=90=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AedEquipmentMangerServiceImpl.java   | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/service/impl/AedEquipmentMangerServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/service/impl/AedEquipmentMangerServiceImpl.java
index ebda348..3c39e97 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/service/impl/AedEquipmentMangerServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/service/impl/AedEquipmentMangerServiceImpl.java
@@ -2,6 +2,7 @@ package com.renkang.emergency.aed.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -671,6 +672,7 @@ public class AedEquipmentMangerServiceImpl extends ServiceImpl<AedEquipmentMange
             ImportParams params = new ImportParams();
             params.setTitleRows(1);
             params.setHeadRows(1);
+            params.setSheetNum(1);//指定读取第一个sheet
             list = ExcelImportUtil.importExcel(file.getInputStream(), AedTempImportVO.class, params);
             if(ObjectUtil.isNotEmpty(list)){
                 //通过单位名称反查orgCode
@@ -690,17 +692,27 @@ public class AedEquipmentMangerServiceImpl extends ServiceImpl<AedEquipmentMange
                         equipmentManger.setHostSerialNum(vo.getHostSerialNum());
                         if(StrUtil.isNotEmpty(vo.getLongitude()) && StrUtil.isNotEmpty(vo.getLatitude())){
                             try {
-                                String[] split = converter.run(vo.getLongitude() + "-" + vo.getLatitude()).split("-");
-                                CoordinateConverter.Gps gps = CoordinateConverter.GPS84ToGCJ02(
-                                        TypeConversionUtil.toDoubleOfNull(split[0]), TypeConversionUtil.toDoubleOfNull(split[1]));
-                                if (gps != null) {
-                                    BigDecimal lon = BigDecimal.valueOf(gps.getLongitude());
-                                    BigDecimal lat = BigDecimal.valueOf(gps.getLatitude());
+                                //判断坐标是否是小数坐标
+                                if(!NumberUtil.isDouble(vo.getLongitude()) || !NumberUtil.isDouble(vo.getLatitude())){
+                                    String[] split = converter.run(vo.getLongitude() + "-" + vo.getLatitude()).split("-");
+                                    CoordinateConverter.Gps gps = CoordinateConverter.GPS84ToGCJ02(
+                                            TypeConversionUtil.toDoubleOfNull(split[0]), TypeConversionUtil.toDoubleOfNull(split[1]));
+                                    if (gps != null) {
+                                        BigDecimal lon = BigDecimal.valueOf(gps.getLongitude());
+                                        BigDecimal lat = BigDecimal.valueOf(gps.getLatitude());
+                                        equipmentManger.setLongitude(lon);
+                                        equipmentManger.setLatitude(lat);
+                                    }
+                                }else{
+                                    //小数直接用
+                                    BigDecimal lon = BigDecimal.valueOf( TypeConversionUtil.toDoubleOfNull(vo.getLongitude()));
+                                    BigDecimal lat = BigDecimal.valueOf(TypeConversionUtil.toDoubleOfNull(vo.getLatitude()));
                                     equipmentManger.setLongitude(lon);
                                     equipmentManger.setLatitude(lat);
-                                    equipmentManger.setGeoCollectType(1);
-                                    equipmentManger.setPublishFlag(1);
                                 }
+                                equipmentManger.setGeoCollectType(1);
+                                equipmentManger.setPublishFlag(1);
+
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }