|
@@ -71,19 +71,16 @@ public class ShowDataController {
|
|
|
response.setPerformAdvice(Arrays.asList(resultInfo.getPerformAdvice().split(";")));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
response.setRiskNotation(resultInfo.getRiskNotation());
|
|
|
|
|
|
-
|
|
|
- if (param.getTableId().equals(1)) {
|
|
|
+ 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());
|
|
|
}
|
|
|
+
|
|
|
|
|
|
ResultOriginData resultOriginData = resultOriginDataService.getOne(new QueryWrapper<ResultOriginData>().eq("device_id", param.getSn()));
|
|
|
response.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(resultOriginData.getDate()));
|
|
@@ -199,6 +196,5 @@ public class ShowDataController {
|
|
|
List<ResultOriginData> resultOriginData = resultOriginDataService.list(new QueryWrapper<ResultOriginData>().eq("type", param.getTableId()));
|
|
|
resultOriginData.forEach(p->snList.add(p.getDeviceId()));
|
|
|
return ApiDTO.ok(snList);
|
|
|
-
|
|
|
}
|
|
|
}
|