2022.03.07 修改任务名

@@ -37,7 +37,7 @@ class Api(ApiTemplate):
             download_process.start()
             download_process.start()
 
 
             task = Task(guid=task_guid,
             task = Task(guid=task_guid,
-                        name="{}下载".format(self.para.get("table_name")),
+                        name="下载|{}".format(self.para.get("table_name")),
                         create_time=datetime.datetime.now(),
                         create_time=datetime.datetime.now(),
                         state=0,
                         state=0,
                         task_type=4,
                         task_type=4,

@@ -83,7 +83,7 @@ class Api(ApiTemplate):
             # 录入数据后台进程,录入主函数为entry
             # 录入数据后台进程,录入主函数为entry
             # 初始化task
             # 初始化task
             task = Task(guid=self.para.get("task_guid"),
             task = Task(guid=self.para.get("task_guid"),
-                        name=self.para.get("task_name"),
+                        name="入库|{}".format(self.para.get("task_name")),
                         create_time=datetime.datetime.now(),
                         create_time=datetime.datetime.now(),
                         state=0,
                         state=0,
                         task_type=1,
                         task_type=1,

@@ -39,7 +39,7 @@ class Api(ApiTemplate):
             refresh_process.start()
             refresh_process.start()
 
 
             task = Task(guid=task_guid,
             task = Task(guid=task_guid,
-                        name="数据库{}更新".format(database.alias),
+                        name="更新|{}".format(database.alias),
                         create_time=datetime.datetime.now(),
                         create_time=datetime.datetime.now(),
                         state=0,
                         state=0,
                         task_type=3,
                         task_type=3,

@@ -76,7 +76,7 @@ class Api(ApiTemplate):
 
 
 
 
             task = Task(guid=task_guid,
             task = Task(guid=task_guid,
-                        name="{}构建矢量金字塔".format(table.name),
+                        name="矢量金字塔|{}".format(table.name),
                         table_guid=table_guid,
                         table_guid=table_guid,
                         create_time=datetime.datetime.now(),
                         create_time=datetime.datetime.now(),
                         state=0,
                         state=0,

@@ -79,7 +79,8 @@ class Api(ApiTemplate):
 
 
 
 
             task = Task(guid=task_guid,
             task = Task(guid=task_guid,
-                        name="{}构建矢量金字塔,网格大小:{}".format(table.name,self.para.get("grids")),
+                        # name="矢量金字塔|{},网格大小:{}".format(table.name,self.para.get("grids")),
+                        name="矢量金字塔|{}".format(table.name),
                         table_guid=table_guid,
                         table_guid=table_guid,
                         create_time=datetime.datetime.now(),
                         create_time=datetime.datetime.now(),
                         state=0,
                         state=0,

@@ -7,7 +7,7 @@ from flask import current_app as app
 import socket
 import socket
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.modules.data.models import Task,InsertingLayerName,db
+from app.modules.data.models import Task,InsertingLayerName,db,Table
 import datetime
 import datetime
 import traceback
 import traceback
 from sqlalchemy import or_
 from sqlalchemy import or_
@@ -22,6 +22,23 @@ class Api(ApiTemplate):
             if last_lins:
             if last_lins:
                 for lin in last_lins:
                 for lin in last_lins:
                     db.session.delete(lin)
                     db.session.delete(lin)
+
+            vacuate_tasks = db.session.query(Task).filter(or_(Task.state == 0, Task.state == 2)).filter_by(task_type = 2).all()
+            for t in vacuate_tasks:
+                table = Table.query.filter_by(guid=t.table_guid).one_or_none()
+                if len(table.relate_table_vacuates.all()) > 0:
+                    Table.query.filter_by(guid=t.table_guid).update({"is_vacuate": 1})
+                else:
+                    Table.query.filter_by(guid=t.table_guid).update({"is_vacuate": 0})
+
+            vacutateing_table = Table.query.filter_by(is_vacuate=2).all()
+
+            for vit in vacutateing_table:
+                if len(vit.relate_table_vacuates.all()) > 0:
+                    vit.is_vacuate = 1
+                else:
+                    vit.is_vacuate = 0
+
             db.session.commit()
             db.session.commit()
         except Exception as e:
         except Exception as e:
             # print(e)
             # print(e)

@@ -33,7 +33,7 @@ class Api(ApiTemplate):
 
 
 
 
             task = Task(guid=task_guid,
             task = Task(guid=task_guid,
-                        name="{}构建影像金字塔".format(self.para.get("alias")),
+                        name="影像金字塔|{}".format(self.para.get("alias")),
                         create_time=datetime.datetime.now(),
                         create_time=datetime.datetime.now(),
                         state=0,
                         state=0,
                         task_type=5,
                         task_type=5,

@@ -32,7 +32,7 @@ class Api(ApiTemplate):
                     "title":self.para.get("title"),
                     "title":self.para.get("title"),
                     "type":"mapserver",
                     "type":"mapserver",
                     "capabilities":2,
                     "capabilities":2,
-                    "project":self.para.get("project")}
+                    "project":self.para.get("project"),"state":1}
 
 
             map_service_register_url = "{}/dmap/api/manager/regservice".format(configure.dmap_engine)
             map_service_register_url = "{}/dmap/api/manager/regservice".format(configure.dmap_engine)
             resp: requests.Response  = requests.post(map_service_register_url,data=json.dumps(para),
             resp: requests.Response  = requests.post(map_service_register_url,data=json.dumps(para),

@@ -28,13 +28,16 @@ class Api(ApiTemplate):
                 project_file = ProjectFile.create(ModelVisitor.object_to_json(ts))
                 project_file = ProjectFile.create(ModelVisitor.object_to_json(ts))
                 service:Service = Service.query.filter_by(guid=ts.service_guid).one_or_none()
                 service:Service = Service.query.filter_by(guid=ts.service_guid).one_or_none()
                 para = {"name":service.name,"title":service.title,
                 para = {"name":service.name,"title":service.title,
-                        "type":"tileserver","capabilities":1 if ts.tile_type=="WMTS" else 16,"project":project_file}
+                        "type":"tileserver","capabilities":1 if ts.tile_type=="WMTS" else 16,"project":project_file,
+                        "state":service.state}
                 res["data"]["list"].append(para)
                 res["data"]["list"].append(para)
 
 
             #地图服务
             #地图服务
             map_services = MapService.query.all()
             map_services = MapService.query.all()
             for ms in map_services:
             for ms in map_services:
+                service: Service = Service.query.filter_by(guid=ms.service_guid).one_or_none()
                 para = ModelVisitor.object_to_json(ms)
                 para = ModelVisitor.object_to_json(ms)
+                para["state"] = service.state
                 res["data"]["list"].append(para)
                 res["data"]["list"].append(para)
             res["data"]["count"] = len(tile_services)+len(map_services)
             res["data"]["count"] = len(tile_services)+len(map_services)
             res["result"] = True
             res["result"] = True

@@ -8,7 +8,7 @@ from app.util.component.ApiTemplate import ApiTemplate
 from .models import Service,db
 from .models import Service,db
 import requests
 import requests
 from .util.ServiceType import ServiceType
 from .util.ServiceType import ServiceType
-
+import configure
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "修改服务状态"
     api_name = "修改服务状态"
@@ -27,6 +27,19 @@ class Api(ApiTemplate):
                 if service:
                 if service:
                     service.state = state
                     service.state = state
                     db.session.commit()
                     db.session.commit()
+
+                    # operate = "startService" if state == 1 else "stopService"
+                    # server_type = "tileserver" if s_type == "电子地图" else "mapserver"
+                    # dmap_engine_url = "{}/dmap/api/manager/{}?servicename={}&servername={}".format(configure.dmap_engine,
+                    #                                                                                operate,service.name,
+                    #                                                                                server_type)
+                    # state_result = requests.get(dmap_engine_url)
+                    # if state_result.status_code == 200:
+                    #     if not state_result.json().get("result"):
+                    #         raise Exception("修改服务状态失败！")
+                    # else:
+                    #     raise Exception("修改服务状态失败！")
+
                     res["result"] = True
                     res["result"] = True
                 else:
                 else:
                     raise Exception("服务不存在！")
                     raise Exception("服务不存在！")
@@ -76,7 +89,7 @@ class Api(ApiTemplate):
             {"name": "state",
             {"name": "state",
              "in": "formData",
              "in": "formData",
              "type": "int",
              "type": "int",
-             "description": "state"},
+             "description": "state","enum":[0,1]},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -35,7 +35,7 @@ class Api(ApiTemplate):
                     "title":self.para.get("title"),
                     "title":self.para.get("title"),
                     "type":"tileserver",
                     "type":"tileserver",
                     "capabilities":1 if self.para.get("tile_type") == "WMTS" else 16,
                     "capabilities":1 if self.para.get("tile_type") == "WMTS" else 16,
-                    "project":project_file}
+                    "project":project_file,"state":1}
 
 
             tile_service_register_url = "{}/dmap/api/manager/RegService".format(configure.dmap_engine)
             tile_service_register_url = "{}/dmap/api/manager/RegService".format(configure.dmap_engine)
             resp: Response  = requests.post(tile_service_register_url,data=json.dumps(para),
             resp: Response  = requests.post(tile_service_register_url,data=json.dumps(para),

@@ -30,7 +30,8 @@ class Api(ApiTemplate):
                 project_file = ProjectFile.create(ModelVisitor.object_to_json(ts))
                 project_file = ProjectFile.create(ModelVisitor.object_to_json(ts))
                 service:Service = Service.query.filter_by(guid=ts.service_guid).one_or_none()
                 service:Service = Service.query.filter_by(guid=ts.service_guid).one_or_none()
                 para = {"name":service.name,"title":service.title,
                 para = {"name":service.name,"title":service.title,
-                        "type":"tileserver","capabilities":1 if ts.tile_type=="WMTS" else 16,"project":project_file}
+                        "type":"tileserver","capabilities":1 if ts.tile_type=="WMTS" else 16,"project":project_file,
+                        "state":service.state}
                 res["data"]["list"].append(para)
                 res["data"]["list"].append(para)
 
 
             res["data"]["count"] = len(tile_services)
             res["data"]["count"] = len(tile_services)

@@ -11,9 +11,15 @@ fn = "PG: user=%s password=%s host=%s port=%s dbname=%s " % ("postgres","chinadc
 driver = ogr.GetDriverByName("PostgreSQL")
 driver = ogr.GetDriverByName("PostgreSQL")
 if driver is None:
 if driver is None:
     raise Exception("打开PostgreSQL驱动失败，可能是当前GDAL未支持PostgreSQL驱动！")
     raise Exception("打开PostgreSQL驱动失败，可能是当前GDAL未支持PostgreSQL驱动！")
+
 ds:DataSource = driver.Open(fn, 1)
 ds:DataSource = driver.Open(fn, 1)
 
 
 layer:Layer = ds.GetLayerByName("BeijingBusStops")
 layer:Layer = ds.GetLayerByName("BeijingBusStops")
 
 
 
 
-dd = gdal.Grid('outcome.tif',"J:\Data\矢量数据\北京\北京公交线路和公交站点shp\stops\BeijingBusStops.shp",algorithm = 'linear:radius=0')
+# dd = gdal.Grid('outcome.tif',"J:\Data\矢量数据\北京\北京公交线路和公交站点shp\stops\BeijingBusStops.shp",algorithm = 'linear:radius=0')
+# layers='test',
+
+opts = gdal.GridOptions()
+
+dd = gdal.Grid('outcome.tif',ds,layers=['BeijingBusStops'],algorithm = 'linear:radius=0')