renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AED导入功能调整，指定sheet数量，支持纯小数的高德坐标

Browse Source
This commit is contained in:
lianlonggang
2025-12-24 16:51:58 +08:00
parent f5247cc21f
commit 7b473e5e36
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/service/impl/AedEquipmentMangerServiceImpl.java
+20 -8
View File
@@ -2,6 +2,7 @@ package com.renkang.emergency.aed.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -671,6 +672,7 @@ public class AedEquipmentMangerServiceImpl extends ServiceImpl<AedEquipmentMange
ImportParams params = new ImportParams(); ImportParams params = new ImportParams();
params.setTitleRows(1); params.setTitleRows(1);
params.setHeadRows(1); params.setHeadRows(1);
params.setSheetNum(1);//指定读取第一个sheet
list = ExcelImportUtil.importExcel(file.getInputStream(), AedTempImportVO.class, params); list = ExcelImportUtil.importExcel(file.getInputStream(), AedTempImportVO.class, params);
if(ObjectUtil.isNotEmpty(list)){ if(ObjectUtil.isNotEmpty(list)){
//通过单位名称反查orgCode //通过单位名称反查orgCode
@@ -690,17 +692,27 @@ public class AedEquipmentMangerServiceImpl extends ServiceImpl<AedEquipmentMange
equipmentManger.setHostSerialNum(vo.getHostSerialNum()); equipmentManger.setHostSerialNum(vo.getHostSerialNum());
if(StrUtil.isNotEmpty(vo.getLongitude()) && StrUtil.isNotEmpty(vo.getLatitude())){ if(StrUtil.isNotEmpty(vo.getLongitude()) && StrUtil.isNotEmpty(vo.getLatitude())){
try { try {
String[] split = converter.run(vo.getLongitude() + "-" + vo.getLatitude()).split("-"); //判断坐标是否是小数坐标
CoordinateConverter.Gps gps = CoordinateConverter.GPS84ToGCJ02( if(!NumberUtil.isDouble(vo.getLongitude()) || !NumberUtil.isDouble(vo.getLatitude())){
TypeConversionUtil.toDoubleOfNull(split[0]), TypeConversionUtil.toDoubleOfNull(split[1])); String[] split = converter.run(vo.getLongitude() + "-" + vo.getLatitude()).split("-");
if (gps != null) { CoordinateConverter.Gps gps = CoordinateConverter.GPS84ToGCJ02(
BigDecimal lon = BigDecimal.valueOf(gps.getLongitude()); TypeConversionUtil.toDoubleOfNull(split[0]), TypeConversionUtil.toDoubleOfNull(split[1]));
BigDecimal lat = BigDecimal.valueOf(gps.getLatitude()); 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.setLongitude(lon);
equipmentManger.setLatitude(lat); equipmentManger.setLatitude(lat);
equipmentManger.setGeoCollectType(1);
equipmentManger.setPublishFlag(1);
} }
equipmentManger.setGeoCollectType(1);
equipmentManger.setPublishFlag(1);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }