气象预警查询修改
parent
efe11bf6ef
commit
7b0038c4a4
|
|
@ -63,14 +63,23 @@ public class WarningController {
|
||||||
apiDto.setPageSize(dto.getPageSize());
|
apiDto.setPageSize(dto.getPageSize());
|
||||||
ArrayList<ApiDto.Filter> filter = Lists.newArrayList();
|
ArrayList<ApiDto.Filter> filter = Lists.newArrayList();
|
||||||
|
|
||||||
if (StringUtils.isNotBlank(dto.getPublishUnit())) {
|
String publishUnit = dto.getPublishUnit();
|
||||||
filter.add(new ApiDto.Filter("publishUnit", "LIKE", String.format("%s%s%s", "%", dto.getPublishUnit(), "%")));
|
if (StringUtils.isNotBlank(publishUnit)) {
|
||||||
|
for (String s : publishUnit.split(",")) {
|
||||||
|
filter.add(new ApiDto.Filter("publishUnit", "LIKE", String.format("%s%s%s", "%", s, "%")));
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(dto.getWarnSignalLevel())) {
|
|
||||||
filter.add(new ApiDto.Filter("warnSignalLevel", "LIKE", String.format("%s%s%s", "%", dto.getWarnSignalLevel(), "%")));
|
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(dto.getWarnSignalType())) {
|
String warnSignalLevel = dto.getWarnSignalLevel();
|
||||||
filter.add(new ApiDto.Filter("warnSignalType", "LIKE", String.format("%s%s%s", "%", dto.getWarnSignalType(), "%")));
|
if (StringUtils.isNotBlank(warnSignalLevel)) {
|
||||||
|
for (String s : warnSignalLevel.split(",")) {
|
||||||
|
filter.add(new ApiDto.Filter("warnSignalLevel", "LIKE", String.format("%s%s%s", "%", s, "%")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
String warnSignalType = dto.getWarnSignalType();
|
||||||
|
if (StringUtils.isNotBlank(warnSignalType)) {
|
||||||
|
for (String s : warnSignalType.split(",")) {
|
||||||
|
filter.add(new ApiDto.Filter("warnSignalType", "LIKE", String.format("%s%s%s", "%", s, "%")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apiDto.setFilter(filter);
|
apiDto.setFilter(filter);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue