告警总记录添加时间

fiveep-controller/src/main/java/com/bizmatics/controller/web/AlarmPowerController.java

@@ -39,8 +39,10 @@ public class AlarmPowerController {
      * @return
      */
     @GetMapping("/count")
-    public ApiResult<ApCountVO> count(@RequestParam(required = false) Integer siteId) {
-        return ApiResult.success(alarmPowerService.selectCount(siteId));
+    public ApiResult<ApCountVO> count(@RequestParam(required = false) Integer siteId,
+                                      @RequestParam Date startTime,
+                                      @RequestParam Date endTime) {
+        return ApiResult.success(alarmPowerService.selectCount(siteId,startTime,endTime));
     }
 
 

fiveep-service/src/main/java/com/bizmatics/service/AlarmPowerService.java

@@ -24,7 +24,7 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      * 告警总数和未处理告警总数
      * @return
      */
-    ApCountVO selectCount(Integer siteId);
+    ApCountVO selectCount(Integer siteId,Date startTime,Date endTime);
 
     /**
      * 告警趋势图

fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java

@@ -44,11 +44,11 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
 
 
     @Override
-    public ApCountVO selectCount(Integer siteId) {
+    public ApCountVO selectCount(Integer siteId,Date startTime,Date endTime) {
         Integer userId = SessionLocal.getUserId();
         ApCountVO apCountVo = new ApCountVO();
-        apCountVo.setCount(baseMapper.selectCount(userId, siteId, null, null, null, null, null));
-        apCountVo.setUnCount(baseMapper.selectCount(userId, siteId, 0, null, null, null, null));
+        apCountVo.setCount(baseMapper.selectCount(userId, siteId, null, startTime, endTime, null, null));
+        apCountVo.setUnCount(baseMapper.selectCount(userId, siteId, 0, startTime, endTime, null, null));
         return apCountVo;
     }