diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java index e71ac32..153c8c6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java @@ -60,7 +60,6 @@ return retMap; } - @PostMapping("/app/registerGeTui") public ResponseData geTuiRegister(@RequestParam String clientid) { messagePusherService.registerGeTui(permissionService.getAuthService().getLoginUser().getId(), clientid); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java index e71ac32..153c8c6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java @@ -60,7 +60,6 @@ return retMap; } - @PostMapping("/app/registerGeTui") public ResponseData geTuiRegister(@RequestParam String clientid) { messagePusherService.registerGeTui(permissionService.getAuthService().getLoginUser().getId(), clientid); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index dce42bf..a05d22a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -6,11 +6,9 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Required; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java index e71ac32..153c8c6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/MessagePusherController.java @@ -60,7 +60,6 @@ return retMap; } - @PostMapping("/app/registerGeTui") public ResponseData geTuiRegister(@RequestParam String clientid) { messagePusherService.registerGeTui(permissionService.getAuthService().getLoginUser().getId(), clientid); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index dce42bf..a05d22a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -6,11 +6,9 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Required; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 33de497..06ecb2a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -291,14 +291,17 @@ case "液位监测仪": deviceData = this.baseMapper.liquidData(deviceInWellInfo.getDevcode()); + watchDataDto.setWatchType("井内水位"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setWatchType("井内水位"); watchDataDto.setType("2"); watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add(watchDataDto); + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; @@ -316,19 +319,24 @@ watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add((WatchDataDto) watchDataDto.clone()); } + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; case "燃气智能监测终端": deviceData = this.baseMapper.gasData(deviceInWellInfo.getDevcode()); + watchDataDto.setWatchType("燃气浓度"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setWatchType("燃气浓度"); watchDataDto.setType("4"); - watchDataDto.setValue(deviceData.getData() + "%LEL"); watchDataDto.setData(deviceData.getData() + "%LEL"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add(watchDataDto); + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; @@ -346,45 +354,55 @@ watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add((WatchDataDto) watchDataDto.clone()); } + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; case "开挖监测仪": deviceData = this.baseMapper.digData(deviceInWellInfo.getDevcode()); + watchDataDto.setWatchType("开挖状态"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setWatchType("开挖状态"); watchDataDto.setType("6"); - watchDataDto.setValue(deviceData.getData() + "mg"); watchDataDto.setData(deviceData.getData() + "mg"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add(watchDataDto); + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; case "噪声记录仪": deviceData = this.baseMapper.noiseData(deviceInWellInfo.getDevcode()); + watchDataDto.setWatchType("管线噪声"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setWatchType("管线噪声"); watchDataDto.setType("8"); - watchDataDto.setValue(deviceData.getData() + "mg"); watchDataDto.setData(deviceData.getData() + "mg"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add(watchDataDto); + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; case "井盖定位监测仪": deviceData = this.baseMapper.wellcoverlocaData(deviceInWellInfo.getDevcode()); + watchDataDto.setWatchType("井盖位置"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setWatchType("井盖位置"); watchDataDto.setType("7"); watchDataDto.setValue(deviceData.getData()); watchDataDto.setData(deviceData.getData()); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add(watchDataDto); + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; @@ -426,13 +444,16 @@ break; case "管盯": deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + watchDataDto.setWatchType("燃气泄漏"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setWatchType("燃气泄漏"); watchDataDto.setType("12"); watchDataDto.setValue(deviceData.getData() + "%LEL"); watchDataDto.setData(deviceData.getData() + "%LEL"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add(watchDataDto); + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; case "硫化氢检测终端": @@ -444,24 +465,30 @@ watchDataDto.setData(deviceData.getData() + "%LEL"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add(watchDataDto); + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; case "可燃气体": deviceData = this.baseMapper.gasDector(deviceInWellInfo.getDevcode()); + watchDataDto.setWatchType("液化气浓度"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setWatchType("液化气浓度"); watchDataDto.setType("101"); watchDataDto.setValue(deviceData.getData() + "%LEL"); watchDataDto.setData(deviceData.getData() + "%LEL"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add(watchDataDto); + }else { + watchDataDto.setValue("无数据"); + watchDataDto.setData("无数据"); } break; case "消防栓防盗水监测仪": deviceData = this.baseMapper.hydrantData(deviceInWellInfo.getDevcode()); + watchDataDto.setWatchType("消防栓状态"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setWatchType("消防栓状态"); watchDataDto.setType("11"); watchDataDto.setValue(deviceData.getData()); watchDataDto.setData(deviceData.getData());