提交 37cd4f1a authored 作者: blu's avatar blu

dingbot

上级 bccb84a9
...@@ -130,6 +130,7 @@ class DingBot: ...@@ -130,6 +130,7 @@ class DingBot:
issues += "[{}]连接失败: {}".format(idx, msg[pos+2:]) issues += "[{}]连接失败: {}".format(idx, msg[pos+2:])
else: else:
issues += "[{}] {}".format(idx, msg) issues += "[{}] {}".format(idx, msg)
idx+=1
if issues: if issues:
body = "摄像头{} 故障: ".format(ipcSn) + issues body = "摄像头{} 故障: ".format(ipcSn) + issues
......
...@@ -1477,6 +1477,7 @@ public: ...@@ -1477,6 +1477,7 @@ public:
ret["data"] = json(); ret["data"] = json();
json detail, summary; json detail, summary;
string sn = req.get_param_value("sn"); string sn = req.get_param_value("sn");
string withSummery = req.get_param_value("summery");
try { try {
if(!sn.empty() && sn != "all") { if(!sn.empty() && sn != "all") {
lock_guard<recursive_mutex> lg(mutIpcStatus); lock_guard<recursive_mutex> lg(mutIpcStatus);
...@@ -1500,21 +1501,23 @@ public: ...@@ -1500,21 +1501,23 @@ public:
ret["data"]["detail"] = detail; ret["data"]["detail"] = detail;
// get a copy to build summary if(withSummery == "true"){
lock_guard<recursive_mutex> lg(mutIpcStatus); // get a copy to build summary
json ipcsData = this->peerData["ipcStatus"]; lock_guard<recursive_mutex> lg(mutIpcStatus);
for(auto &[k,v]: ipcsData.items()) { json ipcsData = this->peerData["ipcStatus"];
json diff = json::diff(v["expected"], v["current"]); for(auto &[k,v]: ipcsData.items()) {
if(diff.size() != 0) { json diff = json::diff(v["expected"], v["current"]);
summary["problematic"].push_back(k); if(diff.size() != 0) {
} summary["problematic"].push_back(k);
else { }
summary["ok"].push_back(k); else {
summary["ok"].push_back(k);
}
} }
}
ret["data"]["summary"] = summary; ret["data"]["summary"] = summary;
ret["data"]["termNoCfg"] = this->peerData["info"]["nocfg"]; ret["data"]["termNoCfg"] = this->peerData["info"]["nocfg"];
}
} }
catch(exception &e) { catch(exception &e) {
ret["code"] = -1; ret["code"] = -1;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论