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-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
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