ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/JianGuanAccountFallbackFactory.java
@@ -2,8 +2,6 @@ import com.ruoyi.account.api.feignClient.InviteUserClient; import com.ruoyi.account.api.feignClient.JianGuanAccountClient; import com.ruoyi.account.api.model.TInviteUser; import com.ruoyi.account.api.vo.GetInviteUser; import com.ruoyi.account.api.vo.GovernmentCloudAccountVO; import com.ruoyi.common.core.domain.R; import org.slf4j.Logger; ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/ChuanYiChongSuperviseUtil.java
@@ -163,19 +163,19 @@ buildBody(post, info, operator); HttpResponse execute = post.execute(); if(200 != execute.getStatus()){ log.error("推送三方平台充电开始状态失败：" + execute.body()); log.error("川易充推送三方平台充电开始状态失败：" + execute.body()); return null; } log.info("推送三方平台设备状态响应：" + execute.body()); log.info("川易充推送三方平台设备状态响应：" + execute.body()); BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class); Integer Ret = baseResult.getRet(); if(0 != Ret){ log.error("推送三方平台充电开始状态失败：" + baseResult.getMsg()); log.error("川易充推送三方平台充电开始状态失败：" + baseResult.getMsg()); return null; } //解密参数 String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV); log.info("推送三方平台设备状态Data：" + decrypt); log.info("川易充推送三方平台设备状态Data：" + decrypt); NotificationStationStatusResult notificationStationStatusResult = JSON.parseObject(decrypt, NotificationStationStatusResult.class); return notificationStationStatusResult; } @@ -197,19 +197,19 @@ buildBody(post, info, operator); HttpResponse execute = post.execute(); if(200 != execute.getStatus()){ log.error("推送川逸充平台充电结束状态失败：" + execute.body()); log.error("川易充推送川逸充平台充电结束状态失败：" + execute.body()); return null; } log.info("推送川逸充平台充电结束状态响应：" + execute.body()); log.info("川易充推送川逸充平台充电结束状态响应：" + execute.body()); BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class); Integer Ret = baseResult.getRet(); if(0 != Ret){ log.error("推送川逸充平台充电结束状态失败：" + baseResult.getMsg()); log.error("川易充推送川逸充平台充电结束状态失败：" + baseResult.getMsg()); return null; } //解密参数 String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV); log.info("推送川逸充充电结束.状态Data：" + decrypt); log.info("川易充推送川逸充充电结束.状态Data：" + decrypt); NotificationEquipChargeStatusResult notificationEquipChargeStatusResult = JSON.parseObject(decrypt, NotificationEquipChargeStatusResult.class); return notificationEquipChargeStatusResult; } @@ -300,9 +300,9 @@ baseRequest.setSig(hmacMD5); String request_json = JacksonUtils.toJson(baseRequest); post.body(request_json); log.info("推送三方平台请求地址：" + post.getUrl()); log.info("推送三方平台请求参数：" + request_json); log.info("推送三方平台请求Data：" + o.toJSONString()); log.info("川易充推送三方平台请求地址：" + post.getUrl()); log.info("川易充推送三方平台请求参数：" + request_json); log.info("川易充推送三方平台请求Data：" + o.toJSONString()); } /** * 构建请求参数和消息头 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java
@@ -1,4 +1,6 @@ package com.ruoyi.jianguan.util; import com.ruoyi.account.api.factory.JianGuanAccountFallbackFactory; import com.ruoyi.account.api.feignClient.JianGuanAccountClient; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.domain.SysLoginLog; import com.ruoyi.system.api.domain.SysOperLog; @@ -69,7 +71,6 @@ import com.ruoyi.account.api.model.TAppUserIntegralChange; import com.ruoyi.account.api.model.TAppUserTag; import com.ruoyi.account.api.feignClient.JianGuanAccountClient; import com.ruoyi.account.api.vo.GovernmentCloudAccountVO; import com.ruoyi.chargingPile.api.feignClient.JianGuanChargingPileClient; import com.ruoyi.chargingPile.api.model.TChargingPile; ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/TaskUtil.java
@@ -1,6 +1,8 @@ package com.ruoyi.jianguan.util; 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.jianguan.model.ConnectorStatusInfo; @@ -13,6 +15,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; @@ -39,6 +42,8 @@ private TCECSuperviseUtil tcecSuperviseUtil; @Resource private ChargingOrderClient chargingOrderClient; @Resource private AppUserClient appUserClient; @Resource private RedisTemplate redisTemplate; @@ -129,11 +134,16 @@ 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()); if (StringUtils.hasLength(data.getPhone())){ jsonObject.put("Mobile",data.getPhone()); } LocalDateTime startTime = chargingOrder.getStartTime(); //状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）
