报警点位数量推送增加一层map 增加通用光电报警数量推送

‘liusuyi’

2023-06-25 1aad56563c6861e13f3a837eb7ef410723cc2358

 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java

@@ -358,18 +358,22 @@
     * @修改人和其它信息
     */
    @Override
    public Map<String, Integer> selectAlarmLogsCount() {
    public Map<String, Object> selectAlarmLogsCount() {
        Map<String,Object> map=new HashMap<>();
        Map<String, Integer> countMap = new HashMap<>();
        String refreshTime = configService.selectConfigByKey("refreshTime");
        int count1001 = ardAlarmStealelecMapper.selectCountByStartTime(refreshTime);
        countMap.put("1001", count1001);
        int count1014 = ardAlarmTubeMapper.selectCountByStartTime(refreshTime);
        countMap.put("1014 ", count1014);
        return countMap;
        int count1002 = ardAlarmCameraMapper.selectCountByAlarmTime(refreshTime);
        countMap.put("1002", count1002);
        int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
        countMap.put("1014", count1014);
        map.put("20000",countMap);
        return map;
    }

    @Override
    public Object selectAlarmList(Integer command, String beginTime, String endTime) {
    public Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
        Map<String, Object> params = new HashMap<>();
        params.put("beginTime", beginTime);
        params.put("endTime", endTime);
@@ -377,15 +381,46 @@
            case 1001:
                ArdAlarmStealelec aas = new ArdAlarmStealelec();
                aas.setParams(params);
                aas.setPageNum(pageNum);
                aas.setPageSize(pageSize);
                List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
                return ardAlarmStealelecs;

            case 1002:
                ArdAlarmCamera aac = new ArdAlarmCamera();
                aac.setParams(params);
                aac.setPageNum(pageNum);
                aac.setPageSize(pageSize);
                List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
                return ardAlarmCameras;
            case 1014:
                ArdAlarmTube aat = new ArdAlarmTube();
                aat.setParams(params);
                aat.setPageNum(pageNum);
                aat.setPageSize(pageSize);
                List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
                return ardAlarmTubes;
        }
        return null;
    }
    public static void main(String[] args) {
        // 给定坐标 A
        double Ax = 0;
        double Ay = 0;

        // 给定角度（以度为单位）
        double angle = 45;

        // 给定距离
        double distance = 1.414;

        // 将角度转换为弧度
        double radians = Math.toRadians(angle);

        // 计算 B 坐标
        double Bx = Ax + distance * Math.cos(radians);
        double By = Ay + distance * Math.sin(radians);

        // 输出结果
        System.out.println("坐标 B: (" + Bx + ", " + By + ")");
    }
}