From ba735a34a9fab9d471c8f1e0d7c28ac5c71e40ad Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 21 May 2024 16:01:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shxy/xymanager_common/util/RawReportUtil.java | 4 ++-- .../shxy/xymanager_service/impl/ActivitiesServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java index dad4fb3..8a9dc2b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java @@ -58,11 +58,11 @@ public class RawReportUtil { } else if (str.startsWith("卡2:")) { map.put("simcard2", str.replaceFirst("卡2:", "")); } else if (str.startsWith("mcu:")) { - map.put("mcu", str.replaceFirst("mcu:", "")); + map.put("mcuVersion", str.replaceFirst("mcu:", "")); } else if (str.startsWith("ai:")) { map.put("aiVersion", str.replaceFirst("ai:", "")); } else if (str.startsWith("cam:")) { - map.put("cameraService", str.replaceFirst("cam:", "")); + map.put("cameraVersion", str.replaceFirst("cam:", "")); } else if (str.startsWith("主板温度:")) { map.put("mainBoardTmp", str.replaceFirst("主板温度:", "")); } else if (str.startsWith("电池温度:")) { diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java index 7696b1d..f05f188 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java @@ -72,7 +72,7 @@ public class ActivitiesServiceImpl implements ActivitiesService { if (t != null) { record.setTermId(t.getId()); } else { - throw new Exception(term.getCmdid() + "装置不存在"); + throw new ApiException(term.getCmdid() + "装置不存在"); } } else { throw new Exception("装置列表信息异常"); @@ -113,7 +113,7 @@ public class ActivitiesServiceImpl implements ActivitiesService { if (t != null) { record.setTermId(t.getId()); } else { - throw new Exception(term.getCmdid() + "装置不存在"); + throw new ApiException(term.getCmdid() + "装置不存在"); } } else { throw new Exception("装置列表信息异常");