autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-04 18:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

update pre数据库为生产数据库

Browse Source
This commit is contained in:
YAS\29473
2025-07-29 10:35:37 +08:00
parent 0dcfb04420
commit 01e554c1a9
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jsowell-admin/src/main/resources/application-pre.yml
View File

@@ -8,17 +8,17 @@ spring:
# redis 配置
redis:
# 地址
# host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
host: 106.14.94.149
host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
# host: 106.14.94.149
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 账号
# username: jsowell
username: jsowell
# 密码
# password: js@160829
password: js160829
password: js@160829
# password: js160829
# 连接超时时间
timeout: 10s
lettuce:
@@ -38,12 +38,12 @@ spring:
druid:
# 主库数据源
master:
# url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell
# password: js@160829
url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_pre
password: Js@160829
url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell
password: js@160829
# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_pre
# password: Js@160829
# 从库数据源
slave:
# 从数据源开关/默认关闭

22
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java vendored
View File

@@ -405,7 +405,7 @@ public class CommonService {
*/
public void pushRealTimeInfoV2(String pileSn, String connectorCode, String connectorStatus,
RealTimeMonitorData realTimeMonitorData, String transactionCode) throws UnsupportedEncodingException {
log.info("推送实时数据到第三方平台，桩编号：{}，枪口号：{}，枪口状态：{}，实时数据：{}", pileSn, connectorCode, connectorStatus, JSON.toJSONString(realTimeMonitorData));
// log.info("推送实时数据到第三方平台，桩编号：{}，枪口号：{}，枪口状态：{}，实时数据：{}", pileSn, connectorCode, connectorStatus, JSON.toJSONString(realTimeMonitorData));
// 推送第三方平台，先通过桩编号查出站点信息 pushToThirdPartyPlatforms
PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn);
if (pileBasicInfo == null) {
@@ -445,19 +445,29 @@ public class CommonService {
){
//无须转换枪口状态
dto.setStatus(connectorStatus);
log.info("枪口状态"+connectorStatus);
// log.info("枪口状态"+connectorStatus);
}else{
dto.setStatus(changedStatus);
log.info("转换的枪口状态"+changedStatus);
// log.info("转换的枪口状态"+changedStatus);
}
// 先推送站点状态
notificationService.notificationStationStatus(dto);
try {
notificationService.notificationStationStatus(dto);
} catch (Exception e) {
log.error("推送站点状态到平台失败，平台类型：{}，错误信息：{}",
thirdPartySecretInfoVO.getPlatformType(), e.getMessage(), e);
}
// 如果有订单信息，推送充电状态
if (orderInfo != null) {
dto.setOrderCode(orderInfo.getOrderCode());
notificationService.notificationConnectorChargeStatus(dto);
try {
dto.setOrderCode(orderInfo.getOrderCode());
notificationService.notificationConnectorChargeStatus(dto);
} catch (Exception e) {
log.error("推送充电状态到平台失败，平台类型：{}，错误信息：{}",
thirdPartySecretInfoVO.getPlatformType(), e.getMessage(), e);
}
} else {
log.info("无订单信息，仅推送站点状态，平台类型：{}", thirdPartySecretInfoVO.getPlatformType());
}