~liusuyi/ruoyi-api.git

			@@ -6,7 +6,9 @@
			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;
			@@ -20,6 +22,8 @@
			import java.util.List;
			import java.util.Map;

			import static com.ruoyi.common.utils.PageUtils.startPage;

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

			@Resource
			IGlobalAlarmService globalAlarmService;
			@@ -60,14 +64,16 @@
			}
			@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);
			}
			}