Browse Source

update

master
zhaohe 1 year ago
parent
commit
2ab39c22f9
  1. 2
      src/api/cmds/disinfection_cmd_impl.cpp
  2. 2
      src/service/device_alert_dectector_service.cpp
  3. 1
      src/service/disfection_ctl/add_liquid_service.cpp

2
src/api/cmds/disinfection_cmd_impl.cpp

@ -166,7 +166,7 @@ void DisinfectionCmdImpl::startFormula(json& cmd, json& receipt) {
} }
int disinfectantVolumeG = m_deviceIoControlService->getDisinfectantVolume_g(); int disinfectantVolumeG = m_deviceIoControlService->getDisinfectantVolume_g();
if (disinfectantVolumeG < MIN_DISINFECTANT_VOLUME) {
if (disinfectantVolumeG < (MIN_DISINFECTANT_VOLUME)) {
logger->error("start disinfection failed, disinfectant volume not enough {} < {}", disinfectantVolumeG, MIN_DISINFECTANT_VOLUME); logger->error("start disinfection failed, disinfectant volume not enough {} < {}", disinfectantVolumeG, MIN_DISINFECTANT_VOLUME);
receipt["ackcode"] = err::zecode(err::kce_disinfectant_insufficient); receipt["ackcode"] = err::zecode(err::kce_disinfectant_insufficient);
receipt["ackcodeInfo"] = err::zecode2str(err::kce_disinfectant_insufficient); receipt["ackcodeInfo"] = err::zecode2str(err::kce_disinfectant_insufficient);

2
src/service/device_alert_dectector_service.cpp

@ -112,7 +112,7 @@ void DeviceAlertDetectorService::userConfirm(const string& contextId) {
auto context = getAlertWarningContext(contextId); auto context = getAlertWarningContext(contextId);
if (context) { if (context) {
context->setProcessedByUsrFlag(true); context->setProcessedByUsrFlag(true);
context->setWarningHasProcessedAfBoot(true);
// context->setWarningHasProcessedAfBoot(true);
} }
} }

1
src/service/disfection_ctl/add_liquid_service.cpp

@ -41,6 +41,7 @@ void AddLiquidService::startReplenishingFluids(int stopatg) {
int32_t nowvolume = m_deviceIoControlService->getDisinfectantVolume_g(); int32_t nowvolume = m_deviceIoControlService->getDisinfectantVolume_g();
int maxg = DISINFECTANT_BUCKET_CAPACITY; int maxg = DISINFECTANT_BUCKET_CAPACITY;
stopatg += 100; //由于加液过程中,测量到的液体要比真实的小,所以这里要比预设值大100
if (stopatg > maxg) { if (stopatg > maxg) {
logger->warn("start Replenishing fail, stopatg {} > maxg {}", stopatg, maxg); logger->warn("start Replenishing fail, stopatg {} > maxg {}", stopatg, maxg);

Loading…
Cancel
Save