合并代码

Pu Zhibing

2024-10-28 a7bb5f73764cf57648f375ec4a27c6189f4f9a66

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

@@ -225,10 +225,10 @@
      if(null != chargingPile){
         //充电桩正常，返回异常，处理充电桩状态和添加故障记录
         if(chargingPile.getStatus() == 1 && 1 == status){
            TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
            List<TFaultMessage> faultMessages = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
                  .eq(TFaultMessage::getStatus, 2).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
            if(null == faultMessage){
               faultMessage = new TFaultMessage();
            if(faultMessages.isEmpty()){
               TFaultMessage faultMessage = new TFaultMessage();
               faultMessage.setSiteId(chargingPile.getSiteId());
               faultMessage.setChargingPileId(chargingPile.getId());
               faultMessage.setStatus(2);
@@ -237,21 +237,41 @@
               faultMessage.setDelFlag(false);
               faultMessage.setContent("设备故障");
               faultMessageService.save(faultMessage);

               chargingPile.setStatus(0 == status ? 1 : 3);
               chargingPileService.updateById(chargingPile);
					
               TChargingPile chargingPile1 = new TChargingPile();
               chargingPile1.setId(chargingPile.getId());
               chargingPile1.setStatus(3);
               chargingPileService.updateById(chargingPile1);
					
               List<TChargingGun> list1 = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()));
               for (TChargingGun chargingGun : list1) {
                  TChargingGun chargingGun1 = new TChargingGun();
                  chargingGun1.setId(chargingGun.getId());
                  chargingGun1.setStatus(7);
                  chargingGunService.updateById(chargingGun1);
               }
            }
         }
         if(chargingPile.getStatus() != 1 && 0 == status){
            TFaultMessage one = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
            List<TFaultMessage> list = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
                  .isNull(TFaultMessage::getEndTime));
            if(null != one){
               one.setEndTime(LocalDateTime.now());
               faultMessageService.updateById(one);
            if(!list.isEmpty()){
               list.forEach(s->s.setEndTime(LocalDateTime.now()));
               faultMessageService.updateBatchById(list);
            }

            chargingPile.setStatus(0 == status ? 1 : 3);
            chargingPileService.updateById(chargingPile);
				
            TChargingPile chargingPile1 = new TChargingPile();
            chargingPile1.setId(chargingPile.getId());
            chargingPile1.setStatus(1);
            chargingPileService.updateById(chargingPile1);
				
            List<TChargingGun> list1 = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()));
            for (TChargingGun chargingGun : list1) {
               TChargingGun chargingGun1 = new TChargingGun();
               chargingGun1.setId(chargingGun.getId());
               chargingGun1.setStatus(2);
               chargingGunService.updateById(chargingGun1);
            }
         }
         if(0 == status){
            Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_pile_online");