2021与蓝度共同重构项目,服务端
liuhaonan
2022-04-01 0350b21561519f5cab9a29645fac67dd906470fd
c3上报具体处理
已修改6个文件
已添加1个文件
已重命名1个文件
237 ■■■■■ 文件已修改
dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3mRedisConstant.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/OrderUtils.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/security/order/OrderQueryTask.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
@@ -4,9 +4,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import lombok.Data;
import org.springframework.core.annotation.OrderUtils;
import java.io.Serializable;
import java.util.Date;
/**
 * C3订单表
@@ -126,6 +130,5 @@
    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
@@ -1,20 +1,39 @@
package com.sandu.ximon.admin.manager.iot.amqp;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
import com.sandu.ximon.admin.manager.iot.amqp.processor.LightDataProcessor;
import com.sandu.ximon.admin.manager.iot.amqp.processor.PoleMonitorDataProcessor;
import com.sandu.ximon.admin.manager.iot.amqp.processor.c3ChargingProcessor;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.*;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3CommonReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3ErrorCodeReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonReportMessage;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
import com.sandu.ximon.admin.service.C3ChargingService;
import com.sandu.ximon.admin.service.C3mOrderService;
import com.sandu.ximon.admin.service.PoleBindingService;
import com.sandu.ximon.admin.service.PoleService;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.vo.C3mOrderVO;
import com.sandu.ximon.dao.domain.C3mCharging;
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.enums.OrderType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import javax.jms.Message;
import javax.jms.MessageListener;
import java.util.Date;
import java.util.Map;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -26,6 +45,16 @@
 */
@Slf4j
public class AmqpMessageListener implements MessageListener {
    @Autowired
    private C3ChargingService c3ChargingService;
    @Autowired
    private PoleBindingService bindingService;
    @Autowired
    private PoleService poleService;
    @Autowired
    private C3mOrderService orderService;
    protected final static ExecutorService EXECUTOR_SERVICE = new ThreadPoolExecutor(
            Runtime.getRuntime().availableProcessors(),
@@ -122,25 +151,49 @@
            c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
        } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
            //  ç½‘页操作二维码请求(41)
            A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
            log.info("C3充电桩上报处理_codeRequestFrame");
            log.info(codeRequestFrame.toString());
        } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
            //心跳包
            //  å¿ƒè·³åŒ…上报(42)   è‹¥äº”分钟无心跳包数据,则判断离线
            c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
        } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
            A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
            log.info("C3充电桩上报处理_completeRequestFrame");
            log.info(completeRequestFrame.toString());
            //  å……电结束上报(43)
            /**
             * è¯»å–心跳包,判断剩余金额和已充电量,统计到缓存中正在进行的订单。
             */
            A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress());
            if (aPackage == null) {
                LogUtils.error("{ å……电桩(" + completeRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败,请检查充电桩是否出现故障! }");
                return;
            }
            refund(aPackage);
        } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
            A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
            log.info("C3充电桩上报处理_stopRequestFrame");
            log.info(stopRequestFrame.toString());
            A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress());
            if (aPackage == null) {
                LogUtils.error("{ å……电桩(" + stopRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败,请检查充电桩是否出现故障! }");
                return;
            }
            refund(aPackage);
        } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
            A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
            log.info("C3充电桩上报处理_errorCodeRequestFrame");
            log.info(errorCodeRequestFrame.toString());
            A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(errorCodeRequestFrame.getDestinationAddress());
            if (aPackage == null) {
                LogUtils.error("{ å……电桩(" + errorCodeRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败,请检查充电桩是否出现故障! }");
                return;
            }
            refund(aPackage);
        }
    }
@@ -148,5 +201,75 @@
        A5AtmosphereHeartbeatReportInnerFrame transformFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
        log.info("大气心跳上报");
        log.info(transformFrame.toString());
    }
    private void refund(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage) {
//    private void refund(A5C3CommonReportInnerFrame completeRequestFrame,String code){
        /**
         * è¯»å–心跳包,判断剩余金额和已充电量,统计到缓存中正在进行的订单。
         */
        String c3Mac = aPackage.getC3Mac();
        //  èŽ·å–å¿ƒè·³åŒ…ä¸­çš„å‰©ä½™é‡‘é¢å’Œå·²å……ç”µé‡ï¼Œä¸Žç¼“å­˜ä¸­æ­£åœ¨è¿›è¡Œçš„è®¢å•è¿›è¡Œå¯¹æ¯”
        String chargingOrderJson = RedisUtils.getBean().get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3Mac);
        if (chargingOrderJson.isEmpty() || null == chargingOrderJson) {
            C3mCharging c3m = c3ChargingService.getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
            PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
                    .eq(PoleBinding::getDeviceCode,aPackage.getC3Mac())
                    .eq(PoleBinding::getDeviceType, 2));
            //  ç”Ÿæˆè®¢å•,并加载到redis缓存,设置超时时间为5分钟
            C3mOrder order = new C3mOrderVO().generateOrder(binding.getPoleId() == null ? 0L : binding.getPoleId()
                    , c3m.getPoleDevicesCode(), c3m.getC3Mac(), OrderType.ERROR, Double.valueOf(aPackage.getRemainingAmount()),
                    Integer.parseInt(new java.text.DecimalFormat("0").format(aPackage.getReservedCapacity()))
            );
            order.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity()));
            order.setOrderStatus(OrderStatus.REFUNDING.getStatus());
            order.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount()));
            orderService.save(order);
            String s = c3ChargingService.finishCharging(c3Mac);
