中秋节前备份

@@ -53,10 +53,10 @@ class Table(db.Model):
     '''
     数据表元数据
     '''
-    __tablename__ = 'dmdms_table'
+    __tablename__ = 'dmap_table'
     guid = Column(String(256), primary_key=True)
     # 数据源外键
-    database_guid = Column(String(256), ForeignKey('dmdms_database.guid'))
+    database_guid = Column(String(256), ForeignKey('dmap_database.guid'))
 
     # 点线面123
     table_type = Column(Integer)
@@ -77,7 +77,7 @@ class Table(db.Model):
     is_vacuate=Column(Integer,default=0)
 
     # 目录外键
-    catalog_guid = Column(String(256), ForeignKey('dmdms_catalog.guid'))
+    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')
@@ -87,12 +87,12 @@ class TableVacuate(db.Model):
     '''
     sub数据表元数据
     '''
-    __tablename__ = 'dmdms_table_vacuate'
+    __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('dmdms_table.guid'))
+    table_guid = Column(String(256), ForeignKey('dmap_table.guid'))
 
     #所在的库
     connectstr= Column(Text)
@@ -101,10 +101,10 @@ class Columns(db.Model):
     '''
     数据表的列
     '''
-    __tablename__ = 'dmdms_column'
+    __tablename__ = 'dmap_column'
     guid = Column(String(256), primary_key=True)
     # 表外键
-    table_guid= Column(String(256), ForeignKey('dmdms_table.guid'))
+    table_guid= Column(String(256), ForeignKey('dmap_table.guid'))
     name=Column(String(256))
     alias = Column(String(256))
     create_time = Column(DateTime)
@@ -114,7 +114,7 @@ class Task(db.Model):
     '''
     任务表
     '''
-    __tablename__ = 'dmdms_task'
+    __tablename__ = 'dmap_task'
     guid = Column(String(256), primary_key=True)
     name = Column(Text)
     process = Column(Text)
@@ -122,9 +122,9 @@ class Task(db.Model):
     update_time = Column(DateTime)
     state = Column(Integer)
     #数据源外键
-    database_guid = Column(String(256), ForeignKey('dmdms_database.guid'))
+    database_guid = Column(String(256), ForeignKey('dmap_database.guid'))
     #目录外键
-    catalog_guid = Column(String(256), ForeignKey('dmdms_catalog.guid'))
+    catalog_guid = Column(String(256), ForeignKey('dmap_catalog.guid'))
     #抽稀任务指定表的guid
     table_guid =  Column(String(256))
     #任务类型
@@ -146,10 +146,10 @@ class Process(db.Model):
     '''
     过程信息表
     '''
-    __tablename__ = 'dmdms_process'
+    __tablename__ = 'dmap_process'
     guid = Column(String(256), primary_key=True)
     # 任务外键
-    task_guid = Column(String(256), ForeignKey('dmdms_task.guid'))
+    task_guid = Column(String(256), ForeignKey('dmap_task.guid'))
     time = Column(DateTime)
     message = Column(Text)
 
@@ -158,9 +158,9 @@ class Catalog(db.Model):
     '''
     目录表
     '''
-    __tablename__ = 'dmdms_catalog'
+    __tablename__ = 'dmap_catalog'
     guid = Column(String(256), primary_key=True)
-    database_guid = Column(String(256), ForeignKey('dmdms_database.guid'))
+    database_guid = Column(String(256), ForeignKey('dmap_database.guid'))
     pguid = Column(String(256))
     path = Column(Text)
     name = Column(String(256))
@@ -169,11 +169,12 @@ class Catalog(db.Model):
     relate_tables = relationship('Table', backref='relate_catalog', lazy='dynamic')
     relate_tasks = relationship('Task', backref='relate_catalog', lazy='dynamic')
 
+
 class Database(db.Model):
     '''
     数据源表
     '''
-    __tablename__ = 'dmdms_database'
+    __tablename__ = 'dmap_database'
     guid = Column(String(256), primary_key=True)
     name = Column(String(256))
     alias = Column(String(256))
@@ -194,7 +195,7 @@ class InsertingLayerName(db.Model):
     '''
     正在入库的数据
     '''
-    __tablename__ = 'dmdms_iln'
+    __tablename__ = 'dmap_iln'
     guid = Column(String(256), primary_key=True)
     task_guid = Column(String(256))
     name = Column(String(256))
@@ -203,9 +204,9 @@ class InsertingLayerName(db.Model):
 class Service(db.Model):
     '''
     '''
-    __tablename__ = 'dmdms_service'
+    __tablename__ = 'dmap_service'
     guid = Column(String(256), primary_key=True)
-    name=Column(String(256))
+    name = Column(String(256))
     alias = Column(String(256))
     #服务状态
     state= Column(Integer)
@@ -216,5 +217,55 @@ class Service(db.Model):
     #服务节点
     node = Column(Integer)
     #服务缩略图
-    overview = Column(Binary)
+    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)
+    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_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)
\ No newline at end of file

@@ -13,7 +13,7 @@ class User (db.Model):
     '''
     用户信息表
     '''
-    __tablename__ = "dmdms_user"
+    __tablename__ = "dmap_user"
     id = Column(Integer, primary_key=True)
     username = Column(Text)
     password = Column(Text)
@@ -33,28 +33,28 @@ class User (db.Model):
 
 
 class OAuth2Client(db.Model, OAuth2ClientMixin):
-    __tablename__ = 'dmdms_oauth2_client'
+    __tablename__ = 'dmap_oauth2_client'
 
     id = Column(Integer, primary_key=True)
     user_id = Column(
-        Integer, ForeignKey('dmdms_user.id', ondelete='CASCADE'))
+        Integer, ForeignKey('dmap_user.id', ondelete='CASCADE'))
     user = relationship('User')
 
 
 class OAuth2AuthorizationCode(db.Model, OAuth2AuthorizationCodeMixin):
-    __tablename__ = 'dmdms_oauth2_code'
+    __tablename__ = 'dmap_oauth2_code'
 
     id = Column(Integer, primary_key=True)
     user_id = Column(
-        Integer, ForeignKey('dmdms_user.id', ondelete='CASCADE'))
+        Integer, ForeignKey('dmap_user.id', ondelete='CASCADE'))
     user = relationship('User')
 
 
 class OAuth2Token(db.Model, OAuth2TokenMixin):
-    __tablename__ = 'dmdms_oauth2_token'
+    __tablename__ = 'dmap_oauth2_token'
 
     id = Column(Integer, primary_key=True)
     user_id = Column(
-        Integer, ForeignKey('dmdms_user.id', ondelete='CASCADE'))
+        Integer, ForeignKey('dmap_user.id', ondelete='CASCADE'))
     # name = Column(Text)
     user = relationship('User')
\ No newline at end of file

+UTF-8
\ No newline at end of file

