|
|
@ -440,6 +440,7 @@ json DBService::getAllFormulaJson() { |
|
|
|
for (auto& f : all) { |
|
|
|
json j_formula; |
|
|
|
j_formula["id"] = f.id; |
|
|
|
j_formula["loglevel"] = f.loglevel; |
|
|
|
j_formula["formula_id"] = f.formula_id; |
|
|
|
j_formula["stoped_gs"] = f.stoped_gs; |
|
|
|
j_formula["continued_gs"] = f.continued_gs; |
|
|
@ -608,9 +609,9 @@ static string getTime() { |
|
|
|
time_t t = ::time(nullptr); |
|
|
|
struct tm* tmp = localtime_r(&t, &tm); |
|
|
|
return fmt::format("{:0>4}-{:0>2}-{:0>2} {:0>2}:{:0>2}:{:0>2}", tm.tm_year + 1900, //
|
|
|
|
tm.tm_mon + 1, //
|
|
|
|
tm.tm_mday, //
|
|
|
|
tm.tm_hour, //
|
|
|
|
tm.tm_mon + 1, //
|
|
|
|
tm.tm_mday, //
|
|
|
|
tm.tm_hour, //
|
|
|
|
tm.tm_min, tm.tm_sec); |
|
|
|
} |
|
|
|
|
|
|
|