lmstack 3 سال پیش
والد
کامیت
0cb165b8b0

+ 5 - 0
src/main/java/com/qx/didi/controller/ShowDataController.java

@@ -74,12 +74,17 @@ public class ShowDataController {
 
             response.setRiskNotation(resultInfo.getRiskNotation());
 
+            if (param.getTableId().equals(1)) {
+                response.setAlarmTime(new SimpleDateFormat("yyyy-MM-dd").format(resultInfo.getAlarmTime()));
+            }
+
             if (param.getTableId().equals(2)) {
                 response.setScore(resultInfo.getScore());
                 response.setSoh(resultInfo.getSoh());
                 response.setCapUniform(resultInfo.getCapUniform());
                 response.setSocUniform(resultInfo.getSocUniform());
                 response.setInnershortIndex(resultInfo.getInnershortIndex());
+                response.setSohUniform(resultInfo.getSohUniform());
             }
 
             // 当前信息

+ 6 - 0
src/main/java/com/qx/didi/dto/Response.java

@@ -73,6 +73,12 @@ public class Response {
     @ApiModelProperty(value = "soc一致性", name = "socUniform", accessMode = AccessMode.READ_ONLY)
     protected Float socUniform;
 
+    @ApiModelProperty(value = "soh一致性", name = "socUniform", accessMode = AccessMode.READ_ONLY)
+    protected Float sohUniform;
+
+    @ApiModelProperty(value = "报警时间", name = "time", accessMode = AccessMode.READ_ONLY)
+    protected String alarmTime;
+
     @ApiModelProperty(value = "内短路指数", name = "innershortIndex", accessMode = AccessMode.READ_ONLY)
     protected Float innershortIndex;
 

+ 6 - 0
src/main/java/com/qx/didi/entity/ResultInfo.java

@@ -1,6 +1,8 @@
 package com.qx.didi.entity;
 
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,6 +48,10 @@ public class ResultInfo implements Serializable {
 
     private Float socUniform;
 
+    private Float sohUniform;
+
+    private Date alarmTime;
+
     private Float innershortIndex;