From 4e76b9737e036c18e8a9e840dc443615ffcec348 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 20 十月 2022 12:20:18 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java | 51 ++++++---------------------------------------------
1 files changed, 6 insertions(+), 45 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 458b83c..2a8b82c 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
@@ -44,7 +44,7 @@
* @param
* @return
*/
- public boolean updateCharge(List<C3mChargingCharge> chargeEntities) { //TODO
+ public boolean updateCharge(List<C3mChargingCharge> chargeEntities) {
// 鍒犻櫎鍘熸湰瀛樺湪鐨勮垂鐜�
Integer c3Id = chargeEntities.get(0).getC3Id();
@@ -59,7 +59,7 @@
if (byId == null) {
throw new BusinessException("c3Id涓嶅瓨鍦�");
}
- String s = chargingService.setRate(byId.getC3Mac(), chargeEntities);
+ String s = chargingService.setRate(byId.getC3Mac(), chargeEntities,false);
if (!"鎿嶄綔鎴愬姛".equals(s)) {
throw new BusinessException("璁剧疆澶辫触,澶辫触鍘熷洜: " + s);
}
@@ -222,9 +222,9 @@
System.out.println("----- " + collect);
//鑾峰彇褰撳墠鏃堕棿
-// LocalTime localTime = LocalTime.now();
- LocalTime localTime = LocalTime.of(0, 0);
- System.out.println(localTime);
+ LocalTime localTime = LocalTime.now();
+// LocalTime localTime = LocalTime.of(18, 00);
+ System.out.println("time"+localTime);
C3mChargingCharge temp1 = collect.get(collect.size() - 1);
if (localTime.isAfter(LocalTime.of(temp1.getHour(), temp1.getMin()))) {
@@ -258,45 +258,6 @@
}
}
-
-//
-// //鑾峰彇褰撳墠鏃堕棿
-// 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;
- return BigDecimal.valueOf(99);
+ return BigDecimal.valueOf(8.8);
}
}
--
Gitblit v1.9.3