Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-29 443ee99e828ea01598024efa9cd9eb5b171327c7

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java

@@ -227,7 +227,7 @@
        Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_gun_online");
        Long time = (Long) charging_pile_online.get(pile_code + gun_code);
        //小于30秒才处理数据，防止频繁查询数据
        if(null != time || (System.currentTimeMillis() - time) < 30000){
        if(null != time && (System.currentTimeMillis() - time) < 30000){
            return;
        }
        TChargingGun tChargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getFullNumber, (pile_code + gun_code)).eq(TChargingGun::getDelFlag, 0));