修改了影像的实体类型，添加了一半的筛选条件

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java

@@ -96,6 +96,9 @@ public class DisasterInfo implements Serializable {
      */
     private Date respondTime;
 
+	@TableField(exist = false)
+	private String name;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java

@@ -145,6 +145,14 @@ public class RemoteSensingSourceData implements Serializable {
      * 数据条目创建时间
      */
     private Date createTime;
+	/**
+	 * 下载链接
+	 */
+	private String downloadUrl;
+	/**
+	 * 来源机构
+	 */
+	private String sourceOrganization;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/HomeDisasterInfo.java

@@ -0,0 +1,8 @@
+package com.kening.vordm.vo;
+
+import com.kening.vordm.entity.DisasterInfo;
+
+
+public class HomeDisasterInfo   extends DisasterInfo {
+	private String organization;
+}

kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java

@@ -0,0 +1,82 @@
+package com.kening.vordm.controller;
+
+import org.springblade.core.mp.support.Query;
+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.service.DisasterInfoService;
+import com.kening.vordm.service.NewsService;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+@RestController
+@RequiredArgsConstructor
+@RequestMapping
+public class DisasterInfoController {
+
+	private final DisasterInfoService disasterInfoService;
+	private final NewsService newsService;
+
+	/**
+	 * 查询条件封装
+	 * @param disasterInfo
+	 * @return
+	 */
+	@GetMapping("/select-condition")
+	public  List<DisasterInfo> getCountryOrTypeOrTime(DisasterInfo disasterInfo){
+		QueryWrapper<DisasterInfo> qw = new QueryWrapper<>();
+		if (disasterInfo.getDisasterType()!=null){
+			qw.like("disaster_type",disasterInfo.getDisasterType());
+		}
+		if (disasterInfo.getDisasterCountry()!=null){
+			qw.like("disaster_country",disasterInfo.getDisasterCountry());
+		}
+		if (disasterInfo.getDisasterTime()!=null){
+			qw.like("disaster_time",disasterInfo.getDisasterTime());
+		}
+		List<DisasterInfo> disasterInfos = disasterInfoService.list(qw);
+		return disasterInfos;
+	}
+	/**
+	 * 灾害id
+	 * @param disasterInfo
+	 * @return
+	 */
+	public List<Long> getDisasterIds(DisasterInfo disasterInfo){
+		List<DisasterInfo> disasterInfos = getCountryOrTypeOrTime(disasterInfo);
+//		List<DisasterInfo> disasterInfos = disasterInfoService.list(Condition.getQueryWrapper(disasterInfo));
+		if (!disasterInfos.isEmpty()){
+			List<Long> ids = new ArrayList<>();
+			disasterInfos.stream().forEach(disasterInfo1 -> {
+				ids.add(disasterInfo1.getId());
+			});
+			return ids;
+		}
+		return null;
+	}
+
+	@GetMapping("/getAllData")
+	public R<List<DisasterInfo>>  getalldata(){
+		return R.data(disasterInfoService.getAllData());
+	}
+	/**
+	 * 指定条件返回数据
+	 * @param query
+	 * @param disasterInfo
+	 * @return
+	 */
+	@GetMapping("/test")
+	public R<IPage<News>> getdata(Query query, DisasterInfo disasterInfo){
+		List<Long> disasterIds = getDisasterIds(disasterInfo);
+		return R.data(newsService.page(Condition.getPage(query),new QueryWrapper<News>().in("disaster_id",disasterIds)));
+	}
+}

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java

@@ -3,6 +3,9 @@ package com.kening.vordm.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kening.vordm.entity.DisasterInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author G1393
@@ -12,5 +15,9 @@ import com.kening.vordm.entity.DisasterInfo;
 */
 public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 
-
+	List<DisasterInfo> getSelectCondition(@Param("disaster_type") String disaster_type,
+										  @Param("disaster_country") String disaster_country,
+										  @Param("disaster_time") String disaster_time,
+										  @Param("name") String name);
+	List<DisasterInfo>  getHomeDisasterInfo();
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml

@@ -31,4 +31,19 @@
         temp_start_time,create_time,vordm_id,
         respond_time
     </sql>
+
+    <select id="getHomeDisasterInfo" parameterType="com.kening.vordm.entity.DisasterInfo">
+        select *
+        from new_vordm.disaster_info
+    </select>
+    <select id="getSelectCondition" parameterType="com.kening.vordm.entity.DisasterInfo">
+        select distinct #{name}  as name
+        from disaster_info
+        where
+            <if test="disaster_type!=null"> disaster_type=#{disaster_type} </if>
+            <if test="disaster_country!=null and (disaster_country!=null or disaster_time!=null)"> and  </if>
+            <if test="disaster_country!=null"> disaster_country=#{disaster_country}  </if>
+            <if test="disaster_time!=null and disaster_country!=null and disaster_time!=null"> and  </if>
+            <if test="disaster_time!=null"> disaster_time like #{disaster_time}</if>
+    </select>
 </mapper>

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml

@@ -36,6 +36,7 @@
         select
         <include refid="Base_Column_List"/>
         from entity_data ed
+        l
         <where>
             <if test="entityData.disasterId != null and entityData.disasterId != ''">
                 ed.disaster_id = #{entityData.disasterId}

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml

@@ -31,6 +31,8 @@
             <result property="lowerLeftLon" column="lower_left_lon" jdbcType="DOUBLE"/>
             <result property="disasterId" column="disaster_id" jdbcType="BIGINT"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="downloadUrl" column="download_url" jdbcType="VARCHAR"/>
+            <result property="sourceOrganization" column="source_organization" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -42,7 +44,7 @@
         upper_left_lon,upper_right_lat,upper_right_lon,
         view_center_lat,view_center_lon,lower_right_lat,
         lower_right_lon,lower_left_lat,lower_left_lon,
-        disaster_id,create_time
+        disaster_id,create_time,download_url,source_organization
     </sql>
 
     <select id="getRemoteSensingSourceData" resultMap="BaseResultMap">

kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java

@@ -4,11 +4,16 @@ package com.kening.vordm.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kening.vordm.entity.DisasterInfo;
 
+import java.util.List;
+
 /**
 * @author G1393
 * @description 针对表【disaster_info(灾害信息表，存储灾害信息)】的数据库操作Service
 * @createDate 2023-04-04 15:54:30
 */
 public interface DisasterInfoService extends IService<DisasterInfo> {
+	List<DisasterInfo>  getAllData();
+
+//	Long   getDisasterId(DisasterInfo disasterInfo);
 
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java

@@ -1,18 +1,37 @@
 package com.kening.vordm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kening.vordm.entity.DisasterInfo;
 import com.kening.vordm.mapper.DisasterInfoMapper;
 import com.kening.vordm.service.DisasterInfoService;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.mp.support.Condition;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author G1393
 * @description 针对表【disaster_info(灾害信息表，存储灾害信息)】的数据库操作Service实现
 * @createDate 2023-04-04 15:54:30
 */
 @Service
+@RequiredArgsConstructor
 public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, DisasterInfo>
 implements DisasterInfoService {
 
+//	public DisasterInfoServiceImpl(DisasterInfoService disasterInfoService) {
+//		this.disasterInfoService = disasterInfoService;
+//	}
+
+	public List<DisasterInfo>  getAllData(){
+		return this.baseMapper.getHomeDisasterInfo();
+	}
+
+//	public  Long getDisasterId(DisasterInfo disasterInfo){
+//		QueryWrapper qw=new QueryWrapper<>(disasterInfo);
+//		Long va=;
+//		return va;
+////	}
 }