changes

liuhaonan

2022-08-29 e947320e6604a12f5fd6e323b0a885b9a77c1e95

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java

@@ -47,7 +47,7 @@
@Slf4j
@AllArgsConstructor
public class C3ChargingService extends BaseServiceImpl<C3mChargingMapper, C3mCharging> {
    private C3mChargingMapper c3mChargingMapper;
    private final C3mChargingMapper c3mChargingMapper;
    private final C3mChargingChargeService c3mChargingChargeService;
    private final PoleBindingService bindingService;
    private final PoleService poleService;
@@ -110,7 +110,7 @@
        System.out.println("设置费率开始");
        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) {//费率表中没有此充电桩数据时  添加默认费率
        if (list == null && list.size() == 0) {//费率表中没有此充电桩数据时  添加默认费率
            c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
        }
        String rateState = setRate(c3Mac, list, true);
@@ -154,6 +154,12 @@
        Thread.sleep(1000);

        /**
         * 是否有进行中的个订单
         */
        SpringContextHolder.getBean(C3mOrderService.class).stopCharingOrder( aPackage);


        /**
         * finally、同步结束
         */
        System.out.println("同步结束  开始");