模板bug修改

DAPlatform/dao/mongodbApi.py

@@ -122,6 +122,7 @@ def findAllTemplate(collection):
             template["templateId"] = i.get("templateId", None)
             template["templateName"] = i.get("templateName", None)
             template["entityList"] = i.get("entityList", None)
+            template["templateType"] = i.get("templateType", None)
             x.append(template)  # 将cursor转化为一个字典
             template = {}
         return x  # 返回这个字典

DAPlatform/views/textAnnotation.py

@@ -266,16 +266,17 @@ def createTemplated():
         return_dict['code'] = '0'
         return json.dumps(return_dict, ensure_ascii=False)
 
-    templateId = get_Data.get('templateId', None)
     templateName = get_Data.get('templateName', None)
     templateType = get_Data.get('templateType', None)
     creatorId = get_Data.get('creatorId', None)
     entityList = get_Data.get('entityList', None)
 
-    if templateId is None or templateName is None or templateType is None or creatorId is None or entityList is None:
+    if templateName is None or templateType is None or creatorId is None or entityList is None:
         return_dict['code'] = '0'
         return json.dumps(return_dict, ensure_ascii=False)
 
+    templateId = str(uuid.uuid1()).replace('-', '')
+
     result = mongodbApi.insertTemplate(collectionTemplate, {"templateId": templateId,"templateName": templateName,
                                                         "templateType": templateType, "creatorId": creatorId,
                                                         "entityList": entityList})
@@ -284,6 +285,13 @@ def createTemplated():
         return_dict['code'] = '0'
         return json.dumps(return_dict, ensure_ascii=False)
 
+    result_system = mongodbApi.findSomeTemplates(collectionTemplate, {"templateType": 0})
+    result = mongodbApi.findSomeTemplates(collectionTemplate, {"creatorId": creatorId})
+    result = result + result_system
+    if result is None:
+        return_dict['message'] = result_system
+        return json.dumps(return_dict, ensure_ascii=False)
+
     return_dict['message'] = result
     return json.dumps(return_dict, ensure_ascii=False)
 
@@ -365,14 +373,13 @@ def deleteTemplate():
         return json.dumps(return_dict, ensure_ascii=False)
 
     templateId = get_Data.get('templateId', None)
-    creatorId = get_Data.get('creatorId', None)
 
     if templateId is None:
         return_dict['return_code'] = '201'
         return_dict['return_info'] = '请求参数有误'
         return json.dumps(return_dict, ensure_ascii=False)
 
-    result = mongodbApi.deleteTemplate(collectionTemplate, {"templateId": templateId, "creatorId": creatorId})
+    result = mongodbApi.deleteTemplate(collectionTemplate, {"templateId": templateId})
 
     if result is None:
         return_dict['return_code'] = '208'