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-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClient.java | 9 ++--
blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java | 6 +-
blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClientFallback.java | 32 ++++++++++++++++
blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java | 4 +-
blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java | 12 +++---
5 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClient.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClient.java
index 3c98395..3aa75f7 100644
--- a/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClient.java
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClient.java
@@ -21,7 +21,8 @@
* @author guoshilong
*/
@FeignClient(
- value = "blade-fire"
+ value = "blade-fire",
+ fallback = IFireClientFallback.class
)
public interface IFireClient {
String API_PREFIX = "/client";
@@ -29,13 +30,13 @@
String FIRE_ALARM_INCIDENT = API_PREFIX + "/fireAlarmIncident";
@GetMapping(REAL_TIME)
- List<FireVO> getRealtime(@RequestParam("time") String time);
+ R<List<FireVO>> getRealtime(@RequestParam("time") String time);
@PostMapping(FIRE_ALARM_INCIDENT)
- BladePage<FireVO> selectFirePage(@RequestParam("current") Integer current, @RequestParam("size") Integer size, @RequestBody FireVO fire);
+ R<BladePage<FireVO>> selectFirePage(@RequestParam("current") Integer current, @RequestParam("size") Integer size, @RequestBody FireVO fire);
String DISASTER_ASSESSMENT =API_PREFIX + "/disasterAssessment";
@PostMapping(DISASTER_ASSESSMENT)
- FireSupplementEntity getSupplementOne(@RequestBody FireSupplementEntity fireSupplementEntity);
+ R<FireSupplementEntity> getSupplementOne(@RequestBody FireSupplementEntity fireSupplementEntity);
}
diff --git a/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClientFallback.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClientFallback.java
new file mode 100644
index 0000000..10f97eb
--- /dev/null
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClientFallback.java
@@ -0,0 +1,32 @@
+package org.springblade.fire.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.tool.api.R;
+import org.springblade.fire.entity.FireSupplementEntity;
+import org.springblade.fire.vo.FireVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Feign失败配置
+ *
+ * @author guoshilong
+ */
+@Component
+public class IFireClientFallback implements IFireClient{
+ @Override
+ public R<List<FireVO>> getRealtime(String time) {
+ return R.fail("获取数据失败");
+ }
+
+ @Override
+ public R<BladePage<FireVO>> selectFirePage(Integer current, Integer size, FireVO fire) {
+ return R.fail("获取数据失败");
+ }
+
+ @Override
+ public R<FireSupplementEntity> getSupplementOne(FireSupplementEntity fireSupplementEntity) {
+ return R.fail("获取数据失败");
+ }
+}
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 fca494b..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
@@ -31,7 +31,7 @@
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 = fireClient.getRealtime(time);
- return R.data(fireList);
+// List<FireVO> fireList = fireClient.getRealtime(time);
+ return fireClient.getRealtime(time);
}
/**
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java
index 870f334..cb65886 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java
@@ -41,8 +41,8 @@
@GetMapping("/fireAlarmIncident")
@ApiOperation(value = "火警事件", notes = "火警事件")
public R<BladePage<FireVO>> getEarlyWarningLedger(FireVO fire, @RequestParam Integer current, @RequestParam Integer size) {
- BladePage<FireVO> pages = fireClient.selectFirePage(current,size, fire);
- return R.data(pages);
+// BladePage<FireVO> pages = fireClient.selectFirePage(current,size, fire);
+ return fireClient.selectFirePage(current,size, fire);
}
/**
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java
index 1092839..00a6809 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java
@@ -33,24 +33,24 @@
@Override
@GetMapping(REAL_TIME)
- public List<FireVO> getRealtime(String time) {
- return fireService.getRealtime(time);
+ public R<List<FireVO>> getRealtime(String time) {
+ return R.data(fireService.getRealtime(time));
}
@Override
@PostMapping(FIRE_ALARM_INCIDENT)
- public BladePage<FireVO> selectFirePage(@RequestParam("current") Integer current,@RequestParam("size") Integer size, @RequestBody FireVO fire) {
+ public R<BladePage<FireVO>> selectFirePage(@RequestParam("current") Integer current,@RequestParam("size") Integer size, @RequestBody FireVO fire) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
IPage<FireVO> fireVOIPage = fireService.selectFirePage(Condition.getPage(query), fire);
- return BladePage.of(fireVOIPage);
+ return R.data(BladePage.of(fireVOIPage));
}
@Override
@PostMapping(DISASTER_ASSESSMENT)
- public FireSupplementEntity getSupplementOne(@RequestBody FireSupplementEntity fireSupplementEntity) {
+ public R<FireSupplementEntity> getSupplementOne(@RequestBody FireSupplementEntity fireSupplementEntity) {
FireSupplementEntity one = fireSupplementService.getOne(Condition.getQueryWrapper(fireSupplementEntity));
- return one;
+ return R.data(one);
}
}
--
Gitblit v1.9.3