aijinhui
2023-10-10 f1cb7ec004323b02c85e3d205ba21ffceec8df65
报警优化
已修改3个文件
68 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/vo/TenVo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java
@@ -3,6 +3,7 @@
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.service.StatisticalService;
import com.ruoyi.statistical.vo.NumVo;
import com.ruoyi.statistical.vo.TenVo;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -10,7 +11,9 @@
import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
/**
@@ -177,19 +180,52 @@
    @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);
        List<TenVo> tenVo = new ArrayList<>();
        TenVo stealelec = new TenVo();
        stealelec.setName("盗电报警");
        stealelec.setValue(statisticalService.stealelecNum());
        tenVo.add(stealelec);
        TenVo camera = new TenVo();
        camera.setName("通用光电");
        camera.setValue(statisticalService.cameraNum());
        tenVo.add(camera);
        TenVo move = new TenVo();
        move.setName("雷达移动");
        move.setValue(statisticalService.moveNum());
        tenVo.add(move);
        TenVo fire = new TenVo();
        fire.setName("雷达防火");
        fire.setValue(statisticalService.fireNum());
        tenVo.add(fire);
        TenVo external = new TenVo();
        external.setName("外联报警");
        external.setValue(statisticalService.externalNum());
        tenVo.add(external);
        TenVo access = new TenVo();
        access.setName("门禁报警");
        access.setValue(statisticalService.accessNum());
        tenVo.add(access);
        TenVo apponekey = new TenVo();
        apponekey.setName("移动终端");
        apponekey.setValue(statisticalService.apponekeyNum());
        tenVo.add(apponekey);
        TenVo pump = new TenVo();
        pump.setName("雷达停机");
        pump.setValue(statisticalService.pumpNum());
        tenVo.add(pump);
        TenVo wall = new TenVo();
        wall.setName("电子围栏");
        wall.setValue(statisticalService.wallNum());
        tenVo.add(wall);
        TenVo digitization = new TenVo();
        digitization.setName("预警报警");
        digitization.setValue(statisticalService.digitizationNum());
        tenVo.add(digitization);
        TenVo tube = new TenVo();
        tube.setName("管线泄露");
        tube.setValue(statisticalService.tubeNum());
        tenVo.add(tube);
        return Results.succeed(tenVo);
    }
    /**
ard-work/src/main/java/com/ruoyi/statistical/vo/TenVo.java
@@ -5,5 +5,5 @@
@Data
public class TenVo {
    private String name;
    private String num;
    private Integer value;
}
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -179,7 +179,7 @@
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
    <select id="ten" resultType="com.ruoyi.statistical.vo.TenVo">
        SELECT name,count(name) num from ard_alarm_radar_move
        where (current_timestamp - interval '1024 hour') &lt;= alarm_time GROUP BY name ORDER BY num desc LIMIT 10
        SELECT name,count(name) as "value" from ard_alarm_radar_move
        where (current_timestamp - interval '1024 hour') &lt;= alarm_time GROUP BY name ORDER BY "value" desc LIMIT 10
    </select>
</mapper>