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

‘liusuyi’

2023-06-25 1aad56563c6861e13f3a837eb7ef410723cc2358

 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java

@@ -6,17 +6,15 @@
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -32,7 +30,7 @@
@Api(tags = "报警数据汇总接口")
@ApiSupport(author = "刘苏义")
@Anonymous
public class GlobalAlarmController {
public class GlobalAlarmController extends BaseController {

    @Resource
    IGlobalAlarmService globalAlarmService;
@@ -55,19 +53,21 @@
    @ApiOperation(value = "查看报警点数量",notes = "查询刷新时间内报警的点位数量")
    @ApiOperationSupport(order = 2)
    public AjaxResult  countAlarmLog() {
        Map<String, Integer> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
        Map<String, Object> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
        return AjaxResult.success(stringIntegerMap);
    }
    @GetMapping("/List")
    @ApiOperation(value = "历史报警聚合接口",notes = "通过command和时间查询历史数据")
    @ApiOperationSupport(includeParameters = {"command","beginTime","endTime"},order = 4)
    @ApiImplicitParams({
            @ApiImplicitParam(name="command",value="报警标识",dataType="integer",paramType="query",example="1001",required=true),
            @ApiImplicitParam(name="beginTime",value="开始时间",dataType="string",paramType="query",example="2023-06-15 00:00:00",required=true),
            @ApiImplicitParam(name="endTime",value="结束时间",dataType="string",paramType="query",example="2023-06-15 14:18:23",required=true),
            @ApiImplicitParam(name="pageNum",value="页码",dataType="integer",paramType="query",example="1",required=true),
            @ApiImplicitParam(name="pageSize",value="页数量",dataType="integer",paramType="query",example="10",required=true)
    })
    public AjaxResult selectAlarmList(Integer command, String beginTime,String endTime) {
        Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime);
        return AjaxResult.success(alarmList);
    public TableDataInfo selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
        startPage();
        Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime, pageNum, pageSize);
        return getDataTable((List)alarmList);
    }
}