开发二级等保功能及心跳消息队列修改

Pu Zhibing

9 天以前 7a4f9541331bef779a506b38a27ed5c3373c0bec

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

@@ -6,7 +6,6 @@
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.api.vo.StartChargeResult;
@@ -28,6 +27,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -72,7 +72,11 @@
      connectorStatusInfo.setStationID(String.valueOf(chargingGun.getSiteId()));
      connectorStatusInfo.setEquipmentID(String.valueOf(chargingGun.getChargingPileId()));
      connectorStatusInfo.setConnectorID(chargingGun.getFullNumber());
      connectorStatusInfo.setEquipmentClassification(1);
      if (chargingGun.getEquipmentClassification()!=null){
         connectorStatusInfo.setEquipmentClassification(chargingGun.getEquipmentClassification());
      }else {
         connectorStatusInfo.setEquipmentClassification(1);
      }
      switch (chargingGun.getStatus()){
         case 1:
            connectorStatusInfo.setStatus(0);
@@ -97,10 +101,7 @@
            break;
      }
      connectorStatusInfo.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
      List<Operator> operators = operatorClient.getAllOperator().getData();
      for (Operator operator : operators) {
         tcecSuperviseUtil.notificationStationStatus(operator, connectorStatusInfo);
      }
      tcecSuperviseUtil.notificationStationStatus(new Operator(), connectorStatusInfo);
      return R.ok();
   }
   /**
@@ -157,14 +158,12 @@
            break;
      }
      supEquipChargeStatus.setCurrentA(chargingOrder.getCurrent());
      supEquipChargeStatus.setSOC(new BigDecimal(chargingOrder.getEndSoc()));

      supEquipChargeStatus.setSOC(StringUtils.hasLength(chargingOrder.getEndSoc())?new BigDecimal(chargingOrder.getEndSoc()):new BigDecimal("1"));
      supEquipChargeStatus.setStartTime(chargingOrder.getStartTime() != null ? chargingOrder.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : "");
      supEquipChargeStatus.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
      supEquipChargeStatus.setTotalPower(chargingOrder.getElectrovalence());
      List<Operator> operators = operatorClient.getAllOperator().getData();
      for (Operator operator : operators) {
         tcecSuperviseUtil.notificationSupEquipChargeStatus(operator, supEquipChargeStatus);
      }
         tcecSuperviseUtil.notificationSupEquipChargeStatus(new Operator(), supEquipChargeStatus);
      return R.ok();
   }
   /**
@@ -208,10 +207,7 @@
            break;
      }

      List<Operator> operators = operatorClient.getAllOperator().getData();
      for (Operator operator : operators) {
         tcecSuperviseUtil.notificationChargeOrderInfo(operator, supChargeOrderInfo);
      }
         tcecSuperviseUtil.notificationChargeOrderInfo(new Operator(), supChargeOrderInfo);
      return R.ok();
   }
}