+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xml:lang="zh"><Esri><CreaDate>20170418</CreaDate><CreaTime>19355600</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>FALSE</SyncOnce><DataProperties><itemProps><itemName Sync="TRUE">北京县区</itemName><imsContentType Sync="TRUE">002</imsContentType><itemLocation><linkage Sync="TRUE">file://\\4N\E$\Data\北京县区区划\北京县区.shp</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation><nativeExtBox><westBL Sync="TRUE">115.417282</westBL><eastBL Sync="TRUE">117.500126</eastBL><southBL Sync="TRUE">39.438282</southBL><northBL Sync="TRUE">41.059244</northBL><exTypeCode Sync="TRUE">1</exTypeCode></nativeExtBox><itemSize Sync="TRUE">0.270</itemSize></itemProps><coordRef><type Sync="TRUE">Geographic</type><geogcsn Sync="TRUE">GCS_WGS_1984</geogcsn><csUnits Sync="TRUE">Angular Unit: Degree (0.017453)</csUnits><peXml Sync="TRUE">&lt;GeographicCoordinateSystem xsi:type='typens:GeographicCoordinateSystem' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:typens='http://www.esri.com/schemas/ArcGIS/10.1'&gt;&lt;WKT&gt;GEOGCS[&amp;quot;GCS_WGS_1984&amp;quot;,DATUM[&amp;quot;D_WGS_1984&amp;quot;,SPHEROID[&amp;quot;WGS_1984&amp;quot;,6378137.0,298.257223563]],PRIMEM[&amp;quot;Greenwich&amp;quot;,0.0],UNIT[&amp;quot;Degree&amp;quot;,0.0174532925199433],AUTHORITY[&amp;quot;EPSG&amp;quot;,4326]]&lt;/WKT&gt;&lt;XOrigin&gt;-400&lt;/XOrigin&gt;&lt;YOrigin&gt;-400&lt;/YOrigin&gt;&lt;XYScale&gt;11258999068426.238&lt;/XYScale&gt;&lt;ZOrigin&gt;-100000&lt;/ZOrigin&gt;&lt;ZScale&gt;10000&lt;/ZScale&gt;&lt;MOrigin&gt;-100000&lt;/MOrigin&gt;&lt;MScale&gt;10000&lt;/MScale&gt;&lt;XYTolerance&gt;8.983152841195215e-009&lt;/XYTolerance&gt;&lt;ZTolerance&gt;0.001&lt;/ZTolerance&gt;&lt;MTolerance&gt;0.001&lt;/MTolerance&gt;&lt;HighPrecision&gt;true&lt;/HighPrecision&gt;&lt;LeftLongitude&gt;-180&lt;/LeftLongitude&gt;&lt;WKID&gt;4326&lt;/WKID&gt;&lt;LatestWKID&gt;4326&lt;/LatestWKID&gt;&lt;/GeographicCoordinateSystem&gt;</peXml></coordRef></DataProperties><SyncDate>20210316</SyncDate><SyncTime>11462400</SyncTime><ModDate>20210316</ModDate><ModTime>11462400</ModTime></Esri><dataIdInfo><envirDesc Sync="TRUE"> Version 6.2 (Build 9200) ; Esri ArcGIS 10.2.0.3348</envirDesc><dataLang><languageCode value="zho" Sync="TRUE"></languageCode><countryCode value="CHN" Sync="TRUE"></countryCode></dataLang><idCitation><resTitle Sync="TRUE">北京县区</resTitle><presForm><PresFormCd value="005" Sync="TRUE"></PresFormCd></presForm></idCitation><spatRpType><SpatRepTypCd value="001" Sync="TRUE"></SpatRepTypCd></spatRpType><dataExt><geoEle><GeoBndBox esriExtentType="search"><exTypeCode Sync="TRUE">1</exTypeCode><westBL Sync="TRUE">115.417282</westBL><eastBL Sync="TRUE">117.500126</eastBL><northBL Sync="TRUE">41.059244</northBL><southBL Sync="TRUE">39.438282</southBL></GeoBndBox></geoEle></dataExt></dataIdInfo><mdLang><languageCode value="zho" Sync="TRUE"></languageCode><countryCode value="CHN" Sync="TRUE"></countryCode></mdLang><distInfo><distFormat><formatName Sync="TRUE">Shapefile</formatName></distFormat><distTranOps><transSize Sync="TRUE">0.270</transSize></distTranOps></distInfo><mdHrLv><ScopeCd value="005" Sync="TRUE"></ScopeCd></mdHrLv><mdHrLvName Sync="TRUE">dataset</mdHrLvName><refSysInfo><RefSystem><refSysID><identCode code="4326" Sync="TRUE"></identCode><idCodeSpace Sync="TRUE">EPSG</idCodeSpace><idVersion Sync="TRUE">8.1.1</idVersion></refSysID></RefSystem></refSysInfo><spatRepInfo><VectSpatRep><geometObjs Name="北京县区"><geoObjTyp><GeoObjTypCd value="002" Sync="TRUE"></GeoObjTypCd></geoObjTyp><geoObjCnt Sync="TRUE">17</geoObjCnt></geometObjs><topLvl><TopoLevCd value="001" Sync="TRUE"></TopoLevCd></topLvl></VectSpatRep></spatRepInfo><spdoinfo><ptvctinf><esriterm Name="北京县区"><efeatyp Sync="TRUE">Simple</efeatyp><efeageom code="4" Sync="TRUE"></efeageom><esritopo Sync="TRUE">FALSE</esritopo><efeacnt Sync="TRUE">17</efeacnt><spindex Sync="TRUE">TRUE</spindex><linrefer Sync="TRUE">FALSE</linrefer></esriterm></ptvctinf></spdoinfo><eainfo><detailed Name="北京县区"><enttyp><enttypl Sync="TRUE">北京县区</enttypl><enttypt Sync="TRUE">Feature Class</enttypt><enttypc Sync="TRUE">17</enttypc></enttyp><attr><attrlabl Sync="TRUE">FID</attrlabl><attalias Sync="TRUE">FID</attalias><attrtype Sync="TRUE">OID</attrtype><attwidth Sync="TRUE">4</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Internal feature number.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Sequential unique whole numbers that are automatically generated.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">OBJECTID</attrlabl><attalias Sync="TRUE">OBJECTID</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">10</attwidth><atprecis Sync="TRUE">10</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Internal feature number.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Sequential unique whole numbers that are automatically generated.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">Shape</attrlabl><attalias Sync="TRUE">Shape</attalias><attrtype Sync="TRUE">Geometry</attrtype><attwidth Sync="TRUE">0</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Feature geometry.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Coordinates defining the features.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">NAME</attrlabl><attalias Sync="TRUE">NAME</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">60</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">KIND</attrlabl><attalias Sync="TRUE">KIND</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">4</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Shape_Leng</attrlabl><attalias Sync="TRUE">Shape_Leng</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">19</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Shape_Area</attrlabl><attalias Sync="TRUE">Shape_Area</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">19</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Area of feature in internal units squared.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Positive real numbers that are automatically generated.</udom></attrdomv></attr></detailed></eainfo><mdDateSt Sync="TRUE">20210316</mdDateSt><mdChar><CharSetCd value="004" Sync="TRUE"></CharSetCd></mdChar></metadata>

@@ -51,7 +51,7 @@ class Api(ApiTemplate):
 
             else:
                 # 保存文件
-                parent = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+                parent = os.path.dirname(os.path.realpath(__file__))
                 dir_path, store_file = FileProcess.save(parent)
                 store_path = ZipUtil.unzip(store_file)
 

@@ -2,11 +2,13 @@
 #createtime:    2021/1/27
 #email:         nheweijun@sina.com
 
-from app.models import Table,Columns
+from app.models import Table,Columns,DES
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
-
+from app.util.component.PGUtil import PGUtil
+from osgeo.ogr import DataSource,Layer
+from osgeo.osr import SpatialReference
 class Api(ApiTemplate):
     api_name = "表信息"
     def process(self):
@@ -16,10 +18,21 @@ class Api(ApiTemplate):
             table = Table.query.filter_by(guid=table_guid).one_or_none()
             if not table:
                 raise Exception("数据不存在！")
-
+            pg_ds = PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
+            layer:Layer = pg_ds.GetLayerByName(table.name)
+            append_dict ={"epsg":None,"sr_wkt":None,"sr_proj4":None,"exist":1}
+            if layer:
+                sr:SpatialReference = layer.GetSpatialRef()
+                if sr:
+                    append_dict["epsg"] = sr.GetAuthorityCode(None)
+                    append_dict["sr_wkt"] = sr.ExportToWkt()
+                    append_dict["sr_proj4"] = sr.ExportToProj4()
+            else:
+                append_dict["exist"]=0
             columns = table.relate_columns.order_by(Columns.name).all()
             res["data"]=ModelVisitor.table_to_json(table)
             res["data"]["columns"] = ModelVisitor.objects_to_jsonarray(columns)
+            res["data"].update(append_dict)
             res["result"] = True
     
         except Exception as e:

@@ -5,18 +5,20 @@
 
 import datetime
 import traceback
-from app.models import Table, Database, DES,Task,db,TableVacuate
+from app.models import Table, Database, DES,Task,db,TableVacuate,Process
 
 from sqlalchemy.engine import ResultProxy
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.PGUtil import PGUtil
-from app.util.component.EntryDataVacuate import VacuateProcess,ThisTask,Process
+
 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
+from osgeo.ogr import DataSource,Layer,Geometry
+from osgeo import ogr
+from app.util.component.VacuateConf import VacuateConf
+from app.util.component.GeometryAdapter import GeometryAdapter
 
 from .table_vacuate_ref import Api as RefApi
 
@@ -139,8 +141,9 @@ class Api(ApiTemplate):
                 geo = feature.GetGeometryRef()
                 #插入抽稀图层
                 if geo is not None:
-                    vacuate_process.vacuate(geo)
+                    vacuate_process.vacuate(geo,feature)
 
+            vacuate_process.set_vacuate_count()
 
             #新增
             if configure.VACUATE_DB_URI:
@@ -212,4 +215,221 @@ class Api(ApiTemplate):
                 }
             }
         }
-    }
\ No newline at end of file
+    }
+
+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()

@@ -137,7 +137,9 @@ class Api(ApiTemplate):
                 geo = feature.GetGeometryRef()
                 #插入抽稀图层
                 if geo is not None:
-                    vacuate_process.vacuate(geo)
+                    vacuate_process.vacuate(geo,feature)
+
+            vacuate_process.set_vacuate_count()
 
             #删除原有数据
             for grid in grids:
@@ -278,6 +280,12 @@ class VacuateProcess:
             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]
 
@@ -304,15 +312,16 @@ class VacuateProcess:
 
                 v_ln = "z{}_vacuate_{}_{}".format(table_guid,lev, grid_name)
                 vl = pg.CreateLayer(v_ln, layer.GetSpatialRef(),ogr.wkbUnknown, options)
+
                 # 抽稀表需要属性
-                vl.CreateFields(layer.schema)
+                vl.CreateFields(schema)
                 self.vacuate_layers[l] = vl
 
         else:
             pass
 
 
-    def vacuate(self,g):
+    def vacuate(self,g,feature):
 
         if self.is_spatial:
 
@@ -349,15 +358,42 @@ class VacuateProcess:
                         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():

@@ -9,7 +9,7 @@ from flask import Blueprint
 from app.util import BlueprintApi
 
 from . import monitor_info
-class DataManager():
+class Monitor(BlueprintApi):
 
     bp = Blueprint("Monitor", __name__, url_prefix="/API/Monitor")
 

@@ -7,9 +7,3 @@
 from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, Time
 from app.models import db
 
-class TestModel(db.Model):
-    '''
-    数据表元数据
-    '''
-    __tablename__ = 'test_model'
-    guid = Column(String(256), primary_key=True)
\ No newline at end of file

@@ -2,3 +2,133 @@
 #author:        4N
 #createtime:    2021/9/14
 #email:         nheweijun@sina.com
