From cef4d402f712aa7b42a2347970cc536c59dcc301 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 14 Mar 2023 15:07:12 +0800
Subject: [PATCH] 大屏 远程调用添加错误返回
---
blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java
index 8a2be1c..32dff4f 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java
@@ -5,9 +5,9 @@
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.api.R;
+import org.springblade.fire.feign.IFireClient;
import org.springblade.modules.dp.service.IComprehensiveStatisticsService;
-import org.springblade.modules.fire.service.IFireService;
-import org.springblade.modules.fire.vo.FireVO;
+import org.springblade.fire.vo.FireVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -28,10 +28,10 @@
@Api(value = "综合统计", tags = "综合统计接口")
public class ComprehensiveStatisticsController extends BladeController {
private IComprehensiveStatisticsService comprehensiveStatisticsService;
- private IFireService fireService;
+ private IFireClient fireClient;
/**
- * 数据概览
+ * 数据概览d
*/
@GetMapping("/dataOverview")
@ApiOperation(value = "数据概览", notes = "数据概览")
@@ -58,8 +58,8 @@
@GetMapping("/realtimeFireAlarmIncident")
@ApiOperation(value = "实时火警事件", notes = "实时火警事件")
public R getRealtimeFireAlarmIncident(@RequestParam(name="time", defaultValue="48")String time) {
- List<FireVO> fireList = fireService.getRealtime(time);
- return R.data(fireList);
+// List<FireVO> fireList = fireClient.getRealtime(time);
+ return fireClient.getRealtime(time);
}
/**
--
Gitblit v1.9.3