diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index ec424fc..0a20ecd 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -2,10 +2,13 @@ package com.kening.vordm.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kening.vordm.entity.DisasterInfo;
 import com.kening.vordm.entity.News;
+import com.kening.vordm.entity.PictureInfo;
 import com.kening.vordm.service.DisasterInfoService;
 import com.kening.vordm.service.NewsService;
+import com.kening.vordm.service.PictureInfoService;
 import com.kening.vordm.vo.DisasterMangerInfo;
 import com.kening.vordm.vo.GroupByUse;
 import lombok.RequiredArgsConstructor;
@@ -26,7 +29,38 @@ public class DisasterInfoController {
 
 	private final DisasterInfoService disasterInfoService;
 	private final NewsService newsService;
+	private final PictureInfoService pictureInfoService;
 
+	/**
+	 * 首页数据，轮播和定位相关
+	 * @return
+	 */
+	@GetMapping("/indexData")
+	public R<List<DisasterInfo>> indexData(){
+		return R.data(disasterInfoService.list(Wrappers.<DisasterInfo>lambdaQuery()
+			.eq(DisasterInfo::getRespondStatus,2)));
+	}
+
+	@GetMapping("/getPicInfoByDisasterId")
+	public R<List<PictureInfo>> getPicInfoByDisasterInfoId(Long disasterId){
+		return R.data(pictureInfoService.list(Wrappers.<PictureInfo>lambdaQuery()
+			.eq(PictureInfo::getDisasterId,disasterId)));
+	}
+
+	/**
+	 * 灾害查询条件，时间，类型，灾害联动
+	 * @param disasterInfo
+	 * @return
+	 */
+	@GetMapping("/selectCondition")
+	public R<List<GroupByUse>> getSelectCondition1(DisasterInfo disasterInfo){
+		String disaster_time=null;
+		if (disasterInfo.getDisasterTime()!=null){
+			disaster_time=disasterInfo.getDisasterTime().toString();
+		}
+		return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(),disasterInfo.getDisasterCountry(),disaster_time,disasterInfo.getName()
+		));
+	}
 
 	/**
 	 * 灾害查询条件，时间，类型，灾害联动