From 8be32612a57edfa2cf2e45d77d5d4cd4c300dfdc Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Tue, 25 Apr 2023 09:16:15 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RemoteSensingSourceDataController.java    | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
index e8bbf53..d08f310 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
@@ -28,42 +28,47 @@ public class RemoteSensingSourceDataController {
 
 	/**
 	 * 根据页码和灾害信息查出遥感影像源数据，可多个灾害
+	 *
 	 * @param disasterInfo
 	 * @param query
 	 * @return
 	 */
 	@GetMapping("/SourceData")
-	public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query){
+	public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query) {
 		List<Long> disasterIds = disasterInfoService.getDisasterId(disasterInfo);
-		if (disasterIds.isEmpty()){
+		if (disasterIds.isEmpty()) {
 			return R.data(null);
 		}
-		return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),new QueryWrapper<RemoteSensingSourceData>().in("disaster_id",disasterIds)));
+		return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), new QueryWrapper<RemoteSensingSourceData>().in("disaster_id", disasterIds)));
 	}
 
 	/**
 	 * 实体数据列表信息
+	 *
 	 * @param optionsJson 实体数据条件信息
-	 * @param query  current当前页  size 每页数据量
+	 * @param query       current当前页  size 每页数据量
 	 * @return
 	 */
 	@GetMapping("/Condition")
-	public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceDataByCondition( String optionsJson, Query query) {
+	public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceDataByCondition(String optionsJson, Query query) {
 		RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData();
-		if (optionsJson!=null){
-			remoteSensingSourceData = (RemoteSensingSourceData)JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
+		if (optionsJson != null) {
+			remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
 		}
 		return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData));
 	}
 
 	/**
 	 * 实体数据列表信息
-	 *  @param params
-	 * 	@param query
-	 * 	@return
+	 *
+	 * @param disasterId
+	 * @param query
+	 * @return
 	 */
 	@GetMapping("/PagesData")
-	public R<IPage<RemoteSensingSourceData>> Pages(@RequestParam Map<String,Object> params, Query query){
-		return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(params,RemoteSensingSourceData.class)));
+	public R<IPage<RemoteSensingSourceData>> pages(Query query, String disasterId) {
+		QueryWrapper<RemoteSensingSourceData> qw = new QueryWrapper<>();
+		qw.eq("disaster_id", disasterId);
+		return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), qw));
 	}
 }