Merge remote-tracking branch 'origin/master'

xuhy

2025-03-25 ac9328daa570069fa5617a2035d2700e6fed76aa

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java

@@ -694,7 +694,8 @@
        }
        for (TChargingGun chargingGun : list) {
            Long time = (Long) charging_gun_online.get(chargingGun.getFullNumber());
            if(null != time && System.currentTimeMillis() - time > 60000){
            //判断设备是否真的脸1分钟（1分钟+代码中的30秒间隔处理存储）
            if(null != time && System.currentTimeMillis() - time > 90000){
                TChargingGun chargingGun1 = new TChargingGun();
                chargingGun1.setId(chargingGun.getId());
                chargingGun1.setStatus(1);