政务云数据上传、川易充bug修改

无关风月

1 天以前 e44b365b8a4e2520dd4cae1ce6adef9169f70b53

 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java

@@ -1,6 +1,8 @@
package com.ruoyi.jianguan.controller;

import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.common.core.domain.R;
@@ -13,6 +15,7 @@
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.other.api.domain.Operator;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -37,6 +40,8 @@
   private final static String operatorId = "906171535";
   @Resource
   private ChargingGunClient chargingGunClient;
   @Resource
   private AppUserClient appUserClient;
   @Resource
   private ChuanYiChongSuperviseUtil chuanYiChongSuperviseUtil;
   @Resource
@@ -153,13 +158,17 @@
      supEquipChargeStatus.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
      supEquipChargeStatus.setTotalPower(chargingOrder.getElectrovalence());
      tcecSuperviseUtil.notificationSupEquipChargeStatus(new Operator(), supEquipChargeStatus);
      TAppUser data = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
      // 川逸充
      if (chargingOrder.getRechargePaymentType()==3){
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("StartChargeSeq",chargingOrder.getCode());
         jsonObject.put("ConnectorID",chargingGun2.getFullNumber());
         LocalDateTime startTime = chargingOrder.getStartTime();
			
         log.info("川逸充用户信息"+data);
         if (StringUtils.hasLength(data.getPhone())){
            jsonObject.put("Mobile",data.getPhone());
         }
         //状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）
         int tempStatus = 0;
         switch (chargingOrder.getStatus()){
@@ -191,16 +200,6 @@
               chuanYiChongSuperviseUtil.notificationStationStatus(new Operator(), jsonObject);
               break;
            case 4:
               tempStatus=3;
               jsonObject.put("StartChargeSeqStat",tempStatus);
               if (startTime!=null){
                  jsonObject.put("StartTime",startTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
               }else{
                  LocalDateTime now = LocalDateTime.now();
                  // 转化为yyyy-MM-dd HH:mm:ss格式字符串
                  jsonObject.put("StartTime",now.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
               }
               chuanYiChongSuperviseUtil.notificationStationStatus(new Operator(), jsonObject);
               break;
            case 5:
               jsonObject.put("StartChargeSeqStat",4);
@@ -230,11 +229,11 @@
                     break;
               }
               jsonObject.put("ConnectorStatus",temp);
					

               jsonObject.put("CurrentA",chargingOrder.getCurrent());
               jsonObject.put("VoltageA",chargingOrder.getVoltage());
               LocalDateTime startTime2 = chargingOrder.getStartTime();
					

               if (startTime2!=null){
                  jsonObject.put("StartTime",startTime2.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
               }else{