Commit 14663fb4 authored by chenzhao's avatar chenzhao

修改代码

parent ba107156
......@@ -1204,13 +1204,13 @@ public class MonitorFanIdxController extends BaseController {
sum += Integer.parseInt(indexDto.getCountString());
}
Map<String, Object> hashMap = new HashMap<>() ;
hashMap.put("title",healthNum+"/"+sum);
double percent = (double) healthNum / sum * 100;
int value = (int) percent;
String[] values = new String[]{String.valueOf(value)};
hashMap.put("seriesData",values);
hashMap.put("title",healthNum+"/"+sum);
return ResponseHelper.buildResponse(hashMap);
}
......@@ -1227,7 +1227,7 @@ public class MonitorFanIdxController extends BaseController {
status =indexDto.getState();
}
}
hashMap.put("status",status);
hashMap.put("title",status);
return ResponseHelper.buildResponse(hashMap);
}
......
......@@ -25,7 +25,7 @@ public class ESEquipments {
@Field(type = FieldType.Text, index = false)
private String address;
@Field(type = FieldType.Text, index = false)
@Field(type = FieldType.Text)
private String dataType;
@Field(type = FieldType.Text)
private String equipmentSpecificName;
......@@ -37,11 +37,11 @@ public class ESEquipments {
private Date createdTime;
@Field(type = FieldType.Text , index = false)
private String unit;
@Field(type = FieldType.Text, index = false)
@Field(type = FieldType.Text)
private String value;
@Field(type = FieldType.Float, index = false)
private Float valueDouble;
@Field(type = FieldType.Text , index = false)
@Field(type = FieldType.Text)
private String valueLabel;
@Field(type = FieldType.Text , index = false)
private String traceId;
......@@ -55,7 +55,7 @@ public class ESEquipments {
private String systemType;
@Field(type = FieldType.Text , index = false)
private String pictureName;
@Field(type = FieldType.Text , index = false)
@Field(type = FieldType.Text)
private String displayName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment