Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-08 2400238fd8ae34a2f10a4ea35db9b1739c534a7e

 ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java

@@ -9,6 +9,7 @@
import com.ruoyi.alarm.external.mapper.ArdAlarmExternalMapper;
import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarFireMapper;
import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMoveMapper;
import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarPumpMapper;
import com.ruoyi.alarm.steal.mapper.ArdAlarmStealelecMapper;
import com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper;
import com.ruoyi.alarm.wall.mapper.ArdAlarmWallMapper;
@@ -52,6 +53,8 @@
    private ArdAlarmAccessMapper accessMapper;
    @Autowired
    private ArdAlarmApponekeyMapper apponekeyMapper;
    @Autowired
    private ArdAlarmRadarPumpMapper pumpMapper;
    @Autowired
    private ArdAlarmWallMapper wallMapper;
    @Autowired
@@ -169,6 +172,12 @@
    }

    @Override
    public List<CountVo> pumpYear(ESParam esParam) {
        List<CountVo> list = pumpMapper.pumpYear(esParam);
        return es(list);
    }

    @Override
    public List<CountVo> wallYear(ESParam esParam) {
        List<CountVo> list = wallMapper.wallYear(esParam);
        return es(list);
@@ -229,6 +238,12 @@
    }

    @Override
    public List<CountVo> pumpMonth(ESParam esParam) {
        List<CountVo> list = pumpMapper.pumpMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }

    @Override
    public List<CountVo> wallMonth(ESParam esParam) {
        List<CountVo> list = wallMapper.wallMonth(esParam);
        return esMonth(list,esParam.getEnd());