nmelone/HenryPump-Drivers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated drivers to most recent version

Browse Source
This commit is contained in:
Nico Melone
2019-12-18 08:09:55 -06:00
parent e46a2f1700
commit d9a908755d
13 changed files with 105 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
email_reports/email_reports.py
View File

@@ -1,5 +1,4 @@
"""Driver for email_reports"""
import threading
import json
import time
@@ -26,9 +25,6 @@ WATCHDOG_SEND_PERIOD = 3600 # Seconds, the longest amount of time before sendin
CHANNELS = tags
# PERSISTENCE FILE
PERSIST = persistence.load()
class start(threading.Thread, deviceBase):
"""Start class required by Meshify."""
@@ -42,7 +38,7 @@ class start(threading.Thread, deviceBase):
mqtt=mqtt, Nodes=Nodes)
self.daemon = True
self.version = "5"
self.version = "6"
self.finished = threading.Event()
self.force_send = False
self.public_ip_address = ""
@@ -50,6 +46,7 @@ class start(threading.Thread, deviceBase):
self.watchdog = False
self.watchdog_last_checked = 0
self.watchdog_last_sent = 0
self.PERSIST = persistence.load()
threading.Thread.start(self)
# this is a required function for all drivers, its goal is to upload some piece of data
@@ -65,13 +62,13 @@ class start(threading.Thread, deviceBase):
print("email_reports driver will start in {} seconds".format(WAIT_FOR_CONNECTION_SECONDS - i))
time.sleep(1)
log.info("BOOM! Starting email_reports driver...")
if not PERSIST:
PERSIST = {'yesterday': dt.today().day - 1,
if not self.PERSIST:
self.PERSIST = {'yesterday': dt.today().day - 1,
'start': 0,
'end': 10000,
'recipients': ['nmelone@henry-pump.com']}
persistence.store(PERSIST)
persistence.store(self.PERSIST)
#self._check_watchdog()
self._check_ip_address()
@@ -84,77 +81,8 @@ class start(threading.Thread, deviceBase):
if self.force_send:
log.warning("FORCE SEND: TRUE")
if self.isReportTime():
#read a full array from PLC
log.info("Gathering Timestamp between {} and {}".format(PERSIST['start'], PERSIST['end']))
trans_day, PERSIST['end'] = read_array(CHANNELS[1].plc_ip,CHANNELS[1].plc_tag,PERSIST['start'],PERSIST['end'],CHANNELS[1].plc_type)
trans_hour, PERSIST['end'] = read_array(CHANNELS[2].plc_ip,CHANNELS[1].plc_tag,PERSIST['start'],PERSIST['end'],CHANNELS[2].plc_type)
trans_min, PERSIST['end'] = read_array(CHANNELS[3].plc_ip,CHANNELS[3].plc_tag,PERSIST['start'],PERSIST['end'],CHANNELS[3].plc_type)
log.info("Gathering Driver IDs between {} and {}".format(PERSIST['start'], PERSIST['end']))
driver_id, PERSIST['end'] = read_array(CHANNELS[0].plc_ip, CHANNELS[0].plc_tag, PERSIST['start'], PERSIST['end'], CHANNELS[0].plc_type) #addr, tag, start, end, plc_type="CLX"
log.info("Gather Transaction Data between {} and {}".format(PERSIST['start'], PERSIST['end']))
trans_total, PERSIST['end'] = read_array(CHANNELS[4].plc_ip,CHANNELS[4].plc_tag,PERSIST['start'],PERSIST['end'],CHANNELS[4].plc_type)
PERSIST['start'] = PERSIST['end']
overall = {
'today_total': CHANNELS[5].read(),
'yesterday_total': CHANNELS[6].read(),
'monthly_total': CHANNELS[7].read(),
'prevmonthly_total': CHANNELS[8].read(),
'current_year_total': CHANNELS[9].read(),
'prev_year_total': CHANNELS[10].read()
}
company_1 = {
'today_total': CHANNELS[11].read(),
'yesterday_total': CHANNELS[12].read(),
'monthly_total': CHANNELS[13].read(),
'prevmonthly_total': CHANNELS[14].read(),
'current_year_total': CHANNELS[15].read(),
'prev_year_total': CHANNELS[16].read()
}
company_2 = {
'today_total': CHANNELS[17].read(),
'yesterday_total': CHANNELS[18].read(),
'monthly_total': CHANNELS[19].read(),
'prevmonthly_total': CHANNELS[20].read(),
'current_year_total': CHANNELS[21].read(),
'prev_year_total': CHANNELS[22].read()
}
company_3 = {
'today_total': CHANNELS[23].read(),
'yesterday_total': CHANNELS[24].read(),
'monthly_total': CHANNELS[25].read(),
'prevmonthly_total': CHANNELS[26].read(),
'current_year_total': CHANNELS[27].read(),
'prev_year_total': CHANNELS[28].read()
}
company_4 = {
'today_total': CHANNELS[29].read(),
'yesterday_total': CHANNELS[30].read(),
'monthly_total': CHANNELS[31].read(),
'prevmonthly_total': CHANNELS[32].read(),
'current_year_total': CHANNELS[33].read(),
'prev_year_total': CHANNELS[34].read()
}
company_5 = {
'today_total': CHANNELS[35].read(),
'yesterday_total': CHANNELS[36].read(),
'monthly_total': CHANNELS[37].read(),
'prevmonthly_total': CHANNELS[38].read(),
'current_year_total': CHANNELS[39].read(),
'prev_year_total': CHANNELS[40].read()
}
log.info("Generating Spreadsheet")
generate_report(driver_id,trans_day,trans_hour,trans_min, trans_total, overall, company_1, company_2, company_3, company_4, company_5)
log.info("Sending Emails")
send_email(PERSIST['recipients'])
PERSIST['yesterday'] = dt.today().day
persistence.store(PERSIST)
self.run_report()
# print("email_reports driver still alive...")
@@ -222,11 +150,85 @@ class start(threading.Thread, deviceBase):
def isReportTime(self):
right_now = dt.today()
if right_now.hour == 23 and right_now.minute == 0 and not(right_now.day == PERSIST['yesterday']):
if right_now.hour == 23 and right_now.minute == 0 and not(right_now.day == self.PERSIST['yesterday']):
if right_now.day == 1:
PERSIST['start'] = 0
PERSIST['end'] = 10000
persistence.store(PERSIST)
self.PERSIST['start'] = 0
self.PERSIST['end'] = 10000
persistence.store(self.PERSIST)
return True
return False
def run_report(self):
#read a full array from PLC
log.info("Gathering Timestamp between {} and {}".format(self.PERSIST['start'], self.PERSIST['end']))
trans_day, self.PERSIST['end'] = read_array(CHANNELS[1].plc_ip,CHANNELS[1].plc_tag,self.PERSIST['start'],10000,CHANNELS[1].plc_type)
trans_hour, self.PERSIST['end'] = read_array(CHANNELS[2].plc_ip,CHANNELS[1].plc_tag,self.PERSIST['start'],self.PERSIST['end'],CHANNELS[2].plc_type)
trans_min, self.PERSIST['end'] = read_array(CHANNELS[3].plc_ip,CHANNELS[3].plc_tag,self.PERSIST['start'],self.PERSIST['end'],CHANNELS[3].plc_type)
log.info("Gathering Driver IDs between {} and {}".format(self.PERSIST['start'], self.PERSIST['end']))
driver_id, self.PERSIST['end'] = read_array(CHANNELS[0].plc_ip, CHANNELS[0].plc_tag, self.PERSIST['start'], self.PERSIST['end'], CHANNELS[0].plc_type) #addr, tag, start, end, plc_type="CLX"
log.info("Gather Transaction Data between {} and {}".format(self.PERSIST['start'], self.PERSIST['end']))
trans_total, self.PERSIST['end'] = read_array(CHANNELS[4].plc_ip,CHANNELS[4].plc_tag,self.PERSIST['start'],self.PERSIST['end'],CHANNELS[4].plc_type)
self.PERSIST['start'] = self.PERSIST['end']
overall = {
'today_total': CHANNELS[5].read(),
'yesterday_total': CHANNELS[6].read(),
'monthly_total': CHANNELS[7].read(),
'prevmonthly_total': CHANNELS[8].read(),
'current_year_total': CHANNELS[9].read(),
'prev_year_total': CHANNELS[10].read()
}
company_1 = {
'today_total': CHANNELS[11].read(),
'yesterday_total': CHANNELS[12].read(),
'monthly_total': CHANNELS[13].read(),
'prevmonthly_total': CHANNELS[14].read(),
'current_year_total': CHANNELS[15].read(),
'prev_year_total': CHANNELS[16].read()
}
company_2 = {
'today_total': CHANNELS[17].read(),
'yesterday_total': CHANNELS[18].read(),
'monthly_total': CHANNELS[19].read(),
'prevmonthly_total': CHANNELS[20].read(),
'current_year_total': CHANNELS[21].read(),
'prev_year_total': CHANNELS[22].read()
}
company_3 = {
'today_total': CHANNELS[23].read(),
'yesterday_total': CHANNELS[24].read(),
'monthly_total': CHANNELS[25].read(),
'prevmonthly_total': CHANNELS[26].read(),
'current_year_total': CHANNELS[27].read(),
'prev_year_total': CHANNELS[28].read()
}
company_4 = {
'today_total': CHANNELS[29].read(),
'yesterday_total': CHANNELS[30].read(),
'monthly_total': CHANNELS[31].read(),
'prevmonthly_total': CHANNELS[32].read(),
'current_year_total': CHANNELS[33].read(),
'prev_year_total': CHANNELS[34].read()
}
company_5 = {
'today_total': CHANNELS[35].read(),
'yesterday_total': CHANNELS[36].read(),
'monthly_total': CHANNELS[37].read(),
'prevmonthly_total': CHANNELS[38].read(),
'current_year_total': CHANNELS[39].read(),
'prev_year_total': CHANNELS[40].read()
}
log.info("Generating Spreadsheet")
generate_report(driver_id,trans_day,trans_hour,trans_min, trans_total, overall, company_1, company_2, company_3, company_4, company_5)
log.info("Sending Emails")
send_email(self.PERSIST['recipients'])
self.PERSIST['yesterday'] = dt.today().day
persistence.store(self.PERSIST)