‘liusuyi’
2023-06-24 e7df7449145d70bbc4504e399f7e26e93c74a78b
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
@@ -8,9 +8,15 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
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 +38,7 @@
    IGlobalAlarmService globalAlarmService;
    @PostMapping("/List")
    @ApiOperation(value = "报警查询接口",notes = "这里包含了所有报警类型的数据")
    @ApiOperation(value = "实时报警聚合接口",notes = "按报警刷新时间聚合查询")
    @ApiOperationSupport(includeParameters = {"command"},order = 1)
    public AjaxResult selectAlarmLog(@RequestBody GlobalAlarmCondition condition) {
        List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogs(condition);
@@ -52,4 +58,16 @@
        Map<String, Integer> 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),
    })
    public AjaxResult selectAlarmList(Integer command, String beginTime,String endTime) {
        Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime);
        return AjaxResult.success(alarmList);
    }
}