diff --git a/src/main/java/com/whdc/controller/WarningController.java b/src/main/java/com/whdc/controller/WarningController.java index ecac71c..d7962e2 100644 --- a/src/main/java/com/whdc/controller/WarningController.java +++ b/src/main/java/com/whdc/controller/WarningController.java @@ -75,7 +75,7 @@ public class WarningController { 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://64.97.146.240:9990/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); if (json != null && json.getInteger("code") == HttpStatus.SC_OK) { List data = json.getJSONArray("data").toJavaList(WarningData.class); @@ -86,12 +86,12 @@ public class WarningController { } /** - * 历史气象预警 + * 历史气象预警统计 * * @param dto * @return */ - @ApiOperation(value = "历史气象预警") + @ApiOperation(value = "历史气象预警统计") @PostMapping("/getHistoryGroupWarning") public ResultJson> getHistoryGroupWarning(@RequestBody GroupWarningDto dto) { @@ -114,7 +114,7 @@ public class WarningController { 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://64.97.146.240:9990/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); if (json != null && json.getInteger("code") == HttpStatus.SC_OK) { List data = json.getJSONArray("data").toJavaList(WarningData.class); diff --git a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java index 0ea275d..c5a9b5a 100644 --- a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java @@ -59,7 +59,7 @@ public class AddressBookServiceImpl extends ServiceImpl getListByAdnm(String adnm) { return baseMapper.getListByAdnm(adnm); diff --git a/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java b/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java index 97eb065..5de1a58 100644 --- a/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java @@ -11,6 +11,7 @@ import com.whdc.service.IAdinfoService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.*; @@ -82,7 +83,11 @@ public class AdinfoServiceImpl extends ServiceImpl impleme if ("00000000000".equals(ad.substring(4))) { // 市 adcdTree.setAdlevel(1); - adcdTree.setAdcdChildren(county.get(cityStr)); + List adcdChildren = county.get(cityStr); + AdcdTree adcdTree1 = new AdcdTree(); + BeanUtils.copyProperties(adcdTree,adcdTree1); + adcdChildren.add(0,adcdTree1); + adcdTree.setAdcdChildren(adcdChildren); addTree(city, provinceStr, adcdTree); tree.add(adcdTree); @@ -98,7 +103,6 @@ public class AdinfoServiceImpl extends ServiceImpl impleme return sorted(tree); } - public List treeList(String adcd, String adnm) { if(StringUtils.isNotBlank(adcd) && adcd.endsWith("0000000000000")){