2021.11.01

@@ -6,7 +6,6 @@
 
 from app.util.component.ApiTemplate import ApiTemplate
 
-from threading import Thread
 from .util.ImageWMSServer import ImageWMSServer
 
 class Api(ApiTemplate):
@@ -62,18 +61,6 @@ class Api(ApiTemplate):
         }
     }
 
-class MyThread(Thread):
-    def __init__(self,func,args=()):
-        super(MyThread,self).__init__()
-        self.func = func
-        self.args = args
-    def run(self):
-        self.result = self.func(*self.args)
-    def get_result(self):
-        try:
-            return self.result
-        except Exception:
-            return None
 
 
 

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 
 from app.util.component.ApiTemplate import ApiTemplate
-from threading import Thread
+
 
 from .util.ImageWMSServer import ImageWMSServer
 class Api(ApiTemplate):
@@ -57,18 +57,6 @@ class Api(ApiTemplate):
         }
     }
 
-class MyThread(Thread):
-    def __init__(self,func,args=()):
-        super(MyThread,self).__init__()
-        self.func = func
-        self.args = args
-    def run(self):
-        self.result = self.func(*self.args)
-    def get_result(self):
-        try:
-            return self.result
-        except Exception:
-            return None
 
 
 

@@ -5,7 +5,6 @@
 
 import traceback
 from app.util.component.ApiTemplate import ApiTemplate
-
 from .util.ImageWMTSServer import ImageWMTSServer
 class Api(ApiTemplate):
     api_name = "切片"

@@ -27,10 +27,10 @@ class Api(ApiTemplate):
                 res["data"]["speci_service"]["images"] = sorted(res["data"]["speci_service"]["images"], key=lambda x: x["name"])
 
             elif service.type.__eq__("切片服务"):
-                speci_service = service.relate_map_service.one_or_none()
+                speci_service = service.relate_tile_service.one_or_none()
                 res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
             elif service.type.__eq__("地图服务"):
-                speci_service = service.relate_tile_service.one_or_none()
+                speci_service = service.relate_map_service.one_or_none()
                 res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
             else:
                 res["data"] = {}

@@ -60,21 +60,35 @@ class ModelVisitor:
         info = {}
         info["catalog_name"] = task.relate_catalog.name if task.relate_catalog else None
         info["database_alias"] = task.relate_database.alias if task.relate_database else None
-        info["consume_time"]=None
         if task.update_time:
-
-            consume_time = int(task.update_time.timestamp()-task.create_time.timestamp())
-            minute = int(consume_time/60)
-            sec = 1 if (int(consume_time%60)==0 and minute==0) else int(consume_time%60)
-            if minute>0:
-                info["consume_time"] = "{}分{}秒".format(minute,sec)
-            else:
-                info["consume_time"] = "{}秒".format(sec)
+            dd: datetime.timedelta = task.update_time - task.create_time
+            info["spend"] = float("{}.{}".format(dd.seconds, str(dd.microseconds)[:3]))
         if object:
             info.update(cls.formatter(task.__dict__))
-        del info["parameter"]
+
+
         return info
 
+    # @classmethod
+    # def task_to_json(cls, task):
+    #     info = {}
+    #     info["catalog_name"] = task.relate_catalog.name if task.relate_catalog else None
+    #     info["database_alias"] = task.relate_database.alias if task.relate_database else None
+    #     info["consume_time"] = None
+    #     if task.update_time:
+    #
+    #         consume_time = int(task.update_time.timestamp() - task.create_time.timestamp())
+    #         minute = int(consume_time / 60)
+    #         sec = 1 if (int(consume_time % 60) == 0 and minute == 0) else int(consume_time % 60)
+    #         if minute > 0:
+    #             info["consume_time"] = "{}分{}秒".format(minute, sec)
+    #         else:
+    #             info["consume_time"] = "{}秒".format(sec)
+    #     if object:
+    #         info.update(cls.formatter(task.__dict__))
+    #
+    #     return info
+
     @classmethod
     def database_to_json(cls,database):
         info = {}