lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

气象预警查询修改,历史气象预警统计修改

master
徐杰盟 2024-05-27 10:41:58 +08:00
parent 7b0038c4a4
commit 6131cd2168
1 changed files with 78 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/main/java/com/whdc/controller/WarningController.java
View File

@ -65,26 +65,53 @@ public class WarningController {
String publishUnit = dto.getPublishUnit(); String publishUnit = dto.getPublishUnit();
if (StringUtils.isNotBlank(publishUnit)) { if (StringUtils.isNotBlank(publishUnit)) {
for (String s : publishUnit.split(",")) { String[] split = publishUnit.split(",");
filter.add(new ApiDto.Filter("publishUnit", "LIKE", String.format("%s%s%s", "%", s, "%"))); if (split.length > 1){
String str = "(";
for (String s : split) {
str += s +",";
}
str = str.substring(0,str.length()-1) + ")";
filter.add(new ApiDto.Filter("publishUnit", "in " + str, ""));
}else{
filter.add(new ApiDto.Filter("publishUnit", "like", String.format("%s%s%s", "%", publishUnit, "%")));
} }
} }
String warnSignalLevel = dto.getWarnSignalLevel(); String warnSignalLevel = dto.getWarnSignalLevel();
if (StringUtils.isNotBlank(warnSignalLevel)) { if (StringUtils.isNotBlank(warnSignalLevel)) {
for (String s : warnSignalLevel.split(",")) { String[] split = warnSignalLevel.split(",");
filter.add(new ApiDto.Filter("warnSignalLevel", "LIKE", String.format("%s%s%s", "%", s, "%"))); if (split.length > 1){
String str = "(";
for (String s : split) {
str += s +",";
}
str = str.substring(0,str.length()-1) + ")";
filter.add(new ApiDto.Filter("warnSignalLevel", "in " + str, ""));
}else{
filter.add(new ApiDto.Filter("warnSignalLevel", "like", String.format("%s%s%s", "%", warnSignalLevel, "%")));
} }
} }
String warnSignalType = dto.getWarnSignalType(); String warnSignalType = dto.getWarnSignalType();
if (StringUtils.isNotBlank(warnSignalType)) { if (StringUtils.isNotBlank(warnSignalType)) {
for (String s : warnSignalType.split(",")) { String[] split = warnSignalType.split(",");
filter.add(new ApiDto.Filter("warnSignalType", "LIKE", String.format("%s%s%s", "%", s, "%"))); if (split.length > 1){
String str = "(";
for (String s : split) {
str += s +",";
}
str = str.substring(0,str.length()-1) + ")";
filter.add(new ApiDto.Filter("warnSignalType", "in " + str, ""));
}else{
filter.add(new ApiDto.Filter("warnSignalType", "like", String.format("%s%s%s", "%", warnSignalType, "%")));
} }
} }
apiDto.setFilter(filter); apiDto.setFilter(filter);
// String str = HttpUtil.sendPost("http://223.75.53.141:8000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto)); String str = HttpUtil.sendPost("http://223.75.53.141:8000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto));
String str = HttpUtil.sendPost("http://127.0.0.1:20000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto)); // String str = HttpUtil.sendPost("http://127.0.0.1:20000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto));
JSONObject json = JSON.parseObject(str); JSONObject json = JSON.parseObject(str);
if (json != null && json.getInteger("code") == HttpStatus.SC_OK) { if (json != null && json.getInteger("code") == HttpStatus.SC_OK) {
List<WarningData> data = json.getJSONArray("data").toJavaList(WarningData.class); List<WarningData> data = json.getJSONArray("data").toJavaList(WarningData.class);
@ -111,15 +138,52 @@ 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)) {
String[] split = publishUnit.split(",");
if (split.length > 1){
String str = "(";
for (String s : split) {
str += s +",";
} }
if (StringUtils.isNotBlank(dto.getWarnSignalLevel())) { str = str.substring(0,str.length()-1) + ")";
filter.add(new ApiDto.Filter("warnSignalLevel", "LIKE", String.format("%s%s%s", "%", dto.getWarnSignalLevel(), "%"))); filter.add(new ApiDto.Filter("publishUnit", "in " + str, ""));
}else{
filter.add(new ApiDto.Filter("publishUnit", "like", String.format("%s%s%s", "%", publishUnit, "%")));
} }
if (StringUtils.isNotBlank(dto.getWarnSignalType())) {
filter.add(new ApiDto.Filter("warnSignalType", "LIKE", String.format("%s%s%s", "%", dto.getWarnSignalType(), "%")));
} }
String warnSignalLevel = dto.getWarnSignalLevel();
if (StringUtils.isNotBlank(warnSignalLevel)) {
String[] split = warnSignalLevel.split(",");
if (split.length > 1){
String str = "(";
for (String s : split) {
str += s +",";
}
str = str.substring(0,str.length()-1) + ")";
filter.add(new ApiDto.Filter("warnSignalLevel", "in " + str, ""));
}else{
filter.add(new ApiDto.Filter("warnSignalLevel", "like", String.format("%s%s%s", "%", warnSignalLevel, "%")));
}
}
String warnSignalType = dto.getWarnSignalType();
if (StringUtils.isNotBlank(warnSignalType)) {
String[] split = warnSignalType.split(",");
if (split.length > 1){
String str = "(";
for (String s : split) {
str += s +",";
}
str = str.substring(0,str.length()-1) + ")";
filter.add(new ApiDto.Filter("warnSignalType", "in " + str, ""));
}else{
filter.add(new ApiDto.Filter("warnSignalType", "like", String.format("%s%s%s", "%", warnSignalType, "%")));
}
}
apiDto.setFilter(filter); apiDto.setFilter(filter);
// String str = HttpUtil.sendPost("http://223.75.53.141:8000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto)); // String str = HttpUtil.sendPost("http://223.75.53.141:8000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto));