diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index e5ecb7476..5de23e895 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -36,11 +36,11 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell_pre -# url: jdbc:mysql://192.168.2.46:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell_prd_copy - 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 + url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell_dev + password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -262,7 +262,7 @@ batteryChargeReport: webDomainPrefix: https://wx.btiger.net/jeecg-boot getTaskIdApi: /api/docking/api/evaluate apiPrefix: /api/docking/report/ - token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ== + token: MTc3MzAzODY1ODYwNy1sbjdiM3h3dHJi mfrID: mfr8944567890598756 # dubbo配置 diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index fc31b5fd2..d1889bc1a 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -289,7 +289,7 @@ batteryChargeReport: webDomainPrefix: https://wx.btiger.net/jeecg-boot getTaskIdApi: /api/docking/api/evaluate apiPrefix: /api/docking/report/ - token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ== + token: MTc3MzAzODY1ODYwNy1sbjdiM3h3dHJi mfrID: mfr8944567890598756 # dubbo配置 diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index 7f073a6e6..b158f0628 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/jsowell-admin/src/main/resources/application.yml @@ -156,7 +156,7 @@ batteryChargeReport: webDomainPrefix: https://wx.btiger.net/jeecg-boot getTaskIdApi: /api/docking/api/evaluate apiPrefix: /api/docking/report/ - token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ== + token: MTc3MzAzODY1ODYwNy1sbjdiM3h3dHJi mfrID: mfr8944567890598756 # sms4j diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java index b9d0e6715..c8a603191 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java @@ -233,7 +233,8 @@ public class BatteryChargeReportService { .gunNo(orderVO.getConnectorCode()) .readBeforeCharge(transactionRecordsData.getAmmeterTotalStart()) .doorStatus(Constants.zero) - .bmsChargeMode(Integer.parseInt(bmsDemandAndChargerOutputData.getBmsChargingModel())) + // .bmsChargeMode(Integer.parseInt(bmsDemandAndChargerOutputData.getBmsChargingModel())) + .bmsChargeMode(1) .vin(transactionRecordsData.getVinCode()) .batteryType(String.valueOf(Integer.parseInt(chargingHandshakeData.getBmsBatteryType()))) .nominalEnergy(new BigDecimal(parameterConfigData.getBmsSumEnergy()).toBigInteger().toString())