图像部分前后端交互修改bug

DAPlatform/Dao/Image.py

@@ -23,9 +23,9 @@ class Point(db.EmbeddedDocument):
     Y = db.FloatField(required=True)
 
     def to_json(self):
-        return {"pointId": self.pointId,
-                "X": self.X,
-                "Y": self.Y}
+        return {'pointId': self.pointId,
+                'X': self.X,
+                'Y': self.Y}
 
 
 # 标签
@@ -35,9 +35,9 @@ class Label(db.EmbeddedDocument):
     pointList = db.ListField(db.EmbeddedDocumentField(Point))
 
     def to_json(self):
-        return {"labelId": self.labelId,
-                "labelName": self.labelName,
-                "pointList": [i.to_json() for i in self.pointList]
+        return {'labelId': self.labelId,
+                'labelName': self.labelName,
+                'pointList': [i.to_json() for i in self.pointList]
                 }
 
 
@@ -49,9 +49,9 @@ class Image(db.Document):
     labelList = db.ListField(db.EmbeddedDocumentField(Label))
 
     def to_json(self):
-        return {"relationId": self.relationId,
-                "imageUrl": self.imageUrl,
-                "labelList": [i.to_json() for i in self.labelList]
+        return {'relationId': self.relationId,
+                'imageUrl': self.imageUrl,
+                'labelList': [i.to_json() for i in self.labelList]
                 }
 
 
@@ -85,6 +85,10 @@ def create_labels(label_list):
 def create_images(image_list):
     res = []
     for i in image_list:
+        rid = i['relationId']
+        obj = Image.objects(relationId=rid)
+        if obj:
+            obj.delete()
         image = Image(
             relationId=i['relationId'],
             imageUrl=i['imageUrl'],
@@ -102,9 +106,9 @@ class LayerEntity(db.EmbeddedDocument):
     layerUrl = db.StringField(required=True)
 
     def to_json(self):
-        return {"layerId": self.layerId,
-                "layerName": self.layerName,
-                "layerUrl": self.layerUrl}
+        return {'layerId': self.layerId,
+                'layerName': self.layerName,
+                'layerUrl': self.layerUrl}
 
 
 # 图层标注的数据库
@@ -114,9 +118,9 @@ class Layer(db.Document):
     labelList = db.ListField(db.EmbeddedDocumentField(Label))
 
     def to_json(self):
-        return {"relationId": self.relationId,
-                "layerEntityList": [i.to_json() for i in self.layerEntityList],
-                "labelList": [i.to_json() for i in self.labelList]
+        return {'relationId': self.relationId,
+                'layerEntityList': [i.to_json() for i in self.layerEntityList],
+                'labelList': [i.to_json() for i in self.labelList]
                 }
 
 
@@ -137,6 +141,10 @@ def create_layer_entities(layer_entity_list):
 def create_layers(layer_list):
     res = []
     for i in layer_list:
+        rid = i['relationId']
+        obj = Layer.objects(relationId=rid)
+        if obj:
+            obj.delete()
         layer = Layer(
             relationId=i['relationId'],
             layerEntityList=create_layer_entities(i['layerEntityList']),
@@ -155,10 +163,10 @@ class LandmarkEntity(db.EmbeddedDocument):
     Y = db.FloatField(required=True)
 
     def to_json(self):
-        return {"landmarkId": self.landmarkId,
-                "landmarkName": self.landmarkName,
-                "X": self.X,
-                "Y": self.Y}
+        return {'landmarkId': self.landmarkId,
+                'landmarkName': self.landmarkName,
+                'X': self.X,
+                'Y': self.Y}
 
 
 # 地标存储表
@@ -168,9 +176,9 @@ class Landmark(db.Document):
     landmarkEntityList = db.ListField(db.EmbeddedDocumentField(LandmarkEntity))
 
     def to_json(self):
-        return {"relationId": self.relationId,
-                "layerEntityList": [i.to_json() for i in self.layerEntityList],
-                "landmarkEntityList": [i.to_json() for i in self.landmarkEntityList]
+        return {'relationId': self.relationId,
+                'layerEntityList': [i.to_json() for i in self.layerEntityList],
+                'landmarkEntityList': [i.to_json() for i in self.landmarkEntityList]
                 }
 
 
@@ -206,8 +214,8 @@ def create_landmarks(landmark_list):
 def getImage(relation_list):
     try:
         image_list = Image.objects(relationId__in=relation_list)
-        data = [json.dumps(image.to_json(), ensure_ascii=False) for image in image_list]
-        return Result(1, len(image_list), {"imageList": data})
+        data = [image.to_json() for image in image_list]
+        return Result(1, {'image num': len(image_list)}, {'imageList': data})
     except Exception as e:
         traceback.print_exc()
         return Result(0, repr(e), {})
@@ -217,7 +225,7 @@ def getImage(relation_list):
 def saveImage(image_list):
     try:
         images = create_images(image_list)
-        return Result(1, len(images), {})
+        return Result(1, {'image num': len(images)}, {})
     except Exception as e:
         traceback.print_exc()
         return Result(0, repr(e), {})
@@ -228,10 +236,10 @@ def getLayer(relation_list):
     try:
         layer_list = Layer.objects(relationId__in=relation_list)
         landmark_list = Landmark.objects(relationId__in=relation_list)
-        layer_data = [json.dumps(layer.to_json(), ensure_ascii=False) for layer in layer_list]
-        landmark_data = [json.dumps(landmark.to_json(), ensure_ascii=False) for landmark in landmark_list]
-        return Result(1, ["layers:", len(layer_data), "landmarks:", len(landmark_data)],
-                      {"layerList": layer_data, "landmarkList": landmark_data})
+        layer_data = [layer.to_json() for layer in layer_list]
+        landmark_data = [landmark.to_json() for landmark in landmark_list]
+        return Result(1, [{'layer num': len(layer_data), 'landmark num': len(landmark_data)}],
+                      {'layerList': layer_data, 'landmarkList': landmark_data})
     except Exception as e:
         traceback.print_exc()
         return Result(0, repr(e), {})
@@ -242,7 +250,7 @@ def saveLayer(layer_list, landmark_list):
     try:
         layers = create_layers(layer_list)
         landmarks = create_landmarks(landmark_list)
-        return Result(1, ["layers:", len(layers), "landmarks:", len(landmarks)], {})
+        return Result(1, [{'layer num': len(layers), 'landmark num': len(landmarks)}], {})
     except Exception as e:
         traceback.print_exc()
         return Result(0, repr(e), {})

DAPlatform/views/imageAnnotation.py

@@ -3,25 +3,26 @@ from flask import Blueprint, jsonify, request
 
 from dao import Image
 
-image = Blueprint("image", __name__, url_prefix="")
+image = Blueprint("image", __name__, url_prefix="/api/image")
 
 
 # 获取图片
-@image.route("/image", methods=["GET"])
+@image.route("/getImage", methods=["POST"])
 def get_image():
     data = json.loads(request.data)
     relation_list = data['relationList']
+    # relation_list = request.args['relationList']
     image = Image.getImage(relation_list)
     res = {
         'code': image.code,
         'message': image.message,
         'data': image.data
     }
-    return json.dumps(res)
+    return json.dumps(res, ensure_ascii=False)
 
 
 # 保存图片标注结果
-@image.route("/image", methods=["POST"])
+@image.route("/saveImage", methods=["POST"])
 def save_image():
     data = json.loads(request.data)
     image_list = data['imageList']
@@ -31,11 +32,11 @@ def save_image():
         'message': ret.message,
         'data': ret.data
     }
-    return json.dumps(res)
+    return json.dumps(res, ensure_ascii=False)
 
 
 # 获取图层
-@image.route("/layer", methods=["GET"])
+@image.route("/getLayer", methods=["POST"])
 def get_layer():
     data = json.loads(request.data)
     relation_list = data['relationList']
@@ -45,11 +46,11 @@ def get_layer():
         'message': layer.message,
         'data': layer.data
     }
-    return json.dumps(res)
+    return json.dumps(res, ensure_ascii=False)
 
 
 # 保存图层标注结果
-@image.route("/layer", methods=["POST"])
+@image.route("/saveLayer", methods=["POST"])
 def save_layer():
     data = json.loads(request.data)
     layer_list = data['layerList']
@@ -60,11 +61,10 @@ def save_layer():
         'message': ret.message,
         'data': ret.data
     }
-    return json.dumps(res)
-
+    return json.dumps(res, ensure_ascii=False)
 
 # 保存图片标注结果的测试数据
-# meta = {
+# {
 #     "imageList": [
 #         {
 #             "relationId": 123,
@@ -104,7 +104,7 @@ def save_layer():
 # }
 
 # 保存图层标注结果的测试数据
-# meta = {
+# {
 #     "layerList": [
 #         {
 #             "relationId": 8,