From 0f45964c05ae246d9cb32e7327e866a87994e63c Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 14 Aug 2024 18:50:57 +0800 Subject: [PATCH] =?UTF-8?q?APP-=E5=90=8A=E8=A3=85=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/bracelet/mapper/ConsControlMapper.java | 1 - .../bracelet/service/impl/ConsControlServiceImpl.java | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/ConsControlMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/ConsControlMapper.java index f7d5d76..aa8cc23 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/ConsControlMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/ConsControlMapper.java @@ -79,7 +79,6 @@ public interface ConsControlMapper { * @author cwchen * @date 2024/8/9 15:13 */ - @MapKey("id") Map getTowerInfo(BraceletParamsDto dto); /** diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java index ddc4fc6..70e9162 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java @@ -173,8 +173,8 @@ public class ConsControlServiceImpl implements IConsControlService { Map towerMap = mapper.getTowerInfo(dto); String distance = mapper.getDistance(); Double distanceValue = 0D; - if (StringUtils.isEmpty(distance)) { - distanceValue = StringUtils.isEmpty(distance) ? 50 : Double.parseDouble(distance); + if (StringUtils.isNotBlank(distance)) { + distanceValue = Double.parseDouble(distance); } List> personList = mapper.getWorkPersonInfo(dto); if (CollectionUtils.isNotEmpty(personList)) { @@ -340,9 +340,9 @@ public class ConsControlServiceImpl implements IConsControlService { return map; } for (Map mapData : shMapDataList) { - if (Objects.equals(String.valueOf(map.get("dataCode")), BusinessConstants.LAT)) { + if (Objects.equals(String.valueOf(mapData.get("dataCode")), BusinessConstants.LAT)) { map.put("lat", mapData.get("dataVal")); - } else if (Objects.equals(String.valueOf(map.get("dataCode")), BusinessConstants.LON)) { + } else if (Objects.equals(String.valueOf(mapData.get("dataCode")), BusinessConstants.LON)) { map.put("lon", mapData.get("dataVal")); } }