update

appsrc/appbase/project_setting_mgr.cpp

@@ -1,5 +1,6 @@
 #include "project_setting_mgr.hpp"
 
+#include "components/zservice_container/zservice_container.hpp"
 using namespace std;
 using namespace iflytop;
 
@@ -19,6 +20,8 @@ static string projectType2Str(int val) {
 }
 
 void ProjectSettingMgr::initialize() {
+  GET_TO_SERVICE(gConfig);
+
   projectSettingsMap[PROJECT_LARGE_SPACE_DM] = createProjectSetting(klarge_space_disinfection_machine);
   projectSettingsMap[PROJECT_SMALL_SPACE_DM] = createProjectSetting(ksmall_space_disinfection_machine);
   projectSettingsMap[PROJECT_PIPE_DM]        = createProjectSetting(kpipe_disinfection_machine);
@@ -44,8 +47,7 @@ shared_ptr<ProjectSetting> ProjectSettingMgr::createProjectSetting(int projectTy
     setdval.val_upper_limit                                   = 8;
     setdval.is_editable                                       = true;
     projectSetting->defaultSettingMap["injection_pump_speed"] = setdval;
-  }
-  else {
+  } else {
     ZCHECK(false, "projectTypeInt not support: " + to_string(projectTypeInt));
   }
 

appsrc/appcomponents/app_errorcode_mgr/app_errorcode_mgr.hpp

@@ -39,7 +39,7 @@ class AppEcodeInfoMgr {
     if (it != ecodeInfoMap.end()) {
       return it->second->info;
     }
-    return "E(" + to_string(code) + ")";
+    return "错误(" + to_string(code) + ")";
   }
 };
 

appsrc/baseservice/front_msg_processer/front_msg_processer.cpp

@@ -31,6 +31,11 @@ void FrontMsgProcesser::processMsg(shared_ptr<MsgProcessContext> cxt) {
   if (m_msgProcesserMap.find(key) != m_msgProcesserMap.end()) {
     try {
       m_msgProcesserMap[key]->fn(cxt);
+
+      if (cxt->ackcode != 0) {
+        cxt->receipt["ackcode"] = cxt->ackcode;
+      }
+
       if (int(cxt->receipt["ackcode"]) != 0) {
         cxt->receipt["message"] = fmt::format("[{}],{}", ecode2str(cxt->receipt["ackcode"]), cxt->ackcodeExtMessage);
       }

appsrc/service/main_control_service.cpp

@@ -1,12 +1,13 @@
 #include "main_control_service.hpp"
 
+#include "appbase/project_setting_mgr.hpp"
 #include "baseservice/baseservice.hpp"
-#include "service/setting_mgr_service.hpp"
-#include "service/user_mgr_service.hpp"
 #include "service/device_info_mgr_service.hpp"
+#include "service/disinfection_logs_service.hpp"
 #include "service/os_mgr_service.hpp"
+#include "service/setting_mgr_service.hpp"
 #include "service/test_page_mgr_service.hpp"
-#include "service/disinfection_logs_service.hpp"
+#include "service/user_mgr_service.hpp"
 #include "udisk_mgr_service.hpp"
 
 using namespace iflytop;
@@ -20,12 +21,16 @@ void MainControlService::dosystem(string order, bool dump) {
 }
 
 void MainControlService::initialize() {
+  BUILD_AND_REG_SERRVICE(ProjectSettingMgr);
+
   // Base
-  BUILD_AND_REG_SERRVICE(DBService);
-  BUILD_AND_REG_SERRVICE(UDiskMgrService);
-  BUILD_AND_REG_SERRVICE(DeviceStateService);
   BUILD_AND_REG_SERRVICE(IflytopFrontEndService);
   BUILD_AND_REG_SERRVICE(FrontMsgProcesser);
+  BUILD_AND_REG_SERRVICE(DBService);
+  BUILD_AND_REG_SERRVICE(DeviceStateService);
+  //
+  BUILD_AND_REG_SERRVICE(UDiskMgrService);
+  //
   BUILD_AND_REG_SERRVICE(DisinfectionLogsService);
   // Device
   BUILD_AND_REG_SERRVICE(UartPrinter);
@@ -36,7 +41,7 @@ void MainControlService::initialize() {
   BUILD_AND_REG_SERRVICE(DeviceInfoMgrService);
   BUILD_AND_REG_SERRVICE(OsMgrService);
   BUILD_AND_REG_SERRVICE(TestPageMgrService);
-  
+
   //
   GET_SERVICE(IflytopFrontEndService)->startListen();
   GET_SERVICE(IflytopFrontEndService)->onMessage.connect([this](weak_ptr<WebSocket> webSocket, json& cmd, json& receipt) {

buildpc.sh

@@ -10,10 +10,11 @@
 #
 
 mkdir -p build
+inittestdata.sh
+
 cd build
 cmake .. \
     -DARCH=amd64 \
 
 make -j8
-make install
-inittestdata.sh
+make install

inittestdata.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
 mkdir -p build/disinfection_logs
-touch build/disinfection_logs/2021-01-01.log
-touch build/disinfection_logs/2021-01-02.log
-touch build/disinfection_logs/2021-01-03.log
+touch build/disinfection_logs/2021-01-01.csv
+touch build/disinfection_logs/2021-01-02.csv
+touch build/disinfection_logs/2021-01-03.csv
 
-echo "C1,C2,C3,C4,C5,C6,C7" >build/disinfection_logs/2021-01-01.log
-echo "C1,C2,C3,C4,C5,C6,C7" >build/disinfection_logs/2021-01-02.log
-echo "C1,C2,C3,C4,C5,C6,C7" >build/disinfection_logs/2021-01-03.log
+echo "C1,C2,C3,C4,C5,C6,C7" >build/disinfection_logs/2021-01-01.csv
+echo "C1,C2,C3,C4,C5,C6,C7" >build/disinfection_logs/2021-01-02.csv
+echo "C1,C2,C3,C4,C5,C6,C7" >build/disinfection_logs/2021-01-03.csv
 
-echo "1,2,3,4,5,6,7" >>build/disinfection_logs/2021-01-01.log
-echo "1,2,3,4,5,6,7" >>build/disinfection_logs/2021-01-02.log
-echo "1,2,3,4,5,6,7" >>build/disinfection_logs/2021-01-03.log
+echo "1,2,3,4,5,6,7" >>build/disinfection_logs/2021-01-01.csv
+echo "1,2,3,4,5,6,7" >>build/disinfection_logs/2021-01-02.csv
+echo "1,2,3,4,5,6,7" >>build/disinfection_logs/2021-01-03.csv