服务结构调整

@@ -8,7 +8,7 @@ from sqlalchemy.sql.expression import true
 import configure
 import configure
 from app.util import BlueprintApi
 from app.util import BlueprintApi
 from app.util import find_class
 from app.util import find_class
-from app.models import db, Table, InsertingLayerName, Database, DES, Task
+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

 # coding=utf-8
 # coding=utf-8
-import base64
-import os
-from flask_sqlalchemy import SQLAlchemy,Model
-import importlib
-from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, Time,Float,Binary
-from sqlalchemy.orm import relationship
-import base64
-from pyDes import *
-import datetime
 
 
-from app.util.component.PGUtil import PGUtil
+import os
+from flask_sqlalchemy import SQLAlchemy
 import glob
 import glob
 import traceback
 import traceback
+from pyDes import des,PAD_PKCS5,ECB
+
+import base64
 class DES():
 class DES():
     '''
     '''
     DES密码加解密
     DES密码加解密
@@ -33,232 +28,6 @@ class DES():
 
 
 db = SQLAlchemy()
 db = SQLAlchemy()
 
 
-
-class Table(db.Model):
-    '''
-    数据表元数据
-    '''
-    __tablename__ = 'dmap_table'
-    guid = Column(String(256), primary_key=True)
-    # 数据源外键
-    database_guid = Column(String(256), ForeignKey('dmap_database.guid'))
-
-    # 点线面123
-    table_type = Column(Integer)
-
-    name = Column(String(256))
-    alias = Column(Text)
-    create_time = Column(DateTime)
-    update_time = Column(DateTime)
-
-    feature_count = Column(Integer)
-
-    description = Column(Text)
-    extent = Column(Text)
-
-    #用户
-    creator = Column(Text)
-    #是否已抽稀
-    is_vacuate=Column(Integer,default=0)
-
-    # 目录外键
-    catalog_guid = Column(String(256), ForeignKey('dmap_catalog.guid'))
-
-    relate_columns = relationship('Columns', backref='relate_table', lazy='dynamic')
-    relate_table_vacuates = relationship('TableVacuate', backref='relate_table', lazy='dynamic')
-
-
-class TableVacuate(db.Model):
-    '''
-    sub数据表元数据
-    '''
-    __tablename__ = 'dmap_table_vacuate'
-    guid = Column(String(256), primary_key=True)
-    name = Column(String(256))
-    level = Column(Integer)
-    pixel_distance = Column(Float)
-    table_guid = Column(String(256), ForeignKey('dmap_table.guid'))
-
-    #所在的库
-    connectstr= Column(Text)
-
-class Columns(db.Model):
-    '''
-    数据表的列
-    '''
-    __tablename__ = 'dmap_column'
-    guid = Column(String(256), primary_key=True)
-    # 表外键
-    table_guid= Column(String(256), ForeignKey('dmap_table.guid'))
-    name=Column(String(256))
-    alias = Column(String(256))
-    create_time = Column(DateTime)
-    update_time = Column(DateTime)
-
-class Task(db.Model):
-    '''
-    任务表
-    '''
-    __tablename__ = 'dmap_task'
-    guid = Column(String(256), primary_key=True)
-    name = Column(Text)
-    process = Column(Text)
-    create_time = Column(DateTime)
-    update_time = Column(DateTime)
-    state = Column(Integer)
-    #数据源外键
-    database_guid = Column(String(256), ForeignKey('dmap_database.guid'))
-    #目录外键
-    catalog_guid = Column(String(256), ForeignKey('dmap_catalog.guid'))
-    #抽稀任务指定表的guid
-    table_guid =  Column(String(256))
-    #任务类型
-    #1：入库任务
-    #2：抽稀任务
-    #3：数据库刷新任务
-    #4：影像金字塔任务
-    #5：数据下载任务
-    task_type=Column(Integer)
-    creator = Column(Text)
-    file_name = Column(Text)
-    relate_processes = relationship('Process', backref='relate_task', lazy='dynamic')
-    # 入库参数
-    parameter= Column(Text)
-
-
-
-class Process(db.Model):
-    '''
-    过程信息表
-    '''
-    __tablename__ = 'dmap_process'
-    guid = Column(String(256), primary_key=True)
-    # 任务外键
-    task_guid = Column(String(256), ForeignKey('dmap_task.guid'))
-    time = Column(DateTime)
-    message = Column(Text)
-
-
-class Catalog(db.Model):
-    '''
-    目录表
-    '''
-    __tablename__ = 'dmap_catalog'
-    guid = Column(String(256), primary_key=True)
-    database_guid = Column(String(256), ForeignKey('dmap_database.guid'))
-    pguid = Column(String(256))
-    path = Column(Text)
-    name = Column(String(256))
-    sort = Column(Integer)
-    description = Column(Text)
-    relate_tables = relationship('Table', backref='relate_catalog', lazy='dynamic')
-    relate_tasks = relationship('Task', backref='relate_catalog', lazy='dynamic')
-
-
-class Database(db.Model):
-    '''
-    数据源表
-    '''
-    __tablename__ = 'dmap_database'
-    guid = Column(String(256), primary_key=True)
-    name = Column(String(256))
-    alias = Column(String(256))
-    sqlalchemy_uri = Column(String(256))
-    description = Column(Text)
-    # 唯一性约束，不能注册相同连接的库
-    connectstr= Column(Text,unique=True)
-    creator = Column(String(256))
-    create_time = Column(DateTime)
-    update_time = Column(DateTime)
-    relate_catalogs = relationship('Catalog', backref='relate_database', lazy='dynamic')
-    relate_tables = relationship('Table', backref='relate_database', lazy='dynamic')
-    relate_tasks = relationship('Task', backref='relate_database', lazy='dynamic')
-
-
-
-class InsertingLayerName(db.Model):
-    '''
-    正在入库的数据
-    '''
-    __tablename__ = 'dmap_iln'
-    guid = Column(String(256), primary_key=True)
-    task_guid = Column(String(256))
-    name = Column(String(256))
-
-
-class Service(db.Model):
-    '''
-    '''
-    __tablename__ = 'dmap_service'
-    guid = Column(String(256), primary_key=True)
-    name = Column(String(256))
-    # alias = Column(String(256))
-
-    title = Column(String(256))
-
-    #服务状态
-    state= Column(Integer)
-    create_time = Column(DateTime)
-    update_time = Column(DateTime)
-    #服务描述
-    description = Column(Text)
-    #服务节点
-    node = Column(Integer)
-    #服务缩略图
-    overview = Column(Text)
-    #服务类型
-    type = Column(String(256))
-    #具体服务id
-    service_guid = Column(String(256))
-    # 目录外键
-    catalog_guid = Column(String(256), ForeignKey('dmap_service_catalog.guid'))
-
-
-class ServiceCatalog(db.Model):
-    '''
-    目录表
-    '''
-    __tablename__ = 'dmap_service_catalog'
-    guid = Column(String(256), primary_key=True)
-    pguid = Column(String(256))
-    path = Column(Text)
-    name = Column(String(256))
-    sort = Column(Integer)
-    description = Column(Text)
-    relate_services = relationship('Service', backref='relate_catalog', lazy='dynamic')
-
-
-
-class TileScheme(db.Model):
-    '''
-    切片方案表
-    '''
-    __tablename__ = 'dmap_tile_scheme'
-    guid = Column(String(256), primary_key=True)
-    name = Column(String(256))
-    alias = Column(String(256))
-    description = Column(Text)
-    crs = Column(String(256))
-    crs_wkt = Column(Text)
-
-    extent = Column(Text)
-    top_left = Column(String(256))
-
-    # xmin = Column(Float)
-    # ymin = Column(Float)
-    # xmax = Column(Float)
-    # ymax = Column(Float)
-    # origin_x = Column(Float)
-    # origin_y = Column(Float)
-
-    levels = Column(Text)
-    dpi = Column(Integer)
-    rows = Column(Integer)
-    cols = Column(Integer)
-    update_time = Column(DateTime)
-
-    parameter = Column(Text)
-
 # 动态加载Model
 # 动态加载Model
 current_dir = os.path.abspath(os.path.dirname(__file__))
 current_dir = os.path.abspath(os.path.dirname(__file__))
 pkgs = list(glob.glob('%s/modules/*/models' % (current_dir)))
 pkgs = list(glob.glob('%s/modules/*/models' % (current_dir)))

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 import uuid
 import uuid
-from app.models import *
+from ..models import *
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "创建目录"
     api_name = "创建目录"

@@ -5,7 +5,7 @@
 
 
 
 
 
 
-from app.models import *
+from ..models import *
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "删除目录"
     api_name = "删除目录"

@@ -3,7 +3,7 @@
 #createtime:    2021/3/9
 #createtime:    2021/3/9
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.models import *
+from ..models import *
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import *
+from ..models import *
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import *
+from ..models import *
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import *
+from ..models import *
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -3,7 +3,7 @@
 #createtime:    2021/3/9
 #createtime:    2021/3/9
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.models import Database,db
+from ..models import Database,db
 
 
 
 
 
 

@@ -6,7 +6,8 @@ from contextlib import closing
 
 
 from sqlalchemy import create_engine
 from sqlalchemy import create_engine
 
 
-from app.models import DES,Database
+from ..models import Database,DES
+
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate

@@ -4,7 +4,8 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import Database,db,Table,TableVacuate,DES
+from ..models import Database,db,Table,TableVacuate,DES
+
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate

@@ -3,12 +3,11 @@
 #createtime:    2021/3/9
 #createtime:    2021/3/9
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.models import Database,db
+from ..models import Database,db,DES
 from contextlib import closing
 from contextlib import closing
 
 
 from sqlalchemy import create_engine
 from sqlalchemy import create_engine
 
 
-from app.models import DES
 import datetime
 import datetime
 from . import database_alias_check
 from . import database_alias_check
 
 

@@ -2,11 +2,9 @@
 #author:        4N
 #author:        4N
 #createtime:    2021/3/9
 #createtime:    2021/3/9
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
-from app.models import Database,DES
-from contextlib import closing
-from sqlalchemy import create_engine,or_
 
 
-from app.models import Database,Catalog,Table
+
+from ..models import Database,Catalog,Table
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate

@@ -2,11 +2,11 @@
 #author:        4N
 #author:        4N
 #createtime:    2021/3/9
 #createtime:    2021/3/9
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
-from app.models import Database,DES
+
 from contextlib import closing
 from contextlib import closing
 from sqlalchemy import create_engine
 from sqlalchemy import create_engine
 
 
-from app.models import Database
+from ..models import Database,DES
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate

@@ -3,11 +3,10 @@
 #createtime:    2021/3/9
 #createtime:    2021/3/9
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 import datetime
 import datetime
-from app.models import Database,db,DES,Table,Columns,TableVacuate
-# from app.util import get_db_session,get_info_from_sqlachemy_uri
+from ..models import Database,db,Table,Columns,TableVacuate,DES
+
 import uuid
 import uuid
 from . import database_test
 from . import database_test
-# from app.util import open_pg_data_source
 from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn
 from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session
 from sqlalchemy import create_engine
 from sqlalchemy import create_engine

@@ -6,7 +6,8 @@ from contextlib import closing
 
 
 from sqlalchemy import create_engine
 from sqlalchemy import create_engine
 
 
-from app.models import DES,Database,db
+from ..models import Database,db,DES
+
 
 
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm import sessionmaker
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate

@@ -6,7 +6,7 @@ import datetime
 
 
 
 
 
 
-from app.models import Task
+from app.modules.data.models import Task
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -6,7 +6,7 @@ import datetime
 
 
 
 
 
 
-from app.models import Table,Database
+from app.modules.data.models import Table,Database
 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.LayerUtil import LayerUtil
 from app.util.component.LayerUtil import LayerUtil
@@ -14,6 +14,7 @@ from app.util.component.PGUtil import PGUtil
 from osgeo.ogr import Geometry,Layer,DataSource,Feature
 from osgeo.ogr import Geometry,Layer,DataSource,Feature
 from app.models import DES
 from app.models import DES
 from osgeo import ogr
 from osgeo import ogr
+import json
 import gzip
 import gzip
 from flask import make_response
 from flask import make_response
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -2,7 +2,7 @@
 # author:        4N
 # author:        4N
 # createtime:    2021/8/4
 # createtime:    2021/8/4
 # email:         nheweijun@sina.com
 # email:         nheweijun@sina.com
-from app.models import Table,Database
+from app.modules.data.models import Table,Database
 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.LayerUtil import LayerUtil
 from app.util.component.LayerUtil import LayerUtil

@@ -6,7 +6,7 @@ import datetime
 
 
 
 
 
 
-from app.models import Task
+from app.modules.data.models import Task
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -4,7 +4,7 @@
 # email:         nheweijun@sina.com
 # email:         nheweijun@sina.com
 
 
 
 
-from app.models import Table,Database
+from app.modules.data.models import Table,Database
 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.LayerUtil import LayerUtil
 from app.util.component.LayerUtil import LayerUtil

@@ -6,7 +6,7 @@ import datetime
 
 
 
 
 
 
-from app.models import Table,Database
+from app.modules.data.models import Table,Database
 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.LayerUtil import LayerUtil
 from app.util.component.LayerUtil import LayerUtil

@@ -4,7 +4,7 @@
 # email:         nheweijun@sina.com
 # email:         nheweijun@sina.com
 
 
 
 
-from app.models import Table,Database
+from app.modules.data.models import Table,Database
 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.LayerUtil import LayerUtil
 from app.util.component.LayerUtil import LayerUtil

@@ -7,7 +7,8 @@ from osgeo.ogr import *
 import uuid
 import uuid
 
 
 import time
 import time
-from app.models import *
+from ..models import *
+
 import json
 import json
 import re
 import re
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate

@@ -4,9 +4,8 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import *
+from ..models import *
 
 
-import traceback
 
 
 from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn,Feature
 from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn,Feature
 from osgeo import gdal,ogr
 from osgeo import gdal,ogr

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import *
+from ..models import *
 
 
 import traceback
 import traceback
 
 
@@ -17,6 +17,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.ZipUtil import ZipUtil
 from app.util.component.ZipUtil import ZipUtil
 import multiprocessing
 import multiprocessing
+import datetime
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 

@@ -7,12 +7,13 @@ from osgeo.ogr import *
 import uuid
 import uuid
 
 
 import time
 import time
-from app.models import *
+from ..models import *
+
 import json
 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
-
+import datetime
 
 
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -4,7 +4,8 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 import configure
 import configure
-from app.models import InsertingLayerName, Database, DES, Task
+from ..models import InsertingLayerName, Database, Task,DES
+
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session
 import multiprocessing
 import multiprocessing
 from app.util.component.EntryDataVacuate import EntryDataVacuate
 from app.util.component.EntryDataVacuate import EntryDataVacuate

@@ -7,11 +7,10 @@ from osgeo.ogr import *
 import uuid
 import uuid
 
 
 import time
 import time
-from app.models import *
+from ..models import *
+import datetime
 import json
 import json
-import re
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.PGUtil import PGUtil
 from .get_meta import Api as MetaApi
 from .get_meta import Api as MetaApi
 from threading import Thread
 from threading import Thread
 from app.util.component.EntryDataVacuate import EntryDataVacuate
 from app.util.component.EntryDataVacuate import EntryDataVacuate

@@ -3,20 +3,12 @@
 # createtime:    2020/9/4
 # createtime:    2020/9/4
 # email:         nheweijun@sina.com
 # email:         nheweijun@sina.com
 
 
-import traceback
-from osgeo.ogr import *
-from osgeo import ogr
 
 
-from flask import request
 import os
 import os
-import uuid
-
-import json
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ZipUtil import ZipUtil
 from app.util.component.FileProcess import FileProcess
 from app.util.component.FileProcess import FileProcess
 import datetime
 import datetime
-import time
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "本地数据list"
     api_name = "本地数据list"
     def process(self):
     def process(self):

@@ -2,7 +2,7 @@
 #createtime:    2021/1/27
 #createtime:    2021/1/27
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.models import Columns
+from ..models import Columns
 import datetime
 import datetime
 
 
 
 

@@ -4,7 +4,7 @@
 
 
 
 
 import traceback
 import traceback
-from app.models import Table
+from ..models import Table
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 
 

@@ -5,7 +5,8 @@
 
 
 
 
 import traceback
 import traceback
-from app.models import Table,Database,DES
+from ..models import Table,Database,DES
+
 
 
 from osgeo.ogr import DataSource
 from osgeo.ogr import DataSource
 
 

@@ -4,9 +4,8 @@
 
 
 
 
 
 
-from app.models import Table,Catalog,Database,DES
+from ..models import *
 
 
-from app.models import db,Columns
 import json
 import json
 
 
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session

@@ -2,7 +2,8 @@
 #createtime:    2021/1/27
 #createtime:    2021/1/27
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.models import Table,Columns,DES
+from ..models import Table,Columns,DES
+
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor

@@ -3,7 +3,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import Table,Catalog,Database,DES,Columns,db
+from ..models import Table,Catalog
 
 
 from sqlalchemy import or_,and_
 from sqlalchemy import or_,and_
 
 

@@ -5,7 +5,7 @@
 
 
 
 
 import traceback
 import traceback
-from app.models import Table,Database,DES,Columns,db,TableVacuate,Task,Process
+from ..models import Table,Database,Columns,db,TableVacuate,Task,Process,DES
 
 
 from osgeo.ogr import DataSource,FeatureDefn,FieldDefn,Layer
 from osgeo.ogr import DataSource,FeatureDefn,FieldDefn,Layer
 
 

@@ -5,7 +5,7 @@
 
 
 import datetime
 import datetime
 import traceback
 import traceback
-from app.models import Table, Database, DES,Task,db,TableVacuate,Process
+from ..models import Table, Database, Task,db,TableVacuate,Process,DES
 
 
 from sqlalchemy.engine import ResultProxy
 from sqlalchemy.engine import ResultProxy
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate

@@ -3,21 +3,11 @@
 # email:         nheweijun@sina.com
 # email:         nheweijun@sina.com
 
 
 
 
-import datetime
-import traceback
-from app.models import Table, Database, DES,Task,db,TableVacuate
-
-from sqlalchemy.engine import ResultProxy
+from ..models import Table,DES,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.EntryDataVacuate import Process
-from app.util.component.GeometryAdapter import GeometryAdapter
-from app.util.component.StructuredPrint import StructurePrint
-import multiprocessing
-import uuid
 import configure
 import configure
-from osgeo.ogr import DataSource,Layer,Geometry
-from osgeo import ogr
+from osgeo.ogr import DataSource
 from flask import current_app
 from flask import current_app
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -3,11 +3,10 @@
 # email:         nheweijun@sina.com
 # email:         nheweijun@sina.com
 
 
 
 
-from app.models import Table,TableVacuate,Task
+from ..models import Table,TableVacuate,Task
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.VacuateConf import VacuateConf
 from app.util.component.VacuateConf import VacuateConf
-import collections
-import json
+
 
 
 import copy
 import copy
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -5,7 +5,7 @@
 
 
 import datetime
 import datetime
 import traceback
 import traceback
-from app.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.EntryDataVacuate import Process
 from app.util.component.EntryDataVacuate import Process
@@ -14,7 +14,7 @@ import uuid
 import configure
 import configure
 from osgeo.ogr import DataSource,Layer,Geometry
 from osgeo.ogr import DataSource,Layer,Geometry
 from osgeo import ogr
 from osgeo import ogr
-from app.util.component.StructuredPrint import StructurePrint
+
 from app.util.component.VacuateConf import VacuateConf
 from app.util.component.VacuateConf import VacuateConf
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -3,21 +3,17 @@
 # email:         nheweijun@sina.com
 # email:         nheweijun@sina.com
 
 
 
 
-import datetime
-import traceback
-from app.models import Table, Database, DES,Task,db,TableVacuate
+from ..models import Table, DES
+
 
 
-from sqlalchemy.engine import ResultProxy
 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.EntryDataVacuate import Process
+
 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.StructuredPrint import StructurePrint
-import multiprocessing
-import uuid
-import configure
-from osgeo.ogr import DataSource,Layer,Geometry
-from osgeo import ogr
+
+from osgeo.ogr import DataSource
+
 from app.util.component.VacuateConf import VacuateConf
 from app.util.component.VacuateConf import VacuateConf
 import copy
 import copy
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -4,9 +4,7 @@
 
 
 
 
 import datetime
 import datetime
-import traceback
-from app.models import Table,Database,DES
-
+from ..models import Table,Database,DES
 from sqlalchemy.engine import ResultProxy
 from sqlalchemy.engine import ResultProxy
 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

