|
@@ -30,8 +30,8 @@ public class AlarmController {
|
|
|
@RequestMapping(value = "/getAlarm",method = RequestMethod.GET)
|
|
|
public Result getAlarmByFarmIdAndDate(@RequestParam(value = "farmId",required = true) Integer farmId,
|
|
|
@RequestParam(value="alarmType",required=false) Integer alarmType,
|
|
|
- @RequestParam(value = "alarmDate") String alarmDate,
|
|
|
- @RequestParam(value = "pageSize") Integer pageSize,
|
|
|
+ @RequestParam(value = "alarmDate",required=false) String alarmDate,
|
|
|
+ @RequestParam(value = "pageSize",required=false) Integer pageSize,
|
|
|
@RequestParam(value = "pageNo") Integer pageNo) throws ParseException {
|
|
|
log.info("farmId>>"+farmId);
|
|
|
log.info("alarmType>>"+alarmType);
|