代码提交
This commit is contained in:
parent
6ead3b9add
commit
14bdf16a95
|
@ -20,7 +20,7 @@ import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@RestController
|
@RestController
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@RequestMapping
|
@RequestMapping("/ui/disasterInfo")
|
||||||
public class DisasterInfoController {
|
public class DisasterInfoController {
|
||||||
|
|
||||||
private final DisasterInfoService disasterInfoService;
|
private final DisasterInfoService disasterInfoService;
|
||||||
|
@ -79,4 +79,15 @@ public class DisasterInfoController {
|
||||||
List<Long> disasterIds = getDisasterIds(disasterInfo);
|
List<Long> disasterIds = getDisasterIds(disasterInfo);
|
||||||
return R.data(newsService.page(Condition.getPage(query),new QueryWrapper<News>().in("disaster_id",disasterIds)));
|
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));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ package com.kening.vordm.mapper;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.kening.vordm.entity.DisasterInfo;
|
import com.kening.vordm.entity.DisasterInfo;
|
||||||
|
import com.kening.vordm.entity.News;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -20,4 +21,11 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
|
||||||
@Param("disaster_time") String disaster_time,
|
@Param("disaster_time") String disaster_time,
|
||||||
@Param("name") String name);
|
@Param("name") String name);
|
||||||
List<DisasterInfo> getHomeDisasterInfo();
|
List<DisasterInfo> getHomeDisasterInfo();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取债害详情信息
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
DisasterInfo getDisasterInfoDetail(@Param("id") Long id);
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,12 +24,12 @@
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
<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>
|
</sql>
|
||||||
|
|
||||||
<select id="getHomeDisasterInfo" parameterType="com.kening.vordm.entity.DisasterInfo">
|
<select id="getHomeDisasterInfo" parameterType="com.kening.vordm.entity.DisasterInfo">
|
||||||
|
@ -40,10 +40,21 @@
|
||||||
select distinct #{name} as name
|
select distinct #{name} as name
|
||||||
from disaster_info
|
from disaster_info
|
||||||
where
|
where
|
||||||
<if test="disaster_type!=null"> disaster_type=#{disaster_type} </if>
|
<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 and (disaster_country!=null or disaster_time!=null)">and</if>
|
||||||
<if test="disaster_country!=null"> disaster_country=#{disaster_country} </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 and disaster_country!=null and disaster_time!=null">and</if>
|
||||||
<if test="disaster_time!=null"> disaster_time like #{disaster_time}</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>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -37,7 +37,6 @@
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List"/>
|
<include refid="Base_Column_List"/>
|
||||||
from entity_data ed
|
from entity_data ed
|
||||||
l
|
|
||||||
<where>
|
<where>
|
||||||
<if test="entityData.disasterId != null and entityData.disasterId != ''">
|
<if test="entityData.disasterId != null and entityData.disasterId != ''">
|
||||||
ed.disaster_id = #{entityData.disasterId}
|
ed.disaster_id = #{entityData.disasterId}
|
||||||
|
|
|
@ -3,6 +3,8 @@ package com.kening.vordm.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.kening.vordm.entity.DisasterInfo;
|
import com.kening.vordm.entity.DisasterInfo;
|
||||||
|
import com.kening.vordm.entity.News;
|
||||||
|
import org.springblade.core.tool.api.R;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -16,4 +18,12 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
|
||||||
|
|
||||||
// Long getDisasterId(DisasterInfo disasterInfo);
|
// Long getDisasterId(DisasterInfo disasterInfo);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取债害详情信息
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
DisasterInfo getDisasterInfoDetail(Long id);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
package com.kening.vordm.service.impl;
|
package com.kening.vordm.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.kening.vordm.entity.DisasterInfo;
|
import com.kening.vordm.entity.DisasterInfo;
|
||||||
|
import com.kening.vordm.entity.News;
|
||||||
import com.kening.vordm.mapper.DisasterInfoMapper;
|
import com.kening.vordm.mapper.DisasterInfoMapper;
|
||||||
import com.kening.vordm.service.DisasterInfoService;
|
import com.kening.vordm.service.DisasterInfoService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springblade.core.mp.support.Condition;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -34,4 +33,15 @@ implements DisasterInfoService {
|
||||||
// Long va=;
|
// Long va=;
|
||||||
// return va;
|
// return va;
|
||||||
//// }
|
//// }
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取债害详情信息
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public DisasterInfo getDisasterInfoDetail(Long id) {
|
||||||
|
return this.baseMapper.getDisasterInfoDetail(id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue