Commit 32b3b02a authored by caotao's avatar caotao

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents cd4ee238 28b7e4f7
...@@ -1358,7 +1358,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1358,7 +1358,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
for (IndicatorsDto datass : listDatass) { for (IndicatorsDto datass : listDatass) {
String url = ""; String url = "";
String[] urls = datass.getPictureName().split(","); String[] urls = datass.getPictureName().split(",");
if (datass.getValue().equals("true")){ if (datass.getValue().equals("false")){
url =pictureUrl+urls[0]; url =pictureUrl+urls[0];
}else { }else {
url =pictureUrl+ urls[1];; url =pictureUrl+ urls[1];;
...@@ -1369,10 +1369,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1369,10 +1369,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
for (IndicatorsDto data : listDatas) { for (IndicatorsDto data : listDatas) {
String url = ""; String url = "";
String[] urls = data.getPictureName().split(","); String[] urls = data.getPictureName().split(",");
if (StringUtils.isNotEmpty(data.getValue()) && data.getValue().equals("true")){ if (StringUtils.isNotEmpty(data.getValue()) && data.getValue().equals("false")){
url =pictureUrl+urls[0]; url =pictureUrl+urls[1];
}else { }else {
url =pictureUrl+ urls[1];; url =pictureUrl+ urls[0];;
} }
if (data.getDisplayName().split("_").length > 2){ if (data.getDisplayName().split("_").length > 2){
photoUrls.put(KGName.getCode(data.getDisplayName().split("_")[1]),url); photoUrls.put(KGName.getCode(data.getDisplayName().split("_")[1]),url);
......
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