修改服务整合ER结构前

@@ -12,7 +12,7 @@ from . import data_download,data_download_task
 from . import get_meta
 from . import get_meta
 from . import data_entry_by_meta
 from . import data_entry_by_meta
 from . import get_data_list
 from . import get_data_list
-
+from . import data_entry_simple
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
@@ -99,4 +99,13 @@ class DataManager(BlueprintApi):
         """
         """
         数据入库ByMeta
         数据入库ByMeta
         """
         """
-        return data_entry_by_meta.Api().result
+        return data_entry_by_meta.Api().result
+
+    @staticmethod
+    @bp.route('/DataEntrySimple', methods=['POST'])
+    @swag_from(data_entry_simple.Api.api_doc)
+    def data_entry_simple():
+        """
+        数据入库Simple
+        """
+        return data_entry_simple.Api().result

+# coding=utf-8
+#author:        4N
+#createtime:    2021/1/27
+#email:         nheweijun@sina.com
+
+from osgeo.ogr import *
+import uuid
+
+import time
+from app.models import *
+import json
+import re
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.PGUtil import PGUtil
+from .get_meta import Api as MetaApi
+from threading import Thread
+from app.util.component.EntryDataVacuate import EntryDataVacuate
+
+class Api(ApiTemplate):
+
+    api_name = "Simple入库"
+
+    def process(self):
+
+
+        data_path = self.para.get("data_path")
+        database_guid = self.para.get("database_guid")
+        is_task = self.para.get("is_task")
+
+        self.para["overwrite"] = "yes"
+        self.para["task_guid"] = uuid.uuid1().__str__()
+        self.para["task_time"] = time.time()
+        self.para["task_name"] = "入库测试接口"
+        self.para["creator"] = "4N"
+
+
+        #返回结果
+        res={}
+        try:
+            meta_api = MetaApi()
+            meta_api.para["data_path"] = data_path
+            meta_list = json.loads(meta_api.process())["data"]
+
+            if is_task:
+                task = Task(guid=self.para.get("task_guid"),
+                            name=self.para.get("task_name"),
+                            create_time=datetime.datetime.now(),
+                            state=0,
+                            task_type=1,
+                            creator=self.para.get("creator"),
+                            file_name=meta_list[0].get("filename"),
+                            database_guid=self.para.get("database_guid"),
+                            catalog_guid=self.para.get("catalog_guid"),
+                            process="等待入库",
+                            parameter=json.dumps(self.para))
+                db.session.add(task)
+                db.session.commit()
+
+                res["result"] = True
+                res["msg"] = "数据录入提交成功！"
+                res["data"] = self.para["task_guid"]
+            else:
+                start = time.time()
+
+                self.para["meta"] = meta_list
+
+                task = Task(guid=self.para.get("task_guid"),
+                            name=self.para.get("task_name"),
+                            create_time=datetime.datetime.now(),
+                            state=0,
+                            task_type=-1,
+                            creator=self.para.get("creator"),
+                            file_name=meta_list[0].get("filename"),
+                            database_guid=self.para.get("database_guid"),
+                            catalog_guid=self.para.get("catalog_guid"),
+                            process="等待入库",
+                            parameter=json.dumps(self.para))
+                db.session.add(task)
+                db.session.commit()
+
+                entry_data_thread = Thread(
+                    target=EntryDataVacuate().entry, args=(self.para,))
+                entry_data_thread.start()
+                entry_data_thread.join()
+                res["result"] = True
+                res["msg"] = "数据入库成功！"
+                res["data"] = "耗时{}秒".format(time.time()-start)
+
+        except Exception as e:
+            raise e
+        return res
+
+
+    api_doc={
+    "tags":["IO接口"],
+    "parameters":[
+        {"name": "data_path",
+         "in": "formData",
+         "type": "string",
+         "description": "服务器数据路径"},
+        {"name": "database_guid",
+         "in": "formData",
+         "type": "string",
+         "description": "数据库guid"},
+        {"name": "is_task",
+         "in": "formData",
+         "type": "boolean",
+         "description": "是否形成任务"}
+    ],
+    "responses":{
+        200:{
+            "schema":{
+                "properties":{
+                }
+            }
+            }
+        }
+    }

@@ -23,7 +23,7 @@ class Api(ApiTemplate):
         res = {}
         res = {}
 
 
         try:
         try:
-            project_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))))
+            project_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))))
             base_path = os.path.join(project_path,"tmp")
             base_path = os.path.join(project_path,"tmp")
             if self.para.get("data_path"):
             if self.para.get("data_path"):
                 base_path = os.path.normpath(self.para.get("data_path"))
                 base_path = os.path.normpath(self.para.get("data_path"))

@@ -14,12 +14,14 @@ from . import capabilities
 from . import image_tile,image_wms
 from . import image_tile,image_wms
 from . import image_service_list
 from . import image_service_list
 from . import image_tile_mask
 from . import image_tile_mask
+from . import image_wmts
 
 
 from . import image_delete
 from . import image_delete
 from . import image_cancle
 from . import image_cancle
 from . import image_register,image_list,image_info,image_edit,image_overview
 from . import image_register,image_list,image_info,image_edit,image_overview
 from . import image_tag_create,image_tag_delete,image_tag_list
 from . import image_tag_create,image_tag_delete,image_tag_list
-
+from . import image_wms_temporary
+from . import image_wms_kv
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
@@ -169,7 +171,7 @@ class DataManager(BlueprintApi):
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Tile/<guid>/<l>/<y>/<z>', methods=['GET'])
     @bp.route('/Tile/<guid>/<l>/<y>/<z>', methods=['GET'])
-    @swag_from(image_tile.Api.api_doc)
+    # @swag_from(image_tile.Api.api_doc)
     def api_image_tile(guid,l,y,z):
     def api_image_tile(guid,l,y,z):
         """
         """
         切片服务
         切片服务
@@ -178,18 +180,11 @@ class DataManager(BlueprintApi):
 
 
 
 
 
 
-    # @staticmethod
-    # @bp.route('/<service_name>/WMTS', methods=['GET'])
-    # @swag_from(image_tile.Api.api_doc)
-    # def api_image_tile(service_name):
-    #     """
-    #     切片服务
-    #     """
-    #     return image_tile.Api(service_name).result
+
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Tile', methods=['GET','POST'])
     @bp.route('/Tile', methods=['GET','POST'])
-    @swag_from(image_tile.Api.api_doc)
+    # @swag_from(image_tile.Api.api_doc)
     def api_image_tile_kv():
     def api_image_tile_kv():
         """
         """
         切片服务
         切片服务
@@ -217,10 +212,40 @@ class DataManager(BlueprintApi):
 
 
 
 
     @staticmethod
     @staticmethod
-    @bp.route('/WMS', methods=['GET','POST'])
+    @bp.route('/<service_name>/WMS', methods=['GET','POST'])
     @swag_from(image_wms.Api.api_doc)
     @swag_from(image_wms.Api.api_doc)
