代码提交

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

@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.List;
 @RestController
 @RequiredArgsConstructor
-@RequestMapping
+@RequestMapping("/ui/disasterInfo")
 public class DisasterInfoController {
 
 	private final DisasterInfoService disasterInfoService;
@@ -79,4 +79,15 @@ public class DisasterInfoController {
 		List<Long> disasterIds = getDisasterIds(disasterInfo);
 		return R.data(newsService.page(Condition.getPage(query),new QueryWrapper<News>().in("disaster_id",disasterIds)));
 	}
+
+	/**
+	 * 获取债害详情信息
+	 * @param id
+	 * @return
+	 */
+	@GetMapping("/getDisasterInfoDetail")
+	public R<DisasterInfo> getDisasterInfoDetail(Long id){
+		return R.data(disasterInfoService.getDisasterInfoDetail(id));
+	}
+
 }

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

@@ -3,6 +3,7 @@ package com.kening.vordm.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kening.vordm.entity.DisasterInfo;
+import com.kening.vordm.entity.News;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,4 +21,11 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 										  @Param("disaster_time") String disaster_time,
 										  @Param("name") String name);
 	List<DisasterInfo>  getHomeDisasterInfo();
+
+	/**
+	 * 获取债害详情信息
+	 * @param id
+	 * @return
+	 */
+	DisasterInfo getDisasterInfoDetail(@Param("id") Long id);
 }

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

@@ -24,12 +24,12 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,disaster_type,disaster_keyword,
+        di.id ,di.disaster_type,di.disaster_keyword,
-        disaster_time,upload_time,geometry,
+        di.disaster_time,di.upload_time,di.geometry,
-        disaster_level,disaster_country,respond_status,
+        di.disaster_level,di.disaster_country,di.respond_status,
-        visit_count,spider_type,tempend_time,
+        di.visit_count,di.spider_type,di.tempend_time,
-        temp_start_time,create_time,vordm_id,
+        di.temp_start_time,di.create_time,di.vordm_id,
-        respond_time
+        di.respond_time
     </sql>
 
     <select id="getHomeDisasterInfo" parameterType="com.kening.vordm.entity.DisasterInfo">
@@ -46,4 +46,15 @@
         <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>
+
+    <select id="getDisasterInfoDetail" resultType="com.kening.vordm.entity.DisasterInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from disaster_info di
+        <where>
+            <if test="id != null and id != ''">
+                di.id = #{id}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -37,7 +37,6 @@
         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/service/DisasterInfoService.java

@@ -3,6 +3,8 @@ package com.kening.vordm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kening.vordm.entity.DisasterInfo;
+import com.kening.vordm.entity.News;
+import org.springblade.core.tool.api.R;
 
 import java.util.List;
 
@@ -16,4 +18,12 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 
 //	Long   getDisasterId(DisasterInfo disasterInfo);
 
+
+
+	/**
+	 * 获取债害详情信息
+	 * @param id
+	 * @return
+	 */
+	DisasterInfo getDisasterInfoDetail(Long id);
 }

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

@@ -1,12 +1,11 @@
 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.entity.News;
 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;
@@ -34,4 +33,15 @@ implements DisasterInfoService {
 //		Long va=;
 //		return va;
 ////	}
+
+
+	/**
+	 * 获取债害详情信息
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public DisasterInfo getDisasterInfoDetail(Long id) {
+		return this.baseMapper.getDisasterInfoDetail(id);
+	}
 }