1

13693261870

2023-04-26 659abe57f755e128e68d0a56bfc473e0baa4260b

 src/main/java/com/yssh/controller/WarningAnalyseController.java

@@ -4,8 +4,10 @@
import io.swagger.annotations.ApiOperation;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -108,4 +110,23 @@

        return Result.OK(list);
    }

    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "根据时间获取报警和预警信息", notes = "根据时间获取报警和预警信息")
    @GetMapping("/getAlarmAndWarnByTime")
    public Result getAlarmAndWarnByTime(
            @RequestParam(value = "begin", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date begin,
            @RequestParam(value = "end", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date end) {
        if (null == begin || null == end) {
            return Result.error(null);
        }

        if (begin.getTime() > end.getTime()) {
            Date tmp = end;
            begin = end;
            end = tmp;
        }

        return Result.OK(warningService.getAlarmAndWarnByTime(begin, end));
    }
}