分析工具添加导出数据和分析结果html文件

analysis/scheme_data.py

@@ -252,24 +252,53 @@ class sch_data(object):
             data_list.append(t)
         db,cur=_connect_sql()
         if(db!=None):
-            cmd="""SELECT id,create_time,addr,err_code,valuez FROM  check_result_detail 
+            cmd="""SELECT id,create_time,addr,err_code,run,valuez FROM  check_result_detail 
             where create_time > %s and create_time < %s  
             and result_id in (select pk from check_result where plan_id =%s) ;"""
             cur.execute(cmd,(self.date_start,self.date_end,scheme_id))
             check_data=cur.fetchall()
             for row in check_data:
                 if(row[3]==0):
-                    s=row[4].split(',')
+                    s=row[5].split(',')
                     for i in range(len(s)):
                         data_list[i].append(int(s[i]))
+        self._check_data=check_data
+        self._titles=title
         return title,data_list,len(check_data)
 
-    def export_scheme(self,ret_limit):
+    def export_check_data(self,path:str):
+        if(self._check_data==None):
+            return
+        if(self._titles==None):
+            return
+        if not os.path.exists(path):
+            os.makedirs(path)
+        save_name=self.scheme_name.split('/')[-1].split('.')[0]
+        save_name=os.path.join(path,save_name)
+        with open(save_name+".csv","w+") as f:
+            title_list=["时间","错误码","执行结果"]
+            title_list+=self._titles
+            title_list.append('\n')
+            s=','.join(title_list)
+            f.write(s)
+            for row in self._check_data:
+                time=row[1].strftime("%Y-%m-%d %H:%M:%S")
+                err=str(row[3])
+                run="=\""+row[4]+"\""
+                data=row[5]
+                s=','.join([time,err,run,data,'\n'])
+                f.write(s)
+        print("export check data end.")
+
+
+    def export_scheme(self,path:str,ret_limit):
+        if not os.path.exists(path):
+            os.makedirs(path)
         name=self.scheme_name
         info=_get_info()
         date=info[0]
         id=info[1]
-        save_name=info[2]
+        save_name=name.split('/')[-1].split('.')[0]
         quest=quest_text("请输入要导出的文件名",save_name)
         ack,save_name=quest.show()
         if(ack!=True):
@@ -287,11 +316,14 @@ class sch_data(object):
             json_obj["PlanID"],sid=_reflush_scheme_id(json_obj["PlanID"])
             # 刷新方案id号之后更新日期
             date=_get_info()[0]
+            # 保存到指定路径下
+            save_name=os.path.join(path,save_name)
             save_name=save_name+"_"+date+"{d:02d}".format(d=sid)
             json_obj["PlanBrief"]=save_name
             json_str=json.dumps(json_obj, sort_keys=True, indent=4, separators=(',', ': '),ensure_ascii=False)
             save_f=open(save_name+".json",'+wb')
             save_f.write(json_str.encode("utf-8"))
             save_f.close()
+            print("scheme export end.")
 if __name__ == "__main__":
     _main()