|
@@ -2,7 +2,9 @@ package com.huaxu.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
+import com.huaxu.dto.AlarmSettingDto;
|
|
import com.huaxu.entity.AlarmSetting;
|
|
import com.huaxu.entity.AlarmSetting;
|
|
|
|
+import com.huaxu.entity.GisSetting;
|
|
import com.huaxu.model.AjaxMessage;
|
|
import com.huaxu.model.AjaxMessage;
|
|
import com.huaxu.model.LoginUser;
|
|
import com.huaxu.model.LoginUser;
|
|
import com.huaxu.model.Pagination;
|
|
import com.huaxu.model.Pagination;
|
|
@@ -82,7 +84,7 @@ public class AlarmSettingController {
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
- * 根据机构查询Gis设置数据
|
|
|
|
|
|
+ * 根据id查询报警设置数据
|
|
*
|
|
*
|
|
* @param id
|
|
* @param id
|
|
* @return
|
|
* @return
|
|
@@ -96,4 +98,27 @@ public class AlarmSettingController {
|
|
AlarmSetting result = alarmSettingService.selectById(id);
|
|
AlarmSetting result = alarmSettingService.selectById(id);
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
return new AjaxMessage<>(ResultStatus.OK, result);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 分页查询报警设置数据
|
|
|
|
+ *
|
|
|
|
+ * @param attributeName 报警参数
|
|
|
|
+ * @param sceneId 场景id
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @RequestMapping(value = "selectPage", method = RequestMethod.GET)
|
|
|
|
+ @ApiOperation(value = "分页查询报警设置数据")
|
|
|
|
+ public AjaxMessage<Pagination<AlarmSettingDto>> selectPage(
|
|
|
|
+ @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
|
|
|
|
+ @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
|
|
|
|
+ @ApiParam(value = "报警参数", required = false) @RequestParam(required = false) String attributeName,
|
|
|
|
+ @ApiParam(value = "场景id", required = false) @RequestParam(required = false) Integer sceneId) {
|
|
|
|
+ AlarmSettingDto alarmSettingDto=new AlarmSettingDto();
|
|
|
|
+ alarmSettingDto.setAttributeName(attributeName);
|
|
|
|
+ alarmSettingDto.setSceneId(sceneId);
|
|
|
|
+ IPage<AlarmSettingDto> iPage = new Page<>(pageNum, pageSize);
|
|
|
|
+ iPage = alarmSettingService.selectPage(iPage, alarmSettingDto);
|
|
|
|
+ Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);
|
|
|
|
+ return new AjaxMessage<>(ResultStatus.OK, pages);
|
|
|
|
+ }
|
|
}
|
|
}
|