冲突解决-glj
This commit is contained in:
commit
6704340b46
|
@ -71,4 +71,8 @@ public class CrawlInfo implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private String startDate;
|
||||||
|
private String endDate;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,4 +25,6 @@ public class DataUpload extends EntityData{
|
||||||
private Long disasterId;
|
private Long disasterId;
|
||||||
|
|
||||||
private String vordmId;
|
private String vordmId;
|
||||||
|
|
||||||
|
private String geometry;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,8 @@
|
||||||
bdb.dict_value as disasterType,
|
bdb.dict_value as disasterType,
|
||||||
di.id as disasterId,
|
di.id as disasterId,
|
||||||
di.disaster_time as disasterTime,
|
di.disaster_time as disasterTime,
|
||||||
di.disaster_country as disasterCountry
|
di.disaster_country as disasterCountry,
|
||||||
|
di.geometry
|
||||||
from disaster_info di
|
from disaster_info di
|
||||||
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
||||||
</select>
|
</select>
|
||||||
|
|
Loading…
Reference in New Issue