From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 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 d149397..814ca43 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
@@ -1,10 +1,12 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.C3mChargingChargeParam;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.C3mChargingChargeMapper;
@@ -12,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;
@@ -46,8 +50,15 @@
c3m.setTimestamp(timestamp);
save(c3m);
}
-// LogService.getBean().log(userId,username,"淇敼C3m璐圭巼",null,
-// "{ "+ JSON.toJSONString(chargeEntities)+" }");
+
+ /**
+ * c3鍏呯數妗╄垂鐜囨洿鏀� 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "c3鍏呯數妗╄垂鐜囨洿鏀癸細" + JSON.toJSONString(chargeEntities);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "c3鍏呯數妗╄垂鐜囨洿鏀�", content);
+ /**
+ * c3鍏呯數妗╄垂鐜囨洿鏀� 鏃ュ織璁板綍缁撴潫
+ */
return true;
}
@@ -62,6 +73,8 @@
BeanUtil.copyProperties(c3, charge);
charge.setTimestamp(new Date().getTime());
// c3mChargingChargeMapper.insertCharge(charge);
+
+
return save(charge);
}
@@ -156,4 +169,62 @@
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;
+ }
+ //璁＄畻鑺辫垂 璐圭巼*鐢甸噺
+ BigDecimal chargeDecimal = new BigDecimal(charge);
+ return chargeDecimal;
+ }
}
--
Gitblit v1.9.3