Merge branch 'dev' into dev-g

jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java

@@ -143,6 +143,12 @@ public class ChargeAlgorithmRecord extends BaseEntity {
     @Excel(name = "故障体系指标")
     private String failureMetrics;
 
+    /**
+     * 性能体系指标
+     */
+    @Excel(name = "性能体系指标")
+    private String performanceMetrics;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
@@ -167,6 +173,7 @@ public class ChargeAlgorithmRecord extends BaseEntity {
                 .append("maxAllowableElectricityAlarm", getMaxAllowableElectricityAlarm())
                 .append("securitySystemLevel", getSecuritySystemLevel())
                 .append("failureMetrics", getFailureMetrics())
+                .append("performanceMetrics", getPerformanceMetrics())
                 .append("createTime", getCreateTime())
                 .toString();
     }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ChargeAlgorithmRecordServiceImpl.java

@@ -108,6 +108,12 @@ public class ChargeAlgorithmRecordServiceImpl implements ChargeAlgorithmRecordSe
         String securitySystemLevel = record.getSecuritySystemLevel();
         ChargeAlgorithmRecordVO.SecuritySystem securitySystem = JSON.parseObject(securitySystemLevel, ChargeAlgorithmRecordVO.SecuritySystem.class);
 
+        String failureMetricsStr = record.getFailureMetrics();
+        ChargeAlgorithmRecordVO.FailureMetrics failureMetrics = JSON.parseObject(failureMetricsStr, ChargeAlgorithmRecordVO.FailureMetrics.class);
+
+        String performanceMetricsStr = record.getPerformanceMetrics();
+        ChargeAlgorithmRecordVO.PerformanceMetrics performanceMetrics = JSON.parseObject(performanceMetricsStr, ChargeAlgorithmRecordVO.PerformanceMetrics.class);
+
         ChargeAlgorithmRecordVO vo = ChargeAlgorithmRecordVO.builder()
                 .orderCode(record.getOrderCode())
                 .score(record.getScore())
@@ -128,7 +134,8 @@ public class ChargeAlgorithmRecordServiceImpl implements ChargeAlgorithmRecordSe
                 .maxAllowableVoltageAlarm(record.getMaxAllowableVoltageAlarm())
                 .maxAllowableElectricityAlarm(record.getMaxAllowableElectricityAlarm())
                 .securitySystemLevel(securitySystem)
-                .failureMetrics(record.getFailureMetrics())
+                .failureMetrics(failureMetrics)
+                .performanceMetrics(performanceMetrics)
 
                 .build();
 

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/ChargeAlgorithmRecordVO.java

@@ -1,5 +1,6 @@
 package com.jsowell.pile.vo.uniapp.customer;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.jsowell.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -7,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 电池充电订单报告VO
@@ -138,7 +140,9 @@ public class ChargeAlgorithmRecordVO {
      * 故障体系指标
      */
     @Excel(name = "故障体系指标")
-    private String failureMetrics;
+    private FailureMetrics failureMetrics;
+
+    private PerformanceMetrics performanceMetrics;
 
     @Data
     public static class SecuritySystem{
@@ -155,4 +159,108 @@ public class ChargeAlgorithmRecordVO {
 
         }
     }
+
+    @Data
+    public static class FailureMetrics{
+        @JSONField(name = "volt_rise_alarm")
+        private VoltRiseAlarm voltRiseAlarm;
+
+        @JSONField(name = "volt_decay_alarm")
+        private VoltRiseAlarm voltDecayAlarm;
+
+        @JSONField(name = "temp_diff_alarm")
+        private VoltRiseAlarm tempDiffAlarm;
+
+        @JSONField(name = "temp_rise_alarm")
+        private VoltRiseAlarm tempRiseAlarm;
+
+        @JSONField(name = "soc_alarm")
+        private VoltRiseAlarm socAlarm;
+
+        @Data
+        public static class VoltRiseAlarm{
+            private List<String> threshold;
+
+            private String result;
+
+            private String value;
+        }
+
+        @Data
+        public static class voltDecayAlarm{
+            private List<String> threshold;
+
+            private String result;
+
+            private String value;
+        }
+
+        @Data
+        public static class tempDiffAlarm{
+            private List<String> threshold;
+
+            private String result;
+
+            private String value;
+        }
+
+        @Data
+        public static class tempRiseAlarm{
+            private List<String> threshold;
+
+            private String result;
+
+            private String value;
+        }
+
+        @Data
+        public static class socAlarm{
+            private List<String> threshold;
+
+            private String result;
+
+            private String value;
+        }
+    }
+
+    @Data
+    public static class PerformanceMetrics{
+        @JSONField(name = "charging_loss")
+        private ChargingLoss chargingLoss;
+
+        @JSONField(name = "BMS_accuracy")
+        private BMSAccuracy bmsAccuracy;
+
+        @JSONField(name = "dc_internal_resistance")
+        private DCInternalResistance dcInternalResistance;
+
+        @Data
+        public static class ChargingLoss{
+            private List<String> threshold;
+
+            private String result;
+
+            private String value;
+        }
+
+        @Data
+        public static class BMSAccuracy{
+            private List<String> threshold;
+
+            private String result;
+
+            private String value;
+        }
+
+        @Data
+        public static class DCInternalResistance{
+            private List<String> threshold;
+
+            private String result;
+
+            private String value;
+        }
+    }
+
+
 }