update

README.md

@@ -103,27 +103,20 @@ VERSION 2.0.0
     1. 修改加液，排液，排空管路逻辑
     2. 修改桶体积计算逻辑
     3. 修改默认管理员姓名为admin,密码为8888
-    4. 重构数据
 
 VERSION 2.0.1
-    1. 修改当db文件损坏的时候，删除db文件
-
-    2. 增加DeviceExtSettingDB (存储一些设备高级配置信息)，例如can设备地址，打印机串口地址，设备ID OK
-    3. 增加EquipmentUsageInfoDB (存储设备的使用情况，出厂时间，设备使用时间)
-    4. Calibrate校准信息存储数据库 OK
-    5. 增加校准服务-重量校准服务(OK)....
-    5. 增加校准业务逻辑(OK)....
-
-    4. 增加关机逻辑 OK
-    5. 增加信息查看，增加信息删除 
-
-
-
-
-    命名规范(已命名，但不符合命名规范的服务名暂时不做修改)
-        XXXXMgrService -> 直接操作DAO
-        ActionService  -> 设备业务服务，DrainLiquidService DisinfectionCtrlServiceExt AddLiquidService
+    1. 修改当db文件损坏的时候，重新创建db文件
+    2. 支持设备ID  UI 修改
+    3. 支持设备出厂时间，h2o2传感器使用时间，距离上次设备维护的时间，的维护。（如果来不及，就使用文件袋的形式放在设备中（类似设备维护记录））
+    4. 支持液体重量传感器校准接口。
+    5. 支持设备类型 UI 修改。
 
+TODO:
+    1. 设备使用时间维护(UI接口已经准备好，考虑是否使用文件袋放在设备中的方案)
+    2. 升级方案
+    3. 系统垃圾自动方案
+    4. 部署方案
+    
 
     
 
@@ -133,4 +126,11 @@ TODO:
     3.驱动器注释掉参数刷新的代码
     
 
+```
+
+```
+需要考虑的问题:
+    1. 设备需要定期维护，定期更换器件(蠕动泵)
+    2. H2O2传感器需要定期校准.
+
 ```

appsrc/appconfig/basic/zappversion.hpp

@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "2.0.0"
+#define VERSION      "2.0.1"
 #define PROJECT_NAME "TRANSMIT_DM"

appsrc/baseservice/db/setting_db_dao.cpp

@@ -4,7 +4,7 @@
  *                                    BASIC                                    *
  *******************************************************************************/
 #define SETTING_DB "setting.db"
-#define DB_VERSION "1.0.3"  // 更新这个参数，会自动重置数据库
+#define DB_VERSION "1.0.4"  // 更新这个参数，会自动重置数据库
 
 namespace iflytop {
 namespace db {
@@ -71,7 +71,7 @@ static Setting settingInitTable[] = {
     INT_SETTING(SettingId::kstoped_satur, "消毒停止过氧化氢相对饱和度", "85", "0", "100", /*                  */ true, true, true, true),
     INT_SETTING(SettingId::kcontinued_satur, "消毒继续过氧化氢相对饱和度", "60", "0", "100", /*               */ true, true, true, true),
     INT_SETTING(SettingId::kmax_humidity, "允许消毒最大湿度", "90", "0", "100", /*                            */ true, true, true, true),
-    INT_SETTING(SettingId::kdrainage_pump_speed, "排液蠕动泵最大转速", "400", "0", "400", /*                  */ true, false, false, false),
+    INT_SETTING(SettingId::kdrainage_pump_speed, "排液蠕动泵最大转速", "300", "0", "400", /*                  */ true, false, false, false),
     INT_SETTING(SettingId::kinjection_pump_speed, "喷射蠕动泵转速", "10", "0", "40", /*                      */ true, true, true, true),
     INT_SETTING(SettingId::kpre_heat_time_s, "预热时间", "120", "0", "1200", /*                               */ true, true, true, true),
     INT_SETTING(SettingId::kstoped_humi, "消毒停止相对湿度", "85", "0", "100", /*                             */ true, true, true, true),

appsrc/service/equipment_usage_info_mgr_service.cpp

@@ -6,6 +6,7 @@ using namespace core;
 
 void EquipmentUsageInfoMgrService::initialize() {
   REG_EXTFN_VOID(showHelp, json(void));                         //
+  REG_EXTFN_VOID(getEquipmentUsageInfo, void(void));            //
   REG_EXTFN_VOID(setCurTimeAsFactoryTime, void(void));          //
   REG_EXTFN_VOID(resetHO2SensorUsageTimeSumaryS, float(void));  //
   REG_EXTFN_VOID(resetTimeSinceLastDeviceMaintenanceS, void(void));
@@ -15,10 +16,11 @@ void EquipmentUsageInfoMgrService::getEquipmentUsageInfo(shared_ptr<MsgProcessCo
   auto var       = EquipmentUsageInfoDao::ins()->getEquipmentUsageInfo();
   auto exsetting = DeviceExtSettingDAO::ins()->getDeviceExtSetting();
 
-  cxt->rely["equipmentUsageInfo"]["deviceUsageTimeSumaryS"]     = var.deviceUsageTimeSumaryS;
-  cxt->rely["equipmentUsageInfo"]["deviceFactoryTime"]          = var.deviceFactoryTime;
-  cxt->rely["equipmentUsageInfo"]["h2o2SensorUsageTimeSumaryS"] = var.h2o2SensorUsageTimeSumaryS;
-  cxt->rely["equipmentUsageInfo"]["h2o2SensorExpired"] = var.h2o2SensorUsageTimeSumaryS > (exsetting.h2o2SensorExpireTimeMonth * 30 * 24 * 60 * 60);
+  cxt->rely["equipmentUsageInfo"]["deviceUsageTimeSumaryS"]          = var.deviceUsageTimeSumaryS;
+  cxt->rely["equipmentUsageInfo"]["deviceFactoryTime"]               = var.deviceFactoryTime;
+  cxt->rely["equipmentUsageInfo"]["h2o2SensorUsageTimeSumaryS"]      = var.h2o2SensorUsageTimeSumaryS;
+  cxt->rely["equipmentUsageInfo"]["timeSinceLastDeviceMaintenanceS"] = var.timeSinceLastDeviceMaintenanceS;
+  cxt->rely["equipmentUsageInfo"]["h2o2SensorExpired"]               = var.h2o2SensorUsageTimeSumaryS > (exsetting.h2o2SensorExpireTimeMonth * 30 * 24 * 60 * 60);
 }
 
 void EquipmentUsageInfoMgrService::showHelp(shared_ptr<MsgProcessContext> cxt) {
@@ -52,6 +54,11 @@ void EquipmentUsageInfoMgrService::showHelp(shared_ptr<MsgProcessContext> cxt) {
   helpiterm["chname"] = "重置H2O2传感器使用时间";
   helpiterm["desc"]   = "重置H2O2传感器使用时间";
   cxt->rely["help"].push_back(helpiterm);
+
+  helpiterm["name"]   = "resetTimeSinceLastDeviceMaintenanceS";
+  helpiterm["chname"] = "重置设备维护时间";
+  helpiterm["desc"]   = "重置设备维护时间";
+  cxt->rely["help"].push_back(helpiterm);
 }
 
 void EquipmentUsageInfoMgrService::setCurTimeAsFactoryTime(shared_ptr<MsgProcessContext> cxt) { EquipmentUsageInfoDao::ins()->setCurrentTimeAsFactoryTime(); }