2022.01.26 增加抽稀detail接口

@@ -12,7 +12,7 @@ from app.models import db
 from app.modules.auth.oauth2 import config_oauth, myCodeIDToken
 from app.modules.auth.oauth2 import config_oauth, myCodeIDToken
 from flasgger import Swagger
 from flasgger import Swagger
 import logging
 import logging
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
 import os
 import os
 from app.modules.monitor.schedule import start_schedule
 from app.modules.monitor.schedule import start_schedule

@@ -15,7 +15,7 @@ from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
 from app.util.component.SQLUtil import SQLUtil
 from app.util.component.SQLUtil import SQLUtil
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.GeometryAdapter import GeometryAdapter
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 
 
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -16,7 +16,7 @@ import configure
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
 from app.util.component.ZipUtil import ZipUtil
 from app.util.component.ZipUtil import ZipUtil
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 import multiprocessing
 import multiprocessing
 import datetime
 import datetime
 from app.util.component.TaskController import TaskController
 from app.util.component.TaskController import TaskController

@@ -13,7 +13,7 @@ import json
 import re
 import re
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session
 import configure
 import configure
 import datetime
 import datetime

@@ -7,7 +7,7 @@ import uuid
 import shutil
 import shutil
 from app.modules.data.models import *
 from app.modules.data.models import *
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session
 import configure
 import configure
 import traceback
 import traceback

@@ -20,6 +20,7 @@ from . import table_view
 from . import table_vacuate
 from . import table_vacuate
 from . import table_vacuate_one
 from . import table_vacuate_one
 from . import table_vacuate_info
 from . import table_vacuate_info
+from . import table_vacuate_detail
 from . import table_vacuate_ref
 from . import table_vacuate_ref
 from . import table_vacuate_delete
 from . import table_vacuate_delete
 from . import field_value
 from . import field_value
@@ -163,6 +164,15 @@ class DataManager(BlueprintApi):
         return table_vacuate_info.Api().result
         return table_vacuate_info.Api().result
 
 
     @staticmethod
     @staticmethod
+    @bp.route('/TableVacuateDetail', methods=['GET'])
+    @swag_from(table_vacuate_detail.Api.api_doc)
+    def api_table_vacuate_detail():
+        """
+        数据抽稀详情
+        """
+        return table_vacuate_detail.Api().result
+
+    @staticmethod
     @bp.route('/TableVacuateRef', methods=['POST'])
     @bp.route('/TableVacuateRef', methods=['POST'])
     @swag_from(table_vacuate_ref.Api.api_doc)
     @swag_from(table_vacuate_ref.Api.api_doc)
     def api_table_vacuate_ref():
     def api_table_vacuate_ref():

@@ -21,6 +21,8 @@ class Api(ApiTemplate):
                 raise Exception("数据不存在！")
                 raise Exception("数据不存在！")
             pg_ds = PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
             pg_ds = PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
             layer:Layer = pg_ds.GetLayerByName(table.name)
             layer:Layer = pg_ds.GetLayerByName(table.name)
+            if not layer:
+                raise Exception("数据异常！")
             append_dict ={"srid":None,"sr_wkt":None,"sr_proj4":None,"exist":1,"schema":"public","geomfield":layer.GetGeometryColumn()}
             append_dict ={"srid":None,"sr_wkt":None,"sr_proj4":None,"exist":1,"schema":"public","geomfield":layer.GetGeometryColumn()}
             if layer:
             if layer:
                 sr:SpatialReference = layer.GetSpatialRef()
                 sr:SpatialReference = layer.GetSpatialRef()

@@ -10,7 +10,7 @@ import uuid
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session
 from app.util.component.SQLUtil import SQLUtil
 from app.util.component.SQLUtil import SQLUtil
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.TaskController import TaskController
 from app.util.component.TaskController import TaskController

@@ -12,7 +12,7 @@ import configure
 from ..models import Table, Database, Task,db,TableVacuate,Process,DES
 from ..models import Table, Database, Task,db,TableVacuate,Process,DES
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
 from app.util.component.VacuateConf import VacuateConf
 from app.util.component.VacuateConf import VacuateConf
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.GeometryAdapter import GeometryAdapter

