From 2c6c1bef7406c4fac77505c2fcc5ba24443da055 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 14 Mar 2023 10:20:08 +0800
Subject: [PATCH] 大屏 灾后评估接口修改

---
 blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java                           |   36 ++++++++++++++++++++++++++++++++++++
 blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/IMilitaryLocalCoordinationService.java         |    9 ++++++++-
 blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java |    9 ++-------
 blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java    |    6 ++++--
 4 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java
index c89f64a..1cc9937 100644
--- a/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java
@@ -31,4 +31,40 @@
 public class FireSupplementVO extends FireSupplementEntity {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 报告单位
+	 */
+	private String reportDept;
+	/**
+	 * 填报人
+	 */
+	private String writeReportPerson;
+	/**
+	 * 火灾发生时间
+	 */
+	private String alarmTime;
+	/**
+	 * 经度
+	 */
+	private String lon;
+	/**
+	 * 纬度
+	 */
+	private String lat;
+	/**
+	 * 省
+	 */
+	private String province;
+	/**
+	 * 市
+	 */
+	private String city;
+	/**
+	 * 县/区
+	 */
+	private String district;
+	/**
+	 * 伤亡人数合计
+	 */
+	private String sumInjuryPerson;
 }
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..870f334 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;
@@ -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);
 	}
 
 	/**
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/IMilitaryLocalCoordinationService.java b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/IMilitaryLocalCoordinationService.java
index 227af4b..1f39f6e 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/IMilitaryLocalCoordinationService.java
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/IMilitaryLocalCoordinationService.java
@@ -1,5 +1,7 @@
 package org.springblade.modules.dp.service;
 
+import org.springblade.fire.vo.FireSupplementVO;
+
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.List;
@@ -14,5 +16,10 @@
 	 */
 	HashMap<String, List<HashMap<String, String>>> getSurroundingQueryList(String lon,String lat,String distance);
 
-	void getFireAllDetail(String fireId, HttpServletResponse response);
+	/**
+	 * 获取vo详情
+	 * @param fireId
+	 * @return
+	 */
+	FireSupplementVO getFireAllDetail(String fireId);
 }
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java
index 4ea0bc1..dc8ba64 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java
@@ -33,13 +33,8 @@
 	}
 
 	@Override
-	public void getFireAllDetail(String fireId, HttpServletResponse response){
+	public FireSupplementVO getFireAllDetail(String fireId){
 		FireSupplementVO fireAllDetail = militaryLocalCoordinationMapper.getFireAllDetail(fireId);
-
-	}
-
-
-
-	public void excelExport(String fileName,HttpServletResponse response,List data) throws IOException {
+		return fireAllDetail;
 	}
 }

--
Gitblit v1.9.3