bonus
/
bns-zhgd-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
马三炮 2025-04-24 10:56:17 +08:00
parent 0d61c1364b
commit acbb80b088
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java
View File

@ -38,7 +38,7 @@ public class ExcavationDetectionController extends BaseController {
List<CollectDevVo> 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<DeviceAlarmVo> deviceAlarmVoList = excavationDetectionService.concreteAlarmList(constInfoVo);
return success(deviceAlarmVoList);
}catch (Exception e){
log.error("区域设备统计失败",e.getMessage());
log.error("区域设备统计失败{}",e.getMessage());
return error("区域设备统计失败");
}
}

12
bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/MassConcreteController.java
View File

@ -35,7 +35,7 @@ public class MassConcreteController extends BaseController {
List<ConstInfoVo> 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<CollectDevVo> 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<ConstInfoVo> 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<DeviceAlarmVo> 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<CollectDeviceHisVo> collectDeviceHisVoList = massConcreteService.temperatureList(collectDeviceHisVo);
return success(collectDeviceHisVoList);
}catch (Exception e){
log.error("区域设备统计失败",e.getMessage());
log.error("区域设备统计失败{}",e.getMessage());
return error("区域设备统计失败");
}
}

6
bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ProjectOverviewController.java
View File

@ -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<DeviceAlarmVo> 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("获取设备信息异常");
}
}

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/TowerCraneDetectionServiceImpl.java
View File

@ -38,7 +38,7 @@ public class TowerCraneDetectionServiceImpl implements TowerCraneDetectionServic
constInfoVo.setTypeCode(TypeCodeUtils.TC_CODE);
List<ConstInfoVo> 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));
}