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 6e25b98..594f0a6 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 @@ -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 disasterIds = getDisasterIds(disasterInfo); return R.data(newsService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); } + + /** + * 获取债害详情信息 + * @param id + * @return + */ + @GetMapping("/getDisasterInfoDetail") + public R getDisasterInfoDetail(Long id){ + return R.data(disasterInfoService.getDisasterInfoDetail(id)); + } + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java index 6911405..db31038 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java +++ b/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 { @Param("disaster_time") String disaster_time, @Param("name") String name); List getHomeDisasterInfo(); + + /** + * 获取债害详情信息 + * @param id + * @return + */ + DisasterInfo getDisasterInfoDetail(@Param("id") Long id); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index b85ee0d..06710dd 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -1,35 +1,35 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - id,disaster_type,disaster_keyword, - disaster_time,upload_time,geometry, - disaster_level,disaster_country,respond_status, - visit_count,spider_type,tempend_time, - temp_start_time,create_time,vordm_id, - respond_time + di.id ,di.disaster_type,di.disaster_keyword, + di.disaster_time,di.upload_time,di.geometry, + di.disaster_level,di.disaster_country,di.respond_status, + di.visit_count,di.spider_type,di.tempend_time, + di.temp_start_time,di.create_time,di.vordm_id, + di.respond_time + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index 6e5e92d..7c9edc2 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -37,7 +37,6 @@ select from entity_data ed - l ed.disaster_id = #{entityData.disasterId} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index 9a85f9e..797b307 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/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 { // Long getDisasterId(DisasterInfo disasterInfo); + + + /** + * 获取债害详情信息 + * @param id + * @return + */ + DisasterInfo getDisasterInfoDetail(Long id); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index 393052a..f7d4a53 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/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); + } }