From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
index 0635b37..88c1060 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
@@ -14,6 +14,8 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.time.LocalTime;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -50,12 +52,12 @@
}
/**
- * c3鍏呯數妗╄垂鐜囨洿鏀规棩蹇楄褰曞紑濮�
+ * c3鍏呯數妗╄垂鐜囨洿鏀� 鏃ュ織璁板綍寮�濮�
*/
String content = "c3鍏呯數妗╄垂鐜囨洿鏀癸細" + JSON.toJSONString(chargeEntities);
StoreOperationRecordsUtils.storeOperationData(null, null, "c3鍏呯數妗╄垂鐜囨洿鏀�", content);
/**
- * c3鍏呯數妗╄垂鐜囨洿鏀规棩蹇楄褰曠粨鏉�
+ * c3鍏呯數妗╄垂鐜囨洿鏀� 鏃ュ織璁板綍缁撴潫
*/
return true;
}
@@ -167,4 +169,65 @@
public boolean deleteC3mCharging(Integer c3mId) {
return c3mChargingChargeMapper.deleteCharge(c3mId);
}
+
+ /**
+ * 鏍规嵁c3Id鏌ユ壘璐圭巼 骞惰绠楄姳璐�
+ *
+ * @param c3Id
+ * @return
+ */
+ public BigDecimal getCostByC3id(Long c3Id, Integer power) {
+ BigDecimal chargeDecimal = getchargeDecimalByC3id(c3Id);
+ BigDecimal powerDecimal = new BigDecimal(power);
+ BigDecimal result = chargeDecimal.multiply(powerDecimal);
+ return result;
+ }
+
+
+ /**
+ * 鏍规嵁c3Id鏌ユ壘璐圭巼
+ *
+ * @param c3Id
+ * @return
+ */
+ public BigDecimal getchargeDecimalByC3id(Long c3Id) {
+ List<C3mChargingCharge> list = list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3Id));
+ //鑾峰彇褰撳墠鏃堕棿
+ LocalTime localTime = LocalTime.now();
+ //閬嶅巻璐圭巼闆嗗悎 鍒ゆ柇褰撳墠鏃堕棿鏄惁鍦ㄨ垂鐜囨椂闂存鍐�
+ LocalTime startTime;
+ LocalTime endTime;
+ //榛樿璐圭巼
+ Double charge = 8.8;
+ if (list.size() > 1) {
+ //璐圭巼鏉℃暟澶т簬1鏃讹紝閬嶅巻璐圭巼闆嗗悎 鑾峰彇褰撳墠鏃堕棿娈电殑璐圭巼
+ for (int i = 0; i < list.size(); i++) {
+ //鑾峰彇璐圭巼鏃堕棿娈� 杞寲涓篖ocalTime
+ startTime = LocalTime.of(list.get(i).getHour(), list.get(i).getMin());
+ endTime = LocalTime.of(list.get(i + 1).getHour(), list.get(i + 1).getMin());
+ if (i == list.size()) {
+ startTime = LocalTime.of(list.get(i).getHour(), list.get(i).getMin());
+ endTime = LocalTime.of(list.get(0).getHour(), list.get(0).getMin());
+ }
+ //鍒ゆ柇褰撳墠鏃堕棿鏄惁鍦ㄨ垂鐜囨椂闂存鍐�
+ if (localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
+ //鑾峰彇璐圭巼
+ charge = list.get(i).getCharge();
+ }
+
+ }
+ } else if (list.size() == 1) {
+ //鍙湁涓�鏉¤垂鐜囨椂锛岀洿鎺ヨ幏鍙栬垂鐜�
+ charge = list.get(0).getCharge();
+ } else {
+ //鍏朵粬璐圭巼鏃讹紝鑾峰彇榛樿璐圭巼
+ charge = 8.8;
+ }
+
+ //charge杞寲涓築igDecimal
+ //double鐩存帴浣跨敤 new BigDecimal()鏃朵細鍑虹幇绮惧害闂锛屾墍浠ラ渶瑕佷娇鐢˙igDecimal.valueOf()鏂规硶 骞惰缃簿搴︿负2浣嶅皬鏁�
+ BigDecimal chargeDecimal = BigDecimal.valueOf(charge).setScale(2, BigDecimal.ROUND_HALF_UP);
+
+ return chargeDecimal;
+ }
}
--
Gitblit v1.9.3