|
@@ -31,66 +31,95 @@ public class RtAnalogDataController {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 重载/轻载/正常
|
|
* 重载/轻载/正常
|
|
|
|
+ *
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@GetMapping("count")
|
|
@GetMapping("count")
|
|
- public ApiResult<RadCountVO> getCount(){
|
|
|
|
|
|
+ public ApiResult<RadCountVO> getCount() {
|
|
return ApiResult.success(rtAnalogDataService.selectCount());
|
|
return ApiResult.success(rtAnalogDataService.selectCount());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* 查看实时数据详情
|
|
* 查看实时数据详情
|
|
|
|
+ *
|
|
* @param siteId 站点id
|
|
* @param siteId 站点id
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@GetMapping("one")
|
|
@GetMapping("one")
|
|
- public ApiResult<List<Map<String,Object>>> getOne(@RequestParam Integer siteId){
|
|
|
|
|
|
+ public ApiResult<List<Map<String, Object>>> getOne(@RequestParam Integer siteId) {
|
|
return ApiResult.success(rtAnalogDataService.getOne(siteId));
|
|
return ApiResult.success(rtAnalogDataService.getOne(siteId));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 实时负荷
|
|
* 实时负荷
|
|
|
|
+ *
|
|
* @param siteId 站点id
|
|
* @param siteId 站点id
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@GetMapping("epLoad")
|
|
@GetMapping("epLoad")
|
|
- public ApiResult<Double> getEpLoad(Integer siteId){
|
|
|
|
|
|
+ public ApiResult<Double> getEpLoad(Integer siteId) {
|
|
return ApiResult.success(rtAnalogDataService.getEpLoad(siteId));
|
|
return ApiResult.success(rtAnalogDataService.getEpLoad(siteId));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* 电能质量(实时评分)
|
|
* 电能质量(实时评分)
|
|
|
|
+ *
|
|
* @param deviceCode 设备编号
|
|
* @param deviceCode 设备编号
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@GetMapping("realScore")
|
|
@GetMapping("realScore")
|
|
- public ApiResult<RealScoreVO> realScore(@RequestParam String deviceCode){
|
|
|
|
|
|
+ public ApiResult<RealScoreVO> realScore(@RequestParam String deviceCode) {
|
|
return ApiResult.success(rtAnalogDataService.realScore(deviceCode));
|
|
return ApiResult.success(rtAnalogDataService.realScore(deviceCode));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 伍继PC1.0-数据报表
|
|
|
|
+ *
|
|
|
|
+ * @param siteId 站点ID
|
|
|
|
+ * @param startTime 开始时间
|
|
|
|
+ * @param endTime 结束时间
|
|
|
|
+ * @param queryType 类型 日 月 年
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@RequestMapping("DataReport")
|
|
@RequestMapping("DataReport")
|
|
- public ApiResult<List<Map<String,Object>>> getDataReport(@RequestParam Integer siteId,
|
|
|
|
- @RequestParam(required = false) Date startTime,
|
|
|
|
- @RequestParam(required = false) Date endTime,
|
|
|
|
- @RequestParam(required = true) String queryType){
|
|
|
|
- return ApiResult.success(rtAnalogDataService.getDataReport(siteId,startTime,endTime,queryType));
|
|
|
|
|
|
+ public ApiResult<List<Map<String, Object>>> getDataReport(@RequestParam Integer siteId,
|
|
|
|
+ @RequestParam(required = false) Date startTime,
|
|
|
|
+ @RequestParam(required = false) Date endTime,
|
|
|
|
+ @RequestParam(required = true) String queryType) {
|
|
|
|
+ return ApiResult.success(rtAnalogDataService.getDataReport(siteId, startTime, endTime, queryType));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 伍继PC1.0-历史趋势数据查询
|
|
|
|
+ * @param siteId 站点ID
|
|
|
|
+ * @param startTime 开始时间
|
|
|
|
+ * @param endTime 结束时间
|
|
|
|
+ * @param queryType 类型 日 月 年
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@RequestMapping("HistoricalCurve")
|
|
@RequestMapping("HistoricalCurve")
|
|
- public ApiResult<List<Map<String,Object>>> getHistoricalCurve(@RequestParam Integer siteId,
|
|
|
|
- @RequestParam(required = false) Date startTime,
|
|
|
|
- @RequestParam(required = false) Date endTime,
|
|
|
|
- @RequestParam(required = true) String queryType){
|
|
|
|
- return ApiResult.success(rtAnalogDataService.getHistoricalCurve(siteId,startTime,endTime,queryType));
|
|
|
|
|
|
+ public ApiResult<List<Map<String, Object>>> getHistoricalCurve(@RequestParam Integer siteId,
|
|
|
|
+ @RequestParam(required = false) Date startTime,
|
|
|
|
+ @RequestParam(required = false) Date endTime,
|
|
|
|
+ @RequestParam(required = true) String queryType) {
|
|
|
|
+ return ApiResult.success(rtAnalogDataService.getHistoricalCurve(siteId, startTime, endTime, queryType));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 伍继PC1.0-数据报表导出
|
|
|
|
+ * @param siteId 站点ID
|
|
|
|
+ * @param startTime 开始时间
|
|
|
|
+ * @param endTime 结束时间
|
|
|
|
+ * @param queryType 类型 日 月 年
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@GetMapping("/DataReportExport")
|
|
@GetMapping("/DataReportExport")
|
|
public ApiResult<String> export(@RequestParam Integer siteId,
|
|
public ApiResult<String> export(@RequestParam Integer siteId,
|
|
@RequestParam(required = false) Date startTime,
|
|
@RequestParam(required = false) Date startTime,
|
|
@RequestParam(required = false) Date endTime,
|
|
@RequestParam(required = false) Date endTime,
|
|
- @RequestParam(required = true) String queryType){
|
|
|
|
- return ApiResult.success(rtAnalogDataService.DataReportExport(siteId,startTime,endTime,queryType));
|
|
|
|
|
|
+ @RequestParam(required = true) String queryType) {
|
|
|
|
+ return ApiResult.success(rtAnalogDataService.DataReportExport(siteId, startTime, endTime, queryType));
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|