Merge branch 'why' into glj
This commit is contained in:
commit
927f60c521
|
@ -5,13 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @TableName disaster_info_vo
|
* @TableName disaster_info_vo
|
||||||
*/
|
*/
|
||||||
@TableName(value ="disaster_info_vo")
|
@TableName(value ="disaster_info_vo")
|
||||||
|
@ -35,12 +33,12 @@ public class DisasterInfoVo implements Serializable {
|
||||||
/**
|
/**
|
||||||
* 灾害发生时间
|
* 灾害发生时间
|
||||||
*/
|
*/
|
||||||
private LocalDate disasterTime;
|
private Date disasterTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害发起时间
|
* 灾害发起时间
|
||||||
*/
|
*/
|
||||||
private LocalDateTime uploadTime;
|
private Date uploadTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害区域地理字段
|
* 灾害区域地理字段
|
||||||
|
@ -108,7 +106,7 @@ public class DisasterInfoVo implements Serializable {
|
||||||
private String sponsorOrganization;
|
private String sponsorOrganization;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
private String disasterImg;
|
private String disasterImg;
|
||||||
|
|
||||||
|
@ -118,10 +116,15 @@ public class DisasterInfoVo implements Serializable {
|
||||||
private String dictValue;
|
private String dictValue;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
private Long size;
|
private Long size;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private String news;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
}
|
}
|
|
@ -154,18 +154,44 @@ public class DisasterInfoController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/homeDisasterInfo")
|
@GetMapping("/homeDisasterInfo")
|
||||||
public R<IPage<DisasterInfoVo>> gethomeDisasterInfo(Query query, @RequestParam Map<String, String> params) {
|
public R<IPage<DisasterInfoVo>> gethomeDisasterInfo(Query query, @RequestParam Map<String, String> params) {
|
||||||
return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.<DisasterInfoVo>lambdaQuery()
|
if(StringUtils.isNotBlank(String.valueOf(params.get("startTime"))) && !"null".equals(String.valueOf(params.get("startTime")))){
|
||||||
.eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus")))
|
return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.<DisasterInfoVo>lambdaQuery()
|
||||||
.ge(StringUtils.isNotBlank(String.valueOf(params.get("startTime"))),DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("startTime"))))
|
.eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus")))
|
||||||
.le(StringUtils.isNotBlank(String.valueOf(params.get("endTime"))),DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("endTime"))))
|
.ge(DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("startTime"))))
|
||||||
.eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType")))
|
.le(DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("endTime"))))
|
||||||
.orderByDesc(DisasterInfoVo::getDisasterTime)
|
.eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType")))
|
||||||
));
|
.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea")))
|
||||||
|
.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))
|
||||||
|
.eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal")))
|
||||||
|
.eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal")))
|
||||||
|
.eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal")))
|
||||||
|
.inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " +
|
||||||
|
" where t.response_organization = " + params.get("leftVal"))
|
||||||
|
.orderByDesc("Visits".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getVisitCount)
|
||||||
|
.orderByDesc("Downloads".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getDownloadCount)
|
||||||
|
.orderByDesc("updateTime".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getUploadTime)
|
||||||
|
.orderByDesc(DisasterInfoVo::getDisasterTime)
|
||||||
|
));
|
||||||
|
}else{
|
||||||
|
return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.<DisasterInfoVo>lambdaQuery()
|
||||||
|
.eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus")))
|
||||||
|
.eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType")))
|
||||||
|
.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea")))
|
||||||
|
.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))
|
||||||
|
.eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal")))
|
||||||
|
.eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal")))
|
||||||
|
.eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal")))
|
||||||
|
.inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " +
|
||||||
|
" where t.response_organization = " + params.get("leftVal"))
|
||||||
|
.orderByDesc("Visits".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getVisitCount)
|
||||||
|
.orderByDesc("Downloads".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getDownloadCount)
|
||||||
|
.orderByDesc("updateTime".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getUploadTime)
|
||||||
|
.orderByDesc(DisasterInfoVo::getDisasterTime)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
System.out.println(LocalDate.now().minusMonths(6).toString());
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* 获取债害详情信息
|
* 获取债害详情信息
|
||||||
*
|
*
|
||||||
|
|
|
@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
/**
|
/**
|
||||||
* @author wangns
|
* @author wangns
|
||||||
* @description 针对表【disaster_info_vo】的数据库操作Mapper
|
* @description 针对表【disaster_info_vo】的数据库操作Mapper
|
||||||
* @createDate 2023-04-10 17:33:26
|
* @createDate 2023-04-11 10:44:37
|
||||||
* @Entity com.kening.vordm.vo.DisasterInfoVo
|
* @Entity com.kening.vordm.vo.DisasterInfoVo
|
||||||
*/
|
*/
|
||||||
public interface DisasterInfoVoMapper extends BaseMapper<DisasterInfoVo> {
|
public interface DisasterInfoVoMapper extends BaseMapper<DisasterInfoVo> {
|
||||||
|
|
|
@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
/**
|
/**
|
||||||
* @author wangns
|
* @author wangns
|
||||||
* @description 针对表【disaster_info_vo】的数据库操作Service
|
* @description 针对表【disaster_info_vo】的数据库操作Service
|
||||||
* @createDate 2023-04-10 17:33:26
|
* @createDate 2023-04-11 10:44:37
|
||||||
*/
|
*/
|
||||||
public interface DisasterInfoVoService extends IService<DisasterInfoVo> {
|
public interface DisasterInfoVoService extends IService<DisasterInfoVo> {
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
|
||||||
/**
|
/**
|
||||||
* @author wangns
|
* @author wangns
|
||||||
* @description 针对表【disaster_info_vo】的数据库操作Service实现
|
* @description 针对表【disaster_info_vo】的数据库操作Service实现
|
||||||
* @createDate 2023-04-10 17:33:26
|
* @createDate 2023-04-11 10:44:37
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class DisasterInfoVoServiceImpl extends ServiceImpl<DisasterInfoVoMapper, DisasterInfoVo>
|
public class DisasterInfoVoServiceImpl extends ServiceImpl<DisasterInfoVoMapper, DisasterInfoVo>
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
<result property="disasterImg" column="disaster_img" jdbcType="VARCHAR"/>
|
<result property="disasterImg" column="disaster_img" jdbcType="VARCHAR"/>
|
||||||
<result property="dictValue" column="dict_value" jdbcType="VARCHAR"/>
|
<result property="dictValue" column="dict_value" jdbcType="VARCHAR"/>
|
||||||
<result property="size" column="size" jdbcType="DECIMAL"/>
|
<result property="size" column="size" jdbcType="DECIMAL"/>
|
||||||
|
<result property="news" column="news" jdbcType="VARCHAR"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
|
@ -35,6 +36,7 @@
|
||||||
visit_count,download_count,spider_type,
|
visit_count,download_count,spider_type,
|
||||||
tempend_time,temp_start_time,create_time,
|
tempend_time,temp_start_time,create_time,
|
||||||
vordm_id,respond_time,sponsor_organization,
|
vordm_id,respond_time,sponsor_organization,
|
||||||
disaster_img,dict_value,size
|
disaster_img,dict_value,size,
|
||||||
|
news
|
||||||
</sql>
|
</sql>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
Loading…
Reference in New Issue