From abbe8408d07e4f1ac5e7a96e20638f346338cc3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 14 四月 2025 10:35:38 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 17 ++++++++++++-----
server/platform/src/main/resources/application.yml | 2 +-
server/web/src/main/resources/application.yml | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index f9ad69d..495699e 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# application:
# name: parkbike
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index cec7e7b..3282cca 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -249,11 +249,18 @@
.selectAs(Sites::getName,Bikes::getSiteName) ;
PageData<Bikes> pageData = PageData.from(bikesJoinMapper.selectJoinPage(page, Bikes.class, queryWrapper));
double finalLow = low;
- pageData.getRecords().forEach(i->{
- if(Constants.equalsInteger(i.getType(),Constants.ONE)){
- i.setLowVoltage(i.getVoltage().compareTo(new BigDecimal(Double.toString(finalLow)))>=0?0:1);
- }
- });
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(pageData.getRecords())){
+ pageData.getRecords().forEach(i->{
+ if(Constants.equalsInteger(i.getType(),Constants.ONE)){
+ if(Objects.isNull(i.getVoltage())){
+ i.setLowVoltage(Constants.ONE);
+ }else{
+ i.setLowVoltage(i.getVoltage().compareTo(new BigDecimal(Double.toString(finalLow)))>=0?0:1);
+ }
+ }
+ });
+ }
+
return pageData;
}
diff --git a/server/web/src/main/resources/application.yml b/server/web/src/main/resources/application.yml
index a483097..b83b429 100644
--- a/server/web/src/main/resources/application.yml
+++ b/server/web/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# application:
# name: parkbike
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3