-    def image_wms():
+    def image_wms(service_name):
+        """
+        WMS服务
+        """
+        return image_wms.Api(service_name).result
+
+    @staticmethod
+    @bp.route('/<service_name>/WMTS', methods=['GET','POST'])
+    @swag_from(image_wmts.Api.api_doc)
+    def api_image_wmts(service_name):
+        """
+        切片服务
+        """
+        return image_wmts.Api(service_name).result
+
+
+
+    @staticmethod
+    @bp.route('/WMS', methods=['GET','POST'])
+    # @swag_from(image_wms_kv.Api.api_doc)
+    def image_wms_kv():
         """
         """
         WMS服务
         WMS服务
         """
         """
-        return image_wms.Api().result
+        return image_wms_kv.Api().result
+
+
+    @staticmethod
+    @bp.route('/WMSTem', methods=['GET','POST'])
+    @swag_from(image_wms_temporary.Api.api_doc)
+    def image_wms_temporary():
+        """
+        WMS服务预览
+        """
+        return image_wms_temporary.Api().result

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

@@ -48,7 +48,7 @@ class Api(ApiTemplate):
 
 
                     file_info = {"name": f, "path": file_path, "size": file_size, "create_time": fctime,"real_size": real_size}
                     file_info = {"name": f, "path": file_path, "size": file_size, "create_time": fctime,"real_size": real_size}
 
 
-                    if file_path.lower().endswith("tiff") or file_path.lower().endswith("tif") or file_path.lower().endswith("img"):
+                    if file_path.lower().endswith("tiff") or file_path.lower().endswith("tif") or file_path.lower().endswith("img") or os.path.isdir(file_path):
 
 
                         exist_image: Image = Image.query.filter_by(path=os.path.normpath(file_info.get("path")),
                         exist_image: Image = Image.query.filter_by(path=os.path.normpath(file_info.get("path")),
                                                             size=file_info.get("real_size")).one_or_none()
                                                             size=file_info.get("real_size")).one_or_none()
@@ -57,19 +57,33 @@ class Api(ApiTemplate):
                             if exist_image.server.__contains__(data_server):
                             if exist_image.server.__contains__(data_server):
                                 file_info["exist"] = True
                                 file_info["exist"] = True
 
 
+                        file_info["type"] = ImageType.get_type(file_path)
+                        data_list.append(file_info)
 
 
-                    file_info["type"] = ImageType.get_type(file_path)
-                    data_list.append(file_info)
 
 
+                info_dir = []
+                info_img = []
+                for dat in data_list:
 
 
-                data_list_sorted = sorted(data_list, key=lambda x: x["name"])
-                res["data"] = data_list_sorted
+                    if dat["type"].__eq__("dir"):
+                        info_dir.append(dat)
+                    else:
+                        info_img.append(dat)
+
+                info_dir = sorted(info_dir,key = lambda x: x["name"])
+                info_img = sorted(info_img,key = lambda x: x["name"])
+                info_dir.extend(info_img)
+
+                res["data"] = info_dir
 
 
             else:
             else:
                 thrift_connect = ThriftConnect(data_server)
                 thrift_connect = ThriftConnect(data_server)
                 info= json.loads(thrift_connect.client.getImageList(path))
                 info= json.loads(thrift_connect.client.getImageList(path))
                 thrift_connect.close()
                 thrift_connect.close()
 
 
+
+                info_dir = []
+                info_img = []
                 for inf in info:
                 for inf in info:
                     if inf["path"].lower().endswith("tiff") or inf["path"].lower().endswith("tif") or inf["path"].lower().endswith("img"):
                     if inf["path"].lower().endswith("tiff") or inf["path"].lower().endswith("tif") or inf["path"].lower().endswith("img"):
 
 
@@ -80,7 +94,16 @@ class Api(ApiTemplate):
                             if exist_image.server.__contains__(data_server):
                             if exist_image.server.__contains__(data_server):
                                 inf["exist"] = True
                                 inf["exist"] = True
 
 
-                res["data"] = info
+                    if inf["type"].__eq__("dir"):
+                        info_dir.append(inf)
+                    else:
+                        info_img.append(inf)
+
+                info_dir = sorted(info_dir, key = lambda x: x["name"])
+                info_img = sorted(info_img, key = lambda x: x["name"])
+                info_dir.extend(info_img)
+
+                res["data"] = info_dir
 
 
             res["result"] = True
             res["result"] = True
 
 

@@ -4,18 +4,12 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from osgeo import gdal,ogr,osr
-from osgeo.gdal import Dataset,Band
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.modules.service.image.util.ThriftConnect import ThriftConnect
 import json
 import json
 from .models import Image
 from .models import Image
 import datetime
 import datetime
 from app.models import  db
 from app.models import  db
-import uuid
-import os
-from .models import ImageTag
-import math
+
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 

@@ -6,14 +6,12 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ModelVisitor import ModelVisitor
-
 from app.modules.service.image.models import Image,db,ImageTag
 from app.modules.service.image.models import Image,db,ImageTag
-from sqlalchemy import or_,and_
 import datetime
 import datetime
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
-    api_name = "影像数据List"
+    api_name = "修改影像数据"
 
 
     def process(self):
     def process(self):
 
 
@@ -28,7 +26,8 @@ class Api(ApiTemplate):
             this_time = datetime.datetime.now()
             this_time = datetime.datetime.now()
 
 
             del para["guid"]
             del para["guid"]
-            del para["tag_guids"]
+            if  para.get("tag_guids"):
+                del para["tag_guids"]
 
 
             if para or tag_guids:
             if para or tag_guids:
                 para["update_time"] = this_time
                 para["update_time"] = this_time
