计算消息占比和处置率

src/agent/tool_warn.py

@@ -70,6 +70,30 @@ class WarningTool(BaseTool):
                 self.logger.warning(error_msg)
                 return {'code': 400, 'message': error_msg}
 
+            # 计算消息占比
+            if int(response.resultdata["num"]) != 0:
+                num = int(response.resultdata["num"])                
+                redper = int(response.resultdata["rednum"])/num
+                orangeper = int(response.resultdata["orangenum"])/num
+                yellowper = int(response.resultdata["yellownum"])/num
+                blueper = int(response.resultdata["bluenum"])/num
+
+            # 计算处置率
+            if int(response.resultdata["rednum"]) != 0:
+                redcloseper = int(response.resultdata["redcloseper"])/int(response.resultdata["rednum"])
+            else:
+                redcloseper = 0
+            if int(response.resultdata["orangenum"]) != 0:
+                orangecloseper = int(response.resultdata["orangecloseper"])/int(response.resultdata["orangenum"])
+            else:
+                orangecloseper = 0
+            if int(response.resultdata["yellownum"]) != 0:
+                yellowcloseper = int(response.resultdata["yellowcloseper"])/int(response.resultdata["yellownum"])
+            else:
+                yellowcloseper = 0
+            if int(response.resultdata["bluenum"]) != 0:
+                bluecloseper = int(response.resultdata["bluecloseper"])/int(response.resultdata["bluenum"])
+            
             data = {
                 "预警消息个数": response.resultdata["num"],
                 "处置消息个数": response.resultdata["closenum"],
@@ -77,15 +101,23 @@ class WarningTool(BaseTool):
                 "虚警消息个数": response.resultdata["falsenum"],
                 "虚警率": response.resultdata["falseper"],
                 "红色预警消息个数": response.resultdata["rednum"],
-                "红色预警消息占比": response.resultdata["redcloseper"],
+                "红色预警消息占比": f"{redper*100:.2f}%",
+                "红色预警处置个数": response.resultdata["redcloseper"],
+                "红色预警处置率": f"{redcloseper*100:.2f}%",
                 "橙色预警消息个数": response.resultdata["orangenum"],
-                "橙色预警消息占比": response.resultdata["orangecloseper"],
+                "橙色预警消息占比": f"{orangeper*100:.2f}%",
+                "橙色预警处置个数": response.resultdata["orangecloseper"],
+                "橙色预警处置率": f"{orangecloseper*100:.2f}%",
                 "黄色预警消息个数": response.resultdata["yellownum"],
-                "黄色预警消息占比": response.resultdata["yellowcloseper"],
+                "黄色预警消息占比": f"{yellowper*100:.2f}%",
+                "黄色预警处置个数": response.resultdata["yellowcloseper"],
+                "黄色预警处置率": f"{yellowcloseper*100:.2f}%",
                 "蓝色预警消息个数": response.resultdata["bluenum"],
-                "蓝色预警消息占比": response.resultdata["bluecloseper"],
+                "蓝色预警消息占比": f"{blueper*100:.2f}%",
+                "蓝色预警处置个数": response.resultdata["bluecloseper"],
+                "蓝色预警处置率": f"{bluecloseper*100:.2f}%",
                 "数据异常消息个数": response.resultdata["datanum"],
-                "数据异常消息占比": response.resultdata["datacloseper"],
+                "数据异常消息占比": response.resultdata['datacloseper'],
                 "设备维护": response.resultdata["devicemainnum"],
                 "设备维护占比": response.resultdata["devicemaincloseper"],
                 "设备遭到破坏": response.resultdata["damagenum"],