From cd0fa3261b49dbab89bb01dfa94dc3ebdb08dec4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 07 七月 2022 16:32:11 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java |   73 +++++++++++++++++++++++++++---------
 1 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index 1c02071..6ae4861 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -8,6 +8,7 @@
 import com.sandu.common.service.impl.BaseServiceImpl;
 import com.sandu.common.util.SpringContextHolder;
 import com.sandu.ximon.admin.config.C3mRedisConfig;
+import com.sandu.ximon.admin.dto.ChargingDto;
 import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
 import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
 import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3OperationReportInnerFrame;
@@ -30,6 +31,7 @@
 import com.sandu.ximon.dao.domain.C3mOrder;
 import com.sandu.ximon.dao.domain.PoleBinding;
 import com.sandu.ximon.dao.enums.OrderStatus;
+import com.sandu.ximon.dao.domain.*;
 import com.sandu.ximon.dao.mapper.C3mChargingMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -38,10 +40,7 @@
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author ZZQ
@@ -213,24 +212,46 @@
     }
 
     /**
-     * 鏌ヨ鍏呯數妗�
+     * 鑾峰彇鍏呯數妗╄鎯�
      *
      * @return
      */
-    public C3mCharging getByC3Mac(String udid) {
-        C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, udid));
-        String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
-        if (s != null) {
-            try {
-                A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
-                one.setStatusBit((Integer.valueOf(beatDataPackage.getStatusBit())));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } else {
-            one.setStatusBit(0);
+    public ChargingDto getChargingInfo(String poleId) {
+        if (poleId == null) {
+            throw new BusinessException("鐏潌ID涓嶈兘涓虹┖锛�");
         }
-        return one;
+
+        Pole pole = SpringContextHolder.getBean(PoleService.class).
+                getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, poleId));
+        if (pole == null) {
+            throw new BusinessException("鍏呯數妗╃粦瀹氱殑鐏潌涓嶅瓨鍦紒");
+        }
+
+        C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getPoleDevicesCode, pole.getDeviceCode()));
+        ChargingDto chargingDto = new ChargingDto();
+
+        if (one == null) {
+            throw new BusinessException("鍏呯數妗╀俊鎭笉瀛樺湪锛�");
+        }
+        A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Mac());
+        if (beatDataPackage != null) {
+            //鍏呯數妗㊣D
+            chargingDto.setC3Id(one.getC3Id());
+            //C3Mac
+            chargingDto.setC3Mac(one.getC3Mac());
+            //鍦ㄧ嚎鐘舵��
+            chargingDto.setStatusBit(Integer.valueOf(beatDataPackage.getStatusBit()));
+            //鐢靛帇
+            chargingDto.setGridVoltage(beatDataPackage.getGridVoltage());
+            //鐢垫祦
+            chargingDto.setGridCurrent(beatDataPackage.getGridCurrent());
+            //娓╁害
+            chargingDto.setDeviceTemperature(beatDataPackage.getDeviceTemperature());
+            //鐏潌ID
+            chargingDto.setPoleId(pole.getId());
+        }
+
+        return chargingDto;
     }
 
     /**
@@ -328,7 +349,21 @@
      * @param c3Mac
      */
     @Transactional(rollbackFor = Exception.class)
-    public String finishCharging(String c3Mac) {
+    public String finishCharging(String c3Mac, String openId) {
+        //鏌ヨ
+        if (openId.isEmpty()) {
+            throw new BusinessException("openId涓嶈兘涓虹┖");
+        }
+        //鏌ヨ璇ュ厖鐢垫々鏈�杩戠殑璁㈠崟
+        C3mOrder order = SpringContextHolder.getBean(C3mOrderService.class).getOne(Wrappers.lambdaQuery(C3mOrder.class)
+                .eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
+
+        if (order == null) {
+            throw new BusinessException("鍏呯數妗╂病鏈夎繘琛屼腑鐨勮鍗�");
+        }
+        if (!openId.equals(order.getOrderId())) {
+            throw new BusinessException("涓嶈兘鎿嶄綔涓嶅睘浜庢偍鐨勮鍗�");
+        }
 
         C3FinishChargingReqInnerFrame c3FinishChargingReqInnerFrame =
                 new C3FinishChargingReqInnerFrame(c3Mac);

--
Gitblit v1.9.3