|
@@ -1737,7 +1737,7 @@ public class AsyncTask {
|
|
|
showValueSHBasic.setB(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM ,warningTime));
|
|
|
showValueSHBasic.setC(DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getWarningVal(), INT_2) + unit);
|
|
|
showValueSHBasic.setD(DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getDesignVal(), INT_2) + unit);
|
|
|
- showValueSHBasic.setG(count > MAX_COUNT ? MAX_COUNT_STR : count);
|
|
|
+ showValueSHBasic.setG(count > MAX_COUNT ? MAX_COUNT_STR : String.valueOf(count));
|
|
|
if(tXinyiWarningRecord.getType() != 2)
|
|
|
showValueSHBasic.setI(status == 0 ? "报警中" : status == 1 ? "用户关闭" : status == 2 ? "系统关闭" : "应急处理中");
|
|
|
else
|
|
@@ -1800,7 +1800,7 @@ public class AsyncTask {
|
|
|
showValueCSBasic.setC(DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getWarningVal(), INT_2));
|
|
|
showValueCSBasic.setD(DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getControlVal(), INT_2));
|
|
|
showValueCSBasic.setE(DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getDesignVal(), INT_2));
|
|
|
- showValueCSBasic.setG(count > MAX_COUNT ? MAX_COUNT_STR : count);
|
|
|
+ showValueCSBasic.setG(count > MAX_COUNT ? MAX_COUNT_STR : String.valueOf(count));
|
|
|
if(tXinyiWarningRecord.getType() != 2)
|
|
|
showValueCSBasic.setI(status == 0 ? "报警中" : status == 1 ? "用户关闭" : status == 2 ? "系统关闭" : "应急处理中");
|
|
|
else
|
|
@@ -1825,7 +1825,7 @@ public class AsyncTask {
|
|
|
showValueJSBasic.setB(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM ,warningTime));
|
|
|
showValueJSBasic.setC(DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getWarningVal(), INT_2));
|
|
|
showValueJSBasic.setE(DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getDesignVal(), INT_2));
|
|
|
- showValueJSBasic.setG(count > MAX_COUNT ? MAX_COUNT_STR : count);
|
|
|
+ showValueJSBasic.setG(count > MAX_COUNT ? MAX_COUNT_STR : String.valueOf(count));
|
|
|
if(tXinyiWarningRecord.getType() != 2)
|
|
|
showValueJSBasic.setI(status == 0 ? "报警中" : status == 1 ? "用户关闭" : status == 2 ? "系统关闭" : "应急处理中");
|
|
|
else
|