上傳檔案到 'app/main'

app/main/views.py

@@ -6368,9 +6368,9 @@ def dry_block_format():
         print("json.dumps(dry_block_sehedule):", json.dumps(dry_block_sehedule))
         # json.dumps(dry_block_sehedule): {"command": "Dry_OTA", "cond": [{"cond_main": "if D1 tank_UltraSonic >= 30", "cond_add": ["and tank_PA <= 1", "and tank_soil_Temp <= 30"], "cond_com": ["tank_vacuum_status on", "tank_motor_status 15"]}]}
         print('=========================================================')
-        mqtt.publish(topic,  json.dumps(dry_block_sehedule))
+        # mqtt.publish(topic,  json.dumps(dry_block_sehedule))
         
-        return jsonify({"response":"OK"})
+        return jsonify({"response":dry_block_sehedule})
 
 # 積木程式
 @main.route('/dry_block_set', methods=['GET', 'POST'])
@@ -6871,24 +6871,34 @@ def dry_container_tank(tid):
         else:
             return render_template('oops.html', params=locals())
         tonow = dt.now()
-        # 感測器_乾燥桶_SHT11
         print("tonow: ", tonow)
         time_del = timedelta(minutes=-60)
         bias_date_time = tonow + time_del
         # print(dt.now() >= dt(2021,11,29,17,35,36))
         # bias_min = tonow.minute + 3
+
+        # 感測器_乾燥桶_SHT11
         tank_SHT11 = dry_tank_SHT11.query.filter_by(tank_num='D'+str(tid))\
                     .filter(dry_tank_SHT11.datetime >= bias_date_time)\
                     .order_by(text('datetime desc')).first()
-        print("tank_SHT11: ", tank_SHT11, type(tank_SHT11))     # tank_SHT11:  <dry_tank_SHT11 2021-12-03 15:39:16> <class 'app.models.dry_tank_SHT11'>
+        # print("tank_SHT11: ", tank_SHT11, type(tank_SHT11))     # tank_SHT11:  <dry_tank_SHT11 2021-12-03 15:39:16> <class 'app.models.dry_tank_SHT11'>
         if not hasattr(object, 'tank_SHT11'):
-            tank_SHT11 = {"SHT11_Temp":" — "}            
+            tank_SHT11 = {"SHT11_Temp":" — ", "SHT11_Humidity":" — "}
+        print(tank_SHT11["SHT11_Temp"])
         # 感測器_乾燥桶_土壤三合一
         tank_Soil = dry_tank_Soil.query.filter_by(tank_num='D'+str(tid)).order_by(text('datetime desc')).first()
+        if not hasattr(object, 'tank_Soil'):
+            tank_Soil = {"soil_Temp":" — ", "soil_Humidity":" — ", "soil_EC":" — "}
+
         # 感測器_乾燥桶_氣壓
         tank_PA = dry_tank_PA.query.filter_by(tank_num='D'+str(tid)).order_by(text('datetime desc')).first()
+        if not hasattr(object, 'tank_PA'):
+            tank_PA = {"PA":" — "}
+
         # 感測器_乾燥桶_超音波感測器
         tank_UltraSonic = dry_tank_UltraSonic.query.filter_by(tank_num='D'+str(tid)).order_by(text('datetime desc')).first()
+        if not hasattr(object, 'tank_UltraSonic'):
+            tank_UltraSonic = {"UltraSonic":" — "}
 
         # 致動器_乾燥桶_ALL
         tank_brake = dry_tank_brake.query.filter_by(tank_num='D'+str(tid)).order_by(text('datetime desc')).first()