Преглед на файлове

增加每周一检查能耗逻辑

李莎 преди 2 години
родител
ревизия
780e290d05
променени са 1 файла, в които са добавени 26 реда и са изтрити 25 реда
  1. 26 25
      main.py

+ 26 - 25
main.py

@@ -53,30 +53,30 @@ def get_data_time(zillionUtil,hbase_database, hbase_table, building, from_time,
 #     print("%s,mysql数据%s,项目%s插入成功,合计%s条..." % (datetime_now(),my_table,building,len(sqls)))
 
 
-with open("config.json", "r") as f:
-    data = json.load(f)
-    hbase_database = data["metadata"]["database"]
-    url = data["metadata"]["url"]
-    building = data["building"]
-    mysql = data["mysql"]
-    my_database = mysql["database"]
-    dingding = data["dingding"]
-    at_mobiles = data["at_mobiles"]
-
-
-# hbase_database = os.getenv("hbase_database")
-# url = os.getenv("url")
-# building = os.getenv("building")
-# dingding = os.getenv("dingding")
-# at_mobiles = os.getenv("at_mobiles")
-# mysql = {
-#     "host": os.getenv("host"),
-#     "port": os.getenv("port"),
-#     "user": os.getenv("user"),
-#     "passwd": os.getenv("passwd"),
-#     "database": os.getenv("database")
-# }
-# my_database = os.getenv("database")
+# with open("config.json", "r") as f:
+#     data = json.load(f)
+#     hbase_database = data["metadata"]["database"]
+#     url = data["metadata"]["url"]
+#     building = data["building"]
+#     mysql = data["mysql"]
+#     my_database = mysql["database"]
+#     dingding = data["dingding"]
+#     at_mobiles = data["at_mobiles"]
+
+
+hbase_database = os.getenv("hbase_database")
+url = os.getenv("url")
+building = os.getenv("building")
+dingding = os.getenv("dingding")
+at_mobiles = os.getenv("at_mobiles")
+mysql = {
+    "host": os.getenv("host"),
+    "port": os.getenv("port"),
+    "user": os.getenv("user"),
+    "passwd": os.getenv("passwd"),
+    "database": os.getenv("database")
+}
+my_database = os.getenv("database")
 
 
 
@@ -91,7 +91,7 @@ def check_energy():
         if weekday == 0:
             time_now = datetime.datetime.fromtimestamp(int(time.time()),
                                                        pytz.timezone('Asia/Shanghai')).strftime('%H:%M:%S')
-            if time_now == "08:00:00":
+            if time_now == "09:00:00":
                 ##查询本周能耗和上周能耗
                 lastmonday = today - datetime.timedelta(days=weekday + 7)
                 conn = pymysql.connect(**mysql)
@@ -100,6 +100,7 @@ def check_energy():
                 count_sql = SELETE_COUNTLASTDATA_SQL % (project_id, lastmonday.strftime("%Y%m%d"), today.strftime("%Y%m%d"))
                 mysql_cur.execute(count_sql)
                 lastdatacount = mysql_cur.fetchall()[0][0]
+                print("上周能耗天数%s"%lastdatacount)
                 if lastdatacount == 7:
                     lastdata_sql = SELETE_SUMLASTDATA_SQL % (
                     project_id, lastmonday.strftime("%Y%m%d"), today.strftime("%Y%m%d"))