From acbb80b088a1f32514c0162353570ead49ca7c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 24 Apr 2025 10:56:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExcavationDetectionController.java | 6 +++--- .../screen/controller/MassConcreteController.java | 12 ++++++------ .../screen/controller/ProjectOverviewController.java | 6 +++--- .../service/impl/TowerCraneDetectionServiceImpl.java | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java index 0ba3aa4..a905244 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java @@ -38,7 +38,7 @@ public class ExcavationDetectionController extends BaseController { List collectDevVoList = excavationDetectionService.getCollectDeviceList(constInfoVo); return success(collectDevVoList); }catch (Exception e){ - log.error("查询区域列表失败",e.getMessage()); + log.error("查询区域列表失败{}",e.getMessage()); return error("查询区域列表失败"); } } @@ -49,7 +49,7 @@ public class ExcavationDetectionController extends BaseController { ProjectOverviewVo projectOverviewVo = excavationDetectionService.getDevStatistics(constInfoVo); return success(projectOverviewVo); }catch (Exception e){ - log.error("查询区域列表失败",e.getMessage()); + log.error("查询区域列表失败{}",e.getMessage()); return error("查询区域列表失败"); } } @@ -62,7 +62,7 @@ public class ExcavationDetectionController extends BaseController { List deviceAlarmVoList = excavationDetectionService.concreteAlarmList(constInfoVo); return success(deviceAlarmVoList); }catch (Exception e){ - log.error("区域设备统计失败",e.getMessage()); + log.error("区域设备统计失败{}",e.getMessage()); return error("区域设备统计失败"); } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/MassConcreteController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/MassConcreteController.java index 694c447..21ec6a7 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/MassConcreteController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/MassConcreteController.java @@ -35,7 +35,7 @@ public class MassConcreteController extends BaseController { List constInfoVoList = massConcreteService.getTtSysUserCheckList(constInfoVo); return success(constInfoVoList); }catch (Exception e){ - log.error("查询区域列表失败",e.getMessage()); + log.error("查询区域列表失败{}",e.getMessage()); return error("查询区域列表失败"); } } @@ -48,7 +48,7 @@ public class MassConcreteController extends BaseController { List collectDevVoList = massConcreteService.getCollectDeviceList(constInfoVo); return success(collectDevVoList); }catch (Exception e){ - log.error("查询区域列表失败",e.getMessage()); + log.error("查询区域列表失败{}",e.getMessage()); return error("查询区域列表失败"); } } @@ -60,7 +60,7 @@ public class MassConcreteController extends BaseController { ProjectOverviewVo projectOverviewVo = massConcreteService.getDevStatistics(constInfoVo); return success(projectOverviewVo); }catch (Exception e){ - log.error("查询区域列表失败",e.getMessage()); + log.error("查询区域列表失败{}",e.getMessage()); return error("查询区域列表失败"); } } @@ -73,7 +73,7 @@ public class MassConcreteController extends BaseController { List constInfoVoList = massConcreteService.getCollectDeviceAll(constInfoVo); return success(constInfoVoList); }catch (Exception e){ - log.error("区域设备统计失败",e.getMessage()); + log.error("区域设备统计失败{}",e.getMessage()); return error("区域设备统计失败"); } } @@ -86,7 +86,7 @@ public class MassConcreteController extends BaseController { List deviceAlarmVoList = massConcreteService.concreteAlarmList(constInfoVo); return success(deviceAlarmVoList); }catch (Exception e){ - log.error("区域设备统计失败",e.getMessage()); + log.error("区域设备统计失败{}",e.getMessage()); return error("区域设备统计失败"); } } @@ -99,7 +99,7 @@ public class MassConcreteController extends BaseController { List collectDeviceHisVoList = massConcreteService.temperatureList(collectDeviceHisVo); return success(collectDeviceHisVoList); }catch (Exception e){ - log.error("区域设备统计失败",e.getMessage()); + log.error("区域设备统计失败{}",e.getMessage()); return error("区域设备统计失败"); } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ProjectOverviewController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ProjectOverviewController.java index b4220b7..812f9f6 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ProjectOverviewController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ProjectOverviewController.java @@ -47,7 +47,7 @@ public class ProjectOverviewController extends BaseController { ProjectOverviewVo.setDeviceAlarms(deviceAlarms); return success(ProjectOverviewVo); }catch (Exception e){ - log.error("获取设备信息异常",e.getMessage()); + log.error("获取设备信息异常{}",e.getMessage()); return error("获取设备信息异常"); } } @@ -60,7 +60,7 @@ public class ProjectOverviewController extends BaseController { List deviceAlarmVoList = projectOverviewService.getDeviceAlarmList(); return success(deviceAlarmVoList); }catch (Exception e){ - log.error("获取设备信息异常",e.getMessage()); + log.error("获取设备信息异常{}",e.getMessage()); return error("获取设备信息异常"); } } @@ -77,7 +77,7 @@ public class ProjectOverviewController extends BaseController { environmentalDetectionVo.setNoise("58"); return success(environmentalDetectionVo); }catch (Exception e){ - log.error("获取设备信息异常",e.getMessage()); + log.error("获取设备信息异常{}",e.getMessage()); return error("获取设备信息异常"); } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/TowerCraneDetectionServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/TowerCraneDetectionServiceImpl.java index 56cbf3e..e0953ec 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/TowerCraneDetectionServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/TowerCraneDetectionServiceImpl.java @@ -38,7 +38,7 @@ public class TowerCraneDetectionServiceImpl implements TowerCraneDetectionServic constInfoVo.setTypeCode(TypeCodeUtils.TC_CODE); List collectDevVoList = mapper.getConstDeviceList(constInfoVo); collectDevVoList.forEach(item -> { - if(item != null && item.getConfigData() != null && !item.getConfigData().isEmpty()){ + if(item != null && item.getConfigData() != null && !item.getConfigData().isEmpty() && !"null".equals(item.getConfigData())){ JSONObject jsonObject = JsonHelper.jsonStrToJsonObj(item.getConfigData()); item.setTowerCraneInfo(JsonHelper.jsonObjToBean(jsonObject.getJSONObject("deviceDetail"), TowerCraneInfoVo.class)); }