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("装置列表信息异常");