2022.02.21 merge

@@ -131,3 +131,4 @@ def create_app():
 
     start_schedule()
     return app
+

@@ -185,7 +185,7 @@ class DataManager(BlueprintApi):
     @bp.route("/init", methods=["GET"])
     def init():
         username = 'admin'
-        password = 'admin'
+        password = SM3.encode('DMap@123')
         if not User.query.filter_by(username=username).one_or_none():
             user = User(username=username, password=password, role='admin',
                         phone='', company='', position='', email='',
@@ -197,12 +197,13 @@ class DataManager(BlueprintApi):
             return "创建默认用户成功"
         else:
             return "默认用户已存在"
-
+        
     @staticmethod
-    @bp.route("/test", methods=["GET"])
-    def test():
-        result = 'c78ca1de8139e62c99d4c4d2050ddd16'
-        result = AESHelper.encode('dataman2')
-        # result=DES.decode('U2FsdGVkX199Ncuh7+0/HVmonwM9Uz7SYnmF73wtW7c=')
-        result2 = AESHelper.decode(result)
-        return result2
+    @bp.route("/translate", methods=["GET"])
+    def translate():
+        password = ['esri@123','admin','DMap@123','passwd']
+        result = {}
+        for p in password:
+            new_pwd = SM3.encode(p)
+            result[p] = new_pwd
+        return result
\ No newline at end of file

@@ -5,8 +5,9 @@
 
 # import schedule
 from flask import json
+from sqlalchemy import true
 from .models import MonitorHost, MonitorInfo
-import datetime
+from datetime import datetime, timedelta
 import math
 import uuid
 import schedule
@@ -30,7 +31,6 @@ def pull_metric():
             0, configure.SQLALCHEMY_DATABASE_URI)
 
         # 拉取服务器信息
-
         hosts = sys_session.query(
             MonitorHost.host)
         for host in hosts:
@@ -61,7 +61,40 @@ def pull_metric():
         # 获取数据并汇聚为1min的数据入库
         # 结束
     except Exception as e:
-        #sys_session.rollback()
+
+        StructurePrint().print(e.__str__()+":" + traceback.format_exc(), "error")
+    finally:
+        if sys_session:
+            try:
+                sys_session.close()
+            except Exception as e:
+                StructurePrint().print(e.__str__()+":" + traceback.format_exc(), "error")
+        if sys_ds:
+            try:
+                sys_ds.Destroy()
+            except Exception as e:
+                StructurePrint().print(e.__str__()+":" + traceback.format_exc(), "error")
+
+
+#每天清理7天前的数据
+def monitor_vacuuming():
+    try:
+        current_date = datetime.now()
+        last_7_date = current_date+timedelta(days=-7)
+        current_hour = current_date.hour
+        if current_hour == 0:
+            sys_session = PGUtil.get_db_session(
+                configure.SQLALCHEMY_DATABASE_URI)
+            sys_ds = PGUtil.open_pg_data_source(
+                0, configure.SQLALCHEMY_DATABASE_URI)
+            info_orm = sys_session.query(MonitorInfo).filter(
+                MonitorInfo.time_stamp < last_7_date)
+            count = info_orm.count()
+            info_orm.delete()
+            sys_session.commit()
+            StructurePrint().print("MonitorInfo清理%d条监控数据" % count, "info")
+    except Exception as e:
+
         StructurePrint().print(e.__str__()+":" + traceback.format_exc(), "error")
     finally:
         if sys_session:
@@ -77,10 +110,13 @@ def pull_metric():
 
 
 def start_schedule():
-    # # 1分钟巡检一次
+
     try:
         StructurePrint().print("start_schedule")
+        # 1分钟巡检一次
         schedule.every(1).minutes.do(pull_metric)
+        # 每天00:00清理数据
+        schedule.every().day.at('00:00').do(monitor_vacuuming)
         stop_run_continuously = run_continuously()
     except Exception as e:
         StructurePrint().print("start_schedule:"+e.__str__() +
@@ -130,7 +166,7 @@ def get_sample_data(orginal, name, host):
 
 
 def get_data(stamp, host, metrics_name, cur_data):
-    time_stamp = datetime.datetime.strptime(
+    time_stamp = datetime.strptime(
         cur_data['timestamp'], "%Y-%m-%d %H:%M:%S")
     date_stamp = time_stamp.strftime("%Y-%m-%d")
     guid = uuid.uuid1().__str__()