接口

src/main/java/com/qx/didi/controller/ShowDataController.java

@@ -43,7 +43,6 @@ public class ShowDataController {
     ResultVoltSocServiceImpl resultVoltSocService;
     @Autowired
     ResultVoltdiffOutlierServiceImpl resultVoltdiffOutlierService;
-
     @Autowired
     SohResultMapper sohResultMapper;
 
@@ -76,7 +75,9 @@ public class ShowDataController {
             response.setRiskNotation(resultInfo.getRiskNotation());
 
             if (param.getTableId().equals(1)) {
-                response.setAlarmTime(new SimpleDateFormat("yyyy-MM-dd").format(resultInfo.getAlarmTime()));
+                if (resultInfo.getAlarmTime() != null) {
+                    response.setAlarmTime(new SimpleDateFormat("yyyy-MM-dd").format(resultInfo.getAlarmTime()));
+                }
             }
 
             if (param.getTableId().equals(2)) {

src/main/java/com/qx/didi/dto/Response.java

@@ -106,6 +106,42 @@ public class Response {
     @ApiModelProperty(value = "sohY轴", name = "sohY", accessMode = AccessMode.READ_ONLY)
     protected List<Float>  sohY = new ArrayList<>();
 
+    @ApiModelProperty(value = "电压离群报警时间", name = "voltAlarmTime", accessMode = AccessMode.READ_ONLY)
+    protected String  voltAlarmTime ;
+
+    @ApiModelProperty(value = "电压离群值", name = "voltValue", accessMode = AccessMode.READ_ONLY)
+    protected String  voltValue ;
+
+    @ApiModelProperty(value = "电压离群值与阈值插值", name = "voltValueDiff", accessMode = AccessMode.READ_ONLY)
+    protected String  voltValueDiff ;
+
+    @ApiModelProperty(value = "电压离群阈值", name = "voltThreshold", accessMode = AccessMode.READ_ONLY)
+    protected List<Integer>  voltThreshold ;
+
+    @ApiModelProperty(value = "电压压差离群报警时间", name = "voltDiffAlarmTime", accessMode = AccessMode.READ_ONLY)
+    protected String  voltDiffAlarmTime ;
+
+    @ApiModelProperty(value = "电压压差离群阈值", name = "voltDiffThreshold", accessMode = AccessMode.READ_ONLY)
+    protected List<Integer>  voltDiffThreshold ;
+
+    @ApiModelProperty(value = "电压压差离群值", name = "voltDiffValue", accessMode = AccessMode.READ_ONLY)
+    protected String  voltDiffValue ;
+
+    @ApiModelProperty(value = "电压压差离群值与阈值插值", name = "voltDiffValueDiff", accessMode = AccessMode.READ_ONLY)
+    protected String  voltDiffValueDiff ;
+
+    @ApiModelProperty(value = "内短路离群报警时间", name = "innershortAlarmTime", accessMode = AccessMode.READ_ONLY)
+    protected String  innershortAlarmTime ;
+
+    @ApiModelProperty(value = "内短路离群阈值", name = "innershortThreshold", accessMode = AccessMode.READ_ONLY)
+    protected List<Integer>  innershortThreshold ;
+
+
+    @ApiModelProperty(value = "内短路离群值", name = "innershortValue", accessMode = AccessMode.READ_ONLY)
+    protected String  innershortValue ;
+
+    @ApiModelProperty(value = "内短路离群值与阈值插值", name = "innershortValueDiff", accessMode = AccessMode.READ_ONLY)
+    protected String  innershortValueDiff ;
 
 
 }