aijinhui
2023-10-08 66075a98e7ad6bd8a39f970b27fe2ce493306766
报警数量
已添加1个文件
已修改14个文件
145 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/alarm/access/mapper/ArdAlarmAccessMapper.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/apponekey/mapper/ArdAlarmApponekeyMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/digitization3/mapper/ArdAlarmDigitization3Mapper.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarFireMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarMoveMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarPumpMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/steal/mapper/ArdAlarmStealelecMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/tube/mapper/ArdAlarmTubeMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/wall/mapper/ArdAlarmWallMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/service/StatisticalService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/vo/NumVo.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/access/mapper/ArdAlarmAccessMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.alarm.access.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.access.domain.ArdAlarmAccess;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.vo.CountVo;
@@ -13,7 +15,7 @@
 * @author ard
 * @date 2023-07-10
 */
public interface ArdAlarmAccessMapper
public interface ArdAlarmAccessMapper extends BaseMapper<ArdAlarmAccess>
{
    /**
     * æŸ¥è¯¢é—¨ç¦æŠ¥è­¦
ard-work/src/main/java/com/ruoyi/alarm/apponekey/mapper/ArdAlarmApponekeyMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.access.domain.ArdAlarmAccess;
import com.ruoyi.alarm.apponekey.domain.ArdAlarmApponekey;
import com.ruoyi.statistical.param.ESParam;
@@ -14,7 +15,7 @@
 * @author ard
 * @date 2023-07-21
 */
public interface ArdAlarmApponekeyMapper
public interface ArdAlarmApponekeyMapper extends BaseMapper<ArdAlarmApponekey>
{
    /**
     * æŸ¥è¯¢app一键报警
ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.alarm.camera.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.camera.domain.ArdAlarmCamera;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.vo.CountVo;
@@ -13,7 +15,7 @@
 * @author ard
 * @date 2023-06-21
 */
public interface ArdAlarmCameraMapper
public interface ArdAlarmCameraMapper extends BaseMapper<ArdAlarmCamera>
{
    /**
     * æŸ¥è¯¢é€šç”¨å…‰ç”µæŠ¥è­¦
ard-work/src/main/java/com/ruoyi/alarm/digitization3/mapper/ArdAlarmDigitization3Mapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.alarm.digitization3.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.digitization3.domain.ArdAlarmDigitization3;
import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
import com.ruoyi.statistical.param.ESParam;
@@ -13,7 +15,7 @@
 * @author ard
 * @date 2023-09-19
 */
public interface ArdAlarmDigitization3Mapper
public interface ArdAlarmDigitization3Mapper extends BaseMapper<ArdAlarmDigitization3>
{
    /**
     * æŸ¥è¯¢ä¸‰åœºæ•°å­—化报警
ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.alarm.external.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.vo.CountVo;
@@ -12,7 +14,7 @@
 * @author ard
 * @date 2023-07-07
 */
public interface ArdAlarmExternalMapper
public interface ArdAlarmExternalMapper extends BaseMapper<ArdAlarmExternal>
{
    /**
     * æŸ¥è¯¢å¤–联报警
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarFireMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.vo.CountVo;
@@ -13,7 +14,7 @@
 * @author ard
 * @date 2023-09-02
 */
public interface ArdAlarmRadarFireMapper
public interface ArdAlarmRadarFireMapper extends BaseMapper<ArdAlarmRadarFire>
{
    /**
     * æŸ¥è¯¢é›·è¾¾é˜²ç«æŠ¥è­¦
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarMoveMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarMove;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.vo.CountVo;
@@ -13,7 +14,7 @@
 * @author ard
 * @date 2023-09-02
 */
public interface ArdAlarmRadarMoveMapper
public interface ArdAlarmRadarMoveMapper extends BaseMapper<ArdAlarmRadarMove>
{
    /**
     * æŸ¥è¯¢é›·è¾¾ç§»åŠ¨æŠ¥è­¦
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarPumpMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarPump;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.vo.CountVo;
@@ -13,7 +14,7 @@
 * @author ard
 * @date 2023-09-02
 */
public interface ArdAlarmRadarPumpMapper
public interface ArdAlarmRadarPumpMapper extends BaseMapper<ArdAlarmRadarPump>
{
    /**
     * æŸ¥è¯¢é›·è¾¾æŠ½æ²¹æœºåœæœºæŠ¥è­¦
ard-work/src/main/java/com/ruoyi/alarm/steal/mapper/ArdAlarmStealelecMapper.java
@@ -1,5 +1,6 @@
package com.ruoyi.alarm.steal.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.global.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
import com.ruoyi.statistical.param.ESParam;
@@ -8,7 +9,7 @@
import java.util.List;
public interface ArdAlarmStealelecMapper{
public interface ArdAlarmStealelecMapper extends BaseMapper<ArdAlarmStealelec> {
    /**
     * æŸ¥è¯¢ç›—电报警列表
     *
ard-work/src/main/java/com/ruoyi/alarm/tube/mapper/ArdAlarmTubeMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.vo.CountVo;
@@ -14,7 +15,7 @@
 * @author åˆ˜è‹ä¹‰
 * @date 2023-06-06
 */
public interface ArdAlarmTubeMapper
public interface ArdAlarmTubeMapper extends BaseMapper<ArdAlarmTube>
{
    /**
     * æŸ¥è¯¢ç®¡çº¿æ³„露报警
ard-work/src/main/java/com/ruoyi/alarm/wall/mapper/ArdAlarmWallMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarm.apponekey.domain.ArdAlarmApponekey;
import com.ruoyi.alarm.wall.domain.ArdAlarmWall;
import com.ruoyi.statistical.param.ESParam;
@@ -14,7 +15,7 @@
 * @author ard
 * @date 2023-08-31
 */
public interface ArdAlarmWallMapper
public interface ArdAlarmWallMapper extends BaseMapper<ArdAlarmWall>
{
    /**
     * æŸ¥è¯¢ç”µå­å›´æ æŠ¥è­¦
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java
@@ -2,6 +2,7 @@
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.service.StatisticalService;
import com.ruoyi.statistical.vo.NumVo;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -170,4 +171,25 @@
        return Results.succeed(statisticalService.unit());
    }
    /**
     * æŠ¥è­¦æ•°é‡
     */
    @ApiOperation("报警数量")
    @GetMapping("alarm/num")
    public Results num(){
        NumVo numVo = new NumVo();
        numVo.setStealelec(statisticalService.stealelecNum());
        numVo.setCamera(statisticalService.cameraNum());
        numVo.setMove(statisticalService.moveNum());
        numVo.setFire(statisticalService.fireNum());
        numVo.setExternal(statisticalService.externalNum());
        numVo.setAccess(statisticalService.accessNum());
        numVo.setApponekey(statisticalService.apponekeyNum());
        numVo.setPump(statisticalService.pumpNum());
        numVo.setWall(statisticalService.wallNum());
        numVo.setDigitization(statisticalService.digitizationNum());
        numVo.setTube(statisticalService.tubeNum());
        return Results.succeed(numVo);
    }
}
ard-work/src/main/java/com/ruoyi/statistical/service/StatisticalService.java
@@ -44,4 +44,16 @@
    List<CountVo> tubeMonth(ESParam esParam);
    UnitVo unit();
    int stealelecNum();
    int cameraNum();
    int moveNum();
    int fireNum();
    int externalNum();
    int accessNum();
    int apponekeyNum();
    int pumpNum();
    int wallNum();
    int digitizationNum();
    int tubeNum();
}
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
@@ -312,6 +312,61 @@
        return unitVo;
    }
    @Override
    public int stealelecNum() {
        return stealelecMapper.selectCount(null);
    }
    @Override
    public int cameraNum() {
        return cameraMapper.selectCount(null);
    }
    @Override
    public int moveNum() {
        return moveMapper.selectCount(null);
    }
    @Override
    public int fireNum() {
        return fireMapper.selectCount(null);
    }
    @Override
    public int externalNum() {
        return externalMapper.selectCount(null);
    }
    @Override
    public int accessNum() {
        return accessMapper.selectCount(null);
    }
    @Override
    public int apponekeyNum() {
        return apponekeyMapper.selectCount(null);
    }
    @Override
    public int pumpNum() {
        return pumpMapper.selectCount(null);
    }
    @Override
    public int wallNum() {
        return wallMapper.selectCount(null);
    }
    @Override
    public int digitizationNum() {
        return digitization3Mapper.selectCount(null);
    }
    @Override
    public int tubeNum() {
        return tubeMapper.selectCount(null);
    }
    public List<CountVo> es(List<CountVo> list){
        for (int i = 1; i <= 12 ; i++) {
            String month;
ard-work/src/main/java/com/ruoyi/statistical/vo/NumVo.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.statistical.vo;
import lombok.Data;
@Data
public class NumVo {
    private int stealelec;
    private int camera;
    private int move;
    private int fire;
    private int external;
    private int access;
    private int apponekey;
    private int pump;
    private int wall;
    private int digitization;
    private int tube;
}