Browse Source

修复导出消毒记录错误的BUG

master
zhaohe 1 year ago
parent
commit
920b9cde4e
  1. 24
      scripter/deploy_all.sh
  2. 2
      src/service/disfection_ctl/disinfection_service.cpp
  3. 2
      src/version.hpp

24
scripter/deploy_all.sh

@ -2,7 +2,7 @@
echo "cpy app.out large_space_disinfection" echo "cpy app.out large_space_disinfection"
ssh root@192.168.8.10 "systemctl stop zapp" ssh root@192.168.8.10 "systemctl stop zapp"
scp out/large_space_disinfection/app.out root@192.168.8.10:/app/ scp out/large_space_disinfection/app.out root@192.168.8.10:/app/
ssh root@192.168.8.10 "systemctl restart zapp"
echo "" echo ""
echo "" echo ""
@ -10,7 +10,7 @@ echo ""
echo "cpy app.out small_space_disinfection" echo "cpy app.out small_space_disinfection"
ssh root@192.168.8.11 "systemctl stop zapp" ssh root@192.168.8.11 "systemctl stop zapp"
scp out/small_space_disinfection/app.out root@192.168.8.11:/app/ scp out/small_space_disinfection/app.out root@192.168.8.11:/app/
ssh root@192.168.8.11 "systemctl restart zapp"
echo "" echo ""
echo "" echo ""
@ -18,7 +18,7 @@ echo ""
echo "cpy app.out pipe_disinfection" echo "cpy app.out pipe_disinfection"
ssh root@192.168.8.12 "systemctl stop zapp" ssh root@192.168.8.12 "systemctl stop zapp"
scp out/pipe_disinfection/app.out root@192.168.8.12:/app/ scp out/pipe_disinfection/app.out root@192.168.8.12:/app/
ssh root@192.168.8.12 "systemctl restart zapp"
echo "" echo ""
echo "" echo ""
@ -26,6 +26,22 @@ echo ""
echo "cpy app.out draw_bar_box_disinfection" echo "cpy app.out draw_bar_box_disinfection"
ssh root@192.168.8.13 "systemctl stop zapp" ssh root@192.168.8.13 "systemctl stop zapp"
scp out/draw_bar_box_disinfection/app.out root@192.168.8.13:/app/ scp out/draw_bar_box_disinfection/app.out root@192.168.8.13:/app/
ssh root@192.168.8.13 "systemctl restart zapp"
echo "" echo ""
echo "" echo ""
ssh root@192.168.8.10 "rm /app/*.db"
ssh root@192.168.8.11 "rm /app/*.db"
ssh root@192.168.8.12 "rm /app/*.db"
ssh root@192.168.8.13 "rm /app/*.db"
ssh root@192.168.8.10 "rm -rf /app/disinfection_logs"
ssh root@192.168.8.11 "rm -rf /app/disinfection_logs"
ssh root@192.168.8.12 "rm -rf /app/disinfection_logs"
ssh root@192.168.8.13 "rm -rf /app/disinfection_logs"
ssh root@192.168.8.10 "systemctl restart zapp"
ssh root@192.168.8.11 "systemctl restart zapp"
ssh root@192.168.8.12 "systemctl restart zapp"
ssh root@192.168.8.13 "systemctl restart zapp"

2
src/service/disfection_ctl/disinfection_service.cpp

@ -154,7 +154,7 @@ void DisinfectionService::__dumpDisinfectionLogsToCSV(bool header) {
if (header) { if (header) {
content += fmt::format("{},", ZIconv::noChange("时间")); content += fmt::format("{},", ZIconv::noChange("时间"));
} else { } else {
content += fmt::format("{}", getTime());
content += fmt::format("{},", getTime());
} }
#if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) #if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION)

2
src/version.hpp

@ -1,2 +1,2 @@
#pragma once #pragma once
#define VERSION "6.5"
#define VERSION "6.6"
Loading…
Cancel
Save