動かないのを修正したい
This commit is contained in:
parent
260779fca3
commit
0c4da769ac
1 changed files with 15 additions and 15 deletions
30
dislocker.py
30
dislocker.py
|
@ -35,7 +35,7 @@ class Bot(discord.Client):
|
||||||
cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (discord_user_id,))
|
cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (discord_user_id,))
|
||||||
user_record = cursor.fetchall()
|
user_record = cursor.fetchall()
|
||||||
#ユーザーデータがなかったら(未登録の場合)
|
#ユーザーデータがなかったら(未登録の場合)
|
||||||
if not user_record[0]:
|
if not user_record:
|
||||||
result = {"result": "user_data_not_found"}
|
result = {"result": "user_data_not_found"}
|
||||||
#ユーザーデータが見つかった場合(登録済みの場合)
|
#ユーザーデータが見つかった場合(登録済みの場合)
|
||||||
else:
|
else:
|
||||||
|
@ -44,22 +44,22 @@ class Bot(discord.Client):
|
||||||
if pc_usage_history_record:
|
if pc_usage_history_record:
|
||||||
if pc_usage_history_record[0][5] == None:
|
if pc_usage_history_record[0][5] == None:
|
||||||
result = {"result": "pc_already_in_use_by_you", "pc_number": str(pc_usage_history_record[0][2]), "device_number": str(pc_usage_history_record[0][3]), "start_time": str(pc_usage_history_record[0][4]), "detail": str(pc_usage_history_record[0][6])}
|
result = {"result": "pc_already_in_use_by_you", "pc_number": str(pc_usage_history_record[0][2]), "device_number": str(pc_usage_history_record[0][3]), "start_time": str(pc_usage_history_record[0][4]), "detail": str(pc_usage_history_record[0][6])}
|
||||||
else:
|
|
||||||
cursor.execute("SELECT * FROM pc_list WHERE pc_number=%s", (pc_number,))
|
|
||||||
pc_list_record = cursor.fetchall()
|
|
||||||
if not pc_list_record[0][1] == None:
|
|
||||||
result = {"result": "pc_already_in_use_by_other"}
|
|
||||||
else:
|
else:
|
||||||
if detail == None:
|
cursor.execute("SELECT * FROM pc_list WHERE pc_number=%s", (pc_number,))
|
||||||
cursor.execute("INSERT INTO pc_usage_history (member_id, pc_number, device_number, start_use_time) VALUES (%s, %s, %s, current_timestamp)", (user_record[0][0], pc_number, device_number))
|
pc_list_record = cursor.fetchall()
|
||||||
#使用用途があるとき
|
if not pc_list_record[0][1] == None:
|
||||||
|
result = {"result": "pc_already_in_use_by_other"}
|
||||||
else:
|
else:
|
||||||
cursor.execute("INSERT INTO pc_usage_history (member_id, pc_number, device_number, start_use_time, use_detail) VALUES (%s, %s, %s, current_timestamp, %s)", (user_record[0][0], pc_number, device_number, detail))
|
if detail == None:
|
||||||
|
cursor.execute("INSERT INTO pc_usage_history (member_id, pc_number, device_number, start_use_time) VALUES (%s, %s, %s, current_timestamp)", (user_record[0][0], pc_number, device_number))
|
||||||
cursor.execute("UPDATE pc_list SET using_user_id = %s WHERE pc_number = %s", (user_record[0][0], pc_number))
|
#使用用途があるとき
|
||||||
cursor.execute("UPDATE pc_list SET password_hash = %s WHERE pc_number = %s", (password_hash, pc_number))
|
else:
|
||||||
self.db.commit()
|
cursor.execute("INSERT INTO pc_usage_history (member_id, pc_number, device_number, start_use_time, use_detail) VALUES (%s, %s, %s, current_timestamp, %s)", (user_record[0][0], pc_number, device_number, detail))
|
||||||
result = {"result": "ok", "password": str(password), "name": str(user_record[0][1])}
|
|
||||||
|
cursor.execute("UPDATE pc_list SET using_user_id = %s WHERE pc_number = %s", (user_record[0][0], pc_number))
|
||||||
|
cursor.execute("UPDATE pc_list SET password_hash = %s WHERE pc_number = %s", (password_hash, pc_number))
|
||||||
|
self.db.commit()
|
||||||
|
result = {"result": "ok", "password": str(password), "name": str(user_record[0][1])}
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue