|
@@ -170,7 +170,6 @@ public class PcPumpEntity implements Serializable {
|
|
|
|
|
|
|
|
result.setUploadTime(new Date());
|
|
result.setUploadTime(new Date());
|
|
|
result.setDeviceId(this.getPumpCode());
|
|
result.setDeviceId(this.getPumpCode());
|
|
|
- //todo
|
|
|
|
|
result.setClassification("");
|
|
result.setClassification("");
|
|
|
result.setDataNumber(1);
|
|
result.setDataNumber(1);
|
|
|
|
|
|
|
@@ -205,6 +204,9 @@ public class PcPumpEntity implements Serializable {
|
|
|
parseBufSate9(result,this.getBufState9());
|
|
parseBufSate9(result,this.getBufState9());
|
|
|
// result.setRunState();
|
|
// result.setRunState();
|
|
|
// result.setAlarm();
|
|
// result.setAlarm();
|
|
|
|
|
+ if(DeviceStatusEnum.StartUp.equals(result.getRunState())){
|
|
|
|
|
+ result.setRemainDose(BigDecimal.valueOf(result.getTotalDose()));
|
|
|
|
|
+ }
|
|
|
return result;
|
|
return result;
|
|
|
|
|
|
|
|
}
|
|
}
|