|
@@ -48,14 +48,12 @@ public class ScadaController extends BaseController {
|
|
|
@Autowired
|
|
|
private StatisticsScadaService statisticsScadaService;
|
|
|
|
|
|
- @ToFlyAppLog(title = "查询最新SCADA所有数据")
|
|
|
@ApiOperation(value = "查询最新SCADA所有数据")
|
|
|
@PostMapping("/all")
|
|
|
public ResultRespone getData() {
|
|
|
return decide(scadaService.getListData());
|
|
|
}
|
|
|
|
|
|
- @ToFlyAppLog(title = "根据设备指标查询最新SCADA所有数据")
|
|
|
@ApiOperation(value = "根据设备指标查询最新SCADA所有数据")
|
|
|
@PostMapping("/app/data")
|
|
|
public ResultRespone getAppData(@RequestBody(required = false) DeviceQuery deviceQuery) {
|
|
@@ -63,7 +61,6 @@ public class ScadaController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
- @ToFlyAppLog(title = "分页查询统计SCADA数据")
|
|
|
@ApiOperation(value = "分页查询统计SCADA数据")
|
|
|
@GetMapping("/page")
|
|
|
public ResultRespone getMonthsData(Page page, ScadaQuery scadaQuery,
|
|
@@ -77,7 +74,6 @@ public class ScadaController extends BaseController {
|
|
|
|
|
|
}
|
|
|
|
|
|
- @ToFlyAppLog(title = "SCADA数据导出")
|
|
|
@ApiOperation(value = "分页查询统计SCADA数据")
|
|
|
@GetMapping("/export")
|
|
|
public void export(Page page, ScadaQuery scadaQuery,
|
|
@@ -102,7 +98,6 @@ public class ScadaController extends BaseController {
|
|
|
|
|
|
|
|
|
|
|
|
- @ToFlyAppLog(title = "趋势分析统计SCADA数据")
|
|
|
@ApiOperation(value = "趋势分析统计SCADA数据")
|
|
|
@GetMapping("/trend/page")
|
|
|
public ResultRespone geTrendData(Page page, ScadaQuery scadaQuery,
|
|
@@ -117,7 +112,6 @@ public class ScadaController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
- @ToFlyAppLog(title = "手动更新范围数据,小时,天,月,年,注意时间格式")
|
|
|
@ApiOperation(value = "手动更新范围数据,小时,天,月,年,注意时间格式")
|
|
|
@PostMapping("/data/fetch")
|
|
|
public ResultRespone fetchData(@ApiParam("code编码,非必传,多个逗号隔开") @RequestParam(required = false) String code,
|
|
@@ -137,7 +131,6 @@ public class ScadaController extends BaseController {
|
|
|
return decide("更新正在进行中...请稍后再查看结果");
|
|
|
}
|
|
|
|
|
|
- @ToFlyAppLog(title="手动同步指定日期范围内每天/每月/每年的数据,注意时间格式,只需要年月日" )
|
|
|
@ApiOperation(value = "手动同步指定日期范围内每天的数据,注意时间格式,只需要年月日")
|
|
|
@PostMapping("/syncDataRangeComm")
|
|
|
public ResultRespone syncDataComm(
|
|
@@ -179,7 +172,6 @@ public class ScadaController extends BaseController {
|
|
|
}*/
|
|
|
|
|
|
|
|
|
- @ToFlyAppLog(title = "手动更新虚拟表数据")
|
|
|
@ApiOperation(value = "手动更新虚拟表数据")
|
|
|
@PutMapping("/xn/fetch")
|
|
|
@Async
|
|
@@ -203,7 +195,6 @@ public class ScadaController extends BaseController {
|
|
|
* @param scadaMoreQuery scada历史表
|
|
|
* @return ResultData
|
|
|
*/
|
|
|
- @ToFlyAppLog(title="批量新增scada历史数据" )
|
|
|
@ApiOperation(value = "批量新增scada历史数据")
|
|
|
@PostMapping("/insertBacthHistoryTemp")
|
|
|
public ResultRespone insertBacthHistoryTemp(@RequestBody ScadaMoreQuery scadaMoreQuery) {
|
|
@@ -222,7 +213,6 @@ public class ScadaController extends BaseController {
|
|
|
|
|
|
@GetMapping("/viewScadaData")
|
|
|
@ApiOperation(value = "查询SCADA指标数据")
|
|
|
- @ToFlyAppLog(title = "查询SCADA指标数据")
|
|
|
public ResultRespone viewScadaData(CustomDisplayDto dto){
|
|
|
try {
|
|
|
return ResultRespone.success(scadaService.viewScadaData(dto));
|
|
@@ -234,7 +224,6 @@ public class ScadaController extends BaseController {
|
|
|
|
|
|
@GetMapping("/viewScadaDataNew")
|
|
|
@ApiOperation(value = "查询SCADA指标数据New")
|
|
|
- @ToFlyAppLog(title = "查询SCADA指标数据New")
|
|
|
public ResultRespone viewScadaDataNew(Page page,CustomDisplayDto dto){
|
|
|
try {
|
|
|
return ResultRespone.success(scadaService.viewScadaDataNew(page,dto));
|