+# author:        4N
+# createtime:    2021/1/27
+# email:         nheweijun@sina.com
+
+
+from ..models import Table,TableVacuate,Task
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.VacuateConf import VacuateConf
+
+
+import copy
+class Api(ApiTemplate):
+    api_name = "抽稀Detail"
+    def process(self):
+
+        res = {}
+        try:
+            res["data"] = []
+            table_guids = self.para.get("table_guids")
+
+            for table_guid in table_guids.split(","):
+
+                detail = {"table_guid":table_guid}
+                table: Table = Table.query.filter_by(guid=table_guid).one_or_none()
+                if table:
+                    tvs = TableVacuate.query.filter_by(table_guid=table_guid).all()
+                    detail["table_name"] = table.name
+                    detail["vacuate_count"] = len(tvs)
+                    detail["table_vacuate"] = [{"name":tv.name,"pixel_distance":tv.pixel_distance,"connectstr":tv.connectstr} for tv in tvs]
+
+                res["data"].append(detail)
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc = {
+        "tags": ["管理接口"],
+        "parameters": [
+            {"name": "table_guids",
+             "in": "formData",
+             "type": "string",
+             "description": "表guid", "required": "true"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -8,7 +8,7 @@ import traceback
 from ..models import Table, Database, DES,Task,db,TableVacuate
 from ..models import Table, Database, DES,Task,db,TableVacuate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 import multiprocessing
 import multiprocessing
 import uuid
 import uuid
 import configure
 import configure

@@ -10,7 +10,7 @@ from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
 
 
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.GeometryAdapter import GeometryAdapter
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 
 
 from osgeo.ogr import DataSource
 from osgeo.ogr import DataSource
 
 

@@ -19,7 +19,7 @@ import datetime
 
 
 from ..models import Table, Database, DES,Task,db,TableVacuate,Process
 from ..models import Table, Database, DES,Task,db,TableVacuate,Process
 
 
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 
 
 from osgeo.ogr import DataSource,Layer,Geometry
 from osgeo.ogr import DataSource,Layer,Geometry
 
 

@@ -5,7 +5,7 @@
 
 
 from ..models import db,Task,Table,InsertingLayerName,Process
 from ..models import db,Task,Table,InsertingLayerName,Process
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 import os
 import os
 import signal
 import signal
 import platform
 import platform

@@ -8,7 +8,7 @@ import socket
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     def process(self):
     def process(self):

@@ -13,7 +13,7 @@ import schedule
 from app.util.component.RunContinuous import run_continuously
 from app.util.component.RunContinuous import run_continuously
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
 import configure
 import configure
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 import traceback
 import traceback
 import requests
 import requests
 
 

@@ -31,8 +31,6 @@ class Api(ApiTemplate):
                 else:
                 else:
                     image_services.extend(response.json()["data"]["list"])
                     image_services.extend(response.json()["data"]["list"])
 
 
-
-
             for cata in catalogs:
             for cata in catalogs:
                 catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]
                 catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]
                 service_count = Service.query.filter(Service.catalog_guid.in_(catalog_guids)).count()
                 service_count = Service.query.filter(Service.catalog_guid.in_(catalog_guids)).count()

@@ -5,7 +5,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.modules.service.models import ServiceEngine
 from app.modules.service.models import ServiceEngine
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 import requests
 import requests
 import uuid
 import uuid
 
 

@@ -55,7 +55,7 @@ class Api(ApiTemplate):
             db.session.commit()
             db.session.commit()
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:
-            raise Exception("引擎已注册!")
+            raise e
         return res
         return res
 
 
 
 

@@ -5,7 +5,7 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 from app.models import db
 from app.models import db
 from app.modules.data.models import Task
 from app.modules.data.models import Task
 import multiprocessing
 import multiprocessing

@@ -6,7 +6,7 @@
 
 
 from app.modules.service.models import TileScheme
 from app.modules.service.models import TileScheme
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 import json
 import json
 import base64
 import base64
 
 

@@ -9,7 +9,7 @@ import os
 from app.util.component.FileProcess import FileProcess
 from app.util.component.FileProcess import FileProcess
 from app.util.component.SliceScheme import SliceScheme
 from app.util.component.SliceScheme import SliceScheme
 import shutil
 import shutil
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "解析方案"
     api_name = "解析方案"

@@ -64,26 +64,29 @@ class Api(ApiTemplate):
 
 
             for ie in image_engines:
             for ie in image_engines:
                 url = "{}/API/Service/List".format(ie.url)
                 url = "{}/API/Service/List".format(ie.url)
-                response:requests.Response = requests.post(url,{"page_size":"9999","page_index":"0"})
-                if not response.json().get("result"):
-                    raise Exception("获取影像地图失败！")
-                else:
-                    raw_json = response.json()["data"]["list"]
-                    if state:
-                        raw_json = [ service for service in raw_json if service["state"] == int(state)]
-                    if type:
-                        raw_json = [service for service in raw_json if service["type"] == type]
-                    if catalog_guid:
-                        raw_json = [service for service in raw_json if service["catalog_guid"] == catalog_guid]
-                    # 并集
-                    if title and name:
-                        raw_json = [service for service in raw_json if  re.search(name, service["name"]) or re.search(title, service["title"])]
+                try:
+                    response:requests.Response = requests.post(url,{"page_size":"9999","page_index":"0"})
+                    if not response.json().get("result"):
+                        raise Exception("获取影像地图失败！")
                     else:
                     else:
-                        if title:
-                            raw_json = [service for service in raw_json if re.search(title, service["title"])]
-                        if name:
-                            raw_json = [service for service in raw_json if re.search(name, service["name"])]
-                    services_json.extend(raw_json)
+                        raw_json = response.json()["data"]["list"]
+                        if state:
+                            raw_json = [ service for service in raw_json if service["state"] == int(state)]
+                        if type:
+                            raw_json = [service for service in raw_json if service["type"] == type]
+                        if catalog_guid:
+                            raw_json = [service for service in raw_json if service["catalog_guid"] == catalog_guid]
+                        # 并集
+                        if title and name:
+                            raw_json = [service for service in raw_json if  re.search(name, service["name"]) or re.search(title, service["title"])]
+                        else:
+                            if title:
+                                raw_json = [service for service in raw_json if re.search(title, service["title"])]
+                            if name:
+                                raw_json = [service for service in raw_json if re.search(name, service["name"])]
+                        services_json.extend(raw_json)
+                except:
+                    pass
 
 
             # 筛选服务能力
             # 筛选服务能力
             if function_type:
             if function_type:

@@ -34,7 +34,13 @@ class Api(ApiTemplate):
             #地图服务
             #地图服务
             map_services = MapService.query.all()
             map_services = MapService.query.all()
             for ms in map_services:
             for ms in map_services:
-                res["data"]["list"].append(ModelVisitor.object_to_json(ms))
+                para = ModelVisitor.object_to_json(ms)
+                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

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 import uuid
 import uuid
 from ..models import TileService,Service,db,ServiceFunction,TileScheme
 from ..models import TileService,Service,db,ServiceFunction,TileScheme

@@ -5,7 +5,7 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 import uuid
 import uuid
 from ..models import TileService,Service,db,ServiceFunction,TileScheme
 from ..models import TileService,Service,db,ServiceFunction,TileScheme
 
 

@@ -10,7 +10,7 @@ import configure
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 
 
 from .util.ProjectFile import ProjectFile
 from .util.ProjectFile import ProjectFile
-
+from ..util.ServiceType import ServiceType
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
@@ -25,7 +25,7 @@ class Api(ApiTemplate):
             res["data"]["list"] = []
             res["data"]["list"] = []
 
 
             #切片服务
             #切片服务
-            tile_services = TileService.query.join(Service).filter(Service.type == "切片服务").all()
+            tile_services = TileService.query.join(Service).filter(Service.type == ServiceType.tile_service.value).all()
             for ts in tile_services:
             for ts in tile_services:
                 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()

@@ -9,7 +9,7 @@ import os
 from app.util.component.FileProcess import FileProcess
 from app.util.component.FileProcess import FileProcess
 from app.util.component.SliceScheme import SliceScheme
 from app.util.component.SliceScheme import SliceScheme
 import shutil
 import shutil
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 from flask import request
 from flask import request
 import uuid
 import uuid
 import configure
 import configure

@@ -6,7 +6,7 @@
 
 
 from app.modules.service.models import TileScheme
 from app.modules.service.models import TileScheme
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 import json
 import json
 import base64
 import base64
 
 

@@ -8,7 +8,7 @@ import uuid
 import os
 import os
 import stat
 import stat
 import platform
 import platform
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 class FileProcess:
 class FileProcess:
     @classmethod
     @classmethod
     def save(cls,parent):
     def save(cls,parent):

@@ -5,7 +5,7 @@
 
 
 from flask import request
 from flask import request
 import json
 import json
-from .StructuredPrint import StructurePrint
+from .StructurePrint import StructurePrint
 
 
 class ParameterUtil:
 class ParameterUtil:
 
 

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 from app.modules.data.models import Task
 from app.modules.data.models import Task
-from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.StructurePrint import StructurePrint
 import configure
 import configure
 import time
 import time
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil