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 | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 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 5936405..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
@@ -1,23 +1,18 @@
package org.springblade.modules.dp.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
+import org.springblade.core.mp.support.BladePage;
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.modules.fire.service.IFireService;
-import org.springblade.modules.fire.vo.FireVO;
-import org.springblade.modules.fireSupplement.entity.FireSupplementEntity;
-import org.springblade.modules.fireSupplement.service.IFireSupplementService;
-import org.springblade.system.dto.DeptDTO;
+import org.springblade.fire.vo.FireVO;
import org.springblade.system.feign.ISysClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
@@ -34,20 +29,20 @@
@RequestMapping("dp/militaryLocalCoordination")
@Api(value = "军地协同", tags = "军地协同接口")
public class MilitaryLocalCoordinationController extends BladeController {
- private final IFireService fireService;
- private final IFireSupplementService fireSupplementService;
private final IMilitaryLocalCoordinationService militaryLocalCoordinationService;
private final ISysClient sysClient;
+ private final IFireClient fireClient;
+
/**
* 火警事件
*/
@GetMapping("/fireAlarmIncident")
@ApiOperation(value = "火警事件", notes = "火警事件")
- public R<IPage<FireVO>> getEarlyWarningLedger(FireVO fire, Query query) {
- IPage<FireVO> pages = fireService.selectFirePage(Condition.getPage(query), fire);
- return R.data(pages);
+ public R<BladePage<FireVO>> getEarlyWarningLedger(FireVO fire, @RequestParam Integer current, @RequestParam Integer size) {
+// BladePage<FireVO> pages = fireClient.selectFirePage(current,size, fire);
+ return fireClient.selectFirePage(current,size, fire);
}
/**
@@ -55,9 +50,9 @@
*/
@GetMapping("/disasterAssessment")
@ApiOperation(value = "详情", notes = "传入fireSupplement")
- public R<FireSupplementEntity> detail(FireSupplementEntity fireSupplement) {
- FireSupplementEntity detail = fireSupplementService.getOne(Condition.getQueryWrapper(fireSupplement));
- return R.data(detail);
+ public R<FireSupplementVO> detail(FireSupplementEntity fireSupplement) {
+ FireSupplementVO fireAllDetail = militaryLocalCoordinationService.getFireAllDetail(fireSupplement.getFireId());
+ return R.data(fireAllDetail);
}
/**
@@ -89,6 +84,6 @@
@GetMapping("export-fire-report")
@ApiOperation(value = "导出火灾报告", notes = "传入火灾id")
public void exportUser(String fireId,HttpServletResponse response) {
- militaryLocalCoordinationService.getFireAllDetail(fireId,response);
+// militaryLocalCoordinationService.getFireAllDetail(fireId,response);
}
}
--
Gitblit v1.9.3