From c42bbac189958358b2c8ae4e163d55158d6750fc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 22 三月 2022 11:47:47 +0800
Subject: [PATCH] C3充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 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 785a3f7..624979b 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,6 +1,8 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.bean.BeanUtil;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.param.C3mChargingChargeParam;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import com.sandu.ximon.dao.mapper.C3mChargingChargeMapper;
import lombok.AllArgsConstructor;
@@ -24,12 +26,12 @@
/**
* 淇敼璐圭巼
+ *
* @param chargeEntities
- * @param userId
- * @param username
+ * @param
* @return
*/
- public boolean updateCharge(List<C3mChargingCharge> chargeEntities, Long userId, String username) {
+ public boolean updateCharge(List<C3mChargingCharge> chargeEntities) {
// 鍒犻櫎鍘熸湰瀛樺湪鐨勮垂鐜�
c3mChargingChargeMapper.deleteCharge(chargeEntities.get(0).getC3Id());
Long timestamp = new Date().getTime();
@@ -43,11 +45,24 @@
return true;
}
+ public boolean initCharge(C3mChargingChargeParam c3) {
+ C3mChargingCharge charge = new C3mChargingCharge();
+ BeanUtil.copyProperties(c3, charge);
+ charge.setTimestamp(new Date().getTime());
+// c3mChargingChargeMapper.insertCharge(charge);
+ return save(charge);
+ }
+
public void initCharge(Integer c3Id) {
List<C3mChargingCharge> chargeList = getChargeByC3Id(c3Id);
- if(chargeList.size() == 0) {
+ if (chargeList.size() == 0) {
// 涓嶅瓨鍦ㄨ垂鐜囨椂锛岀敓鎴愬崟涓垂鐜囧苟鎻掑叆鏁版嵁搴�
- C3mChargingCharge c3mChargeEntity = C3mChargingCharge.getInitInstance(c3Id);
+ C3mChargingCharge c3mChargeEntity = new C3mChargingCharge();/*C3mChargingCharge.getInitInstance(c3Id);*/
+ c3mChargeEntity.setC3Id(c3Id);
+ c3mChargeEntity.setHour(0);
+ c3mChargeEntity.setMin(0);
+ c3mChargeEntity.setCharge(8.8);
+ c3mChargeEntity.setTimestamp(new Date().getTime());
c3mChargingChargeMapper.insertCharge(c3mChargeEntity);
}
}
@@ -57,7 +72,7 @@
// 鏌ユ壘鏁版嵁搴撴墍鏈夎垂鐜�
List<C3mChargingCharge> list = c3mChargingChargeMapper.getChargeByC3Id(c3Id);
// 鍒ゆ柇list涓哄崟鏉＄洿鎺ヨ繑鍥�
- if(list.size()<2){
+ if (list.size() < 2) {
return list;
}
// 灏嗘椂鍒嗚繘琛屾帓搴�
@@ -65,7 +80,7 @@
@Override
public int compare(C3mChargingCharge o1, C3mChargingCharge o2) {
int i = o2.getHour().compareTo(o1.getHour());
- if(i == 0){
+ if (i == 0) {
return o2.getMin().compareTo(o1.getMin());
}
return i;
@@ -79,22 +94,22 @@
// list缈昏浆
Collections.reverse(list);
// 鏃堕棿娈靛瓧绗︽嫾鎺�
- for(int i=1;i<list.size();i++){
+ for (int i = 1; i < list.size(); i++) {
C3mChargingCharge pre = list.get(i - 1);
C3mChargingCharge now = list.get(i);
pre.setStrTime(
- pre.getHour()+"鐐�"+pre.getMin()+"鍒� 鍒� "+
- now.getHour()+"鐐�"+now.getMin()+"鍒�"
+ pre.getHour() + "鐐�" + pre.getMin() + "鍒� 鍒� " +
+ now.getHour() + "鐐�" + now.getMin() + "鍒�"
);
- if(i==list.size()-1){
+ if (i == list.size() - 1) {
pre = now;
now = list.get(0);
- if(now.getHour() < pre.getHour()){
+ if (now.getHour() < pre.getHour()) {
pre.setStrTime(
pre.getHour() + "鐐�" + pre.getMin() + "鍒� 鍒� " +
- "闅旀棩"+now.getHour() + "鐐�" + now.getMin() + "鍒�"
+ "闅旀棩" + now.getHour() + "鐐�" + now.getMin() + "鍒�"
);
- }else {
+ } else {
pre.setStrTime(
pre.getHour() + "鐐�" + pre.getMin() + "鍒� 鍒� " +
now.getHour() + "鐐�" + now.getMin() + "鍒�"
--
Gitblit v1.9.3