修改bug

puzhibing

2026-08-14 74bce573f6eb00f9f4942afd903cfad53addc9cf

修改bug

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

@@ -276,8 +276,8 @@
        //0：正常，1：故障，2=插枪
        Integer status = vo.getStatus();
        Long time = (Long) redisTemplate.opsForHash().get("charging_gun_online", (pile_code + gun_code));
        //小于10秒才处理数据，防止频繁查询数据
        if(null != time && (System.currentTimeMillis() - time) < 10000){
        //小于3秒才处理数据，防止频繁查询数据
        if(null != time && (System.currentTimeMillis() - time) < 3000){
            return;
        }
        TChargingGun tChargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getFullNumber, (pile_code + gun_code)).eq(TChargingGun::getDelFlag, 0));

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java

@@ -1385,13 +1385,23 @@
    @PostMapping("/notificationStopChargeResult")
    public R notificationStopChargeResult(@RequestParam("startChargeSeq") String startChargeSeq, @RequestParam("connectorID") String connectorID,
                                          @RequestParam("operatorId") Integer operatorId){
        TChargingOrder chargingOrder = chargingOrderClient.getChargingOrderByStartChargeSeq(startChargeSeq).getData();
        if(null == chargingOrder){
            return null;
        }
        List<TChargingOrderAccountingStrategy> data = chargingOrderAccountingStrategyClient.getChargingOrderAccountingStrategyByOrderId(chargingOrder.getId()).getData();
        Operator operator = operatorClient.getOperatorById(operatorId).getData();
        NotificationStopChargeResult info = new NotificationStopChargeResult();
        info.setStartChargeSeq(startChargeSeq);
        info.setStartChargeSeqStat(4);
        info.setConnectorID(connectorID);
        info.setStartChargeSeqStat(4);
        if(data.isEmpty()){
            info.setSuccStat(1);
            info.setFailReason(3);
        }else{
        info.setSuccStat(0);
        info.setFailReason(0);
        }
        NotificationStopCharge notificationStopCharge = TCECUtil.notificationStopChargeResult(operator, info);
        //启动重试推送机制
        if(null == notificationStopCharge || 1 == notificationStopCharge.getSuccStat()){

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -16,6 +16,7 @@
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.feignClient.*;
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.vo.GetChargingGunByChargingPileIdsVo;
import com.ruoyi.chargingPile.api.vo.GetChargingGunByCode;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
@@ -1949,11 +1950,6 @@
    @Override
    public TCharingOrderVO chargingOrder(ChargingOrderQuery dto) {
        TCharingOrderVO tCharingOrderVO = new TCharingOrderVO();
        List<TChargingGun> allGun = chargingGunClient.getAllGun().getData();
        List<TChargingPile> allPile = chargingGunClient.getAllPile().getData();
        List<Site> data9 = siteClient.getSiteAll().getData();
        List<TAppUser> data6 = appUserClient.getAllUser().getData();
        List<TAppUserCar> data4 = appUserCarClient.getAllCar().getData();
        String startTime1 = null;
        String startTime2 = null;
        String endTime1 = null;
@@ -1993,6 +1989,23 @@
            list3 = chargingOrderAccountingStrategyService.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>()
                    .in(TChargingOrderAccountingStrategy::getChargingOrderId, collect));
        }

        if(list.isEmpty()){
            return tCharingOrderVO;
        }

        List<Integer> chargingPileId = list.stream().map(ChargingOrderVO::getChargingPileId).collect(Collectors.toList());
        GetChargingGunByChargingPileIdsVo getChargingGunByChargingPileIdsVo = new GetChargingGunByChargingPileIdsVo();
        getChargingGunByChargingPileIdsVo.setChargingPileIds(chargingPileId);
        List<TChargingGun> allGun = chargingGunClient.getChargingGunByChargingPileIds(getChargingGunByChargingPileIdsVo).getData();
        List<Integer> siteIdss = list.stream().map(ChargingOrderVO::getSiteId).collect(Collectors.toList());
        List<TChargingPile> allPile = chargingPileClient.getChargingPileBySiteIds(siteIdss).getData();
        List<Site> data9 = siteClient.getSiteByIds(siteIdss).getData();
        List<Long> appUserIds = list.stream().map(ChargingOrderVO::getAppUserId).collect(Collectors.toList());
        List<TAppUser> data6 = appUserClient.getUserByIds(appUserIds).getData();
        List<Long> appUserCarIds = list.stream().map(ChargingOrderVO::getAppUserCarId).collect(Collectors.toList());
        List<TAppUserCar> data4 = appUserCarClient.getCarByIds(appUserCarIds).getData();

        for (ChargingOrderVO chargingOrderVO : list) {
            if (roleType == 2) {
                for (Integer siteId : siteIds) {