@@ -58,7 +57,7 @@ class Api(ApiTemplate):
             {"name": "alias",
             {"name": "alias",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
-            {"name": "ym",
+            {"name": "collect_time",
              "in": "formData",
              "in": "formData",
              "type": "string","description":"成像时间字符串"},
              "type": "string","description":"成像时间字符串"},
             {"name": "region",
             {"name": "region",
@@ -67,9 +66,12 @@ class Api(ApiTemplate):
             {"name": "satellite",
             {"name": "satellite",
              "in": "formData",
              "in": "formData",
              "type": "string", "description": "卫星类型"},
              "type": "string", "description": "卫星类型"},
-            {"name": "epsg",
+            {"name": "crs",
              "in": "formData",
              "in": "formData",
              "type": "string", "description": "空间参考"},
              "type": "string", "description": "空间参考"},
+            {"name": "band_view",
+             "in": "formData",
+             "type": "string", "description": "波段设计[1,1,1]"},
             {"name": "tag_guids",
             {"name": "tag_guids",
              "in": "formData",
              "in": "formData",
              "type": "string", "description": "tags"},
              "type": "string", "description": "tags"},

@@ -8,8 +8,8 @@ from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 
 
 from app.modules.service.image.models import Image,ImageTag
 from app.modules.service.image.models import Image,ImageTag
-from sqlalchemy import or_,and_
 from app.util.component.FileProcess import FileProcess
 from app.util.component.FileProcess import FileProcess
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "影像数据Info"
     api_name = "影像数据Info"

@@ -8,7 +8,9 @@ from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.FileProcess import FileProcess
 from app.util.component.FileProcess import FileProcess
 from app.modules.service.image.models import Image,ImageTag
 from app.modules.service.image.models import Image,ImageTag
-from sqlalchemy import or_,and_
+from sqlalchemy import or_
+import datetime
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "影像数据List"
     api_name = "影像数据List"
@@ -26,6 +28,7 @@ class Api(ApiTemplate):
             band = self.para.get("band")
             band = self.para.get("band")
             region = self.para.get("region")
             region = self.para.get("region")
             tag_guid = self.para.get("tag_guid")
             tag_guid = self.para.get("tag_guid")
+            collect_time = self.para.get("collect_time")
 
 
             type = self.para.get("type")
             type = self.para.get("type")
 
 
@@ -48,12 +51,20 @@ class Api(ApiTemplate):
             if region:
             if region:
                 images = images.filter(Image.region.in_(region.split(",")))
                 images = images.filter(Image.region.in_(region.split(",")))
 
 
+            if collect_time:
+                begin,end = collect_time.split(",")
+                begin = datetime.datetime.strptime(begin,"%Y-%m-%d %H:%M:%S")
+                end = datetime.datetime.strptime(end, "%Y-%m-%d %H:%M:%S")
+                images.filter(Image.collect_time>=begin).filter(Image.collect_time<=end)
+
             if tag_guid:
             if tag_guid:
                 tag:ImageTag = ImageTag.query.filter_by(guid=tag_guid).one_or_none()
                 tag:ImageTag = ImageTag.query.filter_by(guid=tag_guid).one_or_none()
                 images_guid = [img.guid for img in tag.images.all()]
                 images_guid = [img.guid for img in tag.images.all()]
                 images = images.filter(Image.guid.in_(images_guid))
                 images = images.filter(Image.guid.in_(images_guid))
 
 
 
 
+
+
             res["data"] = {}
             res["data"] = {}
             res["data"]["count"] = images.count()
             res["data"]["count"] = images.count()
             imgs = images.limit(page_size).offset(page_index * page_size).all()
             imgs = images.limit(page_size).offset(page_index * page_size).all()
@@ -89,7 +100,7 @@ class Api(ApiTemplate):
             {"name": "name",
             {"name": "name",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
-            {"name": "ym",
+            {"name": "collect_time",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
             {"name": "region",
             {"name": "region",

@@ -64,7 +64,7 @@ class Api(ApiTemplate):
 
 
             bands = json.loads(image.band_view)
             bands = json.loads(image.band_view)
 
 
-            # bands = [1,2,3] if image.band_count>=3 else [1,1,1]
+
 
 
             #计算查询范围，保持正常比例
             #计算查询范围，保持正常比例
             query_extent = json.loads(image.extent)
             query_extent = json.loads(image.extent)
@@ -83,20 +83,17 @@ class Api(ApiTemplate):
             pixel_array = numpy.zeros((height, width, 3), dtype=int)
             pixel_array = numpy.zeros((height, width, 3), dtype=int)
 
 
             for ii in [0, 1, 2]:
             for ii in [0, 1, 2]:
-                # opencv 颜色排序为GBR
+                # opencv 颜色排序为BGR
                 pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
                 pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
 
 
             # 将图片生成在内存中,然后直接返回response
             # 将图片生成在内存中,然后直接返回response
             im_data = Opencv.create_image(format, pixel_array, 30)
             im_data = Opencv.create_image(format, pixel_array, 30)
 
 
-            return Response(im_data, mimetype=format)
-
         except Exception as e:
         except Exception as e:
             StructurePrint().print(traceback.format_exc())
             StructurePrint().print(traceback.format_exc())
-            res["state"] = -1
-            res["message"] = e.__str__()
-            return res
+            raise e
 
 
+        return Response(im_data, mimetype=format)
 
 
     api_doc = {
     api_doc = {
         "tags": ["影像接口"],
         "tags": ["影像接口"],

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 
 
-from osgeo import gdal,ogr,osr
+from osgeo import gdal,osr
 from osgeo.gdal import Dataset,Band
 from osgeo.gdal import Dataset,Band
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
@@ -15,7 +15,6 @@ from app.models import  db
 import uuid
 import uuid
 import os
 import os
 from .models import ImageTag
 from .models import ImageTag
-import math
 from .util.ImageType import ImageType
 from .util.ImageType import ImageType
 
 
 class Api(ApiTemplate):
 class Api(ApiTemplate):
@@ -60,8 +59,9 @@ class Api(ApiTemplate):
                     left_top = (geo[0], geo[3])
                     left_top = (geo[0], geo[3])
 
 
                     right_buttom = (geo[0] + geo[1] * image.RasterXSize, geo[3] + geo[5] * image.RasterYSize)
                     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]]
 
 
+
+                    origin_extent = [left_top[0], right_buttom[1], right_buttom[0], left_top[1]]
                     # target = origin.CloneGeogCS()
                     # target = origin.CloneGeogCS()
                     # tran = osr.CoordinateTransformation(origin, target)
                     # tran = osr.CoordinateTransformation(origin, target)
                     #
                     #
@@ -134,9 +134,9 @@ class Api(ApiTemplate):
                                   server=data_server,
                                   server=data_server,
                                   path = os.path.normpath(info.get("path")),
                                   path = os.path.normpath(info.get("path")),
                                   size=info.get("size"),
                                   size=info.get("size"),
-                                  epsg= info.get("epsg"),
-                                  sr_wkt = info.get("sr_wkt"),
-                                  sr_proj4= info.get("sr_proj4"),
+                                  crs = str(info.get("crs")),
+                                  crs_wkt = info.get("crs_wkt"),
+                                  crs_proj4= info.get("crs_proj4"),
                                   band_count=info.get("band_count"),
                                   band_count=info.get("band_count"),
                                   band_view = "[1,2,3]" if info.get("band_count")>=3 else "[1,1,1]",
                                   band_view = "[1,2,3]" if info.get("band_count")>=3 else "[1,1,1]",
                                   create_time=this_time,
                                   create_time=this_time,

@@ -32,7 +32,7 @@ class Api(ApiTemplate):
             service_update = {}
             service_update = {}
             image_update = {}
             image_update = {}
             for key in self.para.keys():
             for key in self.para.keys():
-                if key in ["name","title","state","description","catalog_guid"]:
+                if key in ["name","title","state","description","catalog_guid","type"]:
                     service_update[key] = self.para.get(key)
                     service_update[key] = self.para.get(key)
                 if key in ["name","scheme_guid"]:
                 if key in ["name","scheme_guid"]:
                     image_update[key] = self.para.get(key)
                     image_update[key] = self.para.get(key)
@@ -98,6 +98,11 @@ class Api(ApiTemplate):
              "type": "string",
              "type": "string",
              "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
              "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
 
 
+            {"name": "type",
+             "in": "formData",
+             "type": "string",
+             "description": "修改服务类型"},
+
             {"name": "title",
             {"name": "title",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",

@@ -3,11 +3,10 @@
 #createtime:    2021/7/19
 #createtime:    2021/7/19
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.modules.service.image.models import ImageService,Image
+from app.modules.service.image.models import ImageService
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
-from app.models import Service
 from sqlalchemy import or_
 from sqlalchemy import or_
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 

@@ -7,8 +7,7 @@ from .models import ImageService,Image
 from app.models import db,Service
 from app.models import db,Service
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 import uuid
-from app.util.component.SliceScheme import SliceScheme
-from app.util.component.FileProcess import FileProcess
+
 import os
 import os
 import json
 import json
 import datetime
 import datetime
@@ -93,7 +92,7 @@ class Api(ApiTemplate):
 
 
     def get_overview(self,service,image_service):
     def get_overview(self,service,image_service):
 
 
-        api = RealApi()
+        api = RealApi("")
 
 
 
 
         query_extent = json.loads(image_service.extent)
         query_extent = json.loads(image_service.extent)
@@ -106,7 +105,7 @@ class Api(ApiTemplate):
 
 
         bbox = ",".join([str(x) for x in query_extent])
         bbox = ",".join([str(x) for x in query_extent])
 
 
-        api.para = {"guid":image_service.guid,"bbox":bbox,"overview":1,"width":512,"height":512}
+        api.para = {"service_name":service.name,"bbox":bbox,"overview":1,"width":512,"height":512}
         res = api.process()
         res = api.process()
         dir_path = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "overview")
         dir_path = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "overview")
         gid = uuid.uuid1().__str__()
         gid = uuid.uuid1().__str__()

@@ -5,9 +5,6 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ModelVisitor import ModelVisitor
-from kazoo.client import KazooClient
-import configure
 from .models import ImageTag
 from .models import ImageTag
 import uuid
 import uuid
 from app.models import db
 from app.models import db

@@ -6,8 +6,6 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
-from kazoo.client import KazooClient
-import configure
 from .models import ImageTag
 from .models import ImageTag
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 

@@ -3,27 +3,15 @@
 #createtime:    2021/3/24
 #createtime:    2021/3/24
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.util import *
 import traceback
 import traceback
-from osgeo import gdal
-from osgeo.gdal import *
-from numpy import ndarray
 import numpy
 import numpy
 from flask import Response
 from flask import Response
 from .util.ImageData import ImageData
 from .util.ImageData import ImageData
 
 
-import time
-import cv2
-from app.modules.service.image.models import ImageService,Image
-from app.models import db,TileScheme
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.SliceScheme import SliceScheme
 from app.util.component.SliceScheme import SliceScheme
 from app.util.component.ParameterUtil import ParameterUtil
 from app.util.component.ParameterUtil import ParameterUtil
 import json
 import json
-from kazoo.client import KazooClient
-from threading import Thread
-from app.modules.service.image.util.ThriftConnect import ThriftConnect,ThriftPool
-import gzip
 import random
 import random
 import copy
 import copy
 from .util.Opencv import Opencv
 from .util.Opencv import Opencv

@@ -10,22 +10,19 @@ from osgeo.gdal import *
 from numpy import ndarray
 from numpy import ndarray
 import numpy
 import numpy
 from flask import Response
 from flask import Response
-import io
-import os
-from PIL import Image
 
 
 import time
 import time
 import cv2
 import cv2
 from app.modules.service.image.models import ImageService,Image
 from app.modules.service.image.models import ImageService,Image
 from app.models import db,TileScheme
 from app.models import db,TileScheme
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-import uuid
+
 from app.util.component.SliceScheme import SliceScheme
 from app.util.component.SliceScheme import SliceScheme
-from app.util.component.FileProcess import FileProcess
+
 from app.util.component.ParameterUtil import ParameterUtil
 from app.util.component.ParameterUtil import ParameterUtil
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.Geometry2Raster import Geometry2Raster
 from app.util.component.Geometry2Raster import Geometry2Raster
-import os
+
 import json
 import json
 from kazoo.client import KazooClient
 from kazoo.client import KazooClient
 
 
@@ -61,6 +58,7 @@ class Api(ApiTemplate):
 
 
             #缓存服务信息
             #缓存服务信息
             image_service_info = GLOBAL_DIC.get(self.guid)
             image_service_info = GLOBAL_DIC.get(self.guid)
+
             if image_service_info is None:
             if image_service_info is None:
                 image_service:ImageService = ImageService.query.filter_by(guid = self.guid).one_or_none()
                 image_service:ImageService = ImageService.query.filter_by(guid = self.guid).one_or_none()
                 images = image_service.images.all()
                 images = image_service.images.all()

@@ -21,6 +21,11 @@ class Api(ApiTemplate):
 
 
     api_name = "WMS"
     api_name = "WMS"
 
 
+
+    def __init__(self,service_name):
+        super().__init__()
+        self.service_name = service_name
+
     def process(self):
     def process(self):
 
 
 
 
@@ -30,21 +35,21 @@ class Api(ApiTemplate):
         try:
         try:
 
 
             parameter = ParameterUtil.to_lower(parameter)
             parameter = ParameterUtil.to_lower(parameter)
-            self.guid = parameter.get("guid")
-            bbox = parameter.get("bbox")
-            width = int(parameter.get("width")) if parameter.get("width") else 256
-            height = int(parameter.get("height")) if parameter.get("height") else 256
-            image_type = parameter.get("format") if parameter.get("format") else "image/png"
-            quality = int(parameter.get("quality")) if parameter.get("quality") else 30
+            if parameter.get("service_name"):
+                self.service_name = parameter.get("service_name")
 
 
-            image_service_info, zoo, servers = Cache.cache_data(self.guid)
+            #获取缓存信息
+            image_service_info, zoo, servers = Cache.cache_data(self.service_name, type="name")
 
 
             re = parameter.get("request")
             re = parameter.get("request")
             if re and re.__eq__("GetCapabilities"):
             if re and re.__eq__("GetCapabilities"):
                 return self.get_capabilities(image_service_info["service"])
                 return self.get_capabilities(image_service_info["service"])
 
 
-
-            # bands = [1, 2, 3]
+            bbox = parameter.get("bbox")
+            width = int(parameter.get("width")) if parameter.get("width") else 256
+            height = int(parameter.get("height")) if parameter.get("height") else 256
+            image_type = parameter.get("format") if parameter.get("format") else "image/png"
+            quality = int(parameter.get("quality")) if parameter.get("quality") else 30
 
 
             extent = [float(x) for x in bbox.split(",")]
             extent = [float(x) for x in bbox.split(",")]
 
 
@@ -267,6 +272,10 @@ class Api(ApiTemplate):
             {"name": "guid",
             {"name": "guid",
              "in": "query",
              "in": "query",
              "type": "string"},
              "type": "string"},
+            {"name": "request",
+             "in": "query",
+             "type": "string",
+             "enum":["GetMap","GetCapabilities"]},
             {"name": "bbox",
             {"name": "bbox",
              "in": "query",
              "in": "query",
              "type": "string"},
              "type": "string"},

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

@@ -9,7 +9,7 @@ import numpy
 from flask import Response
 from flask import Response
 import random
 import random
 
 
-from app.modules.service.image.models import ImageService,Image
+from app.modules.service.image.models import Image
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 
 
 from app.util.component.ParameterUtil import ParameterUtil
 from app.util.component.ParameterUtil import ParameterUtil
@@ -36,6 +36,25 @@ class Api(ApiTemplate):
             parameter = ParameterUtil.to_lower(parameter)
             parameter = ParameterUtil.to_lower(parameter)
 
 
             image_guids = parameter.get("image_guids")
             image_guids = parameter.get("image_guids")
+            
+            get_extent = parameter.get("get_extent")
+            if get_extent and (get_extent == True or get_extent.lower().__eq__("true")):
+                tmp_extent = []
+                for g in image_guids.split(","):
+                    image = Image.query.filter_by(guid=g).one_or_none()
+                    if image:
+                        image_extent = json.loads(image.extent)
+                        if not tmp_extent:
+                            tmp_extent = image_extent
+                        else:
+                            tmp_extent[0] = min(image_extent[0], tmp_extent[0])
+                            tmp_extent[2] = max(image_extent[2], tmp_extent[2])
+                            tmp_extent[1] = min(image_extent[1], tmp_extent[1])
+                            tmp_extent[3] = max(image_extent[3], tmp_extent[3])
+
+                result["result"] = True
+                result["data"] = tmp_extent
+                return result
 
 
             bbox = parameter.get("bbox")
             bbox = parameter.get("bbox")
             width = int(parameter.get("width")) if parameter.get("width") else 256
             width = int(parameter.get("width")) if parameter.get("width") else 256
@@ -147,9 +166,13 @@ class Api(ApiTemplate):
     api_doc = {
     api_doc = {
         "tags": ["影像接口"],
         "tags": ["影像接口"],
         "parameters": [
         "parameters": [
-            {"name": "guid",
+            {"name": "image_guids",
              "in": "query",
              "in": "query",
              "type": "string"},
              "type": "string"},
+            {"name": "get_extent",
+             "in": "query",
+             "type": "boolean",
+             "enum":[True,False]},
             {"name": "bbox",
             {"name": "bbox",
              "in": "query",
              "in": "query",
              "type": "string"},
              "type": "string"},

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

@@ -31,16 +31,16 @@ class Image(db.Model):
 
 
     size = Column(Float)
     size = Column(Float)
     #坐标wkt
     #坐标wkt
-    sr_wkt = Column(Text) #坐标wkt
-    sr_proj4 = Column(Text)#坐标proj
-    epsg = Column(Integer)#坐标epsg
+    crs_wkt = Column(Text) #坐标wkt
+    crs_proj4 = Column(Text)#坐标proj
+    crs = Column(String)#坐标
     create_time = Column(DateTime)
     create_time = Column(DateTime)
     update_time = Column(DateTime)
     update_time = Column(DateTime)
     cell_x_size = Column(Float)#像元x大小
     cell_x_size = Column(Float)#像元x大小
     cell_y_size = Column(Float)#像元y大小
     cell_y_size = Column(Float)#像元y大小
     region = Column(Text)
     region = Column(Text)
 
 
-    ym = Column(String(256))#时间年份
+    collect_time = Column(DateTime) #成像时间年份
 
 
     satellite = Column(String)#卫星类型
     satellite = Column(String)#卫星类型
     type = Column(String(128))
     type = Column(String(128))

@@ -7,13 +7,14 @@
 from kazoo.client import KazooClient
 from kazoo.client import KazooClient
 import configure
 import configure
 import time
 import time
-from app.modules.service.image.models import ImageService,Image
-from app.models import TileScheme
+from app.modules.service.image.models import ImageService
+from app.models import TileScheme,Service
 import json
 import json
+
 class Cache:
 class Cache:
 
 
     @classmethod
     @classmethod
-    def cache_data(cls,guid):
+    def cache_data(cls,guid_or_name,type="guid"):
 
 
         from app import GLOBAL_DIC
         from app import GLOBAL_DIC
 
 
@@ -38,7 +39,7 @@ class Cache:
             servers = GLOBAL_DIC.get("servers")
             servers = GLOBAL_DIC.get("servers")
 
 
         # 更新缓存
         # 更新缓存
-        if time.time() - GLOBAL_DIC["servers_updatetime"] > 10:
+        if time.time() - GLOBAL_DIC["servers_updatetime"] > 30:
             servers = zoo.get_children("/rpc")
             servers = zoo.get_children("/rpc")
             servers.append("本地服务器")
             servers.append("本地服务器")
             GLOBAL_DIC["servers"] = servers
             GLOBAL_DIC["servers"] = servers
@@ -46,25 +47,31 @@ class Cache:
 
 
 
 
         # 缓存服务信息
         # 缓存服务信息
-        if guid:
-            image_service_info = GLOBAL_DIC.get(guid)
-            if image_service_info is None or time.time() - GLOBAL_DIC.get("service_updatetime") > 20:
-                image_service: ImageService = ImageService.query.filter_by(guid=guid).one_or_none()
+        if guid_or_name:
+            image_service_info = GLOBAL_DIC.get(guid_or_name)
+            if image_service_info is None or time.time() - GLOBAL_DIC.get("service_updatetime") > 30:
+                if type.__eq__("guid"):
+                    image_service: ImageService = ImageService.query.filter_by(guid=guid_or_name).one_or_none()
+                else:
+                    service = Service.query.filter_by(name=guid_or_name).one_or_none()
+                    image_service: ImageService = ImageService.query.filter_by(guid=service.service_guid).one_or_none()
                 images = image_service.images.all()
                 images = image_service.images.all()
 
 
                 if image_service.scheme_guid:
                 if image_service.scheme_guid:
                     scheme: TileScheme = TileScheme.query.filter_by(guid=image_service.scheme_guid).one_or_none()
                     scheme: TileScheme = TileScheme.query.filter_by(guid=image_service.scheme_guid).one_or_none()
-                    GLOBAL_DIC[guid] = {"service": image_service, "images": images,
+                    GLOBAL_DIC[guid_or_name] = {"service": image_service, "images": images,
                                              "scheme": json.loads(scheme.parameter)}
                                              "scheme": json.loads(scheme.parameter)}
                 else:
                 else:
 
 
-                    GLOBAL_DIC[guid] = {"service": image_service, "images": images}
+                    GLOBAL_DIC[guid_or_name] = {"service": image_service, "images": images}
                 GLOBAL_DIC["service_updatetime"] = time.time()
                 GLOBAL_DIC["service_updatetime"] = time.time()
-                image_service_info = GLOBAL_DIC[guid]
+                image_service_info = GLOBAL_DIC[guid_or_name]
 
 
             else:
             else:
-                image_service_info = GLOBAL_DIC[guid]
+                image_service_info = GLOBAL_DIC[guid_or_name]
         else:
         else:
             image_service_info = None
             image_service_info = None
 
 
-        return image_service_info,zoo,servers
+        return image_service_info,zoo,servers
+
+

@@ -82,77 +82,120 @@ class ImageData:
         :param bands:
         :param bands:
         :return:
         :return:
         '''
         '''
-
+        pixel_array = numpy.zeros((height, width, 3), dtype=int)
+        ceng = 0
         img: Dataset = gdal.Open(self.image.path, 0)
         img: Dataset = gdal.Open(self.image.path, 0)
 
 
-        origin_extent = json.loads(self.image.extent)
+        for band in bands:
 
 
-        # 超出空间范围
-        if extent[2] < origin_extent[0] or extent[0] > origin_extent[2] or extent[1] > origin_extent[3] or extent[
-            3] < origin_extent[1]:
-            empty = numpy.zeros((height, width, 3), dtype=int) + 65536
-        # 空间范围相交
-        else:
+            # 自决定金字塔等级
+            xysize = [img.RasterXSize, img.RasterYSize]
 
 
-            ox = img.RasterXSize
-            oy = img.RasterYSize
+            origin_extent = json.loads(self.image.extent)
+            band_data: Band = img.GetRasterBand(band)
 
 
-            # 网格大小
-            grid_x = (origin_extent[2] - origin_extent[0]) / (ox * 1.0)
-            grid_y = (origin_extent[3] - origin_extent[1]) / (oy * 1.0)
+            max_level = band_data.GetOverviewCount()
 
 
-            # 完全在影像范围内
-            if extent[0] > origin_extent[0] and extent[1] > origin_extent[1] and extent[2] < \
-                    origin_extent[2] and extent[3] < origin_extent[3]:
+            # 超出空间范围
+            if extent[2] < origin_extent[0] or extent[0] > origin_extent[2] or extent[1] > origin_extent[
+                3] or extent[3] < origin_extent[1]:
+                empty = numpy.zeros((height, width), dtype=int) + 65536
+            # 空间范围相交
+            else:
+                image_level = self.determine_level(xysize, origin_extent, extent, max_level)
 
 
-                # 网格偏移量
-                off_x = math.floor((extent[0] - origin_extent[0]) / grid_x)
-                off_y = math.floor((origin_extent[3] - extent[3]) / grid_y)
+                if image_level == -1:
+                    overview = band_data
+                else:
+                    try:
+                        overview: Band = band_data.GetOverview(image_level)
+                    except:
+                        raise Exception("该影像不存在该级别的金字塔数据！")
+                ox = overview.XSize
+                oy = overview.YSize
 
 
-                # 截取后网格个数
-                x_g = math.ceil((extent[2] - extent[0]) / grid_x)
+                # 网格大小
+                grid_x = (origin_extent[2] - origin_extent[0]) / (ox * 1.0)
+                grid_y = (origin_extent[3] - origin_extent[1]) / (oy * 1.0)
 
 
-                y_g = math.ceil((extent[3] - extent[1]) / grid_y)
+                # 完全在影像范围内
+                if extent[0] > origin_extent[0] and extent[1] > origin_extent[1] and extent[2] < \
+                        origin_extent[2] and extent[3] < origin_extent[3]:
+
+                    # 网格偏移量
+                    off_x = math.floor((extent[0] - origin_extent[0]) / grid_x)
+                    off_y = math.floor((origin_extent[3] - extent[3]) / grid_y)
+
+                    # 截取后网格个数
+                    x_g = math.ceil((extent[2] - extent[0]) / grid_x)
+
+                    y_g = math.ceil((extent[3] - extent[1]) / grid_y)
+
+                    empty = overview.ReadAsArray(off_x, off_y, x_g, y_g, width, height)
 
 
-                empty = img.ReadRaster(off_x, off_y, x_g, y_g, 256, 256, band_list = bands)
-                img.ReadAsArray()
-            # 部分相交
-            else:
 
 
-                inter_extent = [0, 0, 0, 0]
-                inter_extent[0] = origin_extent[0] if origin_extent[0] > extent[0] else extent[0]
-                inter_extent[1] = origin_extent[1] if origin_extent[1] > extent[1] else extent[1]
-                inter_extent[2] = origin_extent[2] if origin_extent[2] < extent[2] else extent[2]
-                inter_extent[3] = origin_extent[3] if origin_extent[3] < extent[3] else extent[3]
+                # 部分相交
+                else:
 
 
-                # 网格偏移量
-                off_x = math.floor((inter_extent[0] - origin_extent[0]) / grid_x)
-                off_y = math.floor((origin_extent[3] - inter_extent[3]) / grid_y)
+                    inter_extent = [0, 0, 0, 0]
+                    inter_extent[0] = origin_extent[0] if origin_extent[0] > extent[0] else extent[0]
+                    inter_extent[1] = origin_extent[1] if origin_extent[1] > extent[1] else extent[1]
+                    inter_extent[2] = origin_extent[2] if origin_extent[2] < extent[2] else extent[2]
+                    inter_extent[3] = origin_extent[3] if origin_extent[3] < extent[3] else extent[3]
 
 
-                # 截取后网格个数
-                x_g = math.floor((inter_extent[2] - inter_extent[0]) / grid_x)
-                y_g = math.floor((inter_extent[3] - inter_extent[1]) / grid_y)
+                    # 网格偏移量
+                    off_x = math.floor((inter_extent[0] - origin_extent[0]) / grid_x)
+                    off_y = math.floor((origin_extent[3] - inter_extent[3]) / grid_y)
 
 
-                # 相对于出图的偏移量
+                    # 截取后网格个数
+                    x_g = math.floor((inter_extent[2] - inter_extent[0]) / grid_x)
+                    y_g = math.floor((inter_extent[3] - inter_extent[1]) / grid_y)
 
 
-                # 出图的网格大小
-                out_grid_x = (extent[2] - extent[0]) / (width * 1.0)
-                out_grid_y = (extent[3] - extent[1]) / (height * 1.0)
+                    # 相对于出图的偏移量
 
 
-                out_off_x = int(math.ceil((inter_extent[0] - extent[0]) / out_grid_x))
-                out_off_y = int(math.ceil((extent[3] - inter_extent[3]) / out_grid_y))
+                    # 出图的网格大小
+                    out_grid_x = (extent[2] - extent[0]) / (width * 1.0)
+                    out_grid_y = (extent[3] - extent[1]) / (height * 1.0)
 
 
-                out_x_g = int(math.floor((inter_extent[2] - inter_extent[0]) / out_grid_x))
-                out_y_g = int(math.floor((inter_extent[3] - inter_extent[1]) / out_grid_y))
+                    out_off_x = int(math.ceil((inter_extent[0] - extent[0]) / out_grid_x))
+                    out_off_y = int(math.ceil((extent[3] - inter_extent[3]) / out_grid_y))
 
 
-                # 相交部分在出图的哪个位置
+                    out_x_g = int(math.floor((inter_extent[2] - inter_extent[0]) / out_grid_x))
+                    out_y_g = int(math.floor((inter_extent[3] - inter_extent[1]) / out_grid_y))
 
 
-                overview_raster: ndarray = img.ReadAsArray(off_x, off_y, x_g, y_g, out_x_g,
-                                                           out_y_g)
+                    # 相交部分在出图的哪个位置
 
 
-                dat = numpy.zeros((height, width, 3), dtype=int) + 65536
-                dat[out_off_y:out_off_y + out_y_g, out_off_x:out_off_x + out_x_g] = overview_raster
-                empty = dat
+                    overview_raster: ndarray = overview.ReadAsArray(off_x, off_y, x_g, y_g, out_x_g,
+                                                                    out_y_g)
 
 
-        return empty
+                    dat = numpy.zeros((height, width), dtype=int) + 65536
+                    dat[out_off_y:out_off_y + out_y_g, out_off_x:out_off_x + out_x_g] = overview_raster
 
 
+                    empty = dat
+
+            pixel_array[:, :, ceng] = empty
+            ceng += 1
+        return pixel_array
+
+
+    def determine_level(self, xysize, origin_extent, extent, max_level):
+        '''
+        根据范围判断调用金字塔的哪一层
+        :param xysize:
+        :param origin_extent:
+        :param extent:
+        :param max_level:
+        :return:
+        '''
+        x = xysize[0]
+        y = xysize[1]
+        level = -1
+        pixel = x * y * (((extent[2] - extent[0]) * (extent[3] - extent[1])) / (
+                (origin_extent[2] - origin_extent[0]) * (origin_extent[3] - origin_extent[1])))
+        while pixel > 100000 and level < max_level - 1:
+            level += 1
+            x = x / 2
+            y = y / 2
+            pixel = x * y * (((extent[2] - extent[0]) * (extent[3] - extent[1])) / (
+                    (origin_extent[2] - origin_extent[0]) * (origin_extent[3] - origin_extent[1])))
+        return level

@@ -27,9 +27,9 @@ class Api(ApiTemplate):
             parameter = {}
             parameter = {}
             for l_dict in json.loads(data.get("levels")):
             for l_dict in json.loads(data.get("levels")):
                 parameter[str(l_dict["level"])] = {"resolution":l_dict["resolution"],"scale":l_dict["scale"]}
                 parameter[str(l_dict["level"])] = {"resolution":l_dict["resolution"],"scale":l_dict["scale"]}
-            parameter["cols"] = int(data.get("cols"))
-            parameter["rows"] = int(data.get("rows"))
-            parameter["dpi"] = int(data.get("dpi"))
+            parameter["cols"] = int(data.get("cols",256))
+            parameter["rows"] = int(data.get("rows",256))
+            parameter["dpi"] = int(data.get("dpi",96))
             parameter["wkt"] = data.get("crs_wkt")
             parameter["wkt"] = data.get("crs_wkt")
             parameter["x"] = eval(data.get("top_left").split(",")[0])
             parameter["x"] = eval(data.get("top_left").split(",")[0])
             parameter["y"] = eval(data.get("top_left").split(",")[1])
             parameter["y"] = eval(data.get("top_left").split(",")[1])
@@ -51,9 +51,9 @@ class Api(ApiTemplate):
                 # origin_x = top_left[0],
                 # origin_x = top_left[0],
                 # origin_y = top_left[1],
                 # origin_y = top_left[1],
                 levels = json.dumps(json.loads(data.get("levels"))),
                 levels = json.dumps(json.loads(data.get("levels"))),
-                dpi = int(data.get("dpi")),
-                rows = int(data.get("rows")),
-                cols = int(data.get("cols")),
+                dpi = int(data.get("dpi",96)),
+                rows = int(data.get("rows",256)),
+                cols = int(data.get("cols",256)),
                 update_time = datetime.datetime.now(),
                 update_time = datetime.datetime.now(),
                 parameter=json.dumps(parameter)
                 parameter=json.dumps(parameter)
             )
             )

@@ -19,6 +19,18 @@ class Api(ApiTemplate):
         try:
         try:
             guid = self.para.get("guid")
             guid = self.para.get("guid")
             service = Service.query.filter_by(guid=guid).one_or_none()
             service = Service.query.filter_by(guid=guid).one_or_none()
+            if service.type in ["ImageWMTS","ImageWMS"]:
+                from app.modules.service.image.models import ImageService
+                image_service = ImageService.query.filter_by(guid=service.service_guid).one_or_none()
+                db.session.delete(image_service)
+            if service.type in ["WMTS","TMS"]:
+                from app.modules.service.wmts.models import WMTS
+                wmts = WMTS.query.filter_by(guid=service.service_guid).one_or_none()
+                db.session.delete(wmts)
+            if service.type in ["WMTS", "TMS"]:
+                from app.modules.service.wms.models import WMS
+                wms = WMS.query.filter_by(guid=service.service_guid).one_or_none()
+                db.session.delete(wms)
             db.session.delete(service)
             db.session.delete(service)
             db.session.commit()
             db.session.commit()
             res["result"] = True
             res["result"] = True

@@ -44,12 +44,11 @@ class Api(ApiTemplate):
              "type": "string",
              "type": "string",
              "description": "[WMS,WMTS,影像WMS,影像WMTS,guid]"},
              "description": "[WMS,WMTS,影像WMS,影像WMTS,guid]"},
 
 
-            # {"name": "type",
-            #  "in": "formData",
-            #  "type": "string",
-            #  "enum": ["WMS/WFS", "WMTS", "TMS", "ImageWMS", "ImageWMTS"],
-            #  "required": "true",
-            #  "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "type",
+             "in": "formData",
+             "type": "string",
+             "enum": ["WMS/WFS", "WMTS", "TMS", "ImageWMS", "ImageWMTS"],
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
 
 
             {"name": "name",
             {"name": "name",
              "in": "formData",
              "in": "formData",

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/22
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+from app.util.component.FileProcess import FileProcess
+from app.models import Service
+import os
+
+class Api(ApiTemplate):
+    '''
+    解析md文件
+    '''
+    api_name = "服务resolve"
+
+    def process(self):
+        res = {}
+        try:
+
+            parent = os.path.dirname(os.path.realpath(__file__))
+            dir_path, store_file = FileProcess.save(parent)
+
+
+        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/22
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+from app.models import Service
+
+class Api(ApiTemplate):
+    '''
+    保存服务到dmd文件
+    '''
+    api_name = "服务Save"
+    def process(self):
+        res = {}
+        try:
+            guid = self.para.get("guid")
+            service = Service.query.filter_by(guid=guid).one_or_none()
+            if not service:
+                raise Exception("服务不存在！")
+            res["data"] = {}
+
+            if service.type in ["ImageWMS","ImageWMTS"]:
+                from app.modules.service.image.models import ImageService
+                speci_service = ImageService.query.filter_by(guid=service.service_guid).one_or_none()
+                relate_images = speci_service.images.all()
+                res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
+
+                res["data"]["speci_service"]["images"] = [{"name":im["name"],"guid":im["guid"]} for im in ModelVisitor.objects_to_jsonarray(relate_images)]
+                res["data"]["speci_service"]["images"] = sorted(res["data"]["speci_service"]["images"], key=lambda x: x["name"])
+
+            elif service.type.__eq__("WMTS") or service.type.__eq__("TMS"):
+                from app.modules.service.wmts.models import WMTS
+                speci_service = WMTS.query.filter_by(guid=service.service_guid).one_or_none()
+
+                res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
+
+            elif service.type.__eq__("WMS/WFS"):
+                from app.modules.service.wms.models import WMS
+                speci_service = WMS.query.filter_by(guid=service.service_guid).one_or_none()
+                res["data"]["speci_service"] = ModelVisitor.object_to_json(speci_service)
+            else:
+                res["data"] = {}
+
+            res["data"]["service"] = ModelVisitor.object_to_json(service)
+
+        except Exception as e:
+            raise e
+        return res
+
+
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "guid"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -17,6 +17,8 @@ class Api(ApiTemplate):
             state = int(self.para.get("state"))
             state = int(self.para.get("state"))
             Service.query.filter_by(guid=guid).update({"state":state})
             Service.query.filter_by(guid=guid).update({"state":state})
 
 
+            # 清理缓存，拒绝服务
+
             db.session.commit()
             db.session.commit()
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:

@@ -8,8 +8,10 @@ from flask import current_app
 import os
 import os
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.StructuredPrint import StructurePrint
 from app.util.component.StructuredPrint import StructurePrint
-
+from app.models import Service,db
+from sqlalchemy.orm import load_only
 from flask import current_app
 from flask import current_app
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
@@ -24,7 +26,9 @@ class Api(ApiTemplate):
 
 
         result=dict()
         result=dict()
         result.update(self.para)
         result.update(self.para)
+        services = Service.query.options(load_only('guid')).all()
         result["root_path"] = os.path.dirname(current_app.instance_path)
         result["root_path"] = os.path.dirname(current_app.instance_path)
+        result["services"] = ModelVisitor.objects_to_jsonarray(services)
         return result
         return result
 
 
 
 

@@ -307,13 +307,6 @@ class ThisTask:
         :return: 表名
         :return: 表名
         '''
         '''
 
 
-        # 在覆盖模式下，删除原有记录
-        if overwrite.__eq__("yes"):
-            old_table = self.sys_session.query(Table).filter_by(name=new_layer_name).one_or_none()
-            if old_table:
-                self.sys_session.delete(old_table)
-
-
         this_time = datetime.datetime.now()
         this_time = datetime.datetime.now()
 
 
         ext = layer.GetExtent()
         ext = layer.GetExtent()
@@ -336,7 +329,7 @@ class ThisTask:
                       is_vacuate=is_vacuate
                       is_vacuate=is_vacuate
                       )
                       )
         # 删除遗留业务数据
         # 删除遗留业务数据
-        history_table = self.sys_session.query(Table).filter_by(name=new_layer_name).all()
+        history_table = self.sys_session.query(Table).filter_by(name=new_layer_name,database_guid=self.database.guid).all()
         if history_table:
         if history_table:
             for ht in history_table:
             for ht in history_table:
                 self.sys_session.delete(ht)
                 self.sys_session.delete(ht)

@@ -52,8 +52,8 @@ class SliceScheme:
         col = int(col)
         col = int(col)
         detaxy = parameter.get(str(level)).get("resolution")* parameter.get("cols")
         detaxy = parameter.get(str(level)).get("resolution")* parameter.get("cols")
 
 
-        minx = detaxy * col + parameter.get("x")
-        maxy = -detaxy * row + parameter.get("y")
+        minx = detaxy * col + int(parameter.get("x"))
+        maxy = -detaxy * row + int(parameter.get("y"))
         maxx = detaxy + minx
         maxx = detaxy + minx
         miny = -detaxy + maxy
         miny = -detaxy + maxy
 
 

+# coding=utf-8
+#author:        4N
+#createtime:    2021/10/21
+#email:         nheweijun@sina.com
+
+from osgeo import ogr
+from osgeo import gdal
+
+def function():
+    gdal.SetConfigOption("SHAPE_ENCODING", "UTF-8")
+
+    fn = "PG: user=postgres password=chinadci host=172.26.60.101 port=5432 dbname=parcel"
+    driver = ogr.GetDriverByName("PostgreSQL")
+    ds:ogr.DataSource = driver.Open(fn, 1)
+
+    layer:ogr.Layer = ds.GetLayerByName("ZDCLHX2000V14")
+
+    output = r"E:\D2\桌面\工作\2021.10省厅测评\10w.shp"
+
+    shp_driver = ogr.GetDriverByName("FileGDB")
+    output_ds: ogr.DataSource = shp_driver.CreateDataSource(output)
+
+    out_layer:ogr.Layer = output_ds.CreateLayer(layer.GetName(),layer.GetSpatialRef(),layer.GetGeomType())
+
+    field_names = ["id","预编号","土地使用者","所有权性质","土地证号","地址","镇区","测量日期","二维码信息","shape_area"]
+    field_names_yinwen = ["id", "precode", "user", "xingzhi", "tudi", "address", "region", "date", "code", "shape_area"]
+    scheme = [field for field in layer.schema if field.GetName() in field_names]
+
+    out_layer.CreateFields(scheme)
+    count = 100000
+
+    i=0
+    featureDefn = out_layer.GetLayerDefn()
+
+    for f in layer:
+        ff :ogr.Feature = f
+        new_f = ogr.Feature(featureDefn)
+        new_f.SetGeometry(ff.geometry())
+        for field in field_names:
+            dd = ff.GetFieldIndex(field)
+            kkk = ff.GetField(dd)
+            new_f.SetField(field,kkk)
+        out_layer.CreateFeature(new_f)
+        i += 1
+        if i==count:
+            break
+
+    output_ds.Destroy()
+if __name__ == '__main__':
+
+    function()

+# coding=utf-8
+#author:        4N
+#createtime:    2021/10/21
+#email:         nheweijun@sina.com
+
+from osgeo import ogr
+from osgeo import gdal
+
+def function():
+    gdal.SetConfigOption("SHAPE_ENCODING", "GBK")
+
+    fn = "PG: user=postgres password=chinadci host=172.26.60.101 port=5432 dbname=parcel"
+    driver = ogr.GetDriverByName("PostgreSQL")
+    ds:ogr.DataSource = driver.Open(fn, 1)
+
+    layer:ogr.Layer = ds.GetLayerByName("ZDCLHX2000V14")
+    output = r"E:\D2\桌面\工作\2021.10省厅测评\100w.shp"
+    shp_driver = ogr.GetDriverByName("ESRI Shapefile")
+    output_ds: ogr.DataSource = shp_driver.CreateDataSource(output)
+
+    out_layer:ogr.Layer = output_ds.CreateLayer(layer.GetName(),layer.GetSpatialRef(),layer.GetGeomType())
+
+    field_names = ["id","预编号","土地使用者","所有权性质","土地证号","地址","镇区","测量日期","二维码信息","shape_area"]
+    scheme = [field for field in layer.schema if field.GetName() in field_names]
+
+    out_layer.CreateFields(scheme)
+    count = 1000000
+
+    i=0
+    featureDefn = out_layer.GetLayerDefn()
+
+    for f in layer:
+        ff :ogr.Feature = f
+        new_f = ogr.Feature(featureDefn)
+        new_f.SetGeometry(ff.geometry())
+        for field in field_names:
+            dd = ff.GetFieldIndex(field)
+            kkk = ff.GetField(dd)
+            new_f.SetField(field,kkk)
+        out_layer.CreateFeature(new_f)
+        i += 1
+        if i==count:
+            break
+
+    output_ds.Destroy()
+if __name__ == '__main__':
+
+    function()

@@ -3,3 +3,8 @@
 #createtime:    2021/10/15
 #createtime:    2021/10/15
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
+
+
+kk = {"dpi":"11","cols":"112"}
+
+print(int(kk.get("rows",256)))