2021.12.02 任务控制使用新方式修复bug

@@ -24,7 +24,13 @@ class Api(ApiTemplate):
             map_service_guid = uuid.uuid1().__str__()
             map_service_guid = uuid.uuid1().__str__()
             service_function_guid = uuid.uuid1().__str__()
             service_function_guid = uuid.uuid1().__str__()
 
 
-            #调用MapService服务发布接口
+
+
+            # 逻辑是，先调用引擎接口，引擎说可以，才做持久化
+
+
+
+
 
 
             service = Service(
             service = Service(
                 guid = service_guid,
                 guid = service_guid,
@@ -71,6 +77,7 @@ class Api(ApiTemplate):
             # 调用MapService服务的注册服务接口
             # 调用MapService服务的注册服务接口
             try:
             try:
                 pass
                 pass
+                #对，逻辑是，先调用引擎接口，引擎说可以，才做持久化
             except Exception as e:
             except Exception as e:
                 db.session.delete(service)
                 db.session.delete(service)
                 db.session.delete(map_service)
                 db.session.delete(map_service)

@@ -225,7 +225,7 @@ class MapService(db.Model):
     '''
     '''
     MapService元数据
     MapService元数据
     '''
     '''
-    __tablename__ = 'dmdms_map_service'
+    __tablename__ = 'dmap_map_service'
 
 
     guid = Column(String(256), primary_key=True)
     guid = Column(String(256), primary_key=True)
     name = Column(String, unique=True)
     name = Column(String, unique=True)

@@ -28,6 +28,8 @@ class Api(ApiTemplate):
             tile_service_guid = uuid.uuid1().__str__()
             tile_service_guid = uuid.uuid1().__str__()
             service_function_guid = uuid.uuid1().__str__()
             service_function_guid = uuid.uuid1().__str__()
 
 
+            # 调用切片服务的注册服务接口
+            # 先调用切片服务接口，成功后才持久化
 
 
             service = Service(
             service = Service(
                 guid = service_guid,
                 guid = service_guid,

@@ -31,13 +31,13 @@ class TaskController:
             #控制正在运行的任务数量
             #控制正在运行的任务数量
             running_count = sys_session.query(Task).filter(Task.state == 2).filter(Task.task_type == 1).count()
             running_count = sys_session.query(Task).filter(Task.state == 2).filter(Task.task_type == 1).count()
             first_task = sys_session.query(Task).filter(Task.state == 0).filter(Task.task_type == 1).order_by(Task.create_time).first()
             first_task = sys_session.query(Task).filter(Task.state == 0).filter(Task.task_type == 1).order_by(Task.create_time).first()
-            if (running_count > configure.entry_data_thread) or (not first_task.guid.__eq__(task_guid)):
+            if (running_count >= configure.entry_data_thread) or (not first_task.guid.__eq__(task_guid)):
                 StructurePrint().print("等待入库")
                 StructurePrint().print("等待入库")
                 check = False
                 check = False
         if task.task_type==2:
         if task.task_type==2:
             running_count = sys_session.query(Task).filter(Task.state == 2).filter(Task.task_type == 2).count()
             running_count = sys_session.query(Task).filter(Task.state == 2).filter(Task.task_type == 2).count()
             first_task = sys_session.query(Task).filter(Task.state == 0).filter(Task.task_type == 2).order_by(Task.create_time).first()
             first_task = sys_session.query(Task).filter(Task.state == 0).filter(Task.task_type == 2).order_by(Task.create_time).first()
-            if (running_count > configure.entry_data_thread) or (not first_task.guid.__eq__(task_guid)):
+            if (running_count >= configure.entry_data_thread) or (not first_task.guid.__eq__(task_guid)):
                 StructurePrint().print("等待精化")
                 StructurePrint().print("等待精化")
                 check = False
                 check = False
         if task.task_type==3:
         if task.task_type==3: