diff --git a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java index 453032b0..3c9f6cc5 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java @@ -55,8 +55,8 @@ public class DcWarningController extends BaseController */ @ApiOperation("感知事件数据统计") @GetMapping("/countNumber") - public AjaxResult dcWarningCountNumber() { - return AjaxResult.success(dcWarningService.dcWarningCountNumber()); + public AjaxResult dcWarningCountNumber(@RequestParam(required = false) Integer warningSource) { + return AjaxResult.success(dcWarningService.dcWarningCountNumber(warningSource)); } /** diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java index 9b1dc3be..aa7a8af8 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java @@ -24,7 +24,7 @@ public interface DcWarningMapper /** * 感知事件统计 */ - int dcWarningCountNumber(); + int dcWarningCountNumber(Integer warningSource); /** * 查询预警信息 diff --git a/zc-business/src/main/java/com/zc/business/service/IDcWarningService.java b/zc-business/src/main/java/com/zc/business/service/IDcWarningService.java index 8e5ea04f..c33cacb8 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcWarningService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcWarningService.java @@ -22,7 +22,7 @@ public interface IDcWarningService /** * 感知事件数据统计 */ - int dcWarningCountNumber(); + int dcWarningCountNumber(Integer warningSource); /** * 查询预警信息 diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java index 070178f9..fb839689 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java @@ -70,8 +70,8 @@ public class DcWarningServiceImpl implements IDcWarningService * @return */ @Override - public int dcWarningCountNumber() { - return dcWarningMapper.dcWarningCountNumber(); + public int dcWarningCountNumber(Integer warningSource) { + return dcWarningMapper.dcWarningCountNumber(warningSource); } /** diff --git a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml index 2eb3d51a..3486169b 100644 --- a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml @@ -68,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"