From 4e85e7c1abfd70fdd79f54e9c8cadbcd7e1ce031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Sun, 27 Apr 2025 08:47:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?debug=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/user/service/impl/UserServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ruoyi-service/src/main/java/com/ruoyi/system/user/service/impl/UserServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/system/user/service/impl/UserServiceImpl.java index 4bddc73..e2191e1 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/system/user/service/impl/UserServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/system/user/service/impl/UserServiceImpl.java @@ -10,7 +10,6 @@ import java.util.stream.Collectors; import javax.validation.Validator; -import com.ruoyi.bst.device.domain.Device; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -862,7 +861,7 @@ public class UserServiceImpl implements UserService } UserVO data = new UserVO(); data.setUserId(user.getUserId()); - data.setRealName(user.getUserName()); + data.setRealName(user.getRealName()); data.setRealIdCard(user.getRealIdCard()); data.setRealPhone(user.getRealPhone()); data.setIsReal(user.getIsReal()); From a4937551ee1f70e2020938242d8c82ceeed8a2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Sun, 27 Apr 2025 09:12:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E3=80=81=E8=BF=90=E8=90=A5=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/bst/area/service/AreaDashboard.java | 2 +- .../area/service/impl/AreaDashboardImpl.java | 7 ++---- .../service/impl/RealNameServiceImpl.java | 7 +++++- .../com/ruoyi/web/app/AppAreaController.java | 23 +++++++++++++++---- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/AreaDashboard.java b/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/AreaDashboard.java index 811781c..e0afb02 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/AreaDashboard.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/AreaDashboard.java @@ -20,7 +20,7 @@ public interface AreaDashboard { * @param query * @return */ - LongIntegerVO selectMaxOfDeviceCountAreaId(AreaQuery query); + List selectMaxOfDeviceCountAreaId(AreaQuery query); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/impl/AreaDashboardImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/impl/AreaDashboardImpl.java index 94e376d..87b858e 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/impl/AreaDashboardImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/area/service/impl/AreaDashboardImpl.java @@ -12,7 +12,6 @@ import com.ruoyi.bst.area.mapper.AreaMapper; import com.ruoyi.bst.area.service.AreaDashboard; import com.ruoyi.common.domain.vo.LongIntegerVO; import com.ruoyi.common.utils.MathUtils; -import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.dashboard.constants.StatKeys; @Service @@ -31,11 +30,9 @@ public class AreaDashboardImpl implements AreaDashboard { } @Override - public LongIntegerVO selectMaxOfDeviceCountAreaId(AreaQuery query) { - PageHelper.startPage(1, 1); + public List selectMaxOfDeviceCountAreaId(AreaQuery query) { PageHelper.orderBy("value desc"); - List list = areaMapper.selectDeviceCountGroupByAreaId(query); - return CollectionUtils.firstElement(list); + return areaMapper.selectDeviceCountGroupByAreaId(query); } } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/realName/service/impl/RealNameServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/realName/service/impl/RealNameServiceImpl.java index 3611214..7e560b2 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/realName/service/impl/RealNameServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/realName/service/impl/RealNameServiceImpl.java @@ -229,7 +229,12 @@ public class RealNameServiceImpl implements RealNameService realName.setType(RealNameType.TWO_ELEMENT.getCode()); realName.setResult(isSuccess ? "认证成功" : idRes.getReason()); - return this.handleNormalRealName(realName, null); + int result = this.handleNormalRealName(realName, null); + ServiceUtil.assertion(result != 1, "实名认证失败"); + + ServiceUtil.assertion(!isSuccess, "二要素实名认证未通过"); + + return result; } private int handleNormalRealName(RealName realName, String cacheKey) { diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAreaController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAreaController.java index 5c1b8c4..74920b5 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAreaController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAreaController.java @@ -1,6 +1,8 @@ package com.ruoyi.web.app; import java.math.BigDecimal; +import java.util.List; +import java.util.Objects; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -15,6 +17,7 @@ import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.domain.vo.LongIntegerVO; +import com.ruoyi.common.utils.collection.CollectionUtils; import io.swagger.annotations.ApiOperation; @@ -59,11 +62,23 @@ public class AppAreaController extends BaseController { } setQuery(query); - // 查询设备数量最多的运营区ID - LongIntegerVO max = areaDashboard.selectMaxOfDeviceCountAreaId(query); - if (max == null) { + // 按设备数量排序，查询附近的运营区 + Long areaId = query.getId(); + query.setId(null); + List list = areaDashboard.selectMaxOfDeviceCountAreaId(query); + if (CollectionUtils.isEmptyElement(list)) { return success(); - } + } + + // 如果有传运营区ID，则优先找运营区 + LongIntegerVO max = null; + if (areaId != null) { + max = list.stream().filter(item -> Objects.equals(item.getKey(), areaId)).findFirst().orElse(null); + } + // 若没有找到对应运营区，则取设备数量最多的运营区 + if (max == null) { + max = list.get(0); + } // 查询运营区详情 return success(areaService.selectAreaById(max.getKey()));