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/MilitaryLocalCoordinationController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
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 20817ec..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
@@ -8,6 +8,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.fire.entity.FireSupplementEntity;
import org.springblade.fire.feign.IFireClient;
+import org.springblade.fire.vo.FireSupplementVO;
import org.springblade.modules.dp.service.IMilitaryLocalCoordinationService;
import org.springblade.fire.vo.FireVO;
import org.springblade.system.feign.ISysClient;
@@ -40,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);
}
/**
@@ -49,8 +50,9 @@
*/
@GetMapping("/disasterAssessment")
@ApiOperation(value = "详情", notes = "传入fireSupplement")
- public R<FireSupplementEntity> detail(FireSupplementEntity fireSupplement) {
- return R.data(fireClient.getSupplementOne(fireSupplement));
+ public R<FireSupplementVO> detail(FireSupplementEntity fireSupplement) {
+ FireSupplementVO fireAllDetail = militaryLocalCoordinationService.getFireAllDetail(fireSupplement.getFireId());
+ return R.data(fireAllDetail);
}
/**
--
Gitblit v1.9.3