diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java
index 9d9ab57de..90cc1f7a6 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java
@@ -29,6 +29,12 @@ public class ChargeAlgorithmRecord extends BaseEntity {
@Excel(name = "订单编号")
private String orderCode;
+ private String taskId;
+
+ private String webUrl;
+
+ private String pdfUrl;
+
/**
* 总体得分
*/
diff --git a/jsowell-pile/src/main/resources/mapper/pile/ChargeAlgorithmRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ChargeAlgorithmRecordMapper.xml
index 8720cfbb5..58ca3f78e 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/ChargeAlgorithmRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/ChargeAlgorithmRecordMapper.xml
@@ -7,6 +7,9 @@
+
+
+
@@ -31,7 +34,7 @@
- select id, order_code, score, capacity_metrics, energy_indicator, consistency, temp_consistency, volt_consistency,
+ select id, order_code, task_id, web_url, pdf_url, score, capacity_metrics, energy_indicator, consistency, temp_consistency, volt_consistency,
capacity_consistency, sot, thermal_runaway, cooling, seal, current_soc, soc_alarm, temp_diff_alarm, temp_rise_alarm,
max_allowable_voltage_alarm, max_allowable_electricity_alarm, security_system_level, failure_metrics, performance_metrics, create_time from charge_algorithm_record
@@ -40,6 +43,9 @@
and order_code = #{orderCode}
+ and task_id = #{taskId}
+ and web_url = #{webUrl}
+ and pdf_url = #{pdfUrl}
and score = #{score}
and capacity_metrics = #{capacityMetrics}
and energy_indicator = #{energyIndicator}
@@ -72,6 +78,9 @@
insert into charge_algorithm_record
order_code,
+ task_id,
+ web_url,
+ pdf_url,
score,
capacity_metrics,
energy_indicator,
@@ -96,6 +105,9 @@
#{orderCode},
+ #{taskId},
+ #{webUrl},
+ #{pdfUrl},
#{score},
#{capacityMetrics},
#{energyIndicator},
@@ -124,6 +136,9 @@
update charge_algorithm_record
order_code = #{orderCode},
+ task_id = #{taskId},
+ web_url = #{webUrl},
+ pdf_url = #{pdfUrl},
score = #{score},
capacity_metrics = #{capacityMetrics},
energy_indicator = #{energyIndicator},
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 b9a9255d7..0ae1269c1 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
@@ -78,13 +78,14 @@ public class BatteryChargeReportService {
// 根据订单号查询订单信息
OrderVO orderVO = orderBasicInfoService.getChargeOrderInfoByOrderCode(orderCode);
if (orderVO == null) {
- return "订单信息为空";
+ log.error("统一发送orderCode:{} 充电电池数据 error, 订单信息为空", orderCode);
+ return null;
}
// 先判断直流桩还是交流桩,如果是交流桩就不进行计算
PileDetailVO pileDetailVO = pileBasicInfoService.selectPileDetailByPileSn(orderVO.getPileSn());
if (StringUtils.equals(Constants.TWO, pileDetailVO.getChargePortType())) {
log.info("订单:{} 为交流桩订单,不进行充电算法计算", orderCode);
- return "不进行计算";
+ return null;
}
// 查询站点信息