+
+from flasgger import swag_from
+from flask import Blueprint
+from app.util import BlueprintApi
+from . import service_register
+from . import service_type
+from . import service_list
+from . import service_delete
+from . import catalog_create
+from . import catalog_delete
+from . import catalog_edit
+from . import catalog_tree
+from . import catalog_next
+from . import catalog_real_tree
+import os
+from flask import send_from_directory
+
+
+class DataManager(BlueprintApi):
+
+    bp = Blueprint("Service", __name__, url_prefix="/API/Service")
+
+    @staticmethod
+    @bp.route('/Register', methods=['POST'])
+    @swag_from(service_register.Api.api_doc)
+    def api_service_register():
+        """
+        服务注册
+        """
+        return service_register.Api().result
+
+    @staticmethod
+    @bp.route('/Type', methods=['GET'])
+    @swag_from(service_type.Api.api_doc)
+    def api_service_type():
+        """
+        可用服务类型
+        """
+        return service_type.Api().result
+
+    @staticmethod
+    @bp.route('/List', methods=['POST'])
+    @swag_from(service_list.Api.api_doc)
+    def api_service_list():
+        """
+        服务列表
+        """
+        return service_list.Api().result
+
+
+    @staticmethod
+    @bp.route('/Delete', methods=['POST'])
+    @swag_from(service_delete.Api.api_doc)
+    def api_service_delete():
+        """
+        服务删除
+        """
+        return service_delete.Api().result
+
+    @staticmethod
+    @bp.route('/CatalogCreate', methods=['POST'])
+    @swag_from(catalog_create.Api.api_doc)
+    def api_catalog_create():
+        """
+        创建服务目录
+        """
+        return catalog_create.Api().result
+
+    @staticmethod
+    @bp.route('/CatalogDelete', methods=['POST'])
+    @swag_from(catalog_delete.Api.api_doc)
+    def api_catalog_delete():
+        """
+        删除服务目录
+        """
+        return catalog_delete.Api().result
+
+    @staticmethod
+    @bp.route('/CatalogEdit', methods=['POST'])
+    @swag_from(catalog_edit.Api.api_doc)
+    def api_catalog_edit():
+        """
+        修改服务目录
+        """
+        return catalog_edit.Api().result
+
+    @staticmethod
+    @bp.route('/CatalogEdit', methods=['POST'])
+    @swag_from(catalog_edit.Api.api_doc)
+    def api_catalog_edit():
+        """
+        修改服务目录
+        """
+        return catalog_edit.Api().result
+
+    @staticmethod
+    @bp.route('/CatalogNext', methods=['POST'])
+    @swag_from(catalog_next.Api.api_doc)
+    def api_catalog_next():
+        """
+        下一级服务目录
+        """
+        return catalog_next.Api().result
+
+    @staticmethod
+    @bp.route('/CatalogTree', methods=['POST'])
+    @swag_from(catalog_tree.Api.api_doc)
+    def api_catalog_tree():
+        """
+        服务目录树
+        """
+        return catalog_tree.Api().result
+
+    @staticmethod
+    @bp.route('/CatalogRealTree', methods=['POST'])
+    @swag_from(catalog_real_tree.Api.api_doc)
+    def api_catalog_real_tree():
+        """
+        服务目录树
+        """
+        return catalog_real_tree.Api().result
+
+
+    @staticmethod
+    @bp.route('/Overview/<file>', methods=['GET'])
+    def table_download_file(file):
+        parent = os.path.dirname(os.path.realpath(__file__))
+        dirpath = os.path.join(parent,"overview")
+
+        return send_from_directory(dirpath, filename=file, as_attachment=True)
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/3/9
+#email:         nheweijun@sina.com
+
+import uuid
+from app.models import ServiceCatalog,db
+from app.util.component.ApiTemplate import ApiTemplate
+class Api(ApiTemplate):
+    api_name = "创建服务目录"
+
+
+    def process(self):
+  
+        # 返回结果
+        res = {}
+        res["result"] = False
+        try:
+
+
+            if ServiceCatalog.query.filter_by(name=self.para.get("name"),
+                                       pguid=self.para.get("pguid"),
+                                       database_guid=self.para.get("database_guid")).one_or_none():
+                res["msg"]="目录已经存在！"
+                return res
+
+    
+            guid = uuid.uuid1().__str__()
+            path = guid
+    
+            # 获得目录的全路径
+            pguid = self.para.get("pguid")
+            count = 0
+            while pguid !="0" and count<100:
+                count+=1
+                path = pguid+":"+path
+                p_catalog = ServiceCatalog.query.filter_by(guid=pguid).one_or_none()
+                pguid = p_catalog.pguid
+            if count==100:
+                raise Exception("目录结构出现问题！")
+            path = "0" + ":" + path
+    
+            sort = ServiceCatalog.query.filter_by(pguid=self.para.get("pguid")).count()
+    
+            catalog = ServiceCatalog(guid=guid,
+                              pguid=self.para.get("pguid"),name=self.para.get("name"),
+                              sort=sort,
+                              description=self.para.get("description"),
+                              path=path)
+            db.session.add(catalog)
+            db.session.commit()
+
+
+            res["msg"] = "目录创建成功！"
+            res["data"] = guid
+            res["result"] = True
+        except Exception as e:
+            db.session.rollback()
+            raise e
+        return res
+    
+    api_doc={
+    
+    "tags":["服务接口"],
+    "parameters":[
+        {"name": "name",
+         "in": "formData",
+         "type": "string",
+         "description":"目录名"},
+        {"name": "pguid",
+         "in": "formData",
+         "type": "string","description":"父目录guid，创建根目录时为0"}
+    
+    ],
+    "responses":{
+        200:{
+            "schema":{
+                "properties":{
+                }
+            }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/3/9
+#email:         nheweijun@sina.com
+
+
+
+from app.models import ServiceCatalog,db,Service
+from app.util.component.ApiTemplate import ApiTemplate
+class Api(ApiTemplate):
+    api_name = "删除目录"
+    def process(self):
+
+    
+        # 返回结果
+        res = {}
+        try:
+            # 业务逻辑
+
+
+            catalog_guid = self.para.get("guid")
+    
+            catalog =  ServiceCatalog.query.filter_by(guid=catalog_guid).one_or_none()
+            if not catalog:
+                res["msg"]="目录不存在!"
+                return res
+
+            else:
+
+                pguid = catalog.pguid
+                # 所有目录
+                catalogs = ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + catalog_guid + "%")).all()
+                for cata in catalogs:
+                    if pguid.__eq__("0"):
+                        Service.query.filter_by(catalog_guid=cata.guid).update({"catalog_guid": None})
+                        db.session.delete(cata)
+                    else:
+                        Service.query.filter_by(catalog_guid=cata.guid).update({"catalog_guid": pguid})
+                        db.session.delete(cata)
+    
+                db.session.commit()
+                res["msg"] = "目录删除成功！"
+                res["result"] = True
+        except Exception as e:
+            db.session.rollback()
+            raise e
+        return res
+    
+    
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "目录guid", "required": "true"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

+# coding=utf-8
+#author:        4N
+#createtime:    2021/3/9
+#email:         nheweijun@sina.com
+
+from app.models import ServiceCatalog,db
+
+from app.util.component.ApiTemplate import ApiTemplate
+class Api(ApiTemplate):
+    api_name = "修改目录"
+    def process(self):
+ 
+
+        # 返回结果
+        res = {}
+        try:
+            # 业务逻辑
+            if not ServiceCatalog.query.filter_by(guid=self.para.get("guid")).one_or_none():
+                res["msg"]="目录不存在!"
+                res["result"]=False
+                return res
+            else:
+                if self.para.get("name"):
+                    ServiceCatalog.query.filter_by(guid=self.para.get("guid")).update({"name":self.para.get("name")})
+                if self.para.__contains__("description"):
+                    ServiceCatalog.query.filter_by(guid=self.para.get("guid")).update({"description":self.para.get("description")})
+                db.session.commit()
+                res["msg"] = "目录修改成功！"
+                res["result"] = True
+        except Exception as e:
+            db.session.rollback()
+            raise e
+        return res
+    
+    
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "目录guid", "required": "true"},
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "description": "目录名", "required": "true"}
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

