coapserver.py

Server_CoAP/CoAPthon3/coapserver.py

@@ -39,9 +39,9 @@ class CoAPServer(CoAP):
                     print(c['uuid'])
                     positionCalculationThread = threading.Thread(target = self.positionCalculation, args=([c['uuid']]))
                     positionCalculationThread.start()
-                time.sleep(2.1)
+                time.sleep(10.1)
                 currentTime = time.time()
-                trackingCursor = self.trackingCollection.remove({'updateTime': {'lte' : currentTime - 2}})
+                trackingCursor = self.trackingCollection.remove({'updateTime': {'lte' : currentTime - 10}})
         except KeyboardInterrupt:
             print("existing updateUserLocation")
     
@@ -49,7 +49,7 @@ class CoAPServer(CoAP):
         print(useruuid)
         currentTime = time.time()
         trackingCursor = self.trackingCollection.find({'$and':[{'useruuid': useruuid},
-        {'updateTime':{'$gt' : currentTime - 2}}]})
+        {'updateTime':{'$gt' : currentTime - 10}}]})
         #trackingCursor = self.trackingCollection.find({'$and':[{'useruuid':{'$eq' : useruuid}}]})
         userLocationData =[]
 

Server_CoAP/CoAPthon3/exampleresources.py

@@ -49,6 +49,7 @@ class RpNodeInfoResource(Resource): #문제 없음.
     def deleteNodeData(self, info): #문제 없음
         info = info['rpMAC']
         graphColletion = self.db.RpGraphData
+        if  self.collection.find({'rpMAC' : info}).count() != 0:
             rpuuid = self.collection.find({'rpMAC' : info})[0]['rpuuid']
             graphColletion.delete_many({'v2' : rpuuid})
             self.collection.delete_many({'rpMAC' : info})
@@ -102,7 +103,9 @@ class RpNodeInfoResource(Resource): #문제 없음.
                     tempdoc = self.collection.find({'rpuuid': doc['v1']})
                     if tempdoc[0]['x'] == 0 and tempdoc[0]['y'] == 0: # 첫번째 RpNode 즉, (0,0)
                         vertexA = tempdoc[0]# 첫번째 RpNode를 vertexA라 한다.
+                        vertexB = tempdoc[1]
                     vertexB = tempdoc[0]#두번째 RpNode를 vertexB라  한다.
+                    vertexA = tempdoc[1]
                 dis = {
                     'a': graphColletion.find({'v1': vertexB['rpuuid'], 'v2': info})[0]['distance'],
                     'b': graphColletion.find({'v1': vertexA['rpuuid'], 'v2': info})[0]['distance'],
@@ -138,7 +141,9 @@ class RpNodeInfoResource(Resource): #문제 없음.
                     return json.dumps(response)
 
                 nodeList = []
+               
                 for i in range(3):
+                    print(self.piNodeCollection.find({'rpuuid': nodeLocationData[i]['rpuuid']})[0])
                     nodeList.append({
                         'x': self.piNodeCollection.find({'rpuuid': nodeLocationData[i]['rpuuid']})[0]['x'],
                         'y': self.piNodeCollection.find({'rpuuid': nodeLocationData[i]['rpuuid']})[0]['y'],
@@ -156,7 +161,10 @@ class RpNodeInfoResource(Resource): #문제 없음.
 
                 self.collection.update({'rpuuid' : info}, {'$set':{'x': x, 'y': y}}, False)
 
-                return json.dump(response)
+            return json.dumps(response)
+        else:
+            response['operate'] = 0
+            return json.dumps(response)
                 
 class RpGraphInfoResource(Resource): #문제 없음
     def __init__(self, name="RpGraphInfo"):