//            if(C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(code)){
//
//            }
            //是否需要区分log类型 å¾…定
            LogUtils.error("{ å……电桩(" + c3Mac + ")不存在正在进行的订单,请检查充电桩是否出现故障!结束订单,结果为" + s + "}");
        } else {
            C3mOrder c3mOrderEntity = JSON.parseObject(chargingOrderJson, C3mOrder.class);
            //  è®¾ç½®å·²å……电量,订单状态,退款金额,订单退款时间戳,订单退款说明,结束充电时间戳,
            c3mOrderEntity.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity()));
            c3mOrderEntity.setOrderStatus(OrderStatus.REFUNDING.getStatus());
            c3mOrderEntity.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount()));
            //  èŽ·å–å‰©ä½™é‡‘é¢è¿›è¡Œé€€æ¬¾ï¼Œå¹¶å†™å…¥å½“å‰æ­£åœ¨è¿›è¡Œçš„è®¢å•
            boolean b = orderService.orderRefund(c3mOrderEntity.getOutTradeNo(), c3mOrderEntity.getRefundAmount());
            c3mOrderEntity.setRefundTimestamp(new Date().getTime());
            if (b) {
                c3mOrderEntity.setOrderStatus(OrderStatus.REFUND.getStatus());
                c3mOrderEntity.setRefundMsg("充电结束,订单退款成功");
            } else {
                c3mOrderEntity.setOrderStatus(OrderStatus.REFUND_FAILED.getStatus());
                c3mOrderEntity.setRefundMsg(
                        "充电结束,订单退款失败,请进行手动退款(订单号(" +
                                c3mOrderEntity.getOutTradeNo() + "),总金额(" +
                                c3mOrderEntity.getTotalAmount() + ",退款金额(" +
                                aPackage.getRemainingAmount() + "))"
                );
            }
            c3mOrderEntity.setStopChargingTimestamp(new Date().getTime());
            orderService.updateById(c3mOrderEntity);
            //  æ¸…除缓存中正在进行中的订单
            b = RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac());
            if (!b) {
                try {
                    Thread.sleep(2000);
                } catch (InterruptedException e) {
                    e.printStackTrace();
                }
                RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac());
            }
            //  å‘送结束订单
            String s = c3ChargingService.finishCharging(c3Mac);
            LogUtils.error("{ å……电桩(" + c3Mac + ")不存在正在进行的订单,请检查充电桩是否出现故障!结束订单,结果为" + s + "}");
        }
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -57,7 +57,10 @@
            log.info(netRequestFrame.toString());
            if (netRequestFrame.isValidate()) {
                SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
                boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
                if(!b){
                    return;
                }
            }
        }
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3mRedisConstant.java
ÎļþÃû´Ó dao/src/main/java/com/sandu/ximon/dao/enums/C3mRedisConstant.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.sandu.ximon.dao.enums;
package com.sandu.ximon.admin.manager.iot.rrpc.enums;
public enum C3mRedisConstant {
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/OrderUtils.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.sandu.ximon.admin.pay;
import com.sandu.ximon.admin.utils.DateUtils;
import java.util.Date;
import java.util.UUID;
public class OrderUtils {
    public static String generateOutTradeNo () {
        String outTradeNo = DateUtils.orderFormat(new Date());
        String uuid = UUID.randomUUID().toString().substring(0, 2);
        outTradeNo = outTradeNo + uuid;
        return outTradeNo;
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/security/order/OrderQueryTask.java
@@ -5,7 +5,7 @@
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.enums.C3mRedisConstant;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import lombok.Data;
import java.util.Date;
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -1,11 +1,12 @@
package com.sandu.ximon.admin.service;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.dao.bo.C3ChargingBo;
import com.sandu.ximon.admin.config.C3mRedisConfig;
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;
@@ -13,16 +14,25 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.request.*;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.C3ChargingBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Set;
/**
 * @author ZZQ
@@ -68,13 +78,14 @@
     */
    public boolean saveReporEquipment(String deviceName, String mcuUdid, String c3Mac) {
        C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
        boolean flag;
        if (one == null) {
            //将设备信息添加到充电桩设备表
            C3mCharging c3mCharging = new C3mCharging();
            c3mCharging.setMcuUdid(mcuUdid);
            c3mCharging.setPoleDevicesCode(deviceName);
            c3mCharging.setC3Mac(c3Mac);
            boolean flag = save(c3mCharging);
            flag = save(c3mCharging);
            //设置费率
            C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
            List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
@@ -82,21 +93,64 @@
                c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
            }
            return flag;
        } else {
            //将设备信息添加到充电桩设备表
            one.setPoleDevicesCode(deviceName);
            one.setC3Mac(c3Mac);
            boolean flag = updateById(one);
            flag = updateById(one);
            //设置费率
            C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
            List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
            if (list.size() == 0) {//费率表中没有此充电桩数据时  æ·»åŠ é»˜è®¤è´¹çŽ‡
                c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
            }
            return flag;
        }
        //同步时间戳
        String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
        String s = SetCalendar(c3Mac, Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
                Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
                Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)));
        if (!"操作成功".equals(s)) {
            LogUtils.error("发送设置C3时间同步失败!");
            return false;
        }
        /**  è·³åŒ…时间同步
         * è®¾ç½®æ—¶é—´è§„则:充电时为1倍,非充电状态为1.5倍时间
         */
        Set<String> keys = RedisUtils.getBean().keys(C3mRedisConstant.C3_STATUS.getCode() + "*");
        C3mRedisConfig.reFlushTime(keys.size());
        String time1 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false);
        LogUtils.error("C3空闲心跳包时间同步响应结果:" + time1);
        String time2 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true);
        LogUtils.error("C3充电时心跳包时间同步响应结果:" + time2);
        /**
         * èŽ·å–å¿ƒè·³åŒ…ï¼Œåˆ¤æ–­åœ¨çº¿
         */
        A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac);
        if(aPackage == null){
            LogUtils.error("读取心跳包为空");
            return false;
        }
        RedisUtils redisUtils = RedisUtils.getBean();
        redisUtils.set(
                C3mRedisConstant.C3_STATUS.getCode() + c3Mac,
                JSON.toJSONString(aPackage),
                C3mRedisConfig.OUTLINE_TIME
        );
        /**
         * finally、同步结束
         */
        String end = EndOfTheSynchronization(c3Mac);
        if (!"操作成功".equals(end)) {
            LogUtils.error("C3同步结束响应结果"+end);
            return false;
        }
        return flag;
    }
    /**
@@ -688,4 +742,7 @@
        }
        return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getDeviceCode()));
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -19,16 +19,14 @@
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.C3mRedisConstant;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
 * @Author liuhaonan
@@ -56,7 +54,7 @@
            return false;
        } else {
            orderByOutTradeNo.setRefundAmount(refundAmount);
            return c3mOrderRefund(orderByOutTradeNo, "页面API退款", userId, username);
            return c3mOrderRefund(orderByOutTradeNo, "充电桩退款", userId, username);
        }