+# coding=utf-8
+#author:        4N
+#createtime:    2021/3/9
+#email:         nheweijun@sina.com
+
+
+from app.models import ServiceCatalog,db,Service
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+class Api(ApiTemplate):
+    api_name = "下一级目录"
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            # 业务逻辑
+
+            res["data"] = []
+            catalogs = ServiceCatalog.query.filter_by(pguid=self.para.get("catalog_guid")).all()
+            for cata in catalogs:
+                catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]
+                service_count = Service.query.filter(Service.catalog_guid.in_(catalog_guids)).count()
+                cata_json = ModelVisitor.object_to_json(cata)
+                cata_json["service_count"]=service_count
+                res["data"].append(cata_json)
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc={
+
+    "tags":["服务接口"],
+    "parameters":[
+        {"name": "catalog_guid",
+         "in": "formData",
+         "type": "string",
+         "description":"目录guid","required": "true"},
+        {"name": "database_guid",
+         "in": "formData",
+         "type": "string",
+         "description": "数据库guid", "required": "true"},
+
+    ],
+    "responses":{
+        200:{
+            "schema":{
+                "properties":{
+                }
+            }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/3/9
+#email:         nheweijun@sina.com
+
+
+from app.models import ServiceCatalog,Service
+
+from app.util.component.ApiTemplate import ApiTemplate
+class Api(ApiTemplate):
+    api_name = "目录树"
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            # 业务逻辑
+
+            catalogs = ServiceCatalog.query.all()
+
+            tree_origin = []
+            for cata in catalogs:
+                catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]
+                service_count = Service.query.filter(Service.catalog_guid.in_(catalog_guids)).count()
+
+                cata_json ={}
+
+                cata_json["description"] = cata.description
+                cata_json["guid"] = cata.guid
+                cata_json["name"] = cata.name
+                cata_json["path"] = cata.path
+                cata_json["pguid"] = cata.pguid
+                cata_json["sort"] = cata.sort
+                cata_json["service_count"]=service_count
+                cata_json["children"] = []
+                tree_origin.append(cata_json)
+
+            for cata in tree_origin:
+                cata_pguid = cata["pguid"]
+                if not cata_pguid=="0":
+                    for c in tree_origin:
+                        if c["guid"].__eq__(cata_pguid):
+                            c["children"].append(cata)
+
+            res["data"] = [cata for cata in tree_origin if cata["pguid"].__eq__("0")]
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc={
+    
+    "tags":["服务接口"],
+    "parameters":[
+        {"name": "database_guid",
+         "in": "formData",
+         "type": "string",
+         "description": "数据库guid", "required": "true"},
+    
+    ],
+    "responses":{
+        200:{
+            "schema":{
+                "properties":{
+                }
+            }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/3/9
+#email:         nheweijun@sina.com
+
+
+from app.models import Service,ServiceCatalog,db
+
+from app.util.component.ApiTemplate import ApiTemplate
+class Api(ApiTemplate):
+    api_name = "目录"
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            # 业务逻辑
+            catalogs = ServiceCatalog.query.all()
+            res["data"]=[]
+            for cata in catalogs:
+                catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]
+                service_count = Service.query.filter(Service.catalog_guid.in_(catalog_guids)).count()
+                cata_json ={}
+                cata_json["database_guid"]=cata.database_guid
+                cata_json["description"] = cata.description
+                cata_json["guid"] = cata.guid
+                cata_json["name"] = cata.name
+                cata_json["path"] = cata.path
+                cata_json["pguid"] = cata.pguid
+                cata_json["sort"] = cata.sort
+                cata_json["service_count"]=service_count
+                res["data"].append(cata_json)
+    
+            res["result"] = True
+    
+        except Exception as e:
+            raise e
+        return res
+    
+    api_doc={
+    
+    "tags":["服务接口"],
+    "parameters":[
+        {"name": "database_guid",
+         "in": "formData",
+         "type": "string",
+         "description": "数据库guid", "required": "true"},
+    
+    ],
+    "responses":{
+        200:{
+            "schema":{
+                "properties":{
+                }
+            }
+            }
+        }
+    }
\ No newline at end of file

@@ -17,7 +17,7 @@ from . import feature_edit
 class DataManager(BlueprintApi):
 
     bp = Blueprint("FeatureService", __name__, url_prefix="/API/FeatureService")
-
+    service_type = ["要素服务"]
     @staticmethod
     @bp.route('/Query', methods=['POST'])
     @swag_from(feature_query.Api.api_doc)

@@ -17,9 +17,12 @@ from . import image_list
 from . import image_tile
 from . import image_wms
 
+
+
 class DataManager(BlueprintApi):
 
-    bp = Blueprint("Image", __name__, url_prefix="/API/Image")
+    bp = Blueprint("Image", __name__, url_prefix="/API/Service/Image")
+    service_type = ["影像WMS服务","影像WMTS服务"]
 
     @staticmethod
     @bp.route('/Register', methods=['POST'])

@@ -17,8 +17,8 @@ class Api(ApiTemplate):
         try:
             guid = self.para.get("guid")
             image = Image.query.filter_by(guid=guid).one_or_none()
+            db.session.delete(image)
             db.session.commit()
-            # res["data"] = guid
             res["result"] = True
 
         except Exception as e:
@@ -31,8 +31,7 @@ class Api(ApiTemplate):
         "parameters": [
             {"name": "guid",
              "in": "formData",
-             "type": "string",
-             "description": "data_server"}
+             "type": "string"}
         ],
         "responses": {
             200: {

@@ -47,6 +47,20 @@ class Api(ApiTemplate):
     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"},
+            {"name": "name",
+             "in": "formData",
+             "type": "string"},
         ],
         "responses": {
             200: {

@@ -6,53 +6,26 @@
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
-from app.modules.service.image.models import ImageService
-from sqlalchemy import or_
 
+from app.modules.service.image.models import Image
+from sqlalchemy import or_,and_
 class Api(ApiTemplate):
 
-
-
-    api_name = "注册影像服务"
-
-
-
+    api_name = "影像数据预览功能"
 
     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")
-
-            image_services = ImageService.query
-            # 并集
-            if alias and name:
-                image_services = image_services.filter(or_(ImageService.alias.like("%" + alias + "%") , ImageService.name.like("%" + name + "%")))
-            else:
-                if alias:
-                    image_services = image_services.filter(ImageService.alias.like("%" + alias + "%"))
-                if name:
-                    image_services = image_services.filter(ImageService.name.like("%" + name + "%"))
-
-            image_services = image_services.limit(page_size).offset(page_index).all()
-
-            res["data"] = ModelVisitor.objects_to_jsonarray(image_services)
             res["result"] = True
-
-
         except Exception as e:
             raise e
 
         return res
 
+
     api_doc = {
         "tags": ["影像接口"],
         "parameters": [
@@ -65,4 +38,6 @@ class Api(ApiTemplate):
                 }
             }
         }
-    }
\ No newline at end of file
+    }
+
+

@@ -53,21 +53,21 @@ class Api(ApiTemplate):
                     right_buttom = (geo[0] + geo[1] * image.RasterXSize, geo[3] + geo[5] * image.RasterYSize)
                     origin_extent = [left_top[0], right_buttom[0], right_buttom[1], left_top[1]]
 
-                    target = origin.CloneGeogCS()
-                    tran = osr.CoordinateTransformation(origin, target)
-
-                    geo_left_top = tran.TransformPoint(geo[0], geo[3])
-                    geo_right_buttom = tran.TransformPoint(geo[0] + geo[1] * image.RasterXSize,
-                                                           geo[3] + geo[5] * image.RasterYSize)
-
-                    geo_origin_extent = [geo_left_top[1], geo_right_buttom[0], geo_right_buttom[1], geo_left_top[0]]
+                    # target = origin.CloneGeogCS()
+                    # tran = osr.CoordinateTransformation(origin, target)
+                    #
+                    # geo_left_top = tran.TransformPoint(geo[0], geo[3])
+                    # geo_right_buttom = tran.TransformPoint(geo[0] + geo[1] * image.RasterXSize,
+                    #                                        geo[3] + geo[5] * image.RasterYSize)
+                    #
+                    # geo_origin_extent = [geo_left_top[1], geo_right_buttom[0], geo_right_buttom[1], geo_left_top[0]]
 
                     info = {"band_count": band_count,
                             "overview_count": count,
                             "path":image_info["path"],
                             "xy_size": [image.RasterXSize, image.RasterYSize],
                             "origin_extent": origin_extent,
-                            "geo_origin_extent": geo_origin_extent,
+                            # "geo_origin_extent": geo_origin_extent,
                             "null_value": nodatavalue,
                             "size":os.path.getsize(image_info["path"]),
                             "sr_wkt": image.GetProjection(),
@@ -102,8 +102,6 @@ class Api(ApiTemplate):
                 #     origin_extent = info["origin_extent"]
 
 
-
-
                 exist_image = Image.query.filter_by(path=os.path.normpath(info.get("path")),
                                                     size=info.get("size")).one_or_none()
                 if exist_image:
@@ -120,7 +118,7 @@ class Api(ApiTemplate):
                                   cell_y_size = abs(info.get("cell_y_size")),
                                   name=os.path.basename(info.get("path")),
                                   origin_extent=json.dumps(info["origin_extent"]),
-                                  geo_origin_extent = json.dumps(info["geo_origin_extent"]),
+                                  # geo_origin_extent = json.dumps(info["geo_origin_extent"]),
                                   null_value=info.get("null_value"),
                                   server=data_server,
                                   path = os.path.normpath(info.get("path")),

+# coding=utf-8
+#author:        4N
+#createtime:    2021/7/19
+#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
+import uuid
+from app.util.component.SliceScheme import SliceScheme
+from app.util.component.FileProcess import FileProcess
+import os
+import json
+import datetime
+class Api(ApiTemplate):
+
+    api_name = "注册影像服务"
+
+    def process(self):
+
+
+
+        # 返回结果
+        res = {}
+
+        try:
+
+            res["result"] = True
+        except Exception as e:
+            raise e
+
+        return res
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+            {"name": "guids",
+             "in": "formData",
+             "type": "string",
+             "description": "影像guids，以英文逗号相隔"},
+            {"name": "file",
+             "in": "formData",
+             "type": "file",
+             "description": "切片方案"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 
 from app.modules.service.image.models import ImageService,Image
-from app.models import db
+from app.models import db,Service
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 from app.util.component.SliceScheme import SliceScheme
@@ -26,6 +26,8 @@ class Api(ApiTemplate):
         try:
             guids = self.para.get("guids").split(",")
             name = self.para.get("name")
+            catalog_guid = self.para.get("catalog_guid")
+
             service_guid = uuid.uuid1().__str__()
 
 
@@ -33,7 +35,7 @@ class Api(ApiTemplate):
             dir_path, store_file = FileProcess.save(parent)
             scheme = SliceScheme(store_file).parameter
 
-            service = ImageService(guid=service_guid, name=name, slice_scheme=json.dumps(scheme),
+            service = ImageService(guid=service_guid, name=name,
                                    create_time=datetime.datetime.now())
             service_exetent = []
 

@@ -91,11 +91,8 @@ class Api(ApiTemplate):
             height, width = 256,256
 
             # 多线程获取分布式数据
-            if abs(extent[0])>180:
-                intersect_image = [im for im in images if self.determin_intersect(json.loads(im.origin_extent),extent)]
-            else:
-                intersect_image = [im for im in images if self.determin_intersect(json.loads(im.geo_origin_extent), extent)]
 
+            intersect_image = [im for im in images if self.determin_intersect(json.loads(im.origin_extent),extent)]
 
             if len(intersect_image) > 1:
 

@@ -67,12 +67,10 @@ class Api(ApiTemplate):
 
             bands = [1, 2, 3]
             extent = [float(x) for x in bbox.split(",")]
-            extent = [extent[1],extent[0],extent[3],extent[2]]
+            # extent = [extent[1],extent[0],extent[3],extent[2]]
 
-            if abs(extent[0])>180:
-                intersect_image = [im for im in images if self.determin_intersect(json.loads(im.origin_extent),extent)]
-            else:
-                intersect_image = [im for im in images if self.determin_intersect(json.loads(im.geo_origin_extent), extent)]
+
+            intersect_image = [im for im in images if self.determin_intersect(json.loads(im.origin_extent),extent)]
 
             if len(intersect_image)>1:
 
@@ -141,7 +139,6 @@ class Api(ApiTemplate):
             result["message"] = e.__str__()
             return result
 
-
     def determine_level(self,xysize,origin_extent,extent,max_level):
         '''
         根据范围判断调用金字塔的哪一层
@@ -201,7 +198,7 @@ class Api(ApiTemplate):
         '''
         thrift_connect = ThriftConnect(image.server)
         t1 = time.time()
-        image_extent = image.origin_extent if abs(extent[0])>180 else image.geo_origin_extent
+        image_extent = image.origin_extent
 
         data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands,width,height)
 
@@ -324,7 +321,7 @@ class Api(ApiTemplate):
     def get_capabilities(self,image_service:ImageService):
 
         xml = '''<?xml version="1.0" encoding="utf-8" ?>
-        <WMS_Capabilities version="1.3.0">
+        <WMS_Capabilities version="1.2.0">
             <Service>
                 <Name>WMS</Name>
                 <Title>{service_title}</Title>

@@ -13,22 +13,21 @@ class Image(db.Model):
     '''
     影像元数据
     '''
-    __tablename__ = 'dmdms_image'
+    __tablename__ = 'dmap_image'
     guid = Column(String(256), primary_key=True)
     name = Column(String)
     alias = Column(String)
     raster_y_size = Column(Integer)
     raster_x_size = Column(Integer)
     overview_count = Column(Integer)
-    origin_extent = Column(String)
-    geo_origin_extent = Column(String)
+    extent = Column(String)
+    # geo_origin_extent = Column(String)
     null_value = Column(Integer)
     available = Column(Integer)#影像是否可用，不可用可能在创建金字塔中
     band_count = Column(Integer)
     path = Column(String)
     server = Column(String)
-    # host=Column(String)
-    # port=Column(Integer)
+
     size = Column(Float)
     #坐标wkt
     sr_wkt = Column(Text)
@@ -42,9 +41,9 @@ class Image(db.Model):
     #年份
     ym = Column(String(256))
 
-dmdms_image_rel = db.Table('dmdms_image_rel',
-    Column('image_guid',String, ForeignKey('dmdms_image.guid')),
-    Column('service_guid', String, ForeignKey('dmdms_image_service.guid'))
+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'))
     )
 
 
@@ -53,44 +52,40 @@ class ImageService(db.Model):
     '''
     影像服务
     '''
-    __tablename__ = 'dmdms_image_service'
+    __tablename__ = 'dmap_image_service'
     guid = Column(String(256), primary_key=True)
-    name=Column(String(256))
-    alias = Column(String(256))
-    state= Column(Integer)
-    create_time = Column(DateTime)
-    update_time = Column(DateTime)
-    description = Column(Text)
-    slice_scheme = Column(Text)
+
+    scheme_guid = Column(Text)
     extent = Column(String(256))
-    node = Column(Integer)
+    # node = Column(Integer)
     #可视范围geojson
-    visual_range = Column(Text)
-    #影像服务缩略图
-    overview = Column(Binary)
+    visual_region = Column(Text)
+    crs = Column(String(256))
+
+    service_guid = Column(String, ForeignKey('dmap_service.guid'))
 
     images  = db.relationship('Image',
-                              secondary=dmdms_image_rel,
+                              secondary=dmap_image_rel,
                               backref='image_services',
                               lazy='dynamic'
                               )
 
 
-dmdms_image_tag_rel = db.Table('dmdms_image_tag_rel',
-    Column('image_guid',String, ForeignKey('dmdms_image.guid')),
-    Column('tag_guid', String, ForeignKey('dmdms_image_tag.guid'))
+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__ = 'dmdms_image_tag'
+    __tablename__ = 'dmap_image_tag'
     guid = Column(String(256), primary_key=True)
     name=Column(String(256))
     alias = Column(String(256))
     images  = db.relationship('Image',
-                              secondary=dmdms_image_tag_rel,
+                              secondary=dmap_image_tag_rel,
                               backref='image_tags',
                               lazy='dynamic'
                               )

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/16
+#email:         nheweijun@sina.com
+
+
+from flasgger import swag_from
+from flask import Blueprint
+from app.util import BlueprintApi
+
+from . import scheme_create
+from . import scheme_delete
+from . import scheme_edit
+from . import scheme_list
+from . import scheme_resolve
+
+class SchemeManager(BlueprintApi):
+
+    bp = Blueprint("Scheme", __name__, url_prefix="/API/Service/Scheme")
+
+    @staticmethod
+    @bp.route('/Create', methods=['POST'])
+    @swag_from(scheme_create.Api.api_doc)
+    def api_scheme_create():
+        """
+        创建切片方案
+        """
+        return scheme_create.Api().result
+
+
+    @staticmethod
+    @bp.route('/Delete', methods=['POST'])
+    @swag_from(scheme_delete.Api.api_doc)
+    def api_scheme_delete():
+        """
+         删除切片方案
+        """
+        return scheme_delete.Api().result
+
+    @staticmethod
+    @bp.route('/Edit', methods=['POST'])
+    @swag_from(scheme_edit.Api.api_doc)
+    def api_scheme_edit():
+        """
+         修改切片方案
+        """
+        return scheme_edit.Api().result
+
+
+    @staticmethod
+    @bp.route('/List', methods=['POST'])
+    @swag_from(scheme_list.Api.api_doc)
+    def api_scheme_list():
+        """
+         切片方案List
+        """
+        return scheme_list.Api().result
+
+
+    @staticmethod
+    @bp.route('/Resolve', methods=['POST'])
+    @swag_from(scheme_resolve.Api.api_doc)
+    def api_scheme_resolve():
+        """
+         解析切片方案
+        """
+        return scheme_resolve.Api().result
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/16
+#email:         nheweijun@sina.com
+
+
+import uuid
+from app.models import TileScheme,db
+from app.util.component.ApiTemplate import ApiTemplate
+import datetime
+import json
+class Api(ApiTemplate):
+    api_name = "创建方案"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        res["result"] = False
+        try:
+            # 业务逻辑
+
+            data = self.para
+            # extent = [float(x) for x in  data.get("extent").split(",")] if data.get("extent") else [0,0,0,0]
+            # top_left = [float(x) for x in data.get("top_left").split(",")] if data.get("top_left") else [0, 0]
+
+            guid = uuid.uuid1().__str__()
+            tile_scheme = TileScheme(
+                guid = guid,
+                name = data.get("name"),
+                alias = data.get("alias"),
+                description = data.get("description"),
+                crs = data.get("crs"),
+                crs_wkt = data.get("crs_wkt"),
+                extent = data.get("extent"),
+                top_left =  data.get("top_left"),
+                # ymin = extent[1],
+                # xmax = extent[2],
+                # ymax = extent[3],
+                # origin_x = top_left[0],
+                # origin_y = top_left[1],
+                levels = json.dumps(data.get("levels")),
+                dpi = int(data.get("dpi")),
+                rows = int(data.get("rows")),
+                cols = int(data.get("clos")),
+                update_time = datetime.datetime.now()
+            )
+
+            db.session.add(tile_scheme)
+            db.session.commit()
+            res["data"] = guid
+            res["result"] = True
+        except Exception as e:
+            db.session.rollback()
+            raise Exception("参数填写错误！")
+        return res
+
+    api_doc = {
+
+        "tags": ["方案接口"],
+        "parameters": [
+            {"name": "name",
+             "in": "formData",
+             "type": "string"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string"},
+            {"name": "crs",
+             "in": "formData",
+             "type": "string"},
+            {"name": "crs_wkt",
+             "in": "formData",
+             "type": "string"},
+            {"name": "extent",
+             "in": "formData",
+             "type": "string"},
+            {"name": "top_left",
+             "in": "formData",
+             "type": "string"},
+            {"name": "rows",
+             "in": "formData",
+             "type": "string"},
+            {"name": "cols",
+             "in": "formData",
+             "type": "string"},
+            {"name": "dpi",
+             "in": "formData",
+             "type": "string"},
+            {"name": "levels",
+             "in": "formData",
+             "type": "string"},
+
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/16
+#email:         nheweijun@sina.com
+
+
+import uuid
+from app.models import TileScheme,db
+from app.util.component.ApiTemplate import ApiTemplate
+import datetime
+
+class Api(ApiTemplate):
+    api_name = "修改方案"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        res["result"] = False
+        try:
+            # 业务逻辑
+
+
+            guid = self.para.get("guid")
+
+            tile_scheme:TileScheme = TileScheme.query.filter_by(guid=guid).one_or_none()
+            if tile_scheme is None:
+                raise Exception("不存在该切片方案！")
+            db.session.delete(tile_scheme)
+            db.session.commit()
+
+            res["data"] = guid
+            res["result"] = True
+        except Exception as e:
+            db.session.rollback()
+
+        return res
+
+    api_doc = {
+
+        "tags": ["方案接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string"}
+
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/16
+#email:         nheweijun@sina.com
+
+
+import uuid
+from app.models import TileScheme,db
+from app.util.component.ApiTemplate import ApiTemplate
+import datetime
+
+class Api(ApiTemplate):
+    api_name = "修改方案"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        res["result"] = False
+        try:
+            # 业务逻辑
+            data = self.para
+
+            guid = data.get("guid")
+
+            tile_scheme:TileScheme = TileScheme.query.filter_by(guid=guid).one_or_none()
+            if tile_scheme is None:
+                raise Exception("不存在该切片方案！")
+
+            update_dict = data
+            update_dict["update_time"] = datetime.datetime.now()
+            del update_dict["guid"]
+
+            tile_scheme.update(update_dict)
+            db.session.commit()
+
+            res["data"] = guid
+            res["result"] = True
+        except Exception as e:
+            db.session.rollback()
+            raise Exception("参数填写错误！")
+        return res
+
+    api_doc = {
+
+        "tags": ["方案接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string"},
+            {"name": "name",
+             "in": "formData",
+             "type": "string"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string"},
+            {"name": "crs",
+             "in": "formData",
+             "type": "string"},
+            {"name": "crs_wkt",
+             "in": "formData",
+             "type": "string"},
+            {"name": "extent",
+             "in": "formData",
+             "type": "string"},
+            {"name": "top_left",
+             "in": "formData",
+             "type": "string"},
+            {"name": "rows",
+             "in": "formData",
+             "type": "string"},
+            {"name": "cols",
+             "in": "formData",
+             "type": "string"},
+            {"name": "dpi",
+             "in": "formData",
+             "type": "string"},
+            {"name": "levels",
+             "in": "formData",
+             "type": "string"},
+
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/16
+#email:         nheweijun@sina.com
+
+
+import uuid
+from app.models import TileScheme,db
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+from sqlalchemy import or_
+import datetime
+
+class Api(ApiTemplate):
+    api_name = "查询切片方案"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        res["result"] = False
+        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")
+            schemes = TileScheme.query
+
+            # 并集
+            if alias and name:
+                schemes = schemes.filter(or_(TileScheme.alias.like("%" + alias + "%") , TileScheme.name.like("%" + name + "%")))
+            else:
+                if alias:
+                    schemes = schemes.filter(TileScheme.alias.like("%" + alias + "%"))
+                if name:
+                    schemes = schemes.filter(TileScheme.name.like("%" + name + "%"))
+
+            schemes = schemes.limit(page_size).offset(page_index).all()
+
+            res["data"] = ModelVisitor.objects_to_jsonarray(schemes)
+            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"},
+            {"name": "name",
+             "in": "formData",
+             "type": "string"},
+
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/16
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+import os
+from app.util.component.FileProcess import FileProcess
+from app.util.component.SliceScheme import SliceScheme
+import shutil
+from app.util.component.StructuredPrint import StructurePrint
+class Api(ApiTemplate):
+    api_name = "解析方案"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        store_file = ""
+        try:
+            # 业务逻辑
+            parent = os.path.dirname(os.path.realpath(__file__))
+            dir_path, store_file = FileProcess.save(parent)
+            scheme = SliceScheme(store_file)
+
+            data = {
+                "crs_wkt": scheme.parameter.get("wkt"),
+                "top_left": "{},{}".format(scheme.parameter.get("x"),scheme.parameter.get("y")),
+                "dpi": scheme.parameter.get("dpi"),
+                "rows": scheme.parameter.get("rows"),
+                "cols": scheme.parameter.get("cols"),
+                "levels": scheme.levels
+            }
+
+            res["data"] = data
+            res["result"] = True
+        except Exception as e:
+            raise e
+        finally:
+            try:
+                file_tmp_path = os.path.join(store_file.split("file_tmp")[0],"file_tmp")
+                dir_path = os.path.dirname(store_file)
+                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("删除文件失败！","ERROR")
+        return res
+
+    api_doc = {
+
+        "tags": ["方案接口"],
+        "parameters": [
+            {"name": "file",
+             "in": "formData",
+             "type": "file",
+             "description": "切片方案"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+from app.util.component.ApiTemplate import ApiTemplate
+
+from app.util import find_class,BlueprintApi
+from app.models import Service,db
+
+
+class Api(ApiTemplate):
+    api_name = "服务类型"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+
+        try:
+            guid = self.para.get("guid")
+            service = Service.query.filter_by(guid=guid).one_or_none()
+            db.session.remove(service)
+            db.session.commit()
+            res["result"] = True
+        except Exception as e:
+            raise e
+
+        return res
+
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "guid"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+
+class Api(ApiTemplate):
+    api_name = "修改服务"
+    def process(self):
+        res = {}
+        try:
+            if self.para.get("type").__eq__("影像WMS"):
+                from app.modules.service.image.image_service_edit import Api
+            elif self.para.get("type").__eq__("影像WMTS"):
+                from app.modules.service.image.image_service_edit import Api
+            elif self.para.get("type").__eq__("WMS"):
+                from app.modules.service.wms.wms_edit import Api
+            elif self.para.get("type").__eq__("WMTS"):
+                from app.modules.service.wmts.wmts_edit import Api
+            else:
+                return res
+            api = Api()
+            api.para = self.para
+            res = api.process()
+
+        except Exception as e:
+            raise e
+        return res
+
+
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+from app.models import Service
+from sqlalchemy import or_
+
+
+class Api(ApiTemplate):
+    api_name = "服务列表"
+
+    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 = Service.query
+            if type:
+                services = services.filter_by(type=type)
+            # 并集
+            if alias and name:
+                services = services.filter(
+                    or_(Service.alias.like("%" + alias + "%"), Service.name.like("%" + name + "%")))
+            else:
+                if alias:
+                    services = services.filter(Service.alias.like("%" + alias + "%"))
+                if name:
+                    services = services.filter(Service.name.like("%" + name + "%"))
+
+            services = services.limit(page_size).offset(page_index).all()
+
+            res["data"] = 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": "服务名"},
+            {"name": "type",
+             "in": "formData",
+             "type": "string",
+             "description": "服务类型"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+from app.util.component.ApiTemplate import ApiTemplate
+
+class Api(ApiTemplate):
+    api_name = "注册服务"
+    def process(self):
+        res = {}
+        try:
+            if self.para.get("type").__eq__("影像WMS"):
+                from app.modules.service.image.image_service_register import Api
+            elif self.para.get("type").__eq__("影像WMTS"):
+                from app.modules.service.image.image_service_register import Api
+            elif self.para.get("type").__eq__("WMS"):
+                from app.modules.service.wms.wms_register import Api
+            elif self.para.get("type").__eq__("WMTS"):
+                from app.modules.service.wmts.wmts_register import Api
+            else:
+                return res
+            api = Api()
+            api.para = self.para
+            res = api.process()
+        except Exception as e:
+            raise e
+        return res
+
+
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+import configure
+from app.util import find_class,BlueprintApi
+
+
+class Api(ApiTemplate):
+    api_name = "服务类型"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        service_types = []
+        try:
+            for scan in ["app.modules.service"]:
+                for api in find_class(scan, BlueprintApi):
+                    service_types.extend(api.service_type)
+            res["data"] = service_types
+            res["result"] = True
+
+        except Exception as e:
+            raise e
+
+        return res
+
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -2,3 +2,12 @@
 #author:        4N
 #createtime:    2021/9/14
 #email:         nheweijun@sina.com
+
+from flasgger import swag_from
+from flask import Blueprint
+from app.util import BlueprintApi
+
+class DataManager(BlueprintApi):
+
+    bp = Blueprint("WMS", __name__, url_prefix="/API/Service/WMS")
+    service_type = ["WMS"]
\ No newline at end of file

+# 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'))
\ No newline at end of file

 # coding=utf-8
 #author:        4N
-#createtime:    2021/6/15
+#createtime:    2021/9/17
 #email:         nheweijun@sina.com

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/17
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+import uuid
+from .models import WMS
+from app.models import Service,db
+import datetime
+import configure
+class Api(ApiTemplate):
+
+    api_name = "注册WMTS服务"
+
+    def process(self):
+        # 返回结果
+        res = {}
+
+        try:
+
+            this_time = datetime.datetime.now()
+            service_guid = uuid.uuid1().__str__()
+            wms_service_guid = uuid.uuid1().__str__()
+
+
+            #调用wms服务发布接口
+
+            service = Service(
+                guid = service_guid,
+                name = self.para.get("name"),
+                alias = self.para.get("alias"),
+                state = int(self.para.get("state")) if self.para.get("state") else None,
+                create_time = this_time,
+                update_time = this_time,
+                description = self.para.get("description"),
+                #node = Column(Integer),
+                overview = "xxxx",
+                type = self.para.get("service_type"),
+                service_guid = wms_service_guid,
+                catalog_guid = self.para.get("catalog_guid")
+            )
+
+            wms = WMS(
+                guid = wms_service_guid,
+                name = self.para.get("name"),
+                status = self.para.get("status"),
+                description=self.para.get("description"),
+                username = self.para.get("username"),
+                readonly = self.para.get("readonly"),
+                updatetime = this_time,
+                sid = int(self.para.get("sid")),
+                stype = self.para.get("stype"),
+                ssupply = self.para.get("ssupply"),
+                sctime = self.para.get("sctime"),
+                company = self.para.get("company"),
+                abstract = self.para.get("abstract"),
+                thumbnail = self.para.get("thumbnail"),
+                layer_style = self.para.get("layer_style"),
+                service_guid = service_guid
+            )
+
+
+            db.session.add(service)
+            db.session.add(wms)
+            db.session.commit()
+            res["data"] = service_guid
+            res["result"] = True
+        except Exception as e:
+            db.session.rollback()
+            raise e
+        return res
+
+    api_doc = {
+        "tags": ["WMTS接口"],
+        "parameters": [
+
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

@@ -2,3 +2,35 @@
 #author:        4N
 #createtime:    2021/9/14
 #email:         nheweijun@sina.com
+
+
+from flasgger import swag_from
+from flask import Blueprint
+from app.util import BlueprintApi
+from . import upload_oview
+
+import os
+from flask import send_from_directory
+
+
+class DataManager(BlueprintApi):
+
+    bp = Blueprint("WMTS", __name__, url_prefix="/API/Service/WMTS")
+
+    @staticmethod
+    @bp.route('/UploadOverview', methods=['POST'])
+    @swag_from(upload_oview.Api.api_doc)
+    def api_upload_oview():
+        """
+        上传缩略图
+        """
+        return upload_oview.Api().result
+
+    @staticmethod
+    @bp.route('/UploadOverview', methods=['POST'])
+    @swag_from(upload_oview.Api.api_doc)
+    def api_upload_oview():
+        """
+        上传缩略图
+        """
+        return upload_oview.Api().result

+# 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_tile = 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'))
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/17
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+import os
+from app.util.component.FileProcess import FileProcess
+from app.util.component.SliceScheme import SliceScheme
+import shutil
+from app.util.component.StructuredPrint import StructurePrint
+from flask import request
+import uuid
+import configure
+class Api(ApiTemplate):
+    api_name = "上传缩略图"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            # 业务逻辑
+            dir_path = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))),"overview")
+
+            file = request.files['file']
+            gid = uuid.uuid1().__str__()
+
+            filename = file.filename.split('"')[0]
+            store_file = os.path.join(dir_path, "{}{}".format(gid,filename))
+            file.save(store_file)
+
+            res["data"] ="http://{}/API/Service/Overview/{}".format(
+                    configure.deploy_ip_host, "{}{}".format(gid,filename))
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc = {
+
+        "tags": ["WMTS接口"],
+        "parameters": [
+            {"name": "file",
+             "in": "formData",
+             "type": "file",
+             "description": "缩略图"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/7/19
+#email:         nheweijun@sina.com
+
+from app.util.component.ApiTemplate import ApiTemplate
+import uuid
+from .models import WMTS
+from app.models import Service,db
+
+import datetime
+class Api(ApiTemplate):
+
+    api_name = "修改WMTS服务"
+
+    def process(self):
+
+
+
+        # 返回结果
+        res = {}
+
+        try:
+            guid = self.para.get("guid")
+            service = Service.query.filter_by(guid=guid).one_or_none()
+            this_time = datetime.datetime.now()
+
+
+            service_update = {"upate_time":this_time}
+            wmts_update = {"upate_time":this_time}
+            for key in self.para.keys():
+                if key in ["name","alias","state","description","overview","catalog_guid"]:
+                    service_update[key] = self.para.get(key)
+                if key in ["name","wmts_type","vendor","crs","datasource","description",
+                           "layer_name","layer_alias","layer_tile","layer_style","layer_format",
+                           "layer_extent","layer_description","scheme_guid"]:
+                    wmts_update[key] = self.para.get(key)
+
+
+            wmts = WMTS.query.filter_by(guid=service.service_guid).one_or_none()
+
+            service.update(service_update)
+            wmts.update(wmts_update)
+
+            db.session.commit()
+
+            res["result"] = True
+        except Exception as e:
+            raise e
+
+        return res
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/7/19
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+import uuid
+from .models import WMTS
+from app.models import Service,db
+import datetime
+import configure
+class Api(ApiTemplate):
+
+    api_name = "注册WMTS服务"
+
+    def process(self):
+        # 返回结果
+        res = {}
+
+        try:
+
+            this_time = datetime.datetime.now()
+            service_guid = uuid.uuid1().__str__()
+            wmts_service_guid = uuid.uuid1().__str__()
+
+
+
+            service = Service(
+                guid = service_guid,
+                name = self.para.get("name"),
+                alias = self.para.get("alias"),
+                state = int(self.para.get("state")) if self.para.get("state") else None,
+                create_time = this_time,
+                update_time = this_time,
+                description = self.para.get("description"),
+                #node = Column(Integer),
+                overview = "http://{}/API/Service/Overview/{}".format(
+                    configure.deploy_ip_host,
+                    self.para.get("overview") if self.para.get("overview") else "wmts_tb.png"),
+                type = self.para.get("service_type"),
+                service_guid = wmts_service_guid,
+                catalog_guid = self.para.get("catalog_guid")
+            )
+
+            wmts = WMTS(
+                guid = wmts_service_guid,
+                name = self.para.get("name"),
+                wmts_type = self.para.get("wmts_type"),
+                vendor = self.para.get("vendor"),
+                create_time = this_time,
+                crs = self.para.get("crs"),
+                datasource = self.para.get("datasource"),
+                description = self.para.get("description"),
+                layer_name = self.para.get("layer_name"),
+                layer_alias = self.para.get("layer_alias"),
+                layer_tile = self.para.get("layer_title"),
+                layer_style = self.para.get("layer_style"),
+                layer_format = self.para.get("layer_format"),
+                layer_extent = self.para.get("layer_extent"),
+                layer_description = self.para.get("layer_description"),
+                scheme_guid = self.para.get("scheme_guid"),
+                service_guid = service_guid
+            )
+
+
+            #调用WMTS的注册服务接口
+
+
+            db.session.add(service)
+            db.session.add(wmts)
+            db.session.commit()
+            res["data"] = service_guid
+            res["result"] = True
+        except Exception as e:
+            db.session.rollback()
+            raise e
+        return res
+
+    api_doc = {
+        "tags": ["WMTS接口"],
+        "parameters": [
+
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

@@ -34,241 +34,3 @@ def find_class(modname, class_name):
                     yield obj
             for i in find_class(modname, class_name):
                 yield i
-
-#
-#
-# # 从sqlachemy_uri解析出相关信息
-# def get_info_from_sqlachemy_uri(uri):
-#     parts = uri.split(":")
-#     user = parts[1][2:]
-#
-#     password_list = parts[2].split("@")
-#     if password_list.__len__()>2:
-#         password = "@".join(password_list[:-1])
-#     else:
-#         password = parts[2].split("@")[0]
-#     host = parts[2].split("@")[-1]
-#     port = parts[3].split("/")[0]
-#     database = parts[3].split("/")[1]
-#     return user, password, host, port, database
-#
-#
-# # 获取请求参数
-# def get_parameter():
-#     parameter = {}
-#     parameter.update(request.args.items())
-#     parameter.update(request.form.items())
-#     try:
-#         request_json = request.get_json()
-#         if json:
-#             parameter.update(request_json)
-#     except:
-#         pass
-#     for key in parameter.keys():
-#         if parameter.get(key) == "":
-#             parameter[key] = None
-#     return parameter
-#
-#
-# def togeojson(dict):
-#     geojson = {}
-#     geojson["type"] = "Feature"
-#     geojson["geometry"] = json.loads(dict.pop("geojson"))
-#     del dict["geojson"]
-#     if dict.get("wkb_geometry"):
-#         del dict["wkb_geometry"]
-#     geojson["properties"] = dict
-#     return geojson
-#
-#
-# def to_feature_collection(result):
-#     geojsonresult = [togeojson(x) for x in result]
-#     data = {}
-#     data["type"] = "FeatureCollection"
-#     data["features"] = geojsonresult
-#     return data
-#
-#
-# def getType(layer):
-#     origin = layer.GetGeomType()  # type:str
-#     if origin == 1 or origin == 4:
-#         return "point"
-#     elif origin == 2 or origin == 5:
-#         return "linestring"
-#     elif origin == 3 or origin == 6:
-#         return "polygon"
-#     return str(origin)
-#
-#
-# def objects_to_jsonarray(object):
-#     result = []
-#     for o in object:
-#         result.append(object_to_json(o))
-#     return result
-#
-#
-# def object_to_json(object):
-#     info = {}
-#     if object:
-#         info = object.__dict__
-#         try:
-#             del info['_sa_instance_state']
-#         except:
-#             pass
-#         for key in info:
-#             if isinstance(info[key], datetime.datetime):
-#                 info[key] = info[key].strftime('%Y-%m-%d %H:%M:%S')
-#             if isinstance(info[key], datetime.time):
-#                 info[key] = info[key].strftime('%H:%M:%S')
-#     return info
-#
-#
-# def create_zip(path, filepaths: list):
-#     """
-#     创建ZIP文件  并写入文件  (支持大文件夹)
-#     :param path:   创建的ZIP文件路径
-#     :param filepaths:
-#     :return:
-#     """
-#     try:
-#         with zipfile.ZipFile(path, 'w', zipfile.ZIP_DEFLATED) as zip:
-#             for filepath in filepaths:
-#                 if os.path.isdir(filepath):
-#                     pre_len = len(os.path.dirname(filepath))
-#                     for parent, dirnames, filenames in os.walk(filepath):
-#                         for filename in filenames:
-#                             pathfile = os.path.join(parent, filename)
-#                             if pathfile != path:  # 避免将新创建的zip写入该zip文件
-#                                 arcname = pathfile[pre_len:].strip(os.path.sep)  # 相对路径  不进行则会生成目录树
-#                                 zip.write(pathfile, arcname)
-#                 elif os.path.isfile(filepath):
-#                     zip.write(filepath, os.path.basename(filepath))
-#                 else:
-#                     print("创建zip文件对象失败！原因：未识别到路径")
-#                     return "创建zip文件对象失败！原因：未识别到路径"
-#             return True
-#
-#     except Exception as e:
-#         print("创建zip文件对象失败！原因：%s" % str(e))
-#         return "创建zip文件对象失败！原因：%s" % str(e)
-#
-# def unzip(store_file):
-#     #处理zip
-#     store_path = os.path.dirname(store_file)
-#     zip_file = zipfile.ZipFile(store_file, 'r')
-#
-#     #是否要重命名文件夹
-#     rename_path = False
-#     rename_path_origin=None
-#     rename_path_after =None
-#     for names in zip_file.namelist():
-#         #zipfile解压中文文件会有编码问题，需要解压后重命名
-#         try:
-#             name_t = names.encode('cp437').decode('gbk')
-#         except:
-#             name_t = names.encode('utf-8').decode('utf-8')
-#
-#         zip_file.extract(names,store_path,)
-#
-#         os.chdir(store_path)  # 切换到目标目录
-#
-#         if names.__contains__("/"):
-#             pat = names.split("/")
-#             pat2 = name_t.split("/")[-1]
-#             pat[-1] = pat2
-#             name_tt = "/".join(pat)
-#             os.rename(names, name_tt)
-#             if not names[-1].__eq__("/"):
-#                 rename_path = True
-#                 rename_path_origin = names.split("/")[:-1]
-#                 rename_path_after = name_t.split("/")[:-1]
-#         else:
-#
-#             os.rename(names, name_t)  # 重命名文件
-#     # 重命名文件夹
-#     if rename_path:
-#         for i in range(len(rename_path_origin),0,-1):
-#             origin = "/".join(rename_path_origin[:i])
-#             rename_path_origin[i-1] = rename_path_after[i-1]
-#             after = "/".join(rename_path_origin[:i])
-#             os.rename(origin, after)
-#
-#     os.chdir(os.path.dirname(store_path))
-#     zip_file.close()
-#
-#
-#
-#     file_for_open = None
-#     encoding = None
-#     for root, dirs, files in os.walk(store_path):
-#         for fn in files:
-#             if fn.endswith("shp"):
-#                 file_for_open = os.path.join(root, fn)
-#             if fn.endswith("cpg"):
-#                 with open(os.path.join(root, fn)) as fd:
-#                     encoding = fd.readline().strip()
-#             if fn.endswith("gdb"):
-#                 print(fn)
-#                 file_for_open =root
-#
-#     return file_for_open,encoding
-#
-# def open_pg_data_source(iswrite,uri=configure.SQLALCHEMY_DATABASE_URI):
-#     """
-#     # 获取PostGIS数据源
-#     :return:
-#     """
-#     db_conn_tuple = get_info_from_sqlachemy_uri(uri)
-#     fn = "PG: user=%s password=%s host=%s port=%s dbname=%s " % db_conn_tuple
-#     driver = ogr.GetDriverByName("PostgreSQL")
-#     if driver is None:
-#         raise Exception("打开PostgreSQL驱动失败，可能是当前GDAL未支持PostgreSQL驱动！")
-#     ds = driver.Open(fn, iswrite)
-#     if ds is None:
-#         raise Exception("打开数据源失败！")
-#     return ds
-#
-#
-# def is_chinese(string):
-#     """
-#     检查整个字符串是否包含中文
-#     :param string: 需要检查的字符串
-#     :return: bool
-#     """
-#     for ch in string:
-#         if u'\u4e00' <= ch <= u'\u9fff':
-#             return True
-#
-#     return False
-#
-#
-# def get_db_session(db_url=configure.SQLALCHEMY_DATABASE_URI,autocommit=False) -> session:
-#     engine = create_engine(db_url)
-#     system_session = sessionmaker(bind=engine,autocommit=autocommit)()
-#     return system_session
-#
-#
-# class Queue:
-#     def __init__(self):
-#         self.items = []
-#     def init(self,items):
-#         self.items = items
-#     def empty(self):
-#         return self.items == []
-#     def append(self, item):
-#         self.items.insert(0,item)
-#     def pop(self):
-#         return self.items.pop()
-#     def size(self):
-#         return len(self.items)
-#     def __str__(self):
-#         return self.items.__str__()
-#
-# def structured_print(mes,type="info"):
-#     message = "[{}] {} {}".format(type.upper(),datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), mes)
-#     print(message)
-#
-#
-#
-# if __name__ == '__main__':
-#     print(get_info_from_sqlachemy_uri("postgresql://postgres:CDchinadci@2020@10.48.0.50:5432/dcidms"))

@@ -499,6 +499,12 @@ class VacuateProcess:
             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]
 
@@ -523,14 +529,14 @@ class VacuateProcess:
                 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(layer.schema)
+                vl.CreateFields(schema)
                 self.vacuate_layers[l] = vl
 
         else:
             pass
 
 
-    def vacuate(self,g):
+    def vacuate(self,g,feature):
 
         if self.is_spatial:
 
@@ -567,6 +573,13 @@ class VacuateProcess:
                         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
                 #超大的还有机会
@@ -574,8 +587,27 @@ class VacuateProcess:
                     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():

@@ -12,6 +12,7 @@ import math
 class SliceScheme:
 
     parameter={}
+    levels = []
     def __init__(self,slice_scheme_path):
         tree = ET.parse(slice_scheme_path)
         root:Element = tree.getroot()
@@ -27,6 +28,8 @@ class SliceScheme:
         self.parameter["y"] = float(TileCacheInfo.find("TileOrigin").find("Y").text)
         self.parameter["dpi"] = float(TileCacheInfo.find("DPI").text)
 
+        self.parameter["wkt"] = TileCacheInfo.find("SpatialReference").find("WKT").text
+
 
         LODInfos:Element = TileCacheInfo.find("LODInfos")
 
@@ -37,6 +40,10 @@ class SliceScheme:
             info_dict["resolution"] = float(info.find("Resolution").text)
             self.parameter[info.find("LevelID").text] =info_dict
 
+            self.levels.append({"level":int(info.find("LevelID").text),
+                                "scale":float(info.find("Scale").text),
+                                "resolution":float(info.find("Resolution").text)})
+
     @staticmethod
     def get_polygon(parameter,level,row,col):
         level=int(level)
@@ -54,7 +61,7 @@ class SliceScheme:
 
 
 
-    def get_polygon2(self,level,row,col):
+    def get_poly(self,level,row,col):
         level=int(level)
         row = int(row)
         col = int(col)

@@ -3,20 +3,41 @@
 #createtime:    2021/7/15
 #email:         nheweijun@sina.com
 
-from pyDes import des,ECB,PAD_PKCS5
-import base64
-import numpy
-import gzip
-import sys
-import json
-# pixel_array = numpy.empty((256,256,3),dtype=int)+3
-#
-#
-#
-# # 使用gzip 压缩传输
-# content = gzip.compress(pixel_array, 2)
-#
-# print(sys.getsizeof(json.dumps(pixel_array.tolist())))
-# print(sys.getsizeof((content)))
-import random
-print(int(random.random()*2))
\ No newline at end of file
+from osgeo import gdal
+
+
+from osgeo import gdal, gdalconst
+from osgeo import ogr
+
+rasterFile = 'F:/**0416.dat'  # 原影像
+shpFile = 'F:/**小麦.shp'  # 裁剪矩形
+
+dataset = gdal.Open(rasterFile, gdalconst.GA_ReadOnly)
+
+geo_transform = dataset.GetGeoTransform()
+cols = dataset.RasterXSize  # 列数
+rows = dataset.RasterYSize  # 行数
+
+x_min = geo_transform[0]
+y_min = geo_transform[3]
+pixel_width = geo_transform[1]
+
+shp = ogr.Open(shpFile, 0)
+m_layer = shp.GetLayerByIndex(0)
+
+target_ds = gdal.GetDriverByName('MEM').Create("", xsize=cols, ysize=rows, bands=1,
+                                                 eType=gdal.GDT_Byte)
+target_ds.SetGeoTransform(geo_transform)
+target_ds.SetProjection(dataset.GetProjection())
+
+band = target_ds.GetRasterBand(1)
+band.SetNoDataValue(0)
+band.FlushCache()
+gdal.RasterizeLayer(target_ds, [1], m_layer)  # 跟shp字段给栅格像元赋值
+
+
+
+# gdal.RasterizeLayer(target_ds, [1], m_layer) # 多边形内像元值的全是255
+del dataset
+del target_ds
+shp.Release()