From 77cb365302cc814df041e31e4a880d804a93383f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 17:19:28 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 928be5b..094a5fd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -5,6 +5,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;
import com.doumee.core.haikang.model.param.BaseListPageRequest;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
@@ -952,6 +953,7 @@
public BoardCarsListVO platformJobCarsList(){
BoardCarsListVO data = new BoardCarsListVO();
List<CarsDeviceDetaisResponse> detaisResponses = HKCarOpenService.getAllCarsDetais();
+ List<CarsAlarmResultListResponse> eventList = HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date());
data.setCarsList(detaisResponses);
if(data.getCarsList()!=null && data.getCarsList().size()>0){
List<String> codes = new ArrayList<>();
@@ -959,7 +961,7 @@
int online = 0;
for(CarsDeviceDetaisResponse model:detaisResponses){
if(Constants.equalsInteger(model.getStatus(),Constants.ONE) ||Constants.equalsInteger(model.getStatus(),Constants.TWO)){
- //濡傛灉鏄湪绾挎垨鑰呬紤鐪狅紝鏌ヨ鍦ㄩ�旇繕鏄┖闂�
+ //濡傛灉鏄湪绾挎垨鑰呬紤鐪狅紝鏌ヨ鍦ㄩ�旇繕鏄┖闂瞭y
codes.add(model.getPlateNum());
}else
data.setOfflineNum(data.getOfflineNum()+1);
@@ -1174,7 +1176,7 @@
3) 鑷潵姘翠簩姘у寲纰虫帓鏀鹃噺(kg)=鑷潵姘翠娇鐢ㄩ噺(m3)脳0.91锛�*/
data.setCarbon(Constants.formatBigdecimal2Float((carbonElec.multiply(new BigDecimal(0.785)))
.add(carbonGas.multiply(new BigDecimal(0.19)))
- .add(carbonWater.multiply(new BigDecimal(0.91)))));
+ .add(carbonWater.multiply(new BigDecimal(0.91)))).divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP));
return data;
}
@@ -1219,7 +1221,8 @@
param.setPeriodType("day");
BigDecimal total = new BigDecimal(0);
BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
- if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null&& response.getData().getYvalues()!=null ){
for (int i = 0; i < response.getData().getYvalues().get(0).getValue().length; i++) {
total = total.add(new BigDecimal(StringUtils.defaultString( response.getData().getYvalues().get(0).getValue()[i],"0")));
}
@@ -1258,8 +1261,21 @@
data.setRingPercent("0");
data.setSecondRegionDataList(new ArrayList<>());
}
- return data;
+ if(data.getSecondRegionDataList()!=null && data.getSecondRegionDataList().size()>1){
+ int index =-1;
+ for (int i = 0; i <data.getSecondRegionDataList().size() ; i++) {
+ RegionTopPowerResponse t=data.getSecondRegionDataList().get(i);
+ if(Constants.formatBigdecimal(t.getPercent()).compareTo(new BigDecimal(1)) == 0){
+ index =i;
+ break;
+ }
+ }
+ if(index>-1){
+ data.getSecondRegionDataList().remove(index);//鍒犻櫎鏍硅妭鐐规暟鎹�
+ }
+ }
+ return data;
}
/**
* 杩�12涓按鐢垫皵娌硅�楁暟鎹粺璁�
--
Gitblit v1.9.3