+# coding=utf-8
+#author:        4N
+#createtime:    2021/10/26
+#email:         nheweijun@sina.com
+
+from app.models import db
+from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, Time,Float,Binary
+from sqlalchemy.orm import relationship
+import base64
+from pyDes import *
+
+
+class DES():
+    '''
+    DES密码加解密
+    '''
+    Des: des = des("Chinadci", ECB, "\0\0\0\0\0\0\0\0", pad=None, padmode=PAD_PKCS5)
+
+    @classmethod
+    def encode(cls, data):
+        return str(base64.b64encode(cls.Des.encrypt(data)), encoding="utf8")
+
+
+    @classmethod
+    def decode(cls, data):
+        if data:
+            return str(cls.Des.decrypt(base64.b64decode(data.encode("utf-8"))), encoding="utf8")
+
+        else:
+            return data
+
+class Table(db.Model):
+    '''
+    数据表元数据
+    '''
+    __tablename__ = 'dmap_table'
+    guid = Column(String(256), primary_key=True)
+    # 数据源外键
+    database_guid = Column(String(256), ForeignKey('dmap_database.guid'))
+
+    # 点线面123
+    table_type = Column(Integer)
+
+    name = Column(String(256))
+    alias = Column(Text)
+    create_time = Column(DateTime)
+    update_time = Column(DateTime)
+
+    feature_count = Column(Integer)
+
+    description = Column(Text)
+    extent = Column(Text)
+
+    #用户
+    creator = Column(Text)
+    #是否已抽稀
+    is_vacuate=Column(Integer,default=0)
+
+    # 目录外键
+    catalog_guid = Column(String(256), ForeignKey('dmap_catalog.guid'))
+
+    relate_columns = relationship('Columns', backref='relate_table', lazy='dynamic')
+    relate_table_vacuates = relationship('TableVacuate', backref='relate_table', lazy='dynamic')
+
+
+class TableVacuate(db.Model):
+    '''
+    sub数据表元数据
+    '''
+    __tablename__ = 'dmap_table_vacuate'
+    guid = Column(String(256), primary_key=True)
+    name = Column(String(256))
+    level = Column(Integer)
+    pixel_distance = Column(Float)
+    table_guid = Column(String(256), ForeignKey('dmap_table.guid'))
+
+    #所在的库
+    connectstr= Column(Text)
+
+class Columns(db.Model):
+    '''
+    数据表的列
+    '''
+    __tablename__ = 'dmap_column'
+    guid = Column(String(256), primary_key=True)
+    # 表外键
+    table_guid= Column(String(256), ForeignKey('dmap_table.guid'))
+    name=Column(String(256))
+    alias = Column(String(256))
+    create_time = Column(DateTime)
+    update_time = Column(DateTime)
+
+class Task(db.Model):
+    '''
+    任务表
+    '''
+    __tablename__ = 'dmap_task'
+    guid = Column(String(256), primary_key=True)
+    name = Column(Text)
+    process = Column(Text)
+    create_time = Column(DateTime)
+    update_time = Column(DateTime)
+    state = Column(Integer)
+    #数据源外键
+    database_guid = Column(String(256), ForeignKey('dmap_database.guid'))
+    #目录外键
+    catalog_guid = Column(String(256), ForeignKey('dmap_catalog.guid'))
+    #抽稀任务指定表的guid
+    table_guid =  Column(String(256))
+    #任务类型
+    #1：入库任务
+    #2：抽稀任务
+    #3：数据库刷新任务
+    #4：影像金字塔任务
+    #5：数据下载任务
+    task_type=Column(Integer)
+    creator = Column(Text)
+    file_name = Column(Text)
+    relate_processes = relationship('Process', backref='relate_task', lazy='dynamic')
+    # 入库参数
+    parameter= Column(Text)
+
+
+
+class Process(db.Model):
+    '''
+    过程信息表
+    '''
+    __tablename__ = 'dmap_process'
+    guid = Column(String(256), primary_key=True)
+    # 任务外键
+    task_guid = Column(String(256), ForeignKey('dmap_task.guid'))
+    time = Column(DateTime)
+    message = Column(Text)
+
+
+class Catalog(db.Model):
+    '''
+    目录表
+    '''
+    __tablename__ = 'dmap_catalog'
+    guid = Column(String(256), primary_key=True)
+    database_guid = Column(String(256), ForeignKey('dmap_database.guid'))
+    pguid = Column(String(256))
+    path = Column(Text)
+    name = Column(String(256))
+    sort = Column(Integer)
+    description = Column(Text)
+    relate_tables = relationship('Table', backref='relate_catalog', lazy='dynamic')
+    relate_tasks = relationship('Task', backref='relate_catalog', lazy='dynamic')
+
+
+class Database(db.Model):
+    '''
+    数据源表
+    '''
+    __tablename__ = 'dmap_database'
+    guid = Column(String(256), primary_key=True)
+    name = Column(String(256))
+    alias = Column(String(256))
+    sqlalchemy_uri = Column(String(256))
+    description = Column(Text)
+    # 唯一性约束，不能注册相同连接的库
+    connectstr= Column(Text,unique=True)
+    creator = Column(String(256))
+    create_time = Column(DateTime)
+    update_time = Column(DateTime)
+    relate_catalogs = relationship('Catalog', backref='relate_database', lazy='dynamic')
+    relate_tables = relationship('Table', backref='relate_database', lazy='dynamic')
+    relate_tasks = relationship('Task', backref='relate_database', lazy='dynamic')
+
+
+
+class InsertingLayerName(db.Model):
+    '''
+    正在入库的数据
+    '''
+    __tablename__ = 'dmap_iln'
+    guid = Column(String(256), primary_key=True)
+    task_guid = Column(String(256))
+    name = Column(String(256))
+
+
+
+

@@ -3,65 +3,41 @@
 #createtime:    2021/10/11
 #createtime:    2021/10/11
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.models import Task
-import configure
-from app.models import InsertingLayerName, Database, DES, Task,Columns
+
+from ..models import InsertingLayerName,Columns
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session
-import multiprocessing
+
 from app.util.component.EntryDataVacuate import EntryDataVacuate
 from app.util.component.EntryDataVacuate import EntryDataVacuate
 import json
 import json
 from sqlalchemy import distinct
 from sqlalchemy import distinct
-import uuid
-from osgeo.ogr import DataSource
-from app.util.component.StructuredPrint import StructurePrint
-from app.util.component.PGUtil import PGUtil
+
 import time
 import time
-import datetime
-import traceback
-from app.models import Table, Database, DES,Task,db,TableVacuate
-from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.PGUtil import PGUtil
-from app.util.component.EntryDataVacuate import Process
+
 from app.util.component.SQLUtil import SQLUtil
 from app.util.component.SQLUtil import SQLUtil
-import multiprocessing
-import uuid
-import configure
-from osgeo.ogr import DataSource,Layer,Geometry,FieldDefn,FeatureDefn
-from osgeo import ogr
-from app.util.component.StructuredPrint import StructurePrint
-from app.util.component.VacuateConf import VacuateConf
+
 import datetime
 import datetime
-import traceback
-from app.models import Table, Database, DES,Task,db,TableVacuate,Process
 
 
-from sqlalchemy.engine import ResultProxy
-from app.util.component.ApiTemplate import ApiTemplate
+from ..models import Table, Database, DES,Task,db,TableVacuate,Process
 
 
 from app.util.component.StructuredPrint import StructurePrint
 from app.util.component.StructuredPrint import StructurePrint
-from app.util.component.PGUtil import PGUtil
-import multiprocessing
-import uuid
-import configure
+
 from osgeo.ogr import DataSource,Layer,Geometry
 from osgeo.ogr import DataSource,Layer,Geometry
-from osgeo import ogr
+
 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
-from app.models import *
 
 
 import traceback
 import traceback
-
 from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn,Feature
 from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn,Feature
 from osgeo import gdal,ogr
 from osgeo import gdal,ogr
 import os
 import os
 import uuid
 import uuid
 import configure
 import configure
-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
 import multiprocessing
 import multiprocessing
 
 
 
 
-
 def task_consumer():
 def task_consumer():
 
 
     running_dict = {}
     running_dict = {}

@@ -3,7 +3,7 @@
 # createtime:    2020/9/4
 # createtime:    2020/9/4
 # email:         nheweijun@sina.com
 # email:         nheweijun@sina.com
 
 
-from app.models import db,Task
+from ..models import db,Task
 
 
 from sqlalchemy import func
 from sqlalchemy import func
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate

@@ -3,7 +3,7 @@
 #createtime:    2020/9/4
 #createtime:    2020/9/4
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.models import db,Task
+from ..models import db,Task
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate

@@ -3,7 +3,7 @@
 #createtime:    2020/9/4
 #createtime:    2020/9/4
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.models import db,Task,Process
+from ..models import db,Task,Process
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -6,7 +6,7 @@ import datetime
 
 
 
 
 
 
-from app.models import Task
+from ..models import Task
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 class Api(ApiTemplate):
 class Api(ApiTemplate):

