cs151051
/
smartParking
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Update v1.3

master
Evangelos Oulis 5 years ago
parent
7bee74c298
commit
fb14b3ece4
4 changed files with 111 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      gatewayNode/data.json
  2. 7
      gatewayNode/parking.py
  3. BIN
      serverNode/__pycache__/serv.cpython-37.pyc
  4. 41
      serverNode/serv.py

5
gatewayNode/data.json
View File

@ -1,4 +1,7 @@
{ {
"ip": "192.168.89.14", "ip": "192.168.89.14",
"port": "8080" "port": "8080",
"device": "1",
"username": "root",
"password": "root"
} }

7
gatewayNode/parking.py
View File

@ -31,6 +31,11 @@ if json_data != "" and json_data != None:
ser.readline() ser.readline()
prev_status = "-1" prev_status = "-1"
device_session = requests.session()
data = """{"username" :""" + server_par['username'] + """, "password":""" + server_par['password'] + """, "device": """ + server_par['device'] + """}"""
s.post(url = API_ENDPOINT, data = data)
while 1: while 1:
park_status = ser.readline() park_status = ser.readline()
park_status_data = str(park_status).split("#") park_status_data = str(park_status).split("#")
@ -41,7 +46,7 @@ if json_data != "" and json_data != None:
try: try:
if parkingStatus != prev_status: if parkingStatus != prev_status:
data = """{"no":""" + parkingCode + ""","status":""" + parkingStatus + """}""" data = """{"no":""" + parkingCode + ""","status":""" + parkingStatus + """}"""
r = requests.post(url = API_ENDPOINT, data = data) r = s.post(url = API_ENDPOINT, data = data)
if parkingStatus == "0": if parkingStatus == "0":
print("parking reserved. RESPONSE :", r.status_code, "\n") print("parking reserved. RESPONSE :", r.status_code, "\n")
elif parkingStatus == "1": elif parkingStatus == "1":

BIN
serverNode/__pycache__/serv.cpython-37.pyc
View File

Binary file not shown.

41
serverNode/serv.py
View File

@ -7,6 +7,7 @@ from json import dumps
import json import json
from flask_cors import CORS from flask_cors import CORS
import mysql.connector import mysql.connector
import os
# ================================================================== # ==================================================================
# ================================================================== # ==================================================================
@ -15,6 +16,9 @@ import mysql.connector
app = Flask(__name__) app = Flask(__name__)
CORS(app) CORS(app)
# create the secret key for session
app.secret_key = os.urandom(24)
# creating an API object # creating an API object
api = Api(app) api = Api(app)
@ -57,6 +61,12 @@ def isMember(username, password):
return isValid return isValid
def isAuthenticated():
if 'device_id' in session:
return True
else:
return False
# ================================================================== # ==================================================================
# making a class for a particular resource # making a class for a particular resource
@ -65,7 +75,11 @@ def isMember(username, password):
# other methods include put, delete, etc. # other methods include put, delete, etc.
class Parking(Resource): class Parking(Resource):
def get(self): def get(self):
try:
parks = getParkings() parks = getParkings()
except mysql.connector.errors.DatabaseError as e:
mydb.reconnect(attempts=1, delay=0)
return parks, 200 return parks, 200
class ParkingStatus(Resource): class ParkingStatus(Resource):
@ -75,11 +89,15 @@ class ParkingStatus(Resource):
<body><h1>Not get at '/parkingStatus'.</h1></body> <body><h1>Not get at '/parkingStatus'.</h1></body>
</html>""" </html>"""
def post(self): def post(self):
if isAuthenticated():
# Gets the data into as a JSON Object from HTTP request. # Gets the data into as a JSON Object from HTTP request.
data = json.loads(request.data) data = json.loads(request.data)
try:
# SQL get all Parking places status. # SQL get all Parking places status.
parks = getParkings() parks = getParkings()
except mysql.connector.errors.DatabaseError as e:
mydb.reconnect(attempts=1, delay=0)
currentParking = {} currentParking = {}
for park in parks: for park in parks:
@ -102,6 +120,7 @@ class ParkingStatus(Resource):
thereIs = False thereIs = False
toUpdate = False toUpdate = False
try:
if not thereIs: if not thereIs:
# Make a new insert entry for a new Parking Code. # Make a new insert entry for a new Parking Code.
values = (int(data['no']), int(data['status'])) values = (int(data['no']), int(data['status']))
@ -114,14 +133,36 @@ class ParkingStatus(Resource):
myCursor.execute("UPDATE PARKING SET PARKING_STATUS=%s WHERE PARKING_CODE=%s", values) myCursor.execute("UPDATE PARKING SET PARKING_STATUS=%s WHERE PARKING_CODE=%s", values)
mydb.commit() mydb.commit()
parks = getParkings() parks = getParkings()
except mysql.connector.errors.DatabaseError as e:
mydb.reconnect(attempts=1, delay=0)
return currentParking, 201 return currentParking, 201
else:
return "Error! You aren't authenticated. [POST] /authenticate first.", 403
class Authenticate(Resource):
def post(self):
try:
#Get the credencial from body of request.
data = json.loads(request.data)
if data['username'] != None and data['password'] != None and data['device'] != None:
isValid = isMember(data['username'], data['password'])
if isValid:
session['device_id'] = data['device']
else:
return "Not Authenticatiove device", 403
else:
return "Error authentication", 403
except mysql.connector.errors.DatabaseError as e:
mydb.reconnect(attempts=1, delay=0)
# ================================================================== # ==================================================================
# adding the defined resources along with their corresponding urls to REST APIs # adding the defined resources along with their corresponding urls to REST APIs
api.add_resource(Parking, '/') api.add_resource(Parking, '/')
api.add_resource(ParkingStatus, '/parkingStatus') api.add_resource(ParkingStatus, '/parkingStatus')
api.add_resource(Authenticate, '/authenticate')
# ================================================================== # ==================================================================
# driver function # driver function

Write Preview
Loading…
Cancel
Save