Merge remote-tracking branch 'origin/master'

xuhy

2024-08-27 b79c0fa3aa4f7dffe18ab419b6cf4ed47ebd22f9

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

@@ -27,6 +27,8 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.feignClient.ChargingOrderAccountingStrategyClient;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
@@ -81,6 +83,9 @@
   
   @Resource
   private AppUserCarClient appUserCarClient;
	
   @Resource
   private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
   
   
   
@@ -404,7 +409,7 @@
      }else{
         siteIds.add(query.getSiteId());
      }
      // todo 待完善
		
      if(null != query.getStatus() && 0 < query.getStatus().size()){
         if(query.getStatus().contains(3)){
            query.getStatus().add(6);
@@ -427,7 +432,57 @@
               TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
               gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
            }
				
            UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
            gunMonitoring.setChargingRatio(BigDecimal.valueOf(data.getSoc()));
            gunMonitoring.setElectricQuantity(data.getCharging_degree().toString());
            gunMonitoring.setSoc(data.getSoc().toString());
            gunMonitoring.setElectricCurrent(data.getOutput_current().toString());
            gunMonitoring.setVoltage(data.getOutput_voltage().toString());
            switch (data.getHardware_fault()){
               case 1:
                  gunMonitoring.setFaultCause("急停按钮动作故障");
                  break;
               case 2:
                  gunMonitoring.setFaultCause("无可用整流模块");
                  break;
               case 3:
                  gunMonitoring.setFaultCause("出风口温度过高");
                  break;
               case 4:
                  gunMonitoring.setFaultCause("交流防雷故障");
                  break;
               case 5:
                  gunMonitoring.setFaultCause("交直流模块 DC20 通信中断");
                  break;
               case 6:
                  gunMonitoring.setFaultCause("绝缘检测模块 FC08 通信中断");
                  break;
               case 7:
                  gunMonitoring.setFaultCause("电度表通信中断");
                  break;
               case 8:
                  gunMonitoring.setFaultCause("读卡器通信中断");
                  break;
               case 9:
                  gunMonitoring.setFaultCause("RC10 通信中断");
                  break;
               case 10:
                  gunMonitoring.setFaultCause("风扇调速板故障");
                  break;
               case 11:
                  gunMonitoring.setFaultCause("直流熔断器故障");
                  break;
               case 12:
                  gunMonitoring.setFaultCause("高压接触器故障");
                  break;
               case 13:
                  gunMonitoring.setFaultCause("门打开");
                  break;
            }
         }
			
			
      }
      return pageInfo.setRecords(chargingGunMonitoring);
   }