+
+from osgeo.ogr import *
+from osgeo import ogr
+from osgeo import gdal
+import os
+import uuid
+import shutil
+import time
+from app.modules.data.models import *
+from app.util.component.PGUtil import PGUtil
+from app.util.component.StructuredPrint import StructurePrint
+from sqlalchemy.orm import Session
+import configure
+import math
+from functools import lru_cache
+import traceback
+import copy
+from app.util.component.GeometryAdapter import GeometryAdapter
+from app.util.component.VacuateConf import VacuateConf
+import datetime
+class EntryDataVacuate:
+
+    def entry(self,parameter):
+        # meta:dict = parameter.get("meta")
+
+        # 初始化任务
+        this_task = ThisTask(parameter)
+        this_task.write_process("入库任务初始化...")
+
+        # 数据路径，用作删除
+        _data_path=None
+        try:
+            metas: list = parameter.get("meta")
+            # 总的入库是否成功
+            is_success=True
+
+            this_task.update({"process": "入库中"})
+
+            # 开始入库事务
+            this_task.start()
+
+            # 多个文件依次入库
+            for meta in metas:
+                #设置编码
+                encoding = parameter.get("encoding")
+                if encoding:
+                    gdal.SetConfigOption("SHAPE_ENCODING",encoding)
+                else:
+                    gdal.SetConfigOption("SHAPE_ENCODING", "GBK")
+
+                #如果包含cpg文件，优先使用cpg文件中声明的编码
+                encoding_cpg = meta.get("encoding")
+                if encoding_cpg:
+                    gdal.SetConfigOption("SHAPE_ENCODING", encoding_cpg)
+
+                data_path = meta.get("data_path")
+
+                #设定删除路径
+                if not _data_path:
+                    _data_path=data_path
+
+
+                if not data_path:
+                    raise Exception("数据错误！")
+                # 分为shp和gdb 2种录入形式
+
+                if data_path.endswith("shp"):
+                    is_success_one,new_layer_name = self.entry_shp(data_path,this_task,meta)
+                else:
+                    is_success_one,new_layer_names = self.entry_gdb(data_path,this_task,meta)
+
+                #如果其中一个失败，总的入库就失败
+                if not is_success_one:
+                    is_success=False
+
+            this_task.write_process("数据入库结束。")
+
+            if is_success:
+                # 更新任务为成功任务
+                this_task.update({"state": 1,"process":"入库完成","update_time": datetime.datetime.now()})
+                this_task.commit()
+            else:
+                # 更新任务为失败任务
+                this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
+                # rollback
+                this_task.rollback()
+
+        except Exception as e:
+            this_task.write_process("{} 任务结束！".format(e.__str__()))
+            this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
+            StructurePrint().print(e.__str__(),"ERROR")
+            # rollback
+            this_task.rollback()
+        finally:
+            this_task.end()
+            try:
+                file_tmp_path = os.path.join(_data_path.split("file_tmp")[0],"file_tmp")
+                dir_path = os.path.dirname(_data_path)
+                i=0
+                while not os.path.dirname(dir_path).__eq__(file_tmp_path) and i<30:
+                    dir_path = os.path.dirname(dir_path)
+                    i+=1
+                if i<30:
+                    shutil.rmtree(dir_path,True)
+                    StructurePrint().print("删除文件成功！")
+                else:
+                    raise Exception("找不到文件！")
+
+            except Exception as e:
+                StructurePrint().print(e.__str__(), "ERROR")
+                StructurePrint().print("删除文件失败！","ERROR")
+
+
+    def entry_shp(self,data_path,this_task,meta):
+        '''
+        录入shp
+        :param data_path:
+        :return:
+        '''
+
+        driver: Driver = ogr.GetDriverByName("ESRI Shapefile")
+        ds: DataSource = driver.Open(data_path, 1)
+        if not ds:
+            raise Exception("打开数据失败！")
+        layer: Layer = ds.GetLayer(0)
+
+        is_success_one, new_layer_name =self.entry_one_layer(layer, this_task,meta)
+        ds.Destroy()
+        return is_success_one, new_layer_name
+
+    def entry_gdb(self,data_path,this_task,meta):
+        '''
+        录入gdb
+        :param data_path:
+        :return:
+        '''
+
+        is_successes = []
+        new_layer_names=[]
+        driver: Driver = ogr.GetDriverByName("OpenFileGDB")
+        ds: DataSource = driver.Open(data_path, 0)
+        if not ds:
+            raise Exception("打开数据失败！")
+
+
+        for i in range(ds.GetLayerCount()):
+            layer: Layer = ds.GetLayer(i)
+            is_success, new_layer_name = self.entry_one_layer(layer,this_task,meta)
+            new_layer_names.append(new_layer_name)
+            is_successes.append(is_success)
+        ds.Destroy()
+        if is_successes.__contains__(False):
+            return False,new_layer_names
+        else:
+            return True,new_layer_names
+
+    def entry_one_layer(self,layer: Layer,this_task,meta):
+
+        # this_task.pg_ds.StartTransaction()
+        new_layer_name = None
+        # vacuate_process= None
+        success = True
+        table_guid = uuid.uuid1().__str__()
+        try:
+            # 图层设置
+            parameter = this_task.parameter
+
+            overwrite = parameter.get("overwrite") if parameter.get("overwrite") is not None and parameter.get("overwrite")=="yes" else "no"
+            geom_name = parameter.get("geom_name") if parameter.get("geom_name") is not None else "geom"
+            fid =  parameter.get("fid") if parameter.get("fid") is not None else "fid"
+            options = ["OVERWRITE={}".format(overwrite), "FID={}".format(fid), "GEOMETRY_NAME={}".format(geom_name),"PRECISION=NO"]
+
+
+            # 将线/面转多线多面
+            geom_type = GeometryAdapter.change_geom_type(layer.GetGeomType())
+
+            # 更改图层名
+            change_name = False
+            origin_name = layer.GetName().lower()
+
+            # 新图层名
+            new_layer_name: str = meta.get("layer").get(origin_name)
+            origin_name = new_layer_name
+            no = 1
+            while overwrite.__eq__("no") and this_task.pg_ds.GetLayerByName(new_layer_name) :
+                change_name=True
+                new_layer_name = origin_name+"_{}".format(no)
+                no+=1
+
+            if change_name:
+                this_task.write_process("{}图层已存在，更名为{}入库".format(origin_name, new_layer_name))
+
+
+            this_task.write_process("{}图层正在入库...".format(new_layer_name))
+
+            pg_layer: Layer = this_task.pg_ds.CreateLayer(new_layer_name, layer.GetSpatialRef(), geom_type, options)
+
+            # 复制原图层的属性
+            # 去掉fid的属性
+            schema = [sche for sche in layer.schema if not sche.name.__eq__(fid)]
+            pg_layer.CreateFields(schema)
+
+            #创建抽稀过程
+            # vacuate_process = VacuateProcess(layer,table_guid,options)
+
+
+
+            count =0
+
+            for feature in layer:
+                count+=1
+                if count%10000==0:
+                    StructurePrint().print("{}图层已入库{}个对象".format(new_layer_name,count))
+                    # print(time.time()-this_time)
+                    #this_time=time.time()
+                geo :Geometry = feature.GetGeometryRef()
+                # 如果是空对象不录入
+                if geo is not None:
+                    if geo.IsEmpty():
+                        this_task.write_process("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()))
+                        StructurePrint().print("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()),"WARN")
+                        continue
+
+                out_feature: Feature = copy.copy(feature)
+                out_geom = None
+                if geo is not None:
+                    out_geom:Geometry = GeometryAdapter.change_geom(geo, geom_type)
+                    out_feature.SetGeometry(out_geom)
+                # 出现fid为0经常有问题
+                out_feature.SetFID(out_feature.GetFID() + 1)
+                pg_layer.CreateFeature(out_feature)
+
+                #插入抽稀图层
+                # if out_geom is not None:
+                #     vacuate_process.vacuate(out_geom)
+
+            # 注册图层信息
+            # 是否抽吸过
+            # is_vacuate = 1 if vacuate_process.max_level>0 else 0
+            is_vacuate = 0
+
+            this_task.register_table(pg_layer,new_layer_name,overwrite,parameter.get("creator"),is_vacuate,table_guid)
+
+            # 注册抽稀表
+            # this_task.register_table_vacuate(table_guid,vacuate_process.vacuate_layers)
+
+            this_task.write_process("{}图层入库成功。".format(new_layer_name))
+
+        except Exception as e:
+
+            this_task.write_process("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()))
+            StructurePrint().print("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()), "error")
+            print(traceback.format_exc())
+            # 抽稀回滚
+            # vacuate_process.rollback()
+            success =False
+
+        finally:
+            # vacuate_process.end()
+            pass
+        return success,new_layer_name
+
+
+
+class ThisTask:
+
+    def __init__(self, parameter):
+        try:
+            # 该任务事务的连接
+            self.sys_session: Session = PGUtil.get_db_session(configure.SQLALCHEMY_DATABASE_URI)
+            # 专门的写过程的连接
+            self.process_session: Session = PGUtil.get_db_session(configure.SQLALCHEMY_DATABASE_URI)
+
+        except Exception as e:
+            raise Exception("打开数据库失败！")
+        self.parameter = parameter
+
+        self.task = self.process_session.query(Task).filter_by(guid=parameter.get("task_guid"))
+
+        self.database = self.sys_session.query(Database).filter_by(
+            guid=parameter.get("database_guid")).one_or_none()
+
+        self.catalog_guid = parameter.get("catalog_guid")
+
+        self.pg_ds: DataSource = PGUtil.open_pg_data_source(1, DES.decode(self.database.sqlalchemy_uri))
+
+
+    def start(self):
+        self.pg_ds.StartTransaction()
+
+    def update(self, update_dict):
+        self.task.update(update_dict)
+        self.process_session.commit()
+
+    def write_process(self, message):
+        message = "{} {}".format(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), message)
+        task_process_guid = uuid.uuid1().__str__()
+        task_process = Process(guid=task_process_guid, message=message, time=datetime.datetime.now(),
+                               task_guid=self.parameter.get("task_guid"))
+        self.process_session.add(task_process)
+        self.process_session.commit()
+
+    def register_table(self, layer: Layer, new_layer_name, overwrite, creator,is_vacuate,table_guid):
+        '''
+        注册表
+        :param layer: 图层
+        :param new_layer_name: 图层名
+        :return: 表名
+        '''
+
+        this_time = datetime.datetime.now()
+
+        ext = layer.GetExtent()
+        if ext[0] < 360:
+            ext = [round(e, 6) for e in ext]
+        else:
+            ext = [round(e, 2) for e in ext]
+
+        geom_type = GeometryAdapter.get_geometry_type(layer)
+
+        extent = "{},{},{},{}".format(ext[0], ext[1], ext[2], ext[3])
+
+        table = Table(guid=table_guid,
+                      database_guid=self.database.guid,
+                      creator=creator,
+                      name=new_layer_name, create_time=this_time, update_time=this_time,
+                      catalog_guid=self.catalog_guid, table_type=GeometryAdapter.get_table_type(geom_type),
+                      extent=extent,
+                      feature_count=layer.GetFeatureCount(),
+                      is_vacuate=is_vacuate
+                      )
+        # 删除遗留业务数据
+        history_table = self.sys_session.query(Table).filter_by(name=new_layer_name,database_guid=self.database.guid).all()
+        if history_table:
+            for ht in history_table:
+                self.sys_session.delete(ht)
+        self.sys_session.add(table)
+
+        feature_defn: FeatureDefn = layer.GetLayerDefn()
+
+        for i in range(feature_defn.GetFieldCount()):
+            field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
+            field_name = field_defn.GetName().lower()
+            field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
+                "") else field_defn.GetAlternativeName()
+            column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,
+                             name=field_name, alias=field_alias, create_time=this_time, update_time=this_time)
+            self.sys_session.add(column)
+        return table_guid
+
+
+    def register_table_vacuate(self,table_guid,vacuate_layers:dict):
+
+        # 抽稀表有固定的命名规则
+        for level,layer in vacuate_layers.items():
+            pixel_distance_str:str=layer.GetName().split("_")[-1]
+            lev = layer.GetName().split("_")[-2]
+
+            if pixel_distance_str.startswith("0"):
+                pixel_distance_str="0.{}".format(pixel_distance_str)
+
+            pixel_distance = float(pixel_distance_str)
+
+            table_vacuate = TableVacuate(guid=uuid.uuid1().__str__(),
+                                         table_guid=table_guid,
+                                         level=int(lev),
+                                         name=layer.GetName(),
+                                         pixel_distance=pixel_distance)
+            self.sys_session.add(table_vacuate)
+
+
+    def commit(self):
+        if self.sys_session:
+            self.sys_session.commit()
+        if self.pg_ds:
+            self.pg_ds.CommitTransaction()
+        if self.process_session:
+            self.process_session.commit()
+
+
+    def end(self):
+        if self.sys_session:
+            self.sys_session.close()
+        if self.pg_ds:
+            self.pg_ds.Destroy()
+        if self.process_session:
+            self.process_session.close()
+
+    def rollback(self):
+        if self.sys_session:
+            self.sys_session.rollback()
+        if self.pg_ds:
+            self.pg_ds.RollbackTransaction()
+
+
+
+class VacuateProcess:
+
+    max_level=0
+    fill_dict={}
+    vacuate_layers={}
+    vacuate_layers_gridsize={}
+    pg_ds_dict = {}
+    # 图层要素大于5W才抽稀
+    least_vacuate_count = VacuateConf.least_vacuate_count
+
+    extent=[]
+    is_spatial=False
+
+    lonlat_gridsize = VacuateConf.lonlat_gridsize
+    project_gridsize = VacuateConf.project_gridsize
+
+    # 该抽稀过程使用的grid_size
+    t_grid_size = []
+
+    # 该抽稀过程的抽稀网格
+    this_gridsize=[]
+
+
+    def __init__(self,layer:Layer,table_guid, options,sqlalchemy_uri):
+
+        #是空间图层才初始化
+        if layer.GetExtent()[0] > 0 or layer.GetExtent()[0] < 0:
+
+            self.is_spatial=True
+
+            # 判断需要抽稀多少级
+
+            lc = layer.GetFeatureCount()
+            extent = layer.GetExtent()
+            self.extent=extent
+
+            #判断疏密程度
+            p_x = (extent[1]-extent[0])/10.0
+            p_y = (extent[3] - extent[2]) / 10.0
+            fill_precent=0
+            StructurePrint().print("判断疏密")
+            for ix in range(10):
+                for iy in range(10):
+                    grid_extent = [extent[0]+ix*p_x,extent[0]+ix*p_x+p_x,extent[2]+iy*p_y,extent[2]+iy*p_y+p_y]
+                    poly = GeometryAdapter.envelop_2_polygon(grid_extent)
+
+                    layer.SetSpatialFilter(None)
+                    layer.SetSpatialFilter(poly)
+                    layer.ResetReading()
+                    if layer.GetNextFeature():
+                        fill_precent += 1
+
+            print(fill_precent)
+            StructurePrint().print("判断疏密结束")
+
+            layer.SetSpatialFilter(None)
+            layer.ResetReading()
+            # 固有疏密程度
+            original_density=8
+
+
+            # 额外一层
+            # self.this_gridsize.append(0.000075)
+            # self.max_level += 1
+            ######
+
+            if extent[0]>180:
+                self.t_grid_size=self.project_gridsize
+            else:
+                self.t_grid_size = self.lonlat_gridsize
+
+            for grid_size in self.t_grid_size:
+                # 最少抽稀个数
+                if lc > self.least_vacuate_count:
+                    # 网格数至少大于
+                    if ((extent[1] - extent[0]) * (extent[3] - extent[2])) / (grid_size**2)>self.least_vacuate_count:
+                        # 要素数量大于网格数量
+                        # 要考虑图层的疏密程度，original_density*(100.0/fill_precent) 为疏密指数
+                        if lc * original_density * (100.0/fill_precent)>((extent[1] - extent[0])*(extent[3] - extent[2]))/(grid_size**2) :
+                            print(grid_size)
+                            self.this_gridsize.append(grid_size)
+                            self.max_level += 1
+
+
+
+            # 创建抽稀ds
+            for l in range(self.max_level):
+                # pg_ds_l: DataSource = PGUtil.open_pg_data_source(1, DES.decode(sqlalchemy_uri))
+                if configure.VACUATE_DB_URI:
+                    pg_ds_l: DataSource = PGUtil.open_pg_data_source(1, configure.VACUATE_DB_URI)
+                else:
+                    pg_ds_l: DataSource = PGUtil.open_pg_data_source(1, DES.decode(sqlalchemy_uri))
+                pg_ds_l.StartTransaction()
+                self.pg_ds_dict[l] = pg_ds_l
+
+            # 生成抽稀图层
+            options = options[1:]
+            options.append("OVERWRITE=yes")
+            options.append("LAUNDER=no")
+
+            schema = layer.schema
+            # 增加统计字段
+            schema.append(ogr.FieldDefn("_dcigrid_count_", ogr.OFTInteger))
+            schema.append(ogr.FieldDefn("_dcigrid_name_", ogr.OFTString))
+
+            for l in range(self.max_level):
+                this_grid_len = self.this_gridsize[l]
+
+                self.vacuate_layers_gridsize[l] = this_grid_len
+
+                pg = self.pg_ds_dict[l]
+
+                grid_name = str(this_grid_len)
+                if this_grid_len<1:
+                    grid_name = str(this_grid_len).split(".")[-1]
+                    if this_grid_len.__eq__(0.00008):
+                        grid_name = "00008"
+
+                # 抽稀图层是点面混合的
+                # 抽稀表有固定的命名规则
+                # 抽稀表一定要覆盖
+
+
+                print("{}:{}".format(self.t_grid_size.index(this_grid_len),this_grid_len))
+
+
+                v_ln = "z{}_vacuate_{}_{}".format(table_guid, self.t_grid_size.index(this_grid_len), grid_name)
+                vl = pg.CreateLayer(v_ln, layer.GetSpatialRef(),ogr.wkbUnknown, options)
+                # 抽稀表需要属性
+                vl.CreateFields(schema)
+                self.vacuate_layers[l] = vl
+
+        else:
+            pass
+
+
+    def vacuate(self,g,feature):
+
+        if self.is_spatial:
+
+            # 插入到所有抽稀图层中
+            for level in range(self.max_level):
+
+                center: Geometry = g.Centroid()
+
+                extent = g.GetEnvelope()
+                long_extent= extent[1]-extent[0]
+                lat_extent = extent[3]-extent[2]
+
+                this_grid_len =self.vacuate_layers_gridsize[level]
+                #超大的直接加入
+                # if long_extent > 10*this_grid_len or lat_extent >10*this_grid_len:
+                #     vacuate_layer: Layer = self.vacuate_layers.get(level)
+                #     feat = ogr.Feature(vacuate_layer.GetLayerDefn())
+                #     feat.SetGeometry(g)
+                #     vacuate_layer.CreateFeature(feat)
+                # else:
+
+                row = int((center.GetY() - self.extent[2]) / this_grid_len)
+                col = int((center.GetX() - self.extent[0]) / this_grid_len)
+                key = "{}.{}.{}".format(level, row, col)
+
+                if not self.fill_dict.get(key):
+                    self.fill_dict[key] = 0
+                if self.fill_dict[key] == 0:
+
+                    vacuate_layer: Layer = self.vacuate_layers.get(level)
+                    feat = ogr.Feature(vacuate_layer.GetLayerDefn())
+                    # 如果图形比网格小，直接存储其中心点
+                    if this_grid_len>long_extent and this_grid_len>lat_extent:
+                        feat.SetGeometry(center)
+                    else:
+                        feat.SetGeometry(g)
+
+                    # 复制旧feature属性
+                    field_dict = feature.items()
+                    for field_name in field_dict:
+                        feat.SetField(field_name, field_dict[field_name])
+                    feat.SetField("_dcigrid_name_",".".join(key.split(".")[1:]))
+
+                    vacuate_layer.CreateFeature(feat)
+                    self.fill_dict[key] += 1
+                #超大的还有机会
+                elif (long_extent > 10*this_grid_len or lat_extent >10*this_grid_len) and self.fill_dict[key]<5:
+                    vacuate_layer: Layer = self.vacuate_layers.get(level)
+                    feat = ogr.Feature(vacuate_layer.GetLayerDefn())
+                    feat.SetGeometry(g)
+
+                    # 复制旧feature属性
+                    field_dict = feature.items()
+                    for field_name in field_dict:
+                        feat.SetField(field_name, field_dict[field_name])
+                    feat.SetField("_dcigrid_name_",".".join(key.split(".")[1:]))
+
+                    vacuate_layer.CreateFeature(feat)
+                    self.fill_dict[key] += 1
+                else:
+                    self.fill_dict[key] += 1
+
+    def set_vacuate_count(self):
+        if self.is_spatial:
+            # 插入到所有抽稀图层中
+            for level in range(self.max_level):
+                vacuate_layer: Layer = self.vacuate_layers.get(level)
+                for feat in vacuate_layer:
+                    key = "{}.{}".format(level,feat.GetField("_dcigrid_name_"))
+                    feat.SetField("_dcigrid_count_",self.fill_dict.get(key))
+                    vacuate_layer.SetFeature(feat)
+
+    def end(self):
+        for pg in self.pg_ds_dict.values():
+            pg.Destroy()
+
+    def rollback(self):
+        for pg in self.pg_ds_dict.values():
+            pg.RollbackTransaction()

+# coding=utf-8
+#author:        4N
+#createtime:    2021/10/27
+#email:         nheweijun@sina.com

@@ -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.models import Task,InsertingLayerName,db
+from app.modules.data.models import Task,InsertingLayerName,db
 import datetime
 import datetime
 import traceback
 import traceback
 from sqlalchemy import or_
 from sqlalchemy import or_

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 import uuid
 import uuid
-from app.models import ServiceCatalog,db
+from ..models import ServiceCatalog,db
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "创建服务目录"
     api_name = "创建服务目录"

@@ -5,7 +5,7 @@
 
 
 
 
 
 
-from app.models import ServiceCatalog,db,Service
+from ..models import ServiceCatalog,db,Service
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "删除目录"
     api_name = "删除目录"

@@ -3,7 +3,7 @@
 #createtime:    2021/3/9
 #createtime:    2021/3/9
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.models import ServiceCatalog,db
+from ..models import ServiceCatalog,db
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import ServiceCatalog,db,Service
+from ..models import ServiceCatalog,db,Service
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import ServiceCatalog,Service
+from ..models import ServiceCatalog,Service
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from app.models import Service,ServiceCatalog,db
+from ..models import Service,ServiceCatalog,db
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -12,10 +12,8 @@ from . import image_server_list
 from . import data_list
 from . import data_list
 from . import capabilities
 from . import capabilities
 from . import image_tile,image_wms
 from . import image_tile,image_wms
-from . import image_service_list
 from . import image_tile_mask
 from . import image_tile_mask
 from . import image_wmts
 from . import image_wmts
-
 from . import image_delete
 from . import image_delete
 from . import image_cancle
 from . import image_cancle
 from . import image_register,image_list,image_info,image_edit,image_overview
 from . import image_register,image_list,image_info,image_edit,image_overview
@@ -23,10 +21,14 @@ from . import image_tag_create,image_tag_delete,image_tag_list
 from . import image_wms_temporary
 from . import image_wms_temporary
 from . import image_wms_kv
 from . import image_wms_kv
 
 
-class DataManager(BlueprintApi):
 
 
-    bp = Blueprint("Image", __name__, url_prefix="/API/Service/Image")
-    service_type = ["ImageWMS","ImageWMTS"]
+class ImageServerInstance:
+    pass
+
+class ImageManager(BlueprintApi):
+
+    bp = Blueprint("ImageService", __name__, url_prefix="/API/Service/Image")
+    service_type = ["影像服务"]
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
@@ -122,14 +124,7 @@ class DataManager(BlueprintApi):
         """
         """
         return image_service_register.Api().result
         return image_service_register.Api().result
 
 
-    @staticmethod
-    @bp.route('/ServiceList', methods=['GET'])
-    @swag_from(image_service_list.Api.api_doc)
-    def api_image_service_list():
-        """
-        服务列表
-        """
-        return image_service_list.Api().result
+
 
 
     @staticmethod
     @staticmethod
     @bp.route('/ServerList', methods=['GET'])
     @bp.route('/ServerList', methods=['GET'])

@@ -6,8 +6,8 @@
 
 
 from flask import Response
 from flask import Response
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from .models import ImageService
-from app.models import Service,TileScheme
+from ..models import ImageService
+from ..models import Service,TileScheme
 import json
 import json
 import configure
 import configure
 
 

@@ -12,7 +12,7 @@ import datetime
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
 import os
 import os
 from app.models import db
 from app.models import db
-from app.modules.service.image.models import Image
+from app.modules.service.models import Image
 from .util.ImageType import ImageType
 from .util.ImageType import ImageType
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -6,7 +6,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import json
 import json
-from .models import Image
+from ..models import Image
 import datetime
 import datetime
 from app.models import  db
 from app.models import  db
 
 

@@ -5,7 +5,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.models import  db
 from app.models import  db
-from .models import Image
+from ..models import Image
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "删除影像数据"
     api_name = "删除影像数据"

@@ -6,7 +6,7 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.modules.service.image.models import Image,db,ImageTag
+from app.modules.service.models import Image,db,ImageTag
 import datetime
 import datetime
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -7,7 +7,7 @@
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 
 
-from app.modules.service.image.models import Image,ImageTag
+from app.modules.service.models import Image,ImageTag
 from app.util.component.FileProcess import FileProcess
 from app.util.component.FileProcess import FileProcess
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -7,7 +7,7 @@
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.FileProcess import FileProcess
 from app.util.component.FileProcess import FileProcess
-from app.modules.service.image.models import Image,ImageTag
+from app.modules.service.models import Image,ImageTag
 from sqlalchemy import or_
 from sqlalchemy import or_
 import datetime
 import datetime
 
 
@@ -27,7 +27,7 @@ class Api(ApiTemplate):
             name = self.para.get("name")
             name = self.para.get("name")
             band = self.para.get("band")
             band = self.para.get("band")
             region = self.para.get("region")
             region = self.para.get("region")
-            tag_guid = self.para.get("tag_guid")
+            tag_guids = self.para.get("tag_guids")
             collect_time = self.para.get("collect_time")
             collect_time = self.para.get("collect_time")
 
 
             type = self.para.get("type")
             type = self.para.get("type")
@@ -53,13 +53,17 @@ class Api(ApiTemplate):
 
 
             if collect_time:
             if collect_time:
                 begin,end = collect_time.split(",")
                 begin,end = collect_time.split(",")
-                begin = datetime.datetime.strptime(begin,"%Y-%m-%d %H:%M:%S")
-                end = datetime.datetime.strptime(end, "%Y-%m-%d %H:%M:%S")
-                images.filter(Image.collect_time>=begin).filter(Image.collect_time<=end)
+                begin:datetime.datetime= datetime.datetime.strptime(begin,"%Y-%m-%d")
 
 
-            if tag_guid:
-                tag:ImageTag = ImageTag.query.filter_by(guid=tag_guid).one_or_none()
-                images_guid = [img.guid for img in tag.images.all()]
+                end = datetime.datetime.strptime(end, "%Y-%m-%d")
+                images = images.filter(Image.collect_time.__ge__(begin)).filter(Image.collect_time.__le__(end))
+
+            if tag_guids:
+                tag_guids = tag_guids.split(",")
+                tags = ImageTag.query.filter(ImageTag.guid.in_(tag_guids)).all()
+                images_guid = []
+                for tag in tags:
+                    images_guid.extend([img.guid for img in tag.images.all()])
                 images = images.filter(Image.guid.in_(images_guid))
                 images = images.filter(Image.guid.in_(images_guid))
 
 
 
 
@@ -112,7 +116,7 @@ class Api(ApiTemplate):
             {"name": "band",
             {"name": "band",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
-            {"name": "tag_guid",
+            {"name": "tag_guids",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
         ],
         ],

@@ -7,7 +7,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.StructuredPrint import StructurePrint
 
 
-from app.modules.service.image.models import Image
+from app.modules.service.models import Image
 
 
 import random
 import random
 
 

@@ -9,12 +9,12 @@ from osgeo.gdal import Dataset,Band
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
 import json
 import json
-from .models import Image
+from ..models import Image
 import datetime
 import datetime
 from app.models import  db
 from app.models import  db
 import uuid
 import uuid
 import os
 import os
-from .models import ImageTag
+from ..models import ImageTag
 from .util.ImageType import ImageType
 from .util.ImageType import ImageType
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -3,15 +3,15 @@
 #createtime:    2021/7/19
 #createtime:    2021/7/19
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.modules.service.image.models import ImageService,Image
-from app.models import db
+
+
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.models import Service
+from ..models import Service,ImageService,Image,db,ServiceFunction
 import datetime
 import datetime
 import json
 import json
 from .image_service_register import Api  as RegisterApi
 from .image_service_register import Api  as RegisterApi
 import configure
 import configure
-
+import uuid
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
@@ -28,19 +28,30 @@ class Api(ApiTemplate):
             service = Service.query.filter_by(guid=guid)
             service = Service.query.filter_by(guid=guid)
             this_time = datetime.datetime.now()
             this_time = datetime.datetime.now()
             image_guids = self.para.get("image_guids")
             image_guids = self.para.get("image_guids")
+            function_types = self.para.get("function_types")
 
 
             service_update = {}
             service_update = {}
             image_update = {}
             image_update = {}
+
             for key in self.para.keys():
             for key in self.para.keys():
-                if key in ["name","title","state","description","catalog_guid","type"]:
+                if key in ["name","title","state","description","catalog_guid"]:
                     service_update[key] = self.para.get(key)
                     service_update[key] = self.para.get(key)
                 if key in ["name","scheme_guid"]:
                 if key in ["name","scheme_guid"]:
                     image_update[key] = self.para.get(key)
                     image_update[key] = self.para.get(key)
 
 
+            image_service = ImageService.query.filter_by(service_guid=guid)
 
 
-
-            image_service = ImageService.query.filter_by(guid=Service.query.filter_by(guid=guid).one_or_none().service_guid)
-
+            # 修改功能
+            if function_types:
+                new_types = function_types.split(",")
+                old_functions = ServiceFunction.query.filter_by(service_guid=guid).all()
+                for function in old_functions:
+                    if function.type not in new_types:
+                        db.session.delete(function)
+                for new_type in new_types:
+                    if new_type not in [fun.type for fun in old_functions]:
+                        service_function = ServiceFunction(guid=uuid.uuid1().__str__())
+                        db.session.add(service_function)
 
 
             #修改影像
             #修改影像
             if image_guids:
             if image_guids:
@@ -63,7 +74,7 @@ class Api(ApiTemplate):
 
 
                     image_update["extent"] = json.dumps(image_service_exetent)
                     image_update["extent"] = json.dumps(image_service_exetent)
 
 
-            if service_update or image_update:
+            if service_update or image_update or function_types:
                 service_update["update_time"] = this_time
                 service_update["update_time"] = this_time
                 if image_guids:
                 if image_guids:
                     register_api = RegisterApi()
                     register_api = RegisterApi()
@@ -71,6 +82,7 @@ class Api(ApiTemplate):
                     service_update["overview"] = "http://{}/API/Service/Overview/{}".format(configure.deploy_ip_host, overview_file)
                     service_update["overview"] = "http://{}/API/Service/Overview/{}".format(configure.deploy_ip_host, overview_file)
 
 
                 service.update(service_update)
                 service.update(service_update)
+
             if image_update:
             if image_update:
                 image_service.update(image_update)
                 image_service.update(image_update)
 
 
@@ -91,31 +103,32 @@ class Api(ApiTemplate):
             {"name": "guid",
             {"name": "guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS,guid]"},
+             "description": "[地图服务，切片服务，影像服务]guid"},
 
 
             {"name": "name",
             {"name": "name",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
 
 
-            {"name": "type",
-             "in": "formData",
-             "type": "string",
-             "description": "修改服务类型"},
 
 
             {"name": "title",
             {"name": "title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "description",
             {"name": "description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
 
 
             {"name": "catalog_guid",
             {"name": "catalog_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
+
+            {"name": "function_types",
+             "in": "formData",
+             "type": "string",
+             "description": "[地图服务，切片服务，影像服务]以逗号相隔,可选WMTS，WMS"},
 
 
 
 
             {"name": "image_guids",
             {"name": "image_guids",

-# coding=utf-8
-#author:        4N
-#createtime:    2021/7/19
-#email:         nheweijun@sina.com
-
-from app.modules.service.image.models import ImageService
-
-from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ModelVisitor import ModelVisitor
-from sqlalchemy import or_
-class Api(ApiTemplate):
-
-    api_name = "影像服务List"
-
-    def process(self):
-
-        # 返回结果
-        res = {}
-
-        try:
-            page_index = int(self.para.get("page_index", "0"))
-            page_size = int(self.para.get("page_size", "10"))
-
-            alias = self.para.get("alias")
-            name = self.para.get("name")
-            type = self.para.get("type")
-
-            services = ImageService.query
-            if type:
-                services = services.filter_by(type=type)
-            # 并集
-            if alias and name:
-                services = services.filter(
-                    or_(ImageService.alias.like("%" + alias + "%"), ImageService.name.like("%" + name + "%")))
-            else:
-                if alias:
-                    services = services.filter(ImageService.alias.like("%" + alias + "%"))
-                if name:
-                    services = services.filter(ImageService.name.like("%" + name + "%"))
-
-
-            res["data"] = {}
-            res["data"]["count"] = services.count()
-            services = services.limit(page_size).offset(page_index * page_size).all()
-            res["data"]["list"] = ModelVisitor.objects_to_jsonarray(services)
-            res["result"] = True
-
-        except Exception as e:
-            raise e
-
-        return res
-
-    api_doc = {
-        "tags": ["影像接口"],
-        "parameters": [
-            {"name": "page_index",
-             "in": "formData",
-             "type": "int",
-             "description": "页"},
-            {"name": "page_size",
-             "in": "formData",
-             "type": "int",
-             "description": "页大小"},
-            {"name": "alias",
-             "in": "formData",
-             "type": "string",
-             "description": "服务别名"},
-            {"name": "name",
-             "in": "formData",
-             "type": "string",
-             "description": "服务名"},
-        ],
-        "responses": {
-            200: {
-                "schema": {
-                    "properties": {
-                    }
-                }
-            }
-        }
-    }

@@ -3,8 +3,8 @@
 #createtime:    2021/7/19
 #createtime:    2021/7/19
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from .models import ImageService,Image
-from app.models import db,Service
+
+from ..models import db,Service,ImageService,Image,ServiceFunction
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 import uuid
 
 
@@ -19,9 +19,14 @@ class Api(ApiTemplate):
 
 
     api_name = "注册影像服务"
     api_name = "注册影像服务"
 
 
-    def process(self):
+    def para_check(self):
+        if not self.para.get("function_types"):
+            raise Exception("缺乏影像服务类型！")
+        if self.para.get("function_types").__contains__("WMTS") and (not self.para.get("scheme_guid")):
+            raise Exception("选择WMTS功能，但是缺乏切片方案！")
 
 
 
 
+    def process(self):
 
 
         # 返回结果
         # 返回结果
         res = {}
         res = {}
@@ -29,11 +34,15 @@ class Api(ApiTemplate):
         try:
         try:
             guids = self.para.get("guids").split(",")
             guids = self.para.get("guids").split(",")
             name = self.para.get("name")
             name = self.para.get("name")
+            function_types = self.para.get("function_types")
+
 
 
             image_service_guid = uuid.uuid1().__str__()
             image_service_guid = uuid.uuid1().__str__()
+            service_guid = uuid.uuid1().__str__()
+            service_function_guid = uuid.uuid1().__str__()
+
 
 
             this_time = datetime.datetime.now()
             this_time = datetime.datetime.now()
-            service_guid = uuid.uuid1().__str__()
             image_service = ImageService(guid=image_service_guid,
             image_service = ImageService(guid=image_service_guid,
                                          name=name,
                                          name=name,
                                          create_time=this_time,
                                          create_time=this_time,
@@ -60,7 +69,7 @@ class Api(ApiTemplate):
 
 
             service = Service(
             service = Service(
                 guid = service_guid,
                 guid = service_guid,
-                name = self.para.get("name"),
+                name = name,
                 title = self.para.get("title"),
                 title = self.para.get("title"),
                 state = 1,
                 state = 1,
                 create_time = this_time,
                 create_time = this_time,
@@ -68,10 +77,17 @@ class Api(ApiTemplate):
                 description = self.para.get("description"),
                 description = self.para.get("description"),
                 #node = Column(Integer),
                 #node = Column(Integer),
                 type = self.para.get("type"),
                 type = self.para.get("type"),
-                service_guid = image_service_guid,
                 catalog_guid = self.para.get("catalog_guid")
                 catalog_guid = self.para.get("catalog_guid")
             )
             )
 
 
+
+
+            for type in function_types.split(","):
+                service_function = ServiceFunction(guid=service_function_guid,
+                                                   service_guid=service_guid,
+                                                   type=type)
+                db.session.add(service_function)
+
             db.session.add(service)
             db.session.add(service)
             db.session.add(image_service)
             db.session.add(image_service)
 
 
@@ -80,8 +96,8 @@ class Api(ApiTemplate):
             overview_file = self.get_overview(service,image_service)
             overview_file = self.get_overview(service,image_service)
             service.overview="http://{}/API/Service/Overview/{}".format(
             service.overview="http://{}/API/Service/Overview/{}".format(
                     configure.deploy_ip_host,overview_file)
                     configure.deploy_ip_host,overview_file)
-            db.session.commit()
 
 
+            db.session.commit()
             res["data"] = image_service_guid
             res["data"] = image_service_guid
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:
@@ -126,35 +142,39 @@ class Api(ApiTemplate):
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
              "required": "true",
              "required": "true",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "title",
             {"name": "title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "description",
             {"name": "description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "type",
             {"name": "type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "enum": ["WMS/WFS","WMTS","TMS","ImageWMS","ImageWMTS"],
+             "enum": ["地图服务","切片服务","影像服务"],
              "required": "true",
              "required": "true",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "catalog_guid",
             {"name": "catalog_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
 
 
             # 影像参数
             # 影像参数
             {"name": "guids",
             {"name": "guids",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[影像WMS,影像WMTS]影像guids，以英文逗号相隔"},
+             "description": "[影像服务]影像guids，以英文逗号相隔"},
             {"name": "scheme_guid",
             {"name": "scheme_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS,影像WMTS]切片方案"},
+             "description": "[影像服务]切片方案"},
+            {"name": "function_types",
+             "in": "formData",
+             "type": "string",
+             "description": "[影像服务]功能类型，以逗号相隔，可选WMTS，WMS"},
 
 
         ],
         ],
         "responses": {
         "responses": {
@@ -166,6 +186,3 @@ class Api(ApiTemplate):
             }
             }
         }
         }
     }
     }
-
-if __name__ == '__main__':
-    pass

@@ -5,7 +5,7 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from .models import ImageTag
+from ..models import ImageTag
 import uuid
 import uuid
 from app.models import db
 from app.models import db
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -6,7 +6,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.models import db
 from app.models import db
-from .models import ImageTag
+from ..models import ImageTag
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "delete tag"
     api_name = "delete tag"

@@ -6,7 +6,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
-from .models import ImageTag
+from ..models import ImageTag
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "获取tag列表"
     api_name = "获取tag列表"

@@ -154,7 +154,7 @@ class Api(ApiTemplate):
 
 
         except Exception as e:
         except Exception as e:
             print(traceback.format_exc())
             print(traceback.format_exc())
-            result["state"] = -1
+            result["result"] = False
             result["message"] = e.__str__()
             result["message"] = e.__str__()
             return result
             return result
 
 

@@ -13,8 +13,8 @@ from flask import Response
 
 
 import time
 import time
 import cv2
 import cv2
-from app.modules.service.image.models import ImageService,Image
-from app.models import db,TileScheme
+from app.modules.service.models import ImageService,Image
+from ..models import db,TileScheme
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 
 
 from app.util.component.SliceScheme import SliceScheme
 from app.util.component.SliceScheme import SliceScheme
@@ -211,7 +211,7 @@ class Api(ApiTemplate):
 
 
         except Exception as e:
         except Exception as e:
             print(traceback.format_exc())
             print(traceback.format_exc())
-            result["state"] = -1
+            result["result"] = False
             result["message"] = e.__str__()
             result["message"] = e.__str__()
             return result
             return result
 
 

@@ -3,19 +3,11 @@
 #createtime:    2021/3/24
 #createtime:    2021/3/24
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.util import *
-import traceback
-import numpy
-from flask import Response
-import random
-from app.modules.service.image.models import ImageService
+
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ParameterUtil import ParameterUtil
-import json
+
 from threading import Thread
 from threading import Thread
-from .util.ImageData import ImageData
-from .util.Cache import Cache
-from .util.Opencv import Opencv
+from .util.ImageWMSServer import ImageWMSServer
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
@@ -27,251 +19,19 @@ class Api(ApiTemplate):
         self.service_name = service_name
         self.service_name = service_name
 
 
     def process(self):
     def process(self):
-
-
-        result = {}
-        parameter: dict = self.para
-
         try:
         try:
-
-            parameter = ParameterUtil.to_lower(parameter)
-            if parameter.get("service_name"):
-                self.service_name = parameter.get("service_name")
-
-            #获取缓存信息
-            image_service_info, zoo, servers = Cache.cache_data(self.service_name, type="name")
-
-            re = parameter.get("request")
-            if re and re.__eq__("GetCapabilities"):
-                return self.get_capabilities(image_service_info["service"])
-
-            bbox = parameter.get("bbox")
-            width = int(parameter.get("width")) if parameter.get("width") else 256
-            height = int(parameter.get("height")) if parameter.get("height") else 256
-            image_type = parameter.get("format") if parameter.get("format") else "image/png"
-            quality = int(parameter.get("quality")) if parameter.get("quality") else 30
-
-            extent = [float(x) for x in bbox.split(",")]
-
-            intersect_image = [im for im in image_service_info["images"] if self.determin_intersect(json.loads(im.extent),extent)]
-
-            if len(intersect_image)>1:
-
-                # 结果矩阵
-                empty_list = [numpy.zeros((height,width), dtype=int) + 65536,
-                              numpy.zeros((height,width), dtype=int) + 65536,
-                              numpy.zeros((height,width), dtype=int) + 65536]
-
-                pixel_array = numpy.zeros((height,width,3), dtype=int)
-                thread_list = []
-
-                for image in intersect_image:
-                    #该影像的服务器，随机选取一个
-                    image_servers = image.server.split(",")
-                    image_servers = [ser for ser in image_servers if ser in servers]
-                    if len(image_servers)>0:
-                        indx = int(random.random() * len(image_servers))
-                        image_server = image_servers[indx]
-                    else:
-                        image_server = "None"
-                    bands = json.loads(image.band_view)
-
-                    image_data = ImageData(image_server, image)
-
-                    thread: MyThread = MyThread(image_data.get_data, args=(extent,bands,height,width))
-                    thread.start()
-                    thread_list.append(thread)
-
-
-                for thread in thread_list:
-                    thread.join()
-                    data = thread.get_result()
-
-                    # 掩膜在中央接口生成,合图
-                    mask = numpy.zeros((height,width), dtype=int)
-                    mask2 = numpy.zeros((height,width), dtype=int)
-                    jizhun = data[:, :, 0]
-                    mask[jizhun == 65536] = 1
-                    mask[jizhun != 65536] = 0
-                    mask2[jizhun == 65536] = 0
-                    mask2[jizhun != 65536] = 1
-                    # 掩膜计算
-                    for i, d in enumerate(empty_list):
-                        empty_list[i] = empty_list[i] * mask + data[:, :, i] * mask2
-
-                for ii in [0, 1, 2]:
-                    # opencv 颜色排序为GBR
-                    pixel_array[:, :, 2 - ii] = empty_list[ii]
-
-
-            elif len(intersect_image)==1:
-                # 该影像的服务器，随机选取一个
-                image = intersect_image[0]
-                image_servers = image.server.split(",")
-                image_servers = [ser for ser in image_servers if ser in servers]
-                if len(image_servers) > 0:
-                    indx = int(random.random() * len(image_servers))
-                    image_server = image_servers[indx]
-                else:
-                    image_server = "None"
-
-                bands = json.loads(image.band_view)
-
-                image_data = ImageData(image_server, image)
-
-                pixel_array_t = image_data.get_data(extent,bands,height,width)
-
-                pixel_array = numpy.zeros((height, width, 3), dtype=int)
-                for ii in [0, 1, 2]:
-                    # opencv 颜色排序为GBR
-                    pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
-            else:
-                # 结果矩阵
-                pixel_array = numpy.zeros((height, width, 3), dtype=int)+65536
-
-            # 将图片生成在内存中,然后直接返回response
-            im_data = Opencv.create_image(image_type, pixel_array, quality)
-
-            if self.para.get("overview"):
-                return pixel_array
-            return Response(im_data, mimetype=image_type.lower())
+            instance = ImageWMSServer()
+            response =  instance.wms(self.service_name,self.para)
 
 
         except Exception as e:
         except Exception as e:
-            print(traceback.format_exc())
-            result["state"] = -1
-            result["message"] = e.__str__()
-            return result
-
-
-
-    def determin_intersect(self, extent1, extent2):
-        if extent2[2] < extent1[0] or extent2[0] > extent1[2] or extent2[1] > extent1[
-            3] or extent2[3] < extent1[1]:
-            return False
-        else:
-            return True
-
-    def get_capabilities(self,image_service:ImageService):
+           raise e
+        return response
 
 
-        xml = '''<?xml version="1.0" encoding="utf-8" ?>
-        <WMS_Capabilities version="1.2.0">
-            <Service>
-                <Name>WMS</Name>
-                <Title>{service_title}</Title>
-                <Abstract>{abstract}</Abstract>
-                <Keywords>GIMS</Keywords>
-                <OnlineResource/>
-                <Fees>none</Fees>
-                <AccessConstraints>none</AccessConstraints>
-            </Service>
-            <Capability>
-                <Request>
-                    <GetCapabilities>
-                        <Format>text/xml</Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get>
-                                    <OnlineResource xlink:href="{url}" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-                                </Get>
-                            </HTTP>
-                        </DCPType>
-                    </GetCapabilities>
-                    <GetMap>
-                        <Format>png</Format>
-                        <Format>jpeg</Format>
-                        <Format>gif</Format>
-                        <Format>image/png</Format>
-                        <Format>image/jpeg</Format>
-                        <Format>image/gif</Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get>
-                                    <OnlineResource xlink:href="{url}" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-                                </Get>
-                            </HTTP>
-                        </DCPType>
-                    </GetMap>
-                    <Map>
-                        <Format>
-                            <PNG/>
-                            <GIF/>
-                            <JPG/>
-                        </Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get onlineResource="{url}"/>
-                            </HTTP>
-                        </DCPType>
-                    </Map>
-                    <Capabilities>
-                        <Format>
-                            <WMS_XML/>
-                        </Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get onlineResource="{url}"/>
-                            </HTTP>
-                        </DCPType>
-                    </Capabilities>
-                    <FeatureInfo>
-                        <Format>
-                            <XML/>
-                            <MIME/>
-                        </Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get onlineResource="{url}"/>
-                            </HTTP>
-                        </DCPType>
-                    </FeatureInfo>
-                </Request>
-                <Exception>
-                    <Format>
-                        <WMS_XML/>
-                        <INIMAGE/>
-                        <BLANK/>
-                    </Format>
-                </Exception>
-                <Layer>
-                    <Name>{service_name}</Name>
-                    <Title>{service_title}</Title>
-                    <CRS>{crs}</CRS>
-                    <BoundingBox CRS="{crs}" maxx="{maxx}" maxy="{maxy}" minx="{minx}" miny="{miny}"/>
-                    
-                    <Layer queryable="1">
-                        <CRS>{crs}</CRS>
-                        <Name>{layer_name}</Name>
-                        <Title>{layer_title}</Title>
-                        <BoundingBox CRS="{crs}" maxx="{maxx}" maxy="{maxy}" minx="{minx}" miny="{miny}"/>
-                    </Layer>
-                </Layer>
-            </Capability>
-        </WMS_Capabilities>'''
 
 
-        extent = json.loads(image_service.extent)
-        xml = xml.format(service_title=image_service.name,
-                         service_name=image_service.name,
-                         abstract= "None" ,
-                         crs="ESPG:4326",
-                         layer_name=image_service.name,
-                         layer_title=image_service.name,
-                         maxx=extent[2],
-                         maxy = extent[3],
-                         minx = extent[0],
-                         miny = extent[1],
-                         url="http://{}/API/Service/Image/WMS?guid={}".format(configure.deploy_ip_host,image_service.guid))
-
-
-        r = Response(response=xml, status=200, mimetype="application/xml")
-        r.headers["Content-Type"] = "text/xml; charset=utf-8"
-        return r
 
 
     api_doc = {
     api_doc = {
         "tags": ["影像接口"],
         "tags": ["影像接口"],
         "parameters": [
         "parameters": [
-            {"name": "guid",
-             "in": "query",
-             "type": "string"},
             {"name": "request",
             {"name": "request",
              "in": "query",
              "in": "query",
              "type": "string",
              "type": "string",

@@ -3,269 +3,24 @@
 #createtime:    2021/3/24
 #createtime:    2021/3/24
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.util import *
-import traceback
-import numpy
-from flask import Response
-import random
-from app.modules.service.image.models import ImageService
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ParameterUtil import ParameterUtil
-import json
 from threading import Thread
 from threading import Thread
-from .util.ImageData import ImageData
-from .util.Cache import Cache
-from .util.Opencv import Opencv
 
 
+from .util.ImageWMSServer import ImageWMSServer
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "WMS"
     api_name = "WMS"
 
 
     def process(self):
     def process(self):
-
-
-        result = {}
-        parameter: dict = self.para
-
         try:
         try:
-
-            parameter = ParameterUtil.to_lower(parameter)
-            if parameter.get("guid"):
-                self.guid = parameter.get("guid")
-
-            #获取缓存信息
-            if parameter.get("guid"):
-
-                image_service_info, zoo, servers = Cache.cache_data(self.guid, type="guid")
-            else:
-                image_service_info, zoo, servers = Cache.cache_data(parameter.get("service_name"), type="name")
-
-            re = parameter.get("request")
-            if re and re.__eq__("GetCapabilities"):
-                return self.get_capabilities(image_service_info["service"])
-
-            bbox = parameter.get("bbox")
-            width = int(parameter.get("width")) if parameter.get("width") else 256
-            height = int(parameter.get("height")) if parameter.get("height") else 256
-            image_type = parameter.get("format") if parameter.get("format") else "image/png"
-            quality = int(parameter.get("quality")) if parameter.get("quality") else 30
-
-
-
-            extent = [float(x) for x in bbox.split(",")]
-
-            intersect_image = [im for im in image_service_info["images"] if self.determin_intersect(json.loads(im.extent),extent)]
-
-            if len(intersect_image)>1:
-
-                # 结果矩阵
-                empty_list = [numpy.zeros((height,width), dtype=int) + 65536,
-                              numpy.zeros((height,width), dtype=int) + 65536,
-                              numpy.zeros((height,width), dtype=int) + 65536]
-
-                pixel_array = numpy.zeros((height,width,3), dtype=int)
-                thread_list = []
-
-                for image in intersect_image:
-                    #该影像的服务器，随机选取一个
-                    image_servers = image.server.split(",")
-                    image_servers = [ser for ser in image_servers if ser in servers]
-                    if len(image_servers)>0:
-                        indx = int(random.random() * len(image_servers))
-                        image_server = image_servers[indx]
-                    else:
-                        image_server = "None"
-                    bands = json.loads(image.band_view)
-
-                    image_data = ImageData(image_server, image)
-
-                    thread: MyThread = MyThread(image_data.get_data, args=(extent,bands,height,width))
-                    thread.start()
-                    thread_list.append(thread)
-
-
-                for thread in thread_list:
-                    thread.join()
-                    data = thread.get_result()
-
-                    # 掩膜在中央接口生成,合图
-                    mask = numpy.zeros((height,width), dtype=int)
-                    mask2 = numpy.zeros((height,width), dtype=int)
-                    jizhun = data[:, :, 0]
-                    mask[jizhun == 65536] = 1
-                    mask[jizhun != 65536] = 0
-                    mask2[jizhun == 65536] = 0
-                    mask2[jizhun != 65536] = 1
-                    # 掩膜计算
-                    for i, d in enumerate(empty_list):
-                        empty_list[i] = empty_list[i] * mask + data[:, :, i] * mask2
-
-                for ii in [0, 1, 2]:
-                    # opencv 颜色排序为GBR
-                    pixel_array[:, :, 2 - ii] = empty_list[ii]
-
-
-            elif len(intersect_image)==1:
-                # 该影像的服务器，随机选取一个
-                image = intersect_image[0]
-                image_servers = image.server.split(",")
-                image_servers = [ser for ser in image_servers if ser in servers]
-                if len(image_servers) > 0:
-                    indx = int(random.random() * len(image_servers))
-                    image_server = image_servers[indx]
-                else:
-                    image_server = "None"
-
-                bands = json.loads(image.band_view)
-
-                image_data = ImageData(image_server, image)
-
-                pixel_array_t = image_data.get_data(extent,bands,height,width)
-
-                pixel_array = numpy.zeros((height, width, 3), dtype=int)
-                for ii in [0, 1, 2]:
-                    # opencv 颜色排序为GBR
-                    pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
+            instance = ImageWMSServer()
+            if self.para.get("guid"):
+                response = instance.wms(self.para.get("service_name"),self.para)
             else:
             else:
-                # 结果矩阵
-                pixel_array = numpy.zeros((height, width, 3), dtype=int)+65536
-
-            # 将图片生成在内存中,然后直接返回response
-            im_data = Opencv.create_image(image_type, pixel_array, quality)
-
-            if self.para.get("overview"):
-                return pixel_array
-            return Response(im_data, mimetype=image_type.lower())
-
+                response = instance.wms(self.para.get("guid"), self.para,type="guid")
         except Exception as e:
         except Exception as e:
-            print(traceback.format_exc())
-            result["state"] = -1
-            result["message"] = e.__str__()
-            return result
-
-
-
-    def determin_intersect(self, extent1, extent2):
-        if extent2[2] < extent1[0] or extent2[0] > extent1[2] or extent2[1] > extent1[
-            3] or extent2[3] < extent1[1]:
-            return False
-        else:
-            return True
-
-    def get_capabilities(self,image_service:ImageService):
-
-        xml = '''<?xml version="1.0" encoding="utf-8" ?>
-        <WMS_Capabilities version="1.2.0">
-            <Service>
-                <Name>WMS</Name>
-                <Title>{service_title}</Title>
-                <Abstract>{abstract}</Abstract>
-                <Keywords>GIMS</Keywords>
-                <OnlineResource/>
-                <Fees>none</Fees>
-                <AccessConstraints>none</AccessConstraints>
-            </Service>
-            <Capability>
-                <Request>
-                    <GetCapabilities>
-                        <Format>text/xml</Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get>
-                                    <OnlineResource xlink:href="{url}" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-                                </Get>
-                            </HTTP>
-                        </DCPType>
-                    </GetCapabilities>
-                    <GetMap>
-                        <Format>png</Format>
-                        <Format>jpeg</Format>
-                        <Format>gif</Format>
-                        <Format>image/png</Format>
-                        <Format>image/jpeg</Format>
-                        <Format>image/gif</Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get>
-                                    <OnlineResource xlink:href="{url}" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-                                </Get>
-                            </HTTP>
-                        </DCPType>
-                    </GetMap>
-                    <Map>
-                        <Format>
-                            <PNG/>
-                            <GIF/>
-                            <JPG/>
-                        </Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get onlineResource="{url}"/>
-                            </HTTP>
-                        </DCPType>
-                    </Map>
-                    <Capabilities>
-                        <Format>
-                            <WMS_XML/>
-                        </Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get onlineResource="{url}"/>
-                            </HTTP>
-                        </DCPType>
-                    </Capabilities>
-                    <FeatureInfo>
-                        <Format>
-                            <XML/>
-                            <MIME/>
-                        </Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get onlineResource="{url}"/>
-                            </HTTP>
-                        </DCPType>
-                    </FeatureInfo>
-                </Request>
-                <Exception>
-                    <Format>
-                        <WMS_XML/>
-                        <INIMAGE/>
-                        <BLANK/>
-                    </Format>
-                </Exception>
-                <Layer>
-                    <Name>{service_name}</Name>
-                    <Title>{service_title}</Title>
-                    <CRS>{crs}</CRS>
-                    <BoundingBox CRS="{crs}" maxx="{maxx}" maxy="{maxy}" minx="{minx}" miny="{miny}"/>
-                    
-                    <Layer queryable="1">
-                        <CRS>{crs}</CRS>
-                        <Name>{layer_name}</Name>
-                        <Title>{layer_title}</Title>
-                        <BoundingBox CRS="{crs}" maxx="{maxx}" maxy="{maxy}" minx="{minx}" miny="{miny}"/>
-                    </Layer>
-                </Layer>
-            </Capability>
-        </WMS_Capabilities>'''
-
-        extent = json.loads(image_service.extent)
-        xml = xml.format(service_title=image_service.name,
-                         service_name=image_service.name,
-                         abstract= "None" ,
-                         crs="ESPG:4326",
-                         layer_name=image_service.name,
-                         layer_title=image_service.name,
-                         maxx=extent[2],
-                         maxy = extent[3],
-                         minx = extent[0],
-                         miny = extent[1],
-                         url="http://{}/API/Service/Image/WMS?guid={}".format(configure.deploy_ip_host,image_service.guid))
-
-
-        r = Response(response=xml, status=200, mimetype="application/xml")
-        r.headers["Content-Type"] = "text/xml; charset=utf-8"
-        return r
+           raise e
+        return response
 
 
     api_doc = {
     api_doc = {
         "tags": ["影像接口"],
         "tags": ["影像接口"],
@@ -273,6 +28,9 @@ class Api(ApiTemplate):
             {"name": "guid",
             {"name": "guid",
              "in": "query",
              "in": "query",
              "type": "string"},
              "type": "string"},
+            {"name": "service_name",
+             "in": "query",
+             "type": "string"},
             {"name": "bbox",
             {"name": "bbox",
              "in": "query",
              "in": "query",
              "type": "string"},
              "type": "string"},

@@ -9,7 +9,7 @@ import numpy
 from flask import Response
 from flask import Response
 import random
 import random
 
 
-from app.modules.service.image.models import Image
+from app.modules.service.models import Image
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 
 
 from app.util.component.ParameterUtil import ParameterUtil
 from app.util.component.ParameterUtil import ParameterUtil
@@ -152,7 +152,7 @@ class Api(ApiTemplate):
 
 
         except Exception as e:
         except Exception as e:
             print(traceback.format_exc())
             print(traceback.format_exc())
-            result["state"] = -1
+            result["result"] = False
             result["message"] = e.__str__()
             result["message"] = e.__str__()
             return result
             return result
 
 

@@ -3,331 +3,29 @@
 #createtime:    2021/3/24
 #createtime:    2021/3/24
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.util import *
 import traceback
 import traceback
-import numpy
-from flask import Response
-from .util.ImageData import ImageData
-
-from app.modules.service.image.models import ImageService
-from app.models import TileScheme,Service
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.SliceScheme import SliceScheme
-from app.util.component.ParameterUtil import ParameterUtil
-import json
-import random
-import copy
-from .util.Opencv import Opencv
-from .util.Cache import Cache
-from .util.MyThread import MyThread
 
 
+from .util.ImageWMTSServer import ImageWMTSServer
 class Api(ApiTemplate):
 class Api(ApiTemplate):
-
     api_name = "切片"
     api_name = "切片"
-
     def __init__(self,service_name):
     def __init__(self,service_name):
         super().__init__()
         super().__init__()
         self.service_name = service_name
         self.service_name = service_name
 
 
     def process(self):
     def process(self):
-
-        result = {}
-        parameter: dict = self.para
-
         try:
         try:
-            if parameter.get("service_name"):
-                self.service_name = parameter.get("service_name")
-
-            #获取缓存数据
-            image_service_info, zoo, servers = Cache.cache_data(self.service_name,type="name")
-
-            # 转换参数
-            parameter = ParameterUtil.to_lower(parameter)
-
-            re = parameter.get("request")
-            if re and re.__eq__("GetCapabilities"):
-                service = Service.query.filter_by(guid=image_service_info["service"].service_guid).one_or_none()
-                return self.get_capabilities(image_service_info["service"],service)
-
-            if parameter.get("tilematrix"):
-                if parameter.get("tilematrix").__contains__(":"):
-                    self.level = int(parameter.get("tilematrix").split(":")[-1])
-                else:
-                    self.level = int(parameter.get("tilematrix"))
-            if parameter.get("tilerow"):
-                self.row = int(parameter.get("tilerow"))
-            if parameter.get("tilecol"):
-                self.col = int(parameter.get("tilecol"))
-
-            image_type = parameter.get("format") if parameter.get("format") else "image/png"
-            quality = int(parameter.get("quality")) if parameter.get("quality") else 30
-            slice_para = image_service_info["scheme"]
-            extent = SliceScheme.get_polygon(slice_para, self.level, self.row, self.col)
-
-            height, width = 256,256
-
-            # 多线程获取分布式数据
-
-            intersect_image = [im for im in image_service_info["images"] if self.determin_intersect(json.loads(im.extent),extent)]
-
-            if len(intersect_image) > 1:
-
-                # 结果矩阵
-                pixel_array = numpy.zeros((height, width, 3), dtype=int) + 65536
-
-                thread_list = []
-
-                for image in intersect_image:
-
-                    # 该影像的服务器，随机选取一个
-                    image_servers = image.server.split(",")
-                    image_servers = [ser for ser in image_servers if ser in servers]
-                    if len(image_servers)>0:
-                        indx = int(random.random() * len(image_servers))
-                        image_server = image_servers[indx]
-                    else:
-                        image_server = "None"
-
-                    bands = json.loads(image.band_view)
-
-                    image_data = ImageData(image_server,image)
-
-                    thread: MyThread = MyThread(image_data.get_data,args=(extent, bands, height, width))
-
-                    thread.start()
-                    thread_list.append(thread)
-
-                for thread in thread_list:
-                    thread.join()
-                    data = thread.get_result()
-
-                    # 掩膜在中央接口生成,合图
-                    mask = numpy.zeros((height, width, 3), dtype=int)
-                    mask_data = numpy.zeros((height, width, 3), dtype=int)
-
-                    mask[data == 65536] = 1
-                    mask[data != 65536] = 0
-                    mask_data[data == 65536] = 0
-                    mask_data[data != 65536] = 1
-
-                    # # 掩膜计算
-                    pixel_array = pixel_array * mask + data * mask_data
-
-                # opencv 颜色排序为GBR
-                d1 = copy.copy(pixel_array[:,:,0])
-                pixel_array[:, :, 0] = pixel_array[:,:,2]
-                pixel_array[:, :, 2] = d1
-
-
-            elif len(intersect_image) == 1:
-                # 该影像的服务器，随机选取一个
-                image = intersect_image[0]
-                image_servers = image.server.split(",")
-                #判断可用服务器
-                image_servers = [ser for ser in image_servers if ser in servers]
-                if len(image_servers) > 0:
-                    indx = int(random.random() * len(image_servers))
-                    image_server = image_servers[indx]
-                else:
-                    image_server = "None"
-                # image_server = image_servers[0]
-                bands = json.loads(image.band_view)
-
-                image_data = ImageData(image_server, image)
-                pixel_array_t: numpy.ndarray = image_data.get_data(extent, bands, height, width)
-                pixel_array = numpy.zeros((height, width, 3), dtype=int)
-
-                for ii in [0, 1, 2]:
-                    # opencv 颜色排序为GBR
-                    pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
-
-            else:
-                # 结果矩阵
-                pixel_array = numpy.zeros((height, width, 3), dtype=int) + 65536
-
-
-
-
-            # 将图片生成在内存中,然后直接返回response
-            im_data = Opencv.create_image(image_type, pixel_array, quality)
-            return Response(im_data, mimetype=image_type.lower())
-
-
+            instance = ImageWMTSServer()
+            response =  instance.wmts(self.service_name,self.para)
         except Exception as e:
         except Exception as e:
             print(traceback.format_exc())
             print(traceback.format_exc())
-            result["state"] = -1
-            result["message"] = e.__str__()
-            return result
-
-    def get_capabilities(self, image_service: ImageService, service: Service):
-        tile_scheme: TileScheme = TileScheme.query.filter_by(guid=image_service.scheme_guid).one_or_none()
-        if not tile_scheme:
-            raise Exception("切片方案不存在！")
-
-        xml = '''<Capabilities xmlns="http://www.opengis.net/wmts/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd" version="1.0.0">
-             <!--  Service Identification  -->
-             <ows:ServiceIdentification>
-             <ows:Title>{title}</ows:Title>
-             <ows:ServiceType>OGC WMTS</ows:ServiceType>
-             <ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
-             </ows:ServiceIdentification>
-
-             <!--  Operations Metadata  -->
-             <ows:OperationsMetadata>
-             <ows:Operation name="GetCapabilities">
-             <ows:DCP>
-             <ows:HTTP>
-             <ows:Get xlink:href="{capabilities_url}">
-             <ows:Constraint name="GetEncoding">
-             <ows:AllowedValues>
-             <ows:Value>RESTful</ows:Value>
-             </ows:AllowedValues>
-             </ows:Constraint>
-             </ows:Get>
-
-             <!--  add KVP binding in 10.1  -->
-             <ows:Get xlink:href="{tile_url}?">
-             <ows:Constraint name="GetEncoding">
-             <ows:AllowedValues>
-             <ows:Value>KVP</ows:Value>
-             </ows:AllowedValues>
-             </ows:Constraint>
-             </ows:Get>
-             </ows:HTTP>
-             </ows:DCP>
-             </ows:Operation>
-             <ows:Operation name="GetTile">
-             <ows:DCP>
-             <ows:HTTP>
-             <ows:Get xlink:href="{tile_url}">
-             <ows:Constraint name="GetEncoding">
-             <ows:AllowedValues>
-             <ows:Value>RESTful</ows:Value>
-             </ows:AllowedValues>
-             </ows:Constraint>
-             </ows:Get>
-             <ows:Get xlink:href="{tile_url}?">
-             <ows:Constraint name="GetEncoding">
-             <ows:AllowedValues>
-             <ows:Value>KVP</ows:Value>
-             </ows:AllowedValues>
-             </ows:Constraint>
-             </ows:Get>
-             </ows:HTTP>
-             </ows:DCP>
-             </ows:Operation>
-             </ows:OperationsMetadata>
-
-             <Contents>
-
-             <!-- Layer -->
-
-
-             <Layer>
-             <ows:Title>{title}</ows:Title>
-             <ows:Identifier>{title}</ows:Identifier>
-             <ows:BoundingBox crs="{crs}">
-             <ows:LowerCorner>{xmin} {ymin}</ows:LowerCorner>
-             <ows:UpperCorner>{xmax} {ymax}</ows:UpperCorner>
-             </ows:BoundingBox>
-
-             <Style isDefault="true">
-             <ows:Title>Default Style</ows:Title>
-             <ows:Identifier>default</ows:Identifier>
-             </Style>
-             <Format>image/png</Format>
-             <TileMatrixSetLink>
-             <TileMatrixSet>{tile_name}</TileMatrixSet>
-             </TileMatrixSetLink>
-
-             <ResourceURL format="image/png" resourceType="tile" template="{tile_url}"/>
-
-             </Layer>
-
-             <!-- TileMatrixSet -->
-
-
-             <TileMatrixSet>
-
-             <TileMatrix>
-             <ows:Title>{tile_title}</ows:Title>
-             <ows:Abstract>{tile_description}</ows:Abstract>
-             <ows:Identifier>{tile_name}</ows:Identifier>
-             <ows:SupportedCRS>{crs}</ows:SupportedCRS>
-
-             {tile_matrix}
-
-             </TileMatrix>
-
-             </TileMatrixSet>
-
-
-             </Contents>
-             <ServiceMetadataURL xlink:href="{capabilities_url}"/>
-             </Capabilities>'''
-
-        tile_matrix_each = '''
-             <TileMatrix>
-             <ows:Identifier>{lev}</ows:Identifier>
-             <ScaleDenominator>{scale}</ScaleDenominator>
-             <TopLeftCorner>{top_left}</TopLeftCorner>
-             <TileWidth>{cols}</TileWidth>
-             <TileHeight>{rows}</TileHeight>
-             </TileMatrix>
-        '''
-
-        tile_matrix = ""
-        top_left = tile_scheme.top_left
-        for level in json.loads(tile_scheme.levels):
-            tile_matrix = "{}{}".format(tile_matrix, tile_matrix_each.format(lev=level["level"],
-                                                                             scale=level["scale"],
-                                                                             top_left=top_left,
-                                                                             cols=tile_scheme.cols,
-                                                                             rows=tile_scheme.rows))
-
-        extent = json.loads(image_service.extent)
-
-        xml = xml.format(
-            capabilities_url="http://{}/API/Service/Image/Capabilities?guid={}".format(configure.deploy_ip_host,
-                                                                                       image_service.guid),
-            tile_url="http://{}/API/Service/Image/Tile?guid={}".format(configure.deploy_ip_host, image_service.guid),
-            crs=tile_scheme.crs,
-            xmin=extent[0],
-            ymin=extent[1],
-            xmax=extent[2],
-            ymax=extent[3],
-            # TileMatrix = "{TileMatrix}",
-            # TileRow = "{TileRow}",
-            # TileCol = "{TileCol}",
-            guid=image_service.guid,
-            title=service.title,
-            tile_title=tile_scheme.name,
-            tile_name=tile_scheme.name,
-            tile_description=tile_scheme.description,
-            tile_matrix=tile_matrix
-            )
-
-        r = Response(response=xml, status=200, mimetype="application/xml")
-        r.headers["Content-Type"] = "text/xml; charset=utf-8"
-
-        return r
-
-
-
-    def determin_intersect(self, extent1, extent2):
-        if extent2[2] < extent1[0] or extent2[0] > extent1[2] or extent2[1] > extent1[
-            3] or extent2[3] < extent1[1]:
-            return False
-        else:
-            return True
+            raise e
+        return response
 
 
 
 
     api_doc = {
     api_doc = {
         "tags": ["影像接口"],
         "tags": ["影像接口"],
         "parameters": [
         "parameters": [
-            {"name": "guid",
-             "in": "formData",
-             "type": "string"},
             {"name": "request",
             {"name": "request",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",

-# coding=utf-8
-#author:        4N
-#createtime:    2021/6/11
-#email:         nheweijun@sina.com
-
-
-from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, Time,Binary,Float
-from app.models import db
-
-
-
-class Image(db.Model):
-    '''
-    影像元数据
-    '''
-    __tablename__ = 'dmap_image'
-    guid = Column(String(256), primary_key=True)
-    name = Column(String)
-    alias = Column(String)
-    raster_y_size = Column(Integer)#图像y 分辨率
-    raster_x_size = Column(Integer)#图像x 分辨率
-    overview_count = Column(Integer)#金字塔等级
-    extent = Column(String)#范围
-    # geo_origin_extent = Column(String)
-    null_value = Column(Integer)#空值
-    available = Column(Integer)#影像是否可用，不可用可能在创建金字塔中
-    band_count = Column(Integer)#波段数
-    band_view = Column(String)#波段设置
-    path = Column(String)
-    server = Column(String)
-
-    size = Column(Float)
-    #坐标wkt
-    crs_wkt = Column(Text) #坐标wkt
-    crs_proj4 = Column(Text)#坐标proj
-    crs = Column(String)#坐标
-    create_time = Column(DateTime)
-    update_time = Column(DateTime)
-    cell_x_size = Column(Float)#像元x大小
-    cell_y_size = Column(Float)#像元y大小
-    region = Column(Text)
-
-    collect_time = Column(DateTime) #成像时间年份
-
-    satellite = Column(String)#卫星类型
-    type = Column(String(128))
-
-
-dmap_image_rel = db.Table('dmap_image_rel',
-    Column('image_guid',String, ForeignKey('dmap_image.guid')),
-    Column('service_guid', String, ForeignKey('dmap_image_service.guid'))
-    )
-
-
-
-class ImageService(db.Model):
-    '''
-    影像服务
-    '''
-    __tablename__ = 'dmap_image_service'
-    guid = Column(String(256), primary_key=True)
-    name = Column(String)
-    scheme_guid = Column(String)
-    extent = Column(String(256))
-    # node = Column(Integer)
-    #可视范围geojson
-    visual_region = Column(Text)
-    crs = Column(String(256))
-    create_time = Column(DateTime)
-    # service_guid = Column(String, ForeignKey('dmap_service.guid'))
-
-    service_guid = Column(String)
-
-    images  = db.relationship('Image',
-                              secondary=dmap_image_rel,
-                              backref='image_services',
-                              lazy='dynamic'
-                              )
-
-
-dmap_image_tag_rel = db.Table('dmap_image_tag_rel',
-    Column('image_guid',String, ForeignKey('dmap_image.guid')),
-    Column('tag_guid', String, ForeignKey('dmap_image_tag.guid'))
-    )
-
-class ImageTag(db.Model):
-    '''
-    影像标签
-    '''
-    __tablename__ = 'dmap_image_tag'
-    guid = Column(String(256), primary_key=True)
-    name=Column(String(256))
-    alias = Column(String(256))
-    images  = db.relationship('Image',
-                              secondary=dmap_image_tag_rel,
-                              backref='image_tags',
-                              lazy='dynamic'
-                              )

@@ -7,8 +7,8 @@
 from kazoo.client import KazooClient
 from kazoo.client import KazooClient
 import configure
 import configure
 import time
 import time
-from app.modules.service.image.models import ImageService
-from app.models import TileScheme,Service
+from app.modules.service.models import ImageService
+from app.modules.service.models import TileScheme,Service
 import json
 import json
 
 
 class Cache:
 class Cache:

+# coding=utf-8
+#author:        4N
+#createtime:    2021/10/26
+#email:         nheweijun@sina.com
+
+
+class ImageServer:
+    pass

+# coding=utf-8
+#author:        4N
+#createtime:    2021/10/26
+#email:         nheweijun@sina.com
+
+
+import numpy
+from app.util.component.ParameterUtil import ParameterUtil
+from .Cache import Cache
+from app.modules.service.models import ImageService
+from flask import Response
+from .ImageData import ImageData
+from .MyThread import MyThread
+from .Opencv import Opencv
+import json
+import random
+import configure
+import threading
+from .ImageServer import ImageServer
+
+
+class ImageWMSServer(ImageServer):
+
+    _instance_lock = threading.Lock()
+    singleton = None
+
+    def __init__(self):
+        pass
+
+    def __new__(cls, *args, **kwargs):
+        if not cls.singleton:
+            with ImageWMSServer._instance_lock:
+                cls.singleton = super().__new__(cls)
+        return cls.singleton
+
+    def wms(self,service_name,parameter,type="name"):
+
+        # 获取缓存信息
+        image_service_info, zoo, servers = Cache.cache_data(service_name, type=type)
+        # 转换参数
+        parameter = ParameterUtil.to_lower(parameter)
+        re = parameter.get("request")
+        if re and re.__eq__("GetCapabilities"):
+            return self.get_wms_capabilities(image_service_info["service"])
+
+        bbox = parameter.get("bbox")
+        width = int(parameter.get("width")) if parameter.get("width") else 256
+        height = int(parameter.get("height")) if parameter.get("height") else 256
+        image_type = parameter.get("format") if parameter.get("format") else "image/png"
+        quality = int(parameter.get("quality")) if parameter.get("quality") else 30
+
+        extent = [float(x) for x in bbox.split(",")]
+
+        intersect_image = [im for im in image_service_info["images"] if
+                           self.determin_intersect(json.loads(im.extent), extent)]
+
+        if len(intersect_image) > 1:
+
+            # 结果矩阵
+            empty_list = [numpy.zeros((height, width), dtype=int) + 65536,
+                          numpy.zeros((height, width), dtype=int) + 65536,
+                          numpy.zeros((height, width), dtype=int) + 65536]
+
+            pixel_array = numpy.zeros((height, width, 3), dtype=int)
+            thread_list = []
+
+            for image in intersect_image:
+                # 该影像的服务器，随机选取一个
+                image_servers = image.server.split(",")
+                image_servers = [ser for ser in image_servers if ser in servers]
+                if len(image_servers) > 0:
+                    indx = int(random.random() * len(image_servers))
+                    image_server = image_servers[indx]
+                else:
+                    image_server = "None"
+                bands = json.loads(image.band_view)
+
+                image_data = ImageData(image_server, image)
+
+                thread: MyThread = MyThread(image_data.get_data, args=(extent, bands, height, width))
+                thread.start()
+                thread_list.append(thread)
+
+            for thread in thread_list:
+                thread.join()
+                data = thread.get_result()
+
+                # 掩膜在中央接口生成,合图
+                mask = numpy.zeros((height, width), dtype=int)
+                mask2 = numpy.zeros((height, width), dtype=int)
+                jizhun = data[:, :, 0]
+                mask[jizhun == 65536] = 1
+                mask[jizhun != 65536] = 0
+                mask2[jizhun == 65536] = 0
+                mask2[jizhun != 65536] = 1
+                # 掩膜计算
+                for i, d in enumerate(empty_list):
+                    empty_list[i] = empty_list[i] * mask + data[:, :, i] * mask2
+
+            for ii in [0, 1, 2]:
+                # opencv 颜色排序为GBR
+                pixel_array[:, :, 2 - ii] = empty_list[ii]
+
+
+        elif len(intersect_image) == 1:
+            # 该影像的服务器，随机选取一个
+            image = intersect_image[0]
+            image_servers = image.server.split(",")
+            image_servers = [ser for ser in image_servers if ser in servers]
+            if len(image_servers) > 0:
+                indx = int(random.random() * len(image_servers))
+                image_server = image_servers[indx]
+            else:
+                image_server = "None"
+
+            bands = json.loads(image.band_view)
+
+            image_data = ImageData(image_server, image)
+
+            pixel_array_t = image_data.get_data(extent, bands, height, width)
+
+            pixel_array = numpy.zeros((height, width, 3), dtype=int)
+            for ii in [0, 1, 2]:
+                # opencv 颜色排序为GBR
+                pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
+        else:
+            # 结果矩阵
+            pixel_array = numpy.zeros((height, width, 3), dtype=int) + 65536
+
+        # 将图片生成在内存中,然后直接返回response
+        im_data = Opencv.create_image(image_type, pixel_array, quality)
+
+        if parameter.get("overview"):
+            return pixel_array
+        return Response(im_data, mimetype=image_type.lower())
+
+
+    def get_wms_capabilities(self, image_service: ImageService):
+
+        xml = '''<?xml version="1.0" encoding="utf-8" ?>
+        <WMS_Capabilities version="1.2.0">
+            <Service>
+                <Name>WMS</Name>
+                <Title>{service_title}</Title>
+                <Abstract>{abstract}</Abstract>
+                <Keywords>GIMS</Keywords>
+                <OnlineResource/>
+                <Fees>none</Fees>
+                <AccessConstraints>none</AccessConstraints>
+            </Service>
+            <Capability>
+                <Request>
+                    <GetCapabilities>
+                        <Format>text/xml</Format>
+                        <DCPType>
+                            <HTTP>
+                                <Get>
+                                    <OnlineResource xlink:href="{url}" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+                                </Get>
+                            </HTTP>
+                        </DCPType>
+                    </GetCapabilities>
+                    <GetMap>
+                        <Format>png</Format>
+                        <Format>jpeg</Format>
+                        <Format>gif</Format>
+                        <Format>image/png</Format>
+                        <Format>image/jpeg</Format>
+                        <Format>image/gif</Format>
+                        <DCPType>
+                            <HTTP>
+                                <Get>
+                                    <OnlineResource xlink:href="{url}" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+                                </Get>
+                            </HTTP>
+                        </DCPType>
+                    </GetMap>
+                    <Map>
+                        <Format>
+                            <PNG/>
+                            <GIF/>
+                            <JPG/>
+                        </Format>
+                        <DCPType>
+                            <HTTP>
+                                <Get onlineResource="{url}"/>
+                            </HTTP>
+                        </DCPType>
+                    </Map>
+                    <Capabilities>
+                        <Format>
+                            <WMS_XML/>
+                        </Format>
+                        <DCPType>
+                            <HTTP>
+                                <Get onlineResource="{url}"/>
+                            </HTTP>
+                        </DCPType>
+                    </Capabilities>
+                    <FeatureInfo>
+                        <Format>
+                            <XML/>
+                            <MIME/>
+                        </Format>
+                        <DCPType>
+                            <HTTP>
+                                <Get onlineResource="{url}"/>
+                            </HTTP>
+                        </DCPType>
+                    </FeatureInfo>
+                </Request>
+                <Exception>
+                    <Format>
+                        <WMS_XML/>
+                        <INIMAGE/>
+                        <BLANK/>
+                    </Format>
+                </Exception>
+                <Layer>
+                    <Name>{service_name}</Name>
+                    <Title>{service_title}</Title>
+                    <CRS>{crs}</CRS>
+                    <BoundingBox CRS="{crs}" maxx="{maxx}" maxy="{maxy}" minx="{minx}" miny="{miny}"/>
+
+                    <Layer queryable="1">
+                        <CRS>{crs}</CRS>
+                        <Name>{layer_name}</Name>
+                        <Title>{layer_title}</Title>
+                        <BoundingBox CRS="{crs}" maxx="{maxx}" maxy="{maxy}" minx="{minx}" miny="{miny}"/>
+                    </Layer>
+                </Layer>
+            </Capability>
+        </WMS_Capabilities>'''
+
+        extent = json.loads(image_service.extent)
+        xml = xml.format(service_title=image_service.name,
+                         service_name=image_service.name,
+                         abstract="None",
+                         crs="ESPG:4326",
+                         layer_name=image_service.name,
+                         layer_title=image_service.name,
+                         maxx=extent[2],
+                         maxy=extent[3],
+                         minx=extent[0],
+                         miny=extent[1],
+                         url="http://{}/API/Service/Image/WMS?guid={}".format(configure.deploy_ip_host,
+                                                                              image_service.guid))
+
+        r = Response(response=xml, status=200, mimetype="application/xml")
+        r.headers["Content-Type"] = "text/xml; charset=utf-8"
+        return r
+
+    def determin_intersect(self, extent1, extent2):
+        if extent2[2] < extent1[0] or extent2[0] > extent1[2] or extent2[1] > extent1[
+            3] or extent2[3] < extent1[1]:
+            return False
+        else:
+            return True

+# coding=utf-8
+#author:        4N
+#createtime:    2021/10/26
+#email:         nheweijun@sina.com
+
+
+import numpy
+from app.util.component.ParameterUtil import ParameterUtil
+from .Cache import Cache
+from app.modules.service.models import ImageService
+from flask import Response
+from .ImageData import ImageData
+from .MyThread import MyThread
+from .Opencv import Opencv
+from app.modules.service.models import Service,TileScheme
+import json
+import random
+import copy
+import configure
+from app.util.component.SliceScheme import SliceScheme
+import threading
+from .ImageServer import ImageServer
+
+class ImageWMTSServer(ImageServer):
+    _instance_lock = threading.Lock()
+    singleton = None
+
+    def __init__(self):
+        pass
+
+    def __new__(cls, *args, **kwargs):
+        if not cls.singleton:
+            with ImageWMTSServer._instance_lock:
+                cls.singleton = super().__new__(cls)
+        return cls.singleton
+
+
+    def wmts(self,service_name,parameter,type="name"):
+
+        image_service_info, zoo, servers = Cache.cache_data(service_name, type=type)
+
+        # 转换参数
+        parameter = ParameterUtil.to_lower(parameter)
+
+        re = parameter.get("request")
+        if re and re.__eq__("GetCapabilities"):
+            service = Service.query.filter_by(guid=image_service_info["service"].service_guid).one_or_none()
+            return self.get_wmts_capabilities(image_service_info["service"], service)
+
+        if parameter.get("tilematrix"):
+            if parameter.get("tilematrix").__contains__(":"):
+                self.level = int(parameter.get("tilematrix").split(":")[-1])
+            else:
+                self.level = int(parameter.get("tilematrix"))
+        if parameter.get("tilerow"):
+            self.row = int(parameter.get("tilerow"))
+        if parameter.get("tilecol"):
+            self.col = int(parameter.get("tilecol"))
+
+        image_type = parameter.get("format") if parameter.get("format") else "image/png"
+        quality = int(parameter.get("quality")) if parameter.get("quality") else 30
+        slice_para = image_service_info["scheme"]
+        extent = SliceScheme.get_polygon(slice_para, self.level, self.row, self.col)
+
+        height, width = 256, 256
+
+        # 多线程获取分布式数据
+
+        intersect_image = [im for im in image_service_info["images"] if
+                           self.determin_intersect(json.loads(im.extent), extent)]
+
+        if len(intersect_image) > 1:
+
+            # 结果矩阵
+            pixel_array = numpy.zeros((height, width, 3), dtype=int) + 65536
+
+            thread_list = []
+
+            for image in intersect_image:
+
+                # 该影像的服务器，随机选取一个
+                image_servers = image.server.split(",")
+                image_servers = [ser for ser in image_servers if ser in servers]
+                if len(image_servers) > 0:
+                    indx = int(random.random() * len(image_servers))
+                    image_server = image_servers[indx]
+                else:
+                    image_server = "None"
+
+                bands = json.loads(image.band_view)
+
+                image_data = ImageData(image_server, image)
+
+                thread: MyThread = MyThread(image_data.get_data, args=(extent, bands, height, width))
+
+                thread.start()
+                thread_list.append(thread)
+
+            for thread in thread_list:
+                thread.join()
+                data = thread.get_result()
+
+                # 掩膜在中央接口生成,合图
+                mask = numpy.zeros((height, width, 3), dtype=int)
+                mask_data = numpy.zeros((height, width, 3), dtype=int)
+
+                mask[data == 65536] = 1
+                mask[data != 65536] = 0
+                mask_data[data == 65536] = 0
+                mask_data[data != 65536] = 1
+
+                # # 掩膜计算
+                pixel_array = pixel_array * mask + data * mask_data
+
+            # opencv 颜色排序为GBR
+            d1 = copy.copy(pixel_array[:, :, 0])
+            pixel_array[:, :, 0] = pixel_array[:, :, 2]
+            pixel_array[:, :, 2] = d1
+
+
+        elif len(intersect_image) == 1:
+            # 该影像的服务器，随机选取一个
+            image = intersect_image[0]
+            image_servers = image.server.split(",")
+            # 判断可用服务器
+            image_servers = [ser for ser in image_servers if ser in servers]
+            if len(image_servers) > 0:
+                indx = int(random.random() * len(image_servers))
+                image_server = image_servers[indx]
+            else:
+                image_server = "None"
+            # image_server = image_servers[0]
+            bands = json.loads(image.band_view)
+
+            image_data = ImageData(image_server, image)
+            pixel_array_t: numpy.ndarray = image_data.get_data(extent, bands, height, width)
+            pixel_array = numpy.zeros((height, width, 3), dtype=int)
+
+            for ii in [0, 1, 2]:
+                # opencv 颜色排序为GBR
+                pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
+
+        else:
+            # 结果矩阵
+            pixel_array = numpy.zeros((height, width, 3), dtype=int) + 65536
+
+        # 将图片生成在内存中,然后直接返回response
+        im_data = Opencv.create_image(image_type, pixel_array, quality)
+        return Response(im_data, mimetype=image_type.lower())
+
+
+    def get_wmts_capabilities(self, image_service: ImageService, service: Service):
+        tile_scheme: TileScheme = TileScheme.query.filter_by(guid=image_service.scheme_guid).one_or_none()
+        if not tile_scheme:
+            raise Exception("切片方案不存在！")
+
+        xml = '''<Capabilities xmlns="http://www.opengis.net/wmts/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd" version="1.0.0">
+             <!--  Service Identification  -->
+             <ows:ServiceIdentification>
+             <ows:Title>{title}</ows:Title>
+             <ows:ServiceType>OGC WMTS</ows:ServiceType>
+             <ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
+             </ows:ServiceIdentification>
+
+             <!--  Operations Metadata  -->
+             <ows:OperationsMetadata>
+             <ows:Operation name="GetCapabilities">
+             <ows:DCP>
+             <ows:HTTP>
+             <ows:Get xlink:href="{capabilities_url}">
+             <ows:Constraint name="GetEncoding">
+             <ows:AllowedValues>
+             <ows:Value>RESTful</ows:Value>
+             </ows:AllowedValues>
+             </ows:Constraint>
+             </ows:Get>
+
+             <!--  add KVP binding in 10.1  -->
+             <ows:Get xlink:href="{tile_url}?">
+             <ows:Constraint name="GetEncoding">
+             <ows:AllowedValues>
+             <ows:Value>KVP</ows:Value>
+             </ows:AllowedValues>
+             </ows:Constraint>
+             </ows:Get>
+             </ows:HTTP>
+             </ows:DCP>
+             </ows:Operation>
+             <ows:Operation name="GetTile">
+             <ows:DCP>
+             <ows:HTTP>
+             <ows:Get xlink:href="{tile_url}">
+             <ows:Constraint name="GetEncoding">
+             <ows:AllowedValues>
+             <ows:Value>RESTful</ows:Value>
+             </ows:AllowedValues>
+             </ows:Constraint>
+             </ows:Get>
+             <ows:Get xlink:href="{tile_url}?">
+             <ows:Constraint name="GetEncoding">
+             <ows:AllowedValues>
+             <ows:Value>KVP</ows:Value>
+             </ows:AllowedValues>
+             </ows:Constraint>
+             </ows:Get>
+             </ows:HTTP>
+             </ows:DCP>
+             </ows:Operation>
+             </ows:OperationsMetadata>
+
+             <Contents>
+
+             <!-- Layer -->
+
+
+             <Layer>
+             <ows:Title>{title}</ows:Title>
+             <ows:Identifier>{title}</ows:Identifier>
+             <ows:BoundingBox crs="{crs}">
+             <ows:LowerCorner>{xmin} {ymin}</ows:LowerCorner>
+             <ows:UpperCorner>{xmax} {ymax}</ows:UpperCorner>
+             </ows:BoundingBox>
+
+             <Style isDefault="true">
+             <ows:Title>Default Style</ows:Title>
+             <ows:Identifier>default</ows:Identifier>
+             </Style>
+             <Format>image/png</Format>
+             <TileMatrixSetLink>
+             <TileMatrixSet>{tile_name}</TileMatrixSet>
+             </TileMatrixSetLink>
+
+             <ResourceURL format="image/png" resourceType="tile" template="{tile_url}"/>
+
+             </Layer>
+
+             <!-- TileMatrixSet -->
+
+
+             <TileMatrixSet>
+
+             <TileMatrix>
+             <ows:Title>{tile_title}</ows:Title>
+             <ows:Abstract>{tile_description}</ows:Abstract>
+             <ows:Identifier>{tile_name}</ows:Identifier>
+             <ows:SupportedCRS>{crs}</ows:SupportedCRS>
+
+             {tile_matrix}
+
+             </TileMatrix>
+
+             </TileMatrixSet>
+
+
+             </Contents>
+             <ServiceMetadataURL xlink:href="{capabilities_url}"/>
+             </Capabilities>'''
+
+        tile_matrix_each = '''
+             <TileMatrix>
+             <ows:Identifier>{lev}</ows:Identifier>
+             <ScaleDenominator>{scale}</ScaleDenominator>
+             <TopLeftCorner>{top_left}</TopLeftCorner>
+             <TileWidth>{cols}</TileWidth>
+             <TileHeight>{rows}</TileHeight>
+             </TileMatrix>
+        '''
+
+        tile_matrix = ""
+        top_left = tile_scheme.top_left
+        for level in json.loads(tile_scheme.levels):
+            tile_matrix = "{}{}".format(tile_matrix, tile_matrix_each.format(lev=level["level"],
+                                                                             scale=level["scale"],
+                                                                             top_left=top_left,
+                                                                             cols=tile_scheme.cols,
+                                                                             rows=tile_scheme.rows))
+
+        extent = json.loads(image_service.extent)
+
+        xml = xml.format(
+            capabilities_url="http://{}/API/Service/Image/Capabilities?guid={}".format(configure.deploy_ip_host,
+                                                                                       image_service.guid),
+            tile_url="http://{}/API/Service/Image/Tile?guid={}".format(configure.deploy_ip_host, image_service.guid),
+            crs=tile_scheme.crs,
+            xmin=extent[0],
+            ymin=extent[1],
+            xmax=extent[2],
+            ymax=extent[3],
+            # TileMatrix = "{TileMatrix}",
+            # TileRow = "{TileRow}",
+            # TileCol = "{TileCol}",
+            guid=image_service.guid,
+            title=service.title,
+            tile_title=tile_scheme.name,
+            tile_name=tile_scheme.name,
+            tile_description=tile_scheme.description,
+            tile_matrix=tile_matrix
+            )
+
+        r = Response(response=xml, status=200, mimetype="application/xml")
+        r.headers["Content-Type"] = "text/xml; charset=utf-8"
+
+        return r
+
+
+
+    def determin_intersect(self, extent1, extent2):
+        if extent2[2] < extent1[0] or extent2[0] > extent1[2] or extent2[1] > extent1[
+            3] or extent2[3] < extent1[1]:
+            return False
+        else:
+            return True

@@ -6,28 +6,28 @@
 from flasgger import swag_from
 from flasgger import swag_from
 from flask import Blueprint
 from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
-from . import wms_register,wms_edit
+from . import map_service_register,map_service_edit
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
-    bp = Blueprint("WMS", __name__, url_prefix="/API/Service/WMS")
-    service_type = ["WMS/WFS"]
+    bp = Blueprint("MapService", __name__, url_prefix="/API/Service/MapService")
+    service_type = ["地图服务"]
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
-    @swag_from(wms_register.Api.api_doc)
+    @swag_from(map_service_register.Api.api_doc)
     def api_wms_register():
     def api_wms_register():
         """
         """
-        注册WMS
+        注册MapService
         """
         """
-        return wms_register.Api().result
+        return map_service_register.Api().result
 
 
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Edit', methods=['POST'])
     @bp.route('/Edit', methods=['POST'])
-    @swag_from(wms_edit.Api.api_doc)
+    @swag_from(map_service_edit.Api.api_doc)
     def api_wms_edit():
     def api_wms_edit():
         """
         """
-        修改WMS
+        修改MapService
         """
         """
-        return wms_edit.Api().result
+        return map_service_edit.Api().result

@@ -6,18 +6,16 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 import uuid
-from .models import WMS
-from app.models import Service,db
+from ..models import Service,MapService,db
+
 
 
 import datetime
 import datetime
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
-    api_name = "修改WMTS服务"
+    api_name = "修改MapService服务"
 
 
     def process(self):
     def process(self):
 
 
-
-
         # 返回结果
         # 返回结果
         res = {}
         res = {}
 
 
@@ -28,24 +26,21 @@ class Api(ApiTemplate):
 
 
 
 
             service_update = {"update_time":this_time}
             service_update = {"update_time":this_time}
-            wms_update = {"updatetime":this_time}
+            map_service_update = {"updatetime":this_time}
             for key in self.para.keys():
             for key in self.para.keys():
                 if key in ["name","title","state","description","overview","catalog_guid"]:
                 if key in ["name","title","state","description","overview","catalog_guid"]:
                     service_update[key] = self.para.get(key)
                     service_update[key] = self.para.get(key)
-                if key in ["status","description","username","readonly",
+                if key in ["name","status","description","username","readonly",
                            "sid","stype","ssupply","sctime","company","abstract","thumbnail","layer_style"]:
                            "sid","stype","ssupply","sctime","company","abstract","thumbnail","layer_style"]:
-                    wms_update[key] = self.para.get(key)
-                if key.__eq__("name"):
-                    wms_update["service"] = self.para.get(key)
+                    map_service_update[key] = self.para.get(key)
 
 
 
 
-
-            wms = WMS.query.filter_by(guid=Service.query.filter_by(guid=guid).one_or_none().service_guid)
+            map_service = MapService.query.filter_by(service_guid=guid)
 
 
             if service_update:
             if service_update:
                 service.update(service_update)
                 service.update(service_update)
-            if wms_update:
-                wms.update(wms_update)
+            if map_service_update:
+                map_service.update(map_service_update)
 
 
             db.session.commit()
             db.session.commit()
 
 
@@ -56,75 +51,80 @@ class Api(ApiTemplate):
         return res
         return res
 
 
     api_doc = {
     api_doc = {
-        "tags": ["WMS接口"],
+        "tags": ["地图服务接口"],
         "parameters": [
         "parameters": [
 
 
             {"name": "name",
             {"name": "name",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
              "required": "true",
              "required": "true",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "title",
             {"name": "title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "description",
             {"name": "description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "catalog_guid",
             {"name": "catalog_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
-
+             "description": "[地图服务，切片服务，影像服务]"},
 
 
 
 
             {"name": "layer_style",
             {"name": "layer_style",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS,WMS]图层样式"},
+             "description": "[地图服务，切片服务]图层样式"},
+
+            {"name": "functions",
+             "in": "formData",
+             "type": "string",
+             "description": "[地图服务]服务能力，用逗号相隔"},
+
 
 
-            # WMS参数
+            # MapService参数
             {"name": "status",
             {"name": "status",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]status"},
+             "description": "[地图服务]status"},
             {"name": "username",
             {"name": "username",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]username"},
+             "description": "[地图服务]username"},
             {"name": "readonly",
             {"name": "readonly",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]readonly"},
+             "description": "[地图服务]readonly"},
             {"name": "sid",
             {"name": "sid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]sid"},
+             "description": "[地图服务]sid"},
             {"name": "stype",
             {"name": "stype",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]stype"},
+             "description": "[地图服务]stype"},
             {"name": "ssupply",
             {"name": "ssupply",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]ssupply"},
+             "description": "[地图服务]ssupply"},
             {"name": "sctime",
             {"name": "sctime",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]sctime"},
+             "description": "[地图服务]sctime"},
             {"name": "company",
             {"name": "company",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]company"},
+             "description": "[地图服务]company"},
             {"name": "abstract",
             {"name": "abstract",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]abstract"},
+             "description": "[地图服务]abstract"},
             {"name": "thumbnail",
             {"name": "thumbnail",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]thumbnail"},
+             "description": "[地图服务]thumbnail"},
 
 
         ],
         ],
         "responses": {
         "responses": {

@@ -6,13 +6,12 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 import uuid
-from .models import WMS
-from app.models import Service,db
+from ..models import Service,db,MapService,ServiceFunction
 import datetime
 import datetime
 import configure
 import configure
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
-    api_name = "注册WMS服务"
+    api_name = "注册MapService服务"
 
 
     def process(self):
     def process(self):
         # 返回结果
         # 返回结果
@@ -22,10 +21,10 @@ class Api(ApiTemplate):
 
 
             this_time = datetime.datetime.now()
             this_time = datetime.datetime.now()
             service_guid = uuid.uuid1().__str__()
             service_guid = uuid.uuid1().__str__()
-            wms_service_guid = uuid.uuid1().__str__()
+            map_service_guid = uuid.uuid1().__str__()
+            service_function_guid = uuid.uuid1().__str__()
 
 
-
-            #调用wms服务发布接口
+            #调用MapService服务发布接口
 
 
             service = Service(
             service = Service(
                 guid = service_guid,
                 guid = service_guid,
@@ -39,13 +38,12 @@ class Api(ApiTemplate):
                 node = 1 ,
                 node = 1 ,
                 overview = "xxxx",
                 overview = "xxxx",
                 type = self.para.get("type"),
                 type = self.para.get("type"),
-                service_guid = wms_service_guid,
                 catalog_guid = self.para.get("catalog_guid")
                 catalog_guid = self.para.get("catalog_guid")
             )
             )
 
 
-            wms = WMS(
-                guid = wms_service_guid,
-                service = self.para.get("name"),
+            map_service = MapService(
+                guid = map_service_guid,
+                name = self.para.get("name"),
                 status = self.para.get("status"),
                 status = self.para.get("status"),
                 description=self.para.get("description"),
                 description=self.para.get("description"),
                 username = self.para.get("username"),
                 username = self.para.get("username"),
@@ -62,10 +60,24 @@ class Api(ApiTemplate):
                 service_guid = service_guid
                 service_guid = service_guid
             )
             )
 
 
+            service_function = ServiceFunction(guid=service_function_guid,type="WMS",
+                                               service_guid=service_guid)
 
 
             db.session.add(service)
             db.session.add(service)
-            db.session.add(wms)
+            db.session.add(map_service)
+            db.session.add(service_function)
             db.session.commit()
             db.session.commit()
+
+            # 调用MapService服务的注册服务接口
+            try:
+                pass
+            except Exception as e:
+                db.session.delete(service)
+                db.session.delete(map_service)
+                db.session.delete(service_function)
+                db.session.commit()
+                raise e
+
             res["data"] = service_guid
             res["data"] = service_guid
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:
@@ -74,82 +86,78 @@ class Api(ApiTemplate):
         return res
         return res
 
 
     api_doc = {
     api_doc = {
-        "tags": ["WMS接口"],
+        "tags": ["地图服务接口"],
         "parameters": [
         "parameters": [
 
 
             {"name": "name",
             {"name": "name",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
              "required": "true",
              "required": "true",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "title",
             {"name": "title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "description",
             {"name": "description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "type",
             {"name": "type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "enum": ["WMS", "WMTS", "影像WMS", "影像WMTS"],
+             "enum": ["地图服务", "切片服务", "影像服务"],
              "required": "true",
              "required": "true",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "catalog_guid",
             {"name": "catalog_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
 
 
-            {"name": "catalog_guid",
-             "in": "formData",
-             "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
 
 
             {"name": "status",
             {"name": "status",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]status"},
+             "description": "[地图服务]status"},
             {"name": "username",
             {"name": "username",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]username"},
+             "description": "[地图服务]username"},
             {"name": "readonly",
             {"name": "readonly",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]readonly"},
+             "description": "[地图服务]readonly"},
             {"name": "sid",
             {"name": "sid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]sid"},
+             "description": "[地图服务]sid"},
             {"name": "stype",
             {"name": "stype",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]stype"},
+             "description": "[地图服务]stype"},
             {"name": "ssupply",
             {"name": "ssupply",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]ssupply"},
+             "description": "[地图服务]ssupply"},
             {"name": "sctime",
             {"name": "sctime",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]sctime"},
+             "description": "[地图服务]sctime"},
             {"name": "company",
             {"name": "company",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]company"},
+             "description": "[地图服务]company"},
             {"name": "abstract",
             {"name": "abstract",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]abstract"},
+             "description": "[地图服务]abstract"},
             {"name": "thumbnail",
             {"name": "thumbnail",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]thumbnail"},
+             "description": "[地图服务]thumbnail"},
             {"name": "layer_style",
             {"name": "layer_style",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS]layer_style"},
+             "description": "[地图服务,切片服务]layer_style"},
 
 
         ],
         ],
         "responses": {
         "responses": {

+# coding=utf-8
+#author:        4N
+#createtime:    2021/10/26
+#email:         nheweijun@sina.com
+
+from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, Time,Float,Binary
+from sqlalchemy.orm import relationship
+from app.models import db
+
+
+class Service(db.Model):
+    '''
+    '''
+    __tablename__ = 'dmap_service'
+    guid = Column(String(256), primary_key=True)
+    name = Column(String(256),unique = True)
+    title = Column(String(256))
+    #服务状态
+    state= Column(Integer)
+    create_time = Column(DateTime)
+    update_time = Column(DateTime)
+    #服务描述
+    description = Column(Text)
+    #服务节点
+    node = Column(Integer)
+    #服务缩略图
+    overview = Column(Text)
+    #服务类型
+    type = Column(String(256)) #地图服务，影像服务，切片服务
+    # 目录外键
+    catalog_guid = Column(String(256), ForeignKey('dmap_service_catalog.guid'))
+
+    relate_service_functions = relationship('ServiceFunction', backref='relate_service', lazy='dynamic')
+    relate_tile_service = relationship('TileService', backref='relate_service', lazy='dynamic')
+    relate_image_service = relationship('ImageService', backref='relate_service', lazy='dynamic')
+    relate_map_service = relationship('MapService', backref='relate_service', lazy='dynamic')
+
+class ServiceFunction(db.Model):
+    '''
+    细分功能
+    '''
+    __tablename__ = 'dmap_service_function'
+    guid = Column(String(256), primary_key=True)
+    type = Column(String(256)) # 功能类别，WMTS，WMS，WFS，等等等
+    url = Column(String(1024))
+    service_guid = Column(String(256), ForeignKey('dmap_service.guid'))
+
+class ServiceCatalog(db.Model):
+    '''
+    目录表
+    '''
+    __tablename__ = 'dmap_service_catalog'
+    guid = Column(String(256), primary_key=True)
+    pguid = Column(String(256))
+    path = Column(Text)
+    name = Column(String(256))
+    sort = Column(Integer)
+    description = Column(Text)
+    relate_services = relationship('Service', backref='relate_catalog', lazy='dynamic')
+
+
+
+class TileScheme(db.Model):
+    '''
+    切片方案表
+    '''
+    __tablename__ = 'dmap_tile_scheme'
+    guid = Column(String(256), primary_key=True)
+    name = Column(String(256))
+    alias = Column(String(256))
+    description = Column(Text)
+    crs = Column(String(256))
+    crs_wkt = Column(Text)
+
+    extent = Column(Text)
+    top_left = Column(String(256))
+
+    levels = Column(Text)
+    dpi = Column(Integer)
+    rows = Column(Integer)
+    cols = Column(Integer)
+    update_time = Column(DateTime)
+
+    parameter = Column(Text)
+
+
+class Image(db.Model):
+    '''
+    影像元数据
+    '''
+    __tablename__ = 'dmap_image'
+    guid = Column(String(256), primary_key=True)
+    name = Column(String)
+    alias = Column(String)
+    raster_y_size = Column(Integer)#图像y 分辨率
+    raster_x_size = Column(Integer)#图像x 分辨率
+    overview_count = Column(Integer)#金字塔等级
+    extent = Column(String)#范围
+    # geo_origin_extent = Column(String)
+    null_value = Column(Integer)#空值
+    available = Column(Integer)#影像是否可用，不可用可能在创建金字塔中
+    band_count = Column(Integer)#波段数
+    band_view = Column(String)#波段设置
+    path = Column(String)
+    server = Column(String)
+
+    size = Column(Float)
+    #坐标wkt
+    crs_wkt = Column(Text) #坐标wkt
+    crs_proj4 = Column(Text)#坐标proj
+    crs = Column(String)#坐标
+    create_time = Column(DateTime)
+    update_time = Column(DateTime)
+    cell_x_size = Column(Float)#像元x大小
+    cell_y_size = Column(Float)#像元y大小
+    region = Column(Text)
+
+    collect_time = Column(DateTime) #成像时间年份
+
+    satellite = Column(String)#卫星类型
+    type = Column(String(128))
+
+
+dmap_image_rel = db.Table('dmap_image_rel',
+    Column('image_guid',String, ForeignKey('dmap_image.guid')),
+    Column('service_guid', String, ForeignKey('dmap_image_service.guid'))
+    )
+
+
+
+class ImageService(db.Model):
+    '''
+    影像服务
+    '''
+    __tablename__ = 'dmap_image_service'
+    guid = Column(String(256), primary_key=True)
+    name = Column(String,unique = True)
+    scheme_guid = Column(String)
+    extent = Column(String(256))
+    # node = Column(Integer)
+    #可视范围geojson
+    visual_region = Column(Text)
+    crs = Column(String(256))
+    create_time = Column(DateTime)
+    service_guid = Column(String, ForeignKey('dmap_service.guid'))
+
+    images  = db.relationship('Image',
+                              secondary=dmap_image_rel,
+                              backref='image_services',
+                              lazy='dynamic'
+                              )
+
+
+dmap_image_tag_rel = db.Table('dmap_image_tag_rel',
+    Column('image_guid',String, ForeignKey('dmap_image.guid')),
+    Column('tag_guid', String, ForeignKey('dmap_image_tag.guid'))
+    )
+
+class ImageTag(db.Model):
+    '''
+    影像标签
+    '''
+    __tablename__ = 'dmap_image_tag'
+    guid = Column(String(256), primary_key=True)
+    name=Column(String(256))
+    alias = Column(String(256))
+    images  = db.relationship('Image',
+                              secondary=dmap_image_tag_rel,
+                              backref='image_tags',
+                              lazy='dynamic'
+                              )
+
+
+class TileService(db.Model):
+    '''
+    切片元数据
+    '''
+    __tablename__ = 'dmap_tile_service'
+
+    guid = Column(String(256), primary_key=True)
+
+    #基本信息
+    name = Column(String,unique = True)
+
+    #厂家
+    vendor = Column(String(256))
+    create_time = Column(DateTime)
+    #坐标系
+    crs = Column(String(256))
+    #切片路径
+    datasource = Column(String)
+    #调用地址
+    metadata_url = Column(String)
+    #描述
+    description = Column(String)
+
+    #图层信息
+    #图层名
+    layer_name = Column(String(256))
+    #图层别名
+    layer_alias = Column(String(256))
+    #图层title
+    layer_title = Column(String(256))
+    #图层样式
+    layer_style = Column(String(256))
+    #图片格式
+    layer_format = Column(String(256))
+    #图层范围
+    layer_extent = Column(String)
+    #图层描述
+    layer_description = Column(String)
+
+    scheme_guid = Column(String,ForeignKey('dmap_tile_scheme.guid'))
+    service_guid = Column(String,ForeignKey('dmap_service.guid'))
+
+
+class MapService(db.Model):
+    '''
+    MapService元数据
+    '''
+    __tablename__ = 'dmdms_map_service'
+
+    guid = Column(String(256), primary_key=True)
+    name = Column(String, unique=True)
+
+    #基本信息
+    status = Column(String)
+    description = Column(String)
+    #厂家
+    username = Column(String(256))
+
+    readonly = Column(String)
+    updatetime = Column(DateTime)
+    sid = Column(Integer)
+    stype = Column(String)
+    ssupply = Column(String)
+    sctime = Column(String)
+    company = Column(String)
+    abstract = Column(String)
+    title = Column(String)
+    thumbnail = Column(String)
+    layer_style = Column(Text)
+    service_guid = Column(String,ForeignKey('dmap_service.guid'))

@@ -5,7 +5,7 @@
 
 
 
 
 import uuid
 import uuid
-from app.models import TileScheme,db
+from ..models import TileScheme,db
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import datetime
 import datetime
 import json
 import json

@@ -5,7 +5,7 @@
 
 
 
 
 import uuid
 import uuid
-from app.models import TileScheme,db
+from ..models import TileScheme,db
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import datetime
 import datetime
 
 

@@ -5,7 +5,7 @@
 
 
 
 
 import uuid
 import uuid
-from app.models import TileScheme,db
+from ..models import TileScheme,db
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import datetime
 import datetime
 import json
 import json

@@ -5,7 +5,7 @@
 
 
 
 
 import uuid
 import uuid
-from app.models import TileScheme,db
+from ..models import TileScheme,db
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 from sqlalchemy import or_
 from sqlalchemy import or_

@@ -5,11 +5,11 @@
 
 
 
 
 import uuid
 import uuid
-from app.models import TileScheme,db
+from ..models import TileScheme,db
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 from sqlalchemy import or_
 from sqlalchemy import or_
-import datetime
+
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "查询切片方案"
     api_name = "查询切片方案"

@@ -10,7 +10,7 @@ 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.StructuredPrint import StructurePrint
-import json
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "解析方案"
     api_name = "解析方案"
 
 

@@ -4,12 +4,14 @@
 #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 import find_class,BlueprintApi
-from app.models import Service,db
-
-
+from app.models import db
+from app.modules.service.models import Service
+from app.modules.service.models import ImageService
+from app.modules.service.models import TileService
+from app.modules.service.models import MapService
 class Api(ApiTemplate):
 class Api(ApiTemplate):
-    api_name = "服务类型"
+
+    api_name = "服务删除"
 
 
     def process(self):
     def process(self):
 
 
@@ -18,19 +20,21 @@ class Api(ApiTemplate):
 
 
         try:
         try:
             guid = self.para.get("guid")
             guid = self.para.get("guid")
+
             service = Service.query.filter_by(guid=guid).one_or_none()
             service = Service.query.filter_by(guid=guid).one_or_none()
-            if service.type in ["ImageWMTS","ImageWMS"]:
-                from app.modules.service.image.models import ImageService
-                image_service = ImageService.query.filter_by(guid=service.service_guid).one_or_none()
+            if service.type.__eq__("影像服务"):
+                image_service = ImageService.query.filter_by(service_guid=guid).one_or_none()
                 db.session.delete(image_service)
                 db.session.delete(image_service)
-            if service.type in ["WMTS","TMS"]:
-                from app.modules.service.wmts.models import WMTS
-                wmts = WMTS.query.filter_by(guid=service.service_guid).one_or_none()
-                db.session.delete(wmts)
-            if service.type in ["WMTS", "TMS"]:
-                from app.modules.service.wms.models import WMS
-                wms = WMS.query.filter_by(guid=service.service_guid).one_or_none()
-                db.session.delete(wms)
+            if service.type.__eq__("切片服务"):
+                tile_service = TileService.query.filter_by(service_guid=guid).one_or_none()
+                db.session.delete(tile_service)
+            if service.type.__eq__("地图服务"):
+                map_service = MapService.query.filter_by(service_guid=guid).one_or_none()
+                db.session.delete(map_service)
+
+            service_functions = service.relate_service_functions.all()
+            for function in service_functions:
+                db.session.delete(function)
             db.session.delete(service)
             db.session.delete(service)
             db.session.commit()
             db.session.commit()
             res["result"] = True
             res["result"] = True

@@ -7,7 +7,11 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.models import Service
+from app.models import db
+from app.modules.service.models import Service
+from app.modules.service.models import ImageService
+from app.modules.service.models import TileService
+from app.modules.service.models import MapService
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "修改服务"
     api_name = "修改服务"
@@ -18,12 +22,12 @@ class Api(ApiTemplate):
             if not service:
             if not service:
                 raise Exception("服务不存在！")
                 raise Exception("服务不存在！")
 
 
-            if service.type in ["ImageWMTS","ImageWMS"]:
+            if service.type.__eq__("影像服务"):
                 from app.modules.service.image.image_service_edit import Api as RealApi
                 from app.modules.service.image.image_service_edit import Api as RealApi
-            elif service.type in ["WMS/WFS"]:
-                from app.modules.service.wms.wms_edit import Api as RealApi
-            elif service.type in ["WMTS","TMS"]:
-                from app.modules.service.wmts.wmts_edit import Api as RealApi
+            elif service.type.__eq__("地图服务"):
+                from app.modules.service.map_service.map_service_edit import Api as RealApi
+            elif service.type.__eq__("切片服务"):
+                from app.modules.service.tile_service.tile_service_edit import Api as RealApi
             else:
             else:
                 return res
                 return res
             api = RealApi()
             api = RealApi()

@@ -6,7 +6,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
-from app.models import Service
+from .models import Service
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "服务Info"
     api_name = "服务Info"
@@ -19,8 +19,8 @@ class Api(ApiTemplate):
                 raise Exception("服务不存在！")
                 raise Exception("服务不存在！")
             res["data"] = {}
             res["data"] = {}
 
 
-            if service.type in ["ImageWMS","ImageWMTS"]:
-                from app.modules.service.image.models import ImageService
+            if service.type.__eq__("影像服务"):
+                from app.modules.service.models import ImageService
                 speci_service = ImageService.query.filter_by(guid=service.service_guid).one_or_none()
                 speci_service = ImageService.query.filter_by(guid=service.service_guid).one_or_none()
                 relate_images = speci_service.images.all()
                 relate_images = speci_service.images.all()
                 res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
                 res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
@@ -28,15 +28,15 @@ class Api(ApiTemplate):
                 res["data"]["speci_service"]["images"] = [{"name":im["name"],"guid":im["guid"]} for im in ModelVisitor.objects_to_jsonarray(relate_images)]
                 res["data"]["speci_service"]["images"] = [{"name":im["name"],"guid":im["guid"]} for im in ModelVisitor.objects_to_jsonarray(relate_images)]
                 res["data"]["speci_service"]["images"] = sorted(res["data"]["speci_service"]["images"], key=lambda x: x["name"])
                 res["data"]["speci_service"]["images"] = sorted(res["data"]["speci_service"]["images"], key=lambda x: x["name"])
 
 
-            elif service.type.__eq__("WMTS") or service.type.__eq__("TMS"):
-                from app.modules.service.wmts.models import WMTS
-                speci_service = WMTS.query.filter_by(guid=service.service_guid).one_or_none()
+            elif service.type.__eq__("切片服务"):
+                from app.modules.service.models import MapService
+                speci_service = MapService.query.filter_by(guid=service.service_guid).one_or_none()
 
 
                 res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
                 res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
 
 
-            elif service.type.__eq__("WMS/WFS"):
-                from app.modules.service.wms.models import WMS
-                speci_service = WMS.query.filter_by(guid=service.service_guid).one_or_none()
+            elif service.type.__eq__("地图服务"):
+                from app.modules.service.models import TileService
+                speci_service = TileService.query.filter_by(guid=service.service_guid).one_or_none()
                 res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
                 res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
             else:
             else:
                 res["data"] = {}
                 res["data"] = {}

@@ -6,7 +6,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
-from app.models import Service
+from .models import Service
 from sqlalchemy import or_
 from sqlalchemy import or_
 
 
 
 
@@ -25,6 +25,7 @@ class Api(ApiTemplate):
             title = self.para.get("title")
             title = self.para.get("title")
             name = self.para.get("name")
             name = self.para.get("name")
             type = self.para.get("type")
             type = self.para.get("type")
+            function_type = self.para.get("function_type")
 
 
             catalog_guid = self.para.get("catalog_guid")
             catalog_guid = self.para.get("catalog_guid")
 
 
@@ -78,7 +79,7 @@ class Api(ApiTemplate):
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
              "description": "服务类型",
              "description": "服务类型",
-             "enum":["WMTS","TMS","WMS/WFS","ImageWMTS","ImageWMS"]},
+             "enum":["影像服务","切片服务","地图服务"]},
             {"name": "catalog_guid",
             {"name": "catalog_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",

@@ -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.models import Service
+from .models import Service
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "注册服务"
     api_name = "注册服务"
     def process(self):
     def process(self):
@@ -14,12 +14,12 @@ class Api(ApiTemplate):
             service = Service.query.filter_by(name=self.para.get("name")).one_or_none()
             service = Service.query.filter_by(name=self.para.get("name")).one_or_none()
             if service:
             if service:
                 raise Exception("服务已存在！")
                 raise Exception("服务已存在！")
-            if self.para.get("type").__eq__("ImageWMS") or self.para.get("type").__eq__("ImageWMTS"):
+            if self.para.get("type").__eq__("影像服务"):
                 from app.modules.service.image.image_service_register import Api as RealApi
                 from app.modules.service.image.image_service_register import Api as RealApi
-            elif self.para.get("type").__eq__("WMS"):
-                from app.modules.service.wms.wms_register import Api as RealApi
-            elif self.para.get("type").__eq__("WMTS") or self.para.get("type").__eq__("TMS"):
-                from app.modules.service.wmts.wmts_register import Api as RealApi
+            elif self.para.get("type").__eq__("地图服务"):
+                from app.modules.service.map_service.map_service_register import Api as RealApi
+            elif self.para.get("type").__eq__("切片服务"):
+                from app.modules.service.tile_service.tile_service_register import Api as RealApi
             else:
             else:
                 return res
                 return res
             api = RealApi()
             api = RealApi()
@@ -39,127 +39,133 @@ class Api(ApiTemplate):
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
              "required": "true",
              "required": "true",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "title",
             {"name": "title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "description",
             {"name": "description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "type",
             {"name": "type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "enum":["WMS/WFS","WMTS","TMS","ImageWMS","ImageWMTS"],
+             "enum":["地图服务","切片服务","影像服务"],
              "required": "true",
              "required": "true",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "catalog_guid",
             {"name": "catalog_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
 
 
             #影像参数
             #影像参数
             {"name": "guids",
             {"name": "guids",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[影像WMS,影像WMTS]影像guids，以英文逗号相隔"},
+             "description": "[影像服务]影像guids，以英文逗号相隔"},
             {"name": "scheme_guid",
             {"name": "scheme_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS,影像WMTS]切片方案"},
+             "description": "[切片服务，影像服务]切片方案"},
+            {"name": "function_types",
+             "in": "formData",
+             "type": "string",
+             "description": "[影像服务]function_types",
+             "enum": ["WMS","WMTS"]},
 
 
-            # WMTS参数
+            # 切片参数
             {"name": "overview",
             {"name": "overview",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]缩略图"},
-            {"name": "wmts_type",
+             "description": "[切片服务]缩略图"},
+            {"name": "tile_type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]wmts_type"},
+             "description": "[切片服务]tile_type",
+             "enum":["WMTS","TMS"]},
             {"name": "vendor",
             {"name": "vendor",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]厂商"},
+             "description": "[切片服务]厂商"},
             {"name": "crs",
             {"name": "crs",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]坐标系"},
+             "description": "[切片服务]坐标系"},
             {"name": "datasource",
             {"name": "datasource",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]数据路径"},
+             "description": "[切片服务]数据路径"},
             {"name": "layer_name",
             {"name": "layer_name",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层名"},
+             "description": "[切片服务]图层名"},
             {"name": "layer_alias",
             {"name": "layer_alias",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层别名"},
+             "description": "[切片服务]图层别名"},
             {"name": "layer_title",
             {"name": "layer_title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层标题"},
+             "description": "[切片服务]图层标题"},
             {"name": "layer_style",
             {"name": "layer_style",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS,WMS]图层样式"},
+             "description": "[切片服务，地图服务]图层样式"},
             {"name": "layer_format",
             {"name": "layer_format",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层format"},
+             "description": "[切片服务]图层format"},
             {"name": "layer_extent",
             {"name": "layer_extent",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层范围"},
+             "description": "[切片服务]图层范围"},
             {"name": "layer_description",
             {"name": "layer_description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层描述"},
+             "description": "[切片服务]图层描述"},
 
 
-            #WMS参数
+            #地图服务参数
             {"name": "status",
             {"name": "status",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]status"},
+             "description": "[地图服务]status"},
             {"name": "username",
             {"name": "username",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]username"},
+             "description": "[地图服务]username"},
             {"name": "readonly",
             {"name": "readonly",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]readonly"},
+             "description": "[地图服务]readonly"},
             {"name": "sid",
             {"name": "sid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]sid"},
+             "description": "[地图服务]sid"},
             {"name": "stype",
             {"name": "stype",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]stype"},
+             "description": "[地图服务]stype"},
             {"name": "ssupply",
             {"name": "ssupply",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]ssupply"},
+             "description": "[地图服务]ssupply"},
             {"name": "sctime",
             {"name": "sctime",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]sctime"},
+             "description": "[地图服务]sctime"},
             {"name": "company",
             {"name": "company",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]company"},
+             "description": "[地图服务]company"},
             {"name": "abstract",
             {"name": "abstract",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]abstract"},
+             "description": "[地图服务]abstract"},
             {"name": "thumbnail",
             {"name": "thumbnail",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS]thumbnail"},
+             "description": "[地图服务]thumbnail"},
 
 
         ],
         ],
         "responses": {
         "responses": {

@@ -7,7 +7,7 @@
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.FileProcess import FileProcess
 from app.util.component.FileProcess import FileProcess
-from app.models import Service
+from .models import Service
 import os
 import os
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):

@@ -6,46 +6,17 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
-from app.models import Service
+from .models import Service
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     '''
     '''
     保存服务到dmd文件
     保存服务到dmd文件
     '''
     '''
-    api_name = "服务Save"
+    api_name = "服务save"
     def process(self):
     def process(self):
         res = {}
         res = {}
         try:
         try:
-            guid = self.para.get("guid")
-            service = Service.query.filter_by(guid=guid).one_or_none()
-            if not service:
-                raise Exception("服务不存在！")
-            res["data"] = {}
-
-            if service.type in ["ImageWMS","ImageWMTS"]:
-                from app.modules.service.image.models import ImageService
-                speci_service = ImageService.query.filter_by(guid=service.service_guid).one_or_none()
-                relate_images = speci_service.images.all()
-                res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
-
-                res["data"]["speci_service"]["images"] = [{"name":im["name"],"guid":im["guid"]} for im in ModelVisitor.objects_to_jsonarray(relate_images)]
-                res["data"]["speci_service"]["images"] = sorted(res["data"]["speci_service"]["images"], key=lambda x: x["name"])
-
-            elif service.type.__eq__("WMTS") or service.type.__eq__("TMS"):
-                from app.modules.service.wmts.models import WMTS
-                speci_service = WMTS.query.filter_by(guid=service.service_guid).one_or_none()
-
-                res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
-
-            elif service.type.__eq__("WMS/WFS"):
-                from app.modules.service.wms.models import WMS
-                speci_service = WMS.query.filter_by(guid=service.service_guid).one_or_none()
-                res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
-            else:
-                res["data"] = {}
-
-            res["data"]["service"] = ModelVisitor.object_to_json(service)
-
+            pass
         except Exception as e:
         except Exception as e:
             raise e
             raise e
         return res
         return res

@@ -7,7 +7,7 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.models import Service,db
+from .models import Service,db
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "修改服务状态"
     api_name = "修改服务状态"
     def process(self):
     def process(self):

@@ -7,15 +7,15 @@
 from flasgger import swag_from
 from flasgger import swag_from
 from flask import Blueprint
 from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
-from . import upload_oview,wmts_register,wmts_edit
+from . import upload_oview,tile_service_register,tile_service_edit
 
 
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
-    bp = Blueprint("WMTS", __name__, url_prefix="/API/Service/WMTS")
+    bp = Blueprint("TileService", __name__, url_prefix="/API/Service/TileService")
 
 
-    service_type = ["WMTS","TMS"]
+    service_type = ["切片服务"]
 
 
     @staticmethod
     @staticmethod
     @bp.route('/UploadOverview', methods=['POST'])
     @bp.route('/UploadOverview', methods=['POST'])
@@ -29,19 +29,19 @@ class DataManager(BlueprintApi):
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
-    @swag_from(wmts_register.Api.api_doc)
+    @swag_from(tile_service_register.Api.api_doc)
     def api_wmts_register():
     def api_wmts_register():
         """
         """
-        注册WMTS
+        注册TileService
         """
         """
-        return wmts_register.Api().result
+        return tile_service_register.Api().result
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Edit', methods=['POST'])
     @bp.route('/Edit', methods=['POST'])
-    @swag_from(wmts_edit.Api.api_doc)
+    @swag_from(tile_service_edit.Api.api_doc)
     def api_wmts_edit():
     def api_wmts_edit():
         """
         """
-        修改WMTS
+        修改TileService
         """
         """
-        return wmts_edit.Api().result
+        return tile_service_edit.Api().result
 
 

@@ -5,13 +5,13 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 import uuid
-from .models import WMTS
-from app.models import Service,db
+from ..models import TileService,Service,db
+
 
 
 import datetime
 import datetime
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
-    api_name = "修改WMTS服务"
+    api_name = "修改切片服务"
 
 
     def process(self):
     def process(self):
 
 
@@ -27,21 +27,20 @@ class Api(ApiTemplate):
 
 
 
 
             service_update = {"update_time":this_time}
             service_update = {"update_time":this_time}
-            wmts_update = {}
+            tile_update = {}
             for key in self.para.keys():
             for key in self.para.keys():
                 if key in ["name","title","state","description","overview","catalog_guid"]:
                 if key in ["name","title","state","description","overview","catalog_guid"]:
                     service_update[key] = self.para.get(key)
                     service_update[key] = self.para.get(key)
-                if key in ["name","wmts_type","vendor","crs","datasource","description",
+                if key in ["name","tile_type","vendor","crs","datasource","description",
                            "layer_name","layer_alias","layer_title","layer_style","layer_format",
                            "layer_name","layer_alias","layer_title","layer_style","layer_format",
                            "layer_extent","layer_description","scheme_guid"]:
                            "layer_extent","layer_description","scheme_guid"]:
-                    wmts_update[key] = self.para.get(key)
-
+                    tile_update[key] = self.para.get(key)
 
 
-            wmts = WMTS.query.filter_by(guid=Service.query.filter_by(guid=guid).one_or_none().service_guid)
+            tile_service = TileService.query.filter_by(service_guid=guid)
             if service_update:
             if service_update:
                 service.update(service_update)
                 service.update(service_update)
-            if wmts_update:
-                wmts.update(wmts_update)
+            if tile_update:
+                tile_service.update(tile_update)
 
 
             db.session.commit()
             db.session.commit()
 
 
@@ -52,82 +51,83 @@ class Api(ApiTemplate):
         return res
         return res
 
 
     api_doc = {
     api_doc = {
-        "tags": ["WMTS接口"],
+        "tags": ["切片服务接口"],
         "parameters": [
         "parameters": [
 
 
             {"name": "name",
             {"name": "name",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
              "required": "true",
              "required": "true",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "title",
             {"name": "title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "description",
             {"name": "description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
 
 
             {"name": "catalog_guid",
             {"name": "catalog_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
 
 
             {"name": "scheme_guid",
             {"name": "scheme_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS,影像WMTS]切片方案"},
+             "description": "[切片服务，影像服务]切片方案"},
 
 
-            # WMTS参数
+            # 切片服务参数
             {"name": "overview",
             {"name": "overview",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]缩略图"},
-            {"name": "wmts_type",
+             "description": "[切片服务]缩略图"},
+            {"name": "tile_type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]wmts_type"},
+             "description": "[切片服务]tile_type",
+             "enum":["WMTS","TMS"]},
             {"name": "vendor",
             {"name": "vendor",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]厂商"},
+             "description": "[切片服务]厂商"},
             {"name": "crs",
             {"name": "crs",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]坐标系"},
+             "description": "[切片服务]坐标系"},
             {"name": "datasource",
             {"name": "datasource",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]数据路径"},
+             "description": "[切片服务]数据路径"},
             {"name": "layer_name",
             {"name": "layer_name",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层名"},
+             "description": "[切片服务]图层名"},
             {"name": "layer_alias",
             {"name": "layer_alias",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层别名"},
+             "description": "[切片服务]图层别名"},
             {"name": "layer_title",
             {"name": "layer_title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层标题"},
+             "description": "[切片服务]图层标题"},
             {"name": "layer_style",
             {"name": "layer_style",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS,WMS]图层样式"},
+             "description": "[切片服务，地图服务]图层样式"},
             {"name": "layer_format",
             {"name": "layer_format",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层format"},
+             "description": "[切片服务]图层format"},
             {"name": "layer_extent",
             {"name": "layer_extent",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层范围"},
+             "description": "[切片服务]图层范围"},
             {"name": "layer_description",
             {"name": "layer_description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层描述"},
+             "description": "[切片服务]图层描述"},
 
 
 
 
         ],
         ],

@@ -6,8 +6,8 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 import uuid
-from .models import WMTS
-from app.models import Service,db
+from ..models import TileService,Service,db,ServiceFunction
+
 import datetime
 import datetime
 import configure
 import configure
 import requests
 import requests
@@ -15,7 +15,7 @@ from requests import Response
 import json
 import json
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
-    api_name = "注册WMTS服务"
+    api_name = "注册切片服务"
 
 
     def process(self):
     def process(self):
         # 返回结果
         # 返回结果
@@ -25,7 +25,9 @@ class Api(ApiTemplate):
 
 
             this_time = datetime.datetime.now()
             this_time = datetime.datetime.now()
             service_guid = uuid.uuid1().__str__()
             service_guid = uuid.uuid1().__str__()
-            wmts_service_guid = uuid.uuid1().__str__()
+            tile_service_guid = uuid.uuid1().__str__()
+            service_function_guid = uuid.uuid1().__str__()
+
 
 
             service = Service(
             service = Service(
                 guid = service_guid,
                 guid = service_guid,
@@ -40,19 +42,18 @@ class Api(ApiTemplate):
                     configure.deploy_ip_host,
                     configure.deploy_ip_host,
                     self.para.get("overview") if self.para.get("overview") else "wmts_tb.png"),
                     self.para.get("overview") if self.para.get("overview") else "wmts_tb.png"),
                 type = self.para.get("type"),
                 type = self.para.get("type"),
-                service_guid = wmts_service_guid,
                 catalog_guid = self.para.get("catalog_guid")
                 catalog_guid = self.para.get("catalog_guid")
             )
             )
 
 
             #已存在就删除
             #已存在就删除
-            wmts_isexist = WMTS.query.filter_by(name=self.para.get("name")).one_or_none()
-            if wmts_isexist:
-                db.session.delete(wmts_isexist)
+            tile_service_isexist = TileService.query.filter_by(name=self.para.get("name")).one_or_none()
+            if tile_service_isexist:
+                db.session.delete(tile_service_isexist)
 
 
-            wmts = WMTS(
-                guid = wmts_service_guid,
+            tile_service = TileService(
+                guid = tile_service_guid,
                 name = self.para.get("name"),
                 name = self.para.get("name"),
-                wmts_type = self.para.get("wmts_type"),
+                tile_type = self.para.get("tile_type"),
                 vendor = self.para.get("vendor"),
                 vendor = self.para.get("vendor"),
                 create_time = this_time,
                 create_time = this_time,
                 crs = self.para.get("crs"),
                 crs = self.para.get("crs"),
@@ -70,19 +71,25 @@ class Api(ApiTemplate):
                 metadata_url="{}/DMap/Services/{}/MapServer/WMTSServer".format(configure.wmts_url,self.para.get("name"))
                 metadata_url="{}/DMap/Services/{}/MapServer/WMTSServer".format(configure.wmts_url,self.para.get("name"))
             )
             )
 
 
+            service_function = ServiceFunction(guid=service_function_guid,
+                                               service_guid=service_guid,
+                                               type=self.para.get("tile_type"))
+
             db.session.add(service)
             db.session.add(service)
-            db.session.add(wmts)
+            db.session.add(tile_service)
+            db.session.add(service_function)
             db.session.commit()
             db.session.commit()
 
 
-            # 调用WMTS的注册服务接口
+            # 调用切片服务的注册服务接口
             try:
             try:
                 url = "{}/dmap/api/manager/updatecache?servicename={}".format(configure.wmts_url,service.name)
                 url = "{}/dmap/api/manager/updatecache?servicename={}".format(configure.wmts_url,service.name)
                 resp:Response = requests.get(url)
                 resp:Response = requests.get(url)
                 if not resp.json()["status"].__eq__("true"):
                 if not resp.json()["status"].__eq__("true"):
-                    raise Exception("调用WMTS的注册服务接口失败！")
+                    raise Exception("调用切片服务的注册服务接口失败！")
             except Exception as e:
             except Exception as e:
                 db.session.delete(service)
                 db.session.delete(service)
-                db.session.delete(wmts)
+                db.session.delete(tile_service)
+                db.session.delete(service_function)
                 db.session.commit()
                 db.session.commit()
                 raise e
                 raise e
             res["data"] = service_guid
             res["data"] = service_guid
@@ -93,80 +100,82 @@ class Api(ApiTemplate):
         return res
         return res
 
 
     api_doc = {
     api_doc = {
-        "tags": ["WMTS接口"],
+        "tags": ["切片服务接口"],
         "parameters": [
         "parameters": [
             {"name": "name",
             {"name": "name",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "title",
             {"name": "title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "description",
             {"name": "description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "type",
             {"name": "type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务",
+             "enum":["地图服务","切片服务","影像服务"]},
             {"name": "catalog_guid",
             {"name": "catalog_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+             "description": "[地图服务，切片服务，影像服务]"},
             {"name": "scheme_guid",
             {"name": "scheme_guid",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS,影像WMTS]切片方案"},
+             "description": "[切片服务，影像服务]切片方案"},
             {"name": "overview",
             {"name": "overview",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]缩略图"},
-            {"name": "wmts_type",
+             "description": "[切片服务]缩略图"},
+            {"name": "tile_type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]wmts_type"},
+             "description": "[切片服务]tile_type",
+             "enum":["WMTS","TMS"]},
             {"name": "vendor",
             {"name": "vendor",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]厂商"},
+             "description": "[切片服务]厂商"},
             {"name": "crs",
             {"name": "crs",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]坐标系"},
+             "description": "[切片服务]坐标系"},
             {"name": "datasource",
             {"name": "datasource",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]数据路径"},
+             "description": "[切片服务]数据路径"},
             {"name": "layer_name",
             {"name": "layer_name",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层名"},
+             "description": "[切片服务]图层名"},
             {"name": "layer_alias",
             {"name": "layer_alias",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层别名"},
+             "description": "[切片服务]图层别名"},
             {"name": "layer_title",
             {"name": "layer_title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层标题"},
+             "description": "[切片服务]图层标题"},
             {"name": "layer_style",
             {"name": "layer_style",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层样式"},
+             "description": "[切片服务]图层样式"},
             {"name": "layer_format",
             {"name": "layer_format",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层format"},
+             "description": "[切片服务]图层format"},
             {"name": "layer_extent",
             {"name": "layer_extent",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层范围"},
+             "description": "[切片服务]图层范围"},
             {"name": "layer_description",
             {"name": "layer_description",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[WMTS]图层描述"},
+             "description": "[切片服务]图层描述"},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -40,7 +40,7 @@ class Api(ApiTemplate):
 
 
     api_doc = {
     api_doc = {
 
 
-        "tags": ["WMTS接口"],
+        "tags": ["切片服务接口"],
         "parameters": [
         "parameters": [
             {"name": "file",
             {"name": "file",
              "in": "formData",
              "in": "formData",

-# coding=utf-8
-#author:        4N
-#createtime:    2021/6/11
-#email:         nheweijun@sina.com
-
-
-from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, Time,Binary,Float
-from app.models import db
-
-
-
-class WMS(db.Model):
-    '''
-    WMTS元数据
-    '''
-    __tablename__ = 'dmdms_wms'
-
-    guid = Column(String(256), primary_key=True)
-    service = Column(String)
-    #基本信息
-    status = Column(String)
-    description = Column(String)
-    #厂家
-    username = Column(String(256))
-
-    readonly = Column(String)
-    updatetime = Column(DateTime)
-    sid = Column(Integer)
-    stype = Column(String)
-    ssupply = Column(String)
-    sctime = Column(String)
-    company = Column(String)
-    abstract = Column(String)
-    title = Column(String)
-    thumbnail = Column(String)
-
-    layer_style = Column(Text)
-
-    # service_guid = Column(String,ForeignKey('dmdms_service.guid'))
-    service_guid = Column(String)

-# coding=utf-8
-#author:        4N
-#createtime:    2021/6/11
-#email:         nheweijun@sina.com
-
-
-from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, Time,Binary,Float
-from app.models import db
-
-
-
-class WMTS(db.Model):
-    '''
-    WMTS元数据
-    '''
-    __tablename__ = 'dmap_wmts'
-
-    guid = Column(String(256), primary_key=True)
-
-    #基本信息
-    name = Column(String)
-    wmts_type = Column(String(256))
-    #厂家
-    vendor = Column(String(256))
-    create_time = Column(DateTime)
-    #坐标系
-    crs = Column(String(256))
-    #切片路径
-    datasource = Column(String)
-    #调用地址
-    metadata_url = Column(String)
-    #描述
-    description = Column(String)
-
-    #图层信息
-    #图层名
-    layer_name = Column(String(256))
-    #图层别名
-    layer_alias = Column(String(256))
-    #图层title
-    layer_title = Column(String(256))
-    #图层样式
-    layer_style = Column(String(256))
-    #图片格式
-    layer_format = Column(String(256))
-    #图层范围
-    layer_extent = Column(String)
-    #图层描述
-    layer_description = Column(String)
-
-    # scheme_guid = Column(String,ForeignKey('dmap_tile_scheme.guid'))
-    #
-    # service_guid = Column(String,ForeignKey('dmap_service.guid'))
-
-    scheme_guid = Column(String)
-    service_guid = Column(String)

@@ -4,14 +4,11 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from flask import current_app
+
 import os
 import os
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ModelVisitor import ModelVisitor
-from app.util.component.StructuredPrint import StructurePrint
-from app.models import Service,db
-from sqlalchemy.orm import load_only
+
 from flask import current_app
 from flask import current_app
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
@@ -26,9 +23,9 @@ class Api(ApiTemplate):
 
 
         result=dict()
         result=dict()
         result.update(self.para)
         result.update(self.para)
-        services = Service.query.options(load_only('guid')).all()
+
         result["root_path"] = os.path.dirname(current_app.instance_path)
         result["root_path"] = os.path.dirname(current_app.instance_path)
-        result["services"] = ModelVisitor.objects_to_jsonarray(services)
+
         return result
         return result
 
 
 
 

@@ -6,6 +6,8 @@ from app.util.component.ParameterUtil import ParameterUtil,StructurePrint
 from flask import current_app
 from flask import current_app
 import traceback
 import traceback
 import json
 import json
+
+
 class ApiTemplate:
 class ApiTemplate:
     #模板方法
     #模板方法
     para = dict()
     para = dict()

@@ -6,12 +6,13 @@ import os
 import uuid
 import uuid
 import shutil
 import shutil
 import time
 import time
-from app.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.StructuredPrint import StructurePrint
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session
 import configure
 import configure
 import copy
 import copy
+import datetime
 class EntryData:
 class EntryData:
 
 
     def entry(self,parameter):
     def entry(self,parameter):

@@ -6,7 +6,7 @@ import os
 import uuid
 import uuid
 import shutil
 import shutil
 import time
 import time
-from app.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.StructuredPrint import StructurePrint
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session
@@ -17,6 +17,7 @@ import traceback
 import copy
 import copy
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.VacuateConf import VacuateConf
 from app.util.component.VacuateConf import VacuateConf
+import datetime
 class EntryDataVacuate:
 class EntryDataVacuate:
 
 
     def entry(self,parameter):
     def entry(self,parameter):

@@ -4,7 +4,7 @@
 deploy_ip_host = "172.26.40.105:8840"
 deploy_ip_host = "172.26.40.105:8840"
 # 系统数据库
 # 系统数据库
 
 
-SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager_test"
+SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager"
 
 
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 #VACUATE_DB_URI = None
 #VACUATE_DB_URI = None