联调修改E路通bug

Pu Zhibing

20 小时以前 0857f1e53b10c29dd6ebd7ce6fd4a5c601a8a7db

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

@@ -3,6 +3,9 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
@@ -81,10 +84,10 @@
   private TCECClient tcecClient;

   @Resource
   private ELuTongClient eLuTongClient;
   private ISiteService siteService;

   @Resource
   private ISiteService siteService;
   private ELuTongClient eLuTongClient;



@@ -267,18 +270,21 @@
         TChargingPile chargingPile = chargingPileService.getById(tChargingGun.getChargingPileId());
         //枪处于离线或者故障，返回状态为正常，则修改其状态
         if(0 == status && tChargingGun.getStatus() != 2){
            Site site = siteService.getById(tChargingGun.getSiteId());
            TChargingGun tChargingGun1 = new TChargingGun();
            tChargingGun1.setId(tChargingGun.getId());
            tChargingGun1.setStatus(2);
            chargingGunService.updateById(tChargingGun1);
            new Thread(new Runnable() {
               @Override
               public void run() {
                  //推送状态给三方平台
                  tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
                  pushConnectorStatus(tChargingGun);
               }
            }).start();
            if(site.getIsOpenSynchronization() == 1){
               new Thread(new Runnable() {
                  @Override
                  public void run() {
                     //推送状态给三方平台
                     tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 2);
                            pushConnectorStatus(tChargingGun);
                  }
               }).start();
            }
            
            if(chargingPile.getStatus() != 1){
               TChargingPile chargingPile1 = new TChargingPile();
@@ -296,18 +302,22 @@
         }
         //枪处于正常，返回状态为故障，则修改其状态
         if(1 == status && tChargingGun.getStatus() != 1 && tChargingGun.getStatus() != 7){
            Site site = siteService.getById(tChargingGun.getSiteId());
            TChargingGun tChargingGun1 = new TChargingGun();
            tChargingGun1.setId(tChargingGun.getId());
            tChargingGun1.setStatus(7);
            chargingGunService.updateById(tChargingGun1);
            new Thread(new Runnable() {
               @Override
               public void run() {
                  //推送状态给三方平台
                  tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
                  pushConnectorStatus(tChargingGun);
               }
            }).start();
            if(site.getIsOpenSynchronization() == 1){
               new Thread(new Runnable() {
                  @Override
                  public void run() {
                     //推送状态给三方平台
                     tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 7);
                            pushConnectorStatus(tChargingGun);
                  }
               }).start();
            }

            
            //桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
            List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
@@ -337,6 +347,7 @@
            order.setStatusList(Arrays.asList(1, 2, 3, 4, 5));
            List<TChargingOrder> orders = chargingOrderClient.getChargingOrder(order).getData();
            if(orders.size() > 0){
               Site site = siteService.getById(tChargingGun.getSiteId());
               TChargingOrder chargingOrder = orders.get(0);
               TChargingGun tChargingGun1 = new TChargingGun();
               if(Arrays.asList(1, 2, 5).contains(chargingOrder.getStatus())){
@@ -354,27 +365,33 @@
                  tChargingGun1.setId(tChargingGun.getId());
                  chargingGunService.updateById(tChargingGun1);
               }
               new Thread(new Runnable() {
                  @Override
                  public void run() {
                     //推送状态给三方平台
                     tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
                     pushConnectorStatus(tChargingGun);
                  }
               }).start();
               if(site.getIsOpenSynchronization() == 1){
                  new Thread(new Runnable() {
                     @Override
                     public void run() {
                        //推送状态给三方平台
                        tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 5);
                                pushConnectorStatus(tChargingGun);
                     }
                  }).start();
               }

            }else{
               Site site = siteService.getById(tChargingGun.getSiteId());
               TChargingGun tChargingGun1 = new TChargingGun();
               tChargingGun1.setId(tChargingGun.getId());
               tChargingGun1.setStatus(3);
               chargingGunService.updateById(tChargingGun1);
               new Thread(new Runnable() {
                  @Override
                  public void run() {
                     //推送状态给三方平台
                     tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
                     pushConnectorStatus(tChargingGun);
                  }
               }).start();
               if(site.getIsOpenSynchronization() == 1){
                  new Thread(new Runnable() {
                     @Override
                     public void run() {
                        //推送状态给三方平台
                        tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 3);
                                pushConnectorStatus(tChargingGun);
                     }
                  }).start();
               }
            }
            
            List<TFaultMessage> list = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingGunId, tChargingGun.getId())
@@ -398,7 +415,7 @@
         ConnectorStatusReq connectorStatusReq = new ConnectorStatusReq();
         connectorStatusReq.setOperatorId("91510903906171535D");
         connectorStatusReq.setSerAreaCode(site.getSerAreaCode());
         connectorStatusReq.setStationId(site.getId().toString());
         connectorStatusReq.setStationId(site.getCode());
         List<ConnectorStatusInfo> connectorStatusInfos = new ArrayList<>();
         connectorStatusInfos.add(buildConnectorStatus(chargingGun));
         connectorStatusReq.setItemSize(connectorStatusInfos.size());
@@ -413,7 +430,7 @@

   private ConnectorStatusInfo buildConnectorStatus(TChargingGun chargingGun){
      ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
      connectorStatusInfo.setConnectorId(chargingGun.getId().toString());
      connectorStatusInfo.setConnectorId(chargingGun.getCode());
      switch (chargingGun.getStatus()){
         case 1:
            connectorStatusInfo.setStatus(0);