hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-23 23:45:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ 进一步同步 boot 和 cloud 代码，移除多余无用的类

Browse Source
This commit is contained in:
YunaiV
2024-02-27 17:15:55 +08:00
parent 2aade25e78
commit d134bfc4a6
10 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtils.java
View File

@ -71,7 +71,7 @@ public class AreaUtils {
* @param id 区域编号
* @return 区域
*/
public static Area parseArea(Integer id) {
public static Area getArea(Integer id) {
return areas.get(id);
}
@ -193,7 +193,7 @@ public class AreaUtils {
*/
public static Integer getParentIdByType(Integer id, @NonNull AreaTypeEnum type) {
for (int i = 0; i < Byte.MAX_VALUE; i++) {
Area area = AreaUtils.parseArea(id);
Area area = AreaUtils.getArea(id);
if (area == null) {
return null;
}

4
yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtils.java
View File

@ -72,7 +72,7 @@ public class IPUtils {
* @return 地区
*/
public static Area getArea(String ip) {
return AreaUtils.parseArea(getAreaId(ip));
return AreaUtils.getArea(getAreaId(ip));
}
/**
@ -82,6 +82,6 @@ public class IPUtils {
* @return 地区
*/
public static Area getArea(long ip) {
return AreaUtils.parseArea(getAreaId(ip));
return AreaUtils.getArea(getAreaId(ip));
}
}

2
yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java
View File

@ -17,7 +17,7 @@ public class AreaUtilsTest {
@Test
public void testGetArea() {
// 调用：北京
Area area = AreaUtils.parseArea(110100);
Area area = AreaUtils.getArea(110100);
// 断言
assertEquals(area.getId(), 110100);
assertEquals(area.getName(), "北京市");