|
@@ -465,7 +465,7 @@ class MysqldbOperational(object):
|
|
|
return False
|
|
|
|
|
|
def get_breakpoint_last_time_datetime(self, tableName):
|
|
|
- sql = "SELECT times FROM %s WHERE is_send = 0 AND times < date_sub(now(), interval 1 hour) ORDER BY id DESC LIMIT 1;" % (
|
|
|
+ sql = "SELECT times FROM `%s` WHERE is_send = 0 AND times < date_sub(now(), interval 1 hour) ORDER BY id DESC LIMIT 1;" % (
|
|
|
tableName)
|
|
|
try:
|
|
|
self._reConn()
|
|
@@ -485,7 +485,7 @@ class MysqldbOperational(object):
|
|
|
return None
|
|
|
|
|
|
def get_breakpoint_last_time_date_and_time(self, tableName):
|
|
|
- sql = "SELECT Date,Time FROM %s WHERE is_send = 0 ORDER BY id LIMIT 1;" % (tableName)
|
|
|
+ sql = "SELECT Date,Time FROM `%s` WHERE is_send = 0 ORDER BY id LIMIT 1;" % (tableName)
|
|
|
dict = {}
|
|
|
try:
|
|
|
self._reConn()
|
|
@@ -505,7 +505,7 @@ class MysqldbOperational(object):
|
|
|
return None
|
|
|
|
|
|
def get_hour_data_datetime(self, tableName, begin, end):
|
|
|
- sql = "SELECT * FROM %s WHERE times >= '%s' And times <= '%s' ORDER BY id ASC;" % (tableName, begin, end)
|
|
|
+ sql = "SELECT * FROM `%s` WHERE times >= '%s' And times <= '%s' ORDER BY id ASC;" % (tableName, begin, end)
|
|
|
try:
|
|
|
self._reConn()
|
|
|
self.cursor = self.con.cursor(cursor=pymysql.cursors.DictCursor)
|
|
@@ -523,7 +523,7 @@ class MysqldbOperational(object):
|
|
|
return None
|
|
|
|
|
|
def get_hour_data_date_and_time(self, tableName, begin, end):
|
|
|
- sql = "SELECT * FROM %s WHERE CONCAT(Date,' ', Time) >= '%s' And CONCAT(Date,' ', Time) <= '%s' ORDER BY id ASC;" % (
|
|
|
+ sql = "SELECT * FROM `%s` WHERE CONCAT(Date,' ', Time) >= '%s' And CONCAT(Date,' ', Time) <= '%s' ORDER BY id ASC;" % (
|
|
|
tableName, begin, end)
|
|
|
try:
|
|
|
self._reConn()
|
|
@@ -545,7 +545,7 @@ class MysqldbOperational(object):
|
|
|
if len(id_list) >= 1:
|
|
|
id = id_list[0]['id']
|
|
|
value = 1
|
|
|
- sql = "UPDATE %s SET is_send = %s WHERE id = %s" % (tableName, value, id)
|
|
|
+ sql = "UPDATE `%s` SET is_send = %s WHERE id = %s" % (tableName, value, id)
|
|
|
for index in range(len(id_list)):
|
|
|
sql = sql + " OR id = %s" % (id_list[index]['id'])
|
|
|
|
|
@@ -581,7 +581,7 @@ class MysqldbOperational(object):
|
|
|
return False
|
|
|
|
|
|
def get_newest_data(self, tableName):
|
|
|
- sql = "SELECT * FROM %s ORDER BY id DESC LIMIT 1;" % (tableName)
|
|
|
+ sql = "SELECT * FROM `%s` ORDER BY id DESC LIMIT 1;" % (tableName)
|
|
|
results = []
|
|
|
try:
|
|
|
self._reConn()
|
|
@@ -604,7 +604,7 @@ class MysqldbOperational(object):
|
|
|
return None
|
|
|
|
|
|
def set_send_status(self, tableName, id, value):
|
|
|
- sql = "UPDATE %s SET is_send = %s WHERE id = %s;" % (tableName, value, id)
|
|
|
+ sql = "UPDATE `%s` SET is_send = %s WHERE id = %s;" % (tableName, value, id)
|
|
|
try:
|
|
|
self._reConn()
|
|
|
self.cursor = self.con.cursor()
|
|
@@ -626,7 +626,7 @@ class MysqldbOperational(object):
|
|
|
"""
|
|
|
|
|
|
yes_time = datetime.now().strftime("%Y-%m-%d")
|
|
|
- sql1 = "UPDATE binocular_dailyreport SET is_send = 1 WHERE size_average IS NULL;"
|
|
|
+ sql1 = "UPDATE binocular_dailyreport SET is_send = 1 WHERE size_average IS NULL AND datetime<\'%s\';" % (yes_time)
|
|
|
sql2 = "SELECT datetime,fish_species,size_average,size_median,weight_average,weight_median FROM binocular_dailyreport WHERE datetime<\'%s\' AND is_send=0 AND size_average IS NOT NULL;" % (yes_time)
|
|
|
|
|
|
try:
|
|
@@ -635,7 +635,7 @@ class MysqldbOperational(object):
|
|
|
self.cursor.execute(sql1)
|
|
|
self.con.commit()
|
|
|
self.cursor.execute(sql2)
|
|
|
- results = self.cursor.fetchall()
|
|
|
+ results = self.cursor.fetchall()
|
|
|
self.cursor.close()
|
|
|
return results
|
|
|
|
|
@@ -673,7 +673,8 @@ class MysqldbOperational(object):
|
|
|
"CAST(AVG(assess_top_number) AS signed) AS assess_top_number," \
|
|
|
"CAST(AVG(assess_middle_number) AS signed) AS assess_middle_number," \
|
|
|
"CAST(AVG(assess_bottom_number) AS signed) AS assess_bottom_number " \
|
|
|
- "FROM fish_distribution_data WHERE datetime<\'%s\' AND is_send=0 GROUP BY date_format(datetime,'%%Y-%%m-%%d');" % (td_time)
|
|
|
+ "FROM fish_distribution_data WHERE datetime<\'%s\' AND is_send=0 " \
|
|
|
+ "GROUP BY date_format(datetime,'%%Y-%%m-%%d');" % (td_time)
|
|
|
try:
|
|
|
self._reConn()
|
|
|
self.cursor = self.con.cursor(cursor=pymysql.cursors.DictCursor)
|