diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java index 8b5451802..54de9cf04 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java @@ -146,7 +146,7 @@ public class OperationContrController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getDailyDeviceAbnormalStatistics") @ApiOperation("获取终端异常统计") - @ApiImplicitParam(name = "conditionBusinessParam", value = "实体", required = true) + @ApiImplicitParam(name = "param", value = "实体", required = true) public HttpResult> dailyDeviceAbnormalStatistics(@RequestBody PqsParam param) { String methodDescribe = getMethodDescribe("dailyDeviceAbnormalStatistics"); Page result = lineService.dailyDeviceAbnormalStatistics(param); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java index 680bb53ac..488beef46 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java @@ -38,7 +38,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist // 获取监测点告警 List lineAlarms = deviceAbnormaStatisticsMapper.getAlarmByLines( DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), - DateUtil.beginOfDay(DateUtil.parse(param.getEndTime()))); + DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); if (CollectionUtil.isNotEmpty(lineAlarms)){ // 根据装置分组 devLineMap = lineAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); @@ -46,7 +46,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist // 获取设备流量 List deviceAlarms = deviceAbnormaStatisticsMapper.getAlarmByDevice( DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), - DateUtil.beginOfDay(DateUtil.parse(param.getEndTime()))); + DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); List devs = deviceAlarms.stream().map(AlarmPO::getId).collect(Collectors.toList()); // 获取通信中断信息 List comMsgs = getCommunicate(devs, param.getBeginTime(), param.getEndTime());