服务整合

@@ -265,9 +265,10 @@ pkgs.extend(list(glob.glob('%s/modules/*/*/models' % (current_dir))))
 for pkg in pkgs :
 for pkg in pkgs :
     pkg = os.path.normpath(pkg)
     pkg = os.path.normpath(pkg)
     node_list = pkg.split(os.path.sep)
     node_list = pkg.split(os.path.sep)
-    pkg_name = ".".join(node_list[node_list.index("app"):])
+    pkg_name = "app.{}".format(".".join(node_list[node_list.index("modules"):]))
     try:
     try:
-        __import__(pkg_name)
+        if pkg_name.__contains__("models"):
+            __import__(pkg_name)
     except Exception as e:
     except Exception as e:
         print(traceback.format_exc())
         print(traceback.format_exc())
         pass
         pass

@@ -80,7 +80,7 @@ class Api(ApiTemplate):
     
     
     api_doc={
     api_doc={
     
     
-    "tags":["目录接口"],
+    "tags":["矢量数据目录接口"],
     "parameters":[
     "parameters":[
         {"name": "name",
         {"name": "name",
          "in": "formData",
          "in": "formData",

@@ -67,7 +67,7 @@ class Api(ApiTemplate):
     
     
     
     
     api_doc = {
     api_doc = {
-        "tags": ["目录接口"],
+        "tags": ["矢量数据目录接口"],
         "parameters": [
         "parameters": [
             {"name": "guid",
             {"name": "guid",
              "in": "formData",
              "in": "formData",

@@ -34,7 +34,7 @@ class Api(ApiTemplate):
     
     
     
     
     api_doc = {
     api_doc = {
-        "tags": ["目录接口"],
+        "tags": ["矢量数据目录接口"],
         "parameters": [
         "parameters": [
             {"name": "guid",
             {"name": "guid",
              "in": "formData",
              "in": "formData",

@@ -35,7 +35,7 @@ class Api(ApiTemplate):
 
 
     api_doc={
     api_doc={
 
 
-    "tags":["目录接口"],
+    "tags":["矢量数据目录接口"],
     "parameters":[
     "parameters":[
         {"name": "catalog_guid",
         {"name": "catalog_guid",
          "in": "formData",
          "in": "formData",

@@ -51,7 +51,7 @@ class Api(ApiTemplate):
 
 
     api_doc={
     api_doc={
     
     
-    "tags":["目录接口"],
+    "tags":["矢量数据目录接口"],
     "parameters":[
     "parameters":[
         {"name": "database_guid",
         {"name": "database_guid",
          "in": "formData",
          "in": "formData",

@@ -42,7 +42,7 @@ class Api(ApiTemplate):
     
     
     api_doc={
     api_doc={
     
     
-    "tags":["目录接口"],
+    "tags":["矢量数据目录接口"],
     "parameters":[
     "parameters":[
         {"name": "database_guid",
         {"name": "database_guid",
          "in": "formData",
          "in": "formData",

@@ -7,9 +7,10 @@ from flasgger import swag_from
 from flask import Blueprint
 from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
 from . import service_register
 from . import service_register
-from . import service_type
+from . import service_exist_type
 from . import service_list
 from . import service_list
 from . import service_delete
 from . import service_delete
+from . import service_state
 import os
 import os
 from flask import send_from_directory
 from flask import send_from_directory
 
 
@@ -17,6 +18,8 @@ from flask import send_from_directory
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
     bp = Blueprint("Service", __name__, url_prefix="/API/Service")
     bp = Blueprint("Service", __name__, url_prefix="/API/Service")
+    service_type = []
+
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
@@ -29,12 +32,21 @@ class DataManager(BlueprintApi):
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Type', methods=['GET'])
     @bp.route('/Type', methods=['GET'])
-    @swag_from(service_type.Api.api_doc)
+    @swag_from(service_exist_type.Api.api_doc)
     def api_service_type():
     def api_service_type():
         """
         """
         可用服务类型
         可用服务类型
         """
         """
-        return service_type.Api().result
+        return service_exist_type.Api().result
+
+    @staticmethod
+    @bp.route('/State', methods=['GET'])
+    @swag_from(service_state.Api.api_doc)
+    def api_service_state():
+        """
+        修改服务状态
+        """
+        return service_state.Api().result
 
 
     @staticmethod
     @staticmethod
     @bp.route('/List', methods=['POST'])
     @bp.route('/List', methods=['POST'])

@@ -19,7 +19,7 @@ from . import catalog_edit, catalog_tree, catalog_delete, catalog_create, catalo
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
     bp = Blueprint("ServiceCatalog", __name__, url_prefix="/API/Service/Catalog")
     bp = Blueprint("ServiceCatalog", __name__, url_prefix="/API/Service/Catalog")
-
+    service_type = []
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Create', methods=['POST'])
     @bp.route('/Create', methods=['POST'])

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

@@ -7,22 +7,23 @@
 from flasgger import swag_from
 from flasgger import swag_from
 from flask import Blueprint
 from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
-from . import image_register
 from . import image_service_register
 from . import image_service_register
 from . import image_server_list
 from . import image_server_list
 from . import data_list
 from . import data_list
 from . import capabilities
 from . import capabilities
-from . import image_list
-from . import image_tile
-from . import image_wms
-from . import image_overview
+from . import image_tile,image_wms
 from . import image_service_list
 from . import image_service_list
+from . import image_tile_mask
+
+
+from . import image_register,image_list,image_info,image_edit,image_overview
+from . import image_tag_create,image_tag_delete,image_tag_list
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
     bp = Blueprint("Image", __name__, url_prefix="/API/Service/Image")
     bp = Blueprint("Image", __name__, url_prefix="/API/Service/Image")
-    service_type = ["影像WMS服务","影像WMTS服务"]
+    service_type = ["ImageWMS","ImageWMTS"]
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
@@ -33,6 +34,24 @@ class DataManager(BlueprintApi):
         """
         """
         return image_register.Api().result
         return image_register.Api().result
 
 
+    @staticmethod
+    @bp.route('/Edit', methods=['POST'])
+    @swag_from(image_edit.Api.api_doc)
+    def api_image_edit():
+        """
+        影像Info
+        """
+        return image_edit.Api().result
+
+    @staticmethod
+    @bp.route('/Info', methods=['POST'])
+    @swag_from(image_info.Api.api_doc)
+    def api_image_info():
+        """
+        影像Info
+        """
+        return image_info.Api().result
+
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Overview', methods=['POST'])
     @bp.route('/Overview', methods=['POST'])
@@ -43,6 +62,35 @@ class DataManager(BlueprintApi):
         """
         """
         return image_overview.Api().result
         return image_overview.Api().result
 
 
+
+    @staticmethod
+    @bp.route('/TagCreate', methods=['POST'])
+    @swag_from(image_tag_create.Api.api_doc)
+    def api_image_tag_create():
+        """
+        Tag创建
+        """
+        return image_tag_create.Api().result
+
+    @staticmethod
+    @bp.route('/TagDelete', methods=['POST'])
+    @swag_from(image_tag_delete.Api.api_doc)
+    def api_image_tag_delete():
+        """
+        Tag删除
+        """
+        return image_tag_delete.Api().result
+
+    @staticmethod
+    @bp.route('/TagList', methods=['POST'])
+    @swag_from(image_tag_list.Api.api_doc)
+    def api_image_tag_list():
+        """
+        TagList
+        """
+        return image_tag_list.Api().result
+
+
     @staticmethod
     @staticmethod
     @bp.route('/ServiceRegister', methods=['POST'])
     @bp.route('/ServiceRegister', methods=['POST'])
     @swag_from(image_service_register.Api.api_doc)
     @swag_from(image_service_register.Api.api_doc)
@@ -117,6 +165,24 @@ class DataManager(BlueprintApi):
         """
         """
         return image_tile.Api("1",1,1,1).result
         return image_tile.Api("1",1,1,1).result
 
 
+    # @staticmethod
+    # @bp.route('/TileMask/<guid>/<l>/<y>/<z>', methods=['GET'])
+    # @swag_from(image_tile_mask.Api.api_doc)
+    # def api_image_tile_mask(guid,l,y,z):
+    #     """
+    #     切片服务
+    #     """
+    #     return image_tile_mask.Api(guid,l,y,z).result
+    #
+    # @staticmethod
+    # @bp.route('/TileMask', methods=['GET','POST'])
+    # @swag_from(image_tile_mask.Api.api_doc)
+    # def api_image_tile_mask_kv():
+    #     """
+    #     切片服务
+    #     """
+    #     return image_tile_mask.Api("1",1,1,1).result
+
 
 
 
 
     @staticmethod
     @staticmethod

@@ -11,6 +11,9 @@ from app.util.component.FileProcess import FileProcess
 import datetime
 import datetime
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
 import os
 import os
+from app.models import db
+from app.modules.service.image.models import Image
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "影像数据列表"
     api_name = "影像数据列表"
@@ -38,11 +41,20 @@ class Api(ApiTemplate):
                 for f in os.listdir(base_path):
                 for f in os.listdir(base_path):
 
 
                     file_path = os.path.normpath(os.path.join(base_path, f))
                     file_path = os.path.normpath(os.path.join(base_path, f))
-                    file_size = FileProcess.get_file_size(file_path)
+                    file_size, real_size = FileProcess.get_file_size(file_path)
 
 
                     fctime = datetime.datetime.fromtimestamp(os.path.getctime(file_path)).strftime('%Y-%m-%d %H:%M:%S')
                     fctime = datetime.datetime.fromtimestamp(os.path.getctime(file_path)).strftime('%Y-%m-%d %H:%M:%S')
 
 
-                    file_info = {"name": f, "path": file_path, "size": file_size, "create_time": fctime}
+                    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"):
+
+                        exist_image: Image = Image.query.filter_by(path=os.path.normpath(file_info.get("path")),
+                                                            size=file_info.get("size")).one_or_none()
+                        file_info["exist"] = False
+                        if exist_image:
+                            if exist_image.server.__contains__(data_server):
+                                file_info["exist"] = True
 
 
                     if file_path.lower().endswith("tiff") or file_path.lower().endswith("tif"):
                     if file_path.lower().endswith("tiff") or file_path.lower().endswith("tif"):
                         file_info["type"] = "tif"
                         file_info["type"] = "tif"
@@ -61,6 +73,17 @@ class Api(ApiTemplate):
                 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()
+
+                for inf in info:
+                    if inf["path"].lower().endswith("tiff") or inf["path"].lower().endswith("tif") or inf["path"].lower().endswith("img"):
+                        dd = os.path.normpath(inf.get("path"))
+                        exist_image = Image.query.filter_by(path=os.path.normpath(inf.get("path")),
+                                                            size=inf.get("real_size")).one_or_none()
+                        inf["exist"] = False
+                        if exist_image:
+                            if exist_image.server.__contains__(data_server):
+                                inf["exist"] = True
+
                 res["data"] = info
                 res["data"] = info
 
 
             res["result"] = True
             res["result"] = True

@@ -41,6 +41,12 @@ class Api(ApiTemplate):
             {"name": "alias",
             {"name": "alias",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
+            {"name": "ym",
+             "in": "formData",
+             "type": "string","description":"成像时间字符串"},
+            {"name": "region",
+             "in": "formData",
+             "type": "string", "description": "所属区域"},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

+# coding=utf-8
+#author:        4N
+#createtime:    2021/7/19
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+
+from app.modules.service.image.models import Image,ImageTag
+from sqlalchemy import or_,and_
+class Api(ApiTemplate):
+
+    api_name = "影像数据Info"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+
+            guid = self.para.get("guid")
+
+            image = Image.query.filter_by(guid=guid).one_or_none()
+            if not image:
+                raise Exception("数据不存在！")
+            tags:ImageTag = image.image_tags.all()
+            tag_names = [tag.name for tag in tags]
+
+            res["data"] = ModelVisitor.object_to_json(image)
+            res["data"]["tag"] = ",".join(tag_names)
+            res["result"] = True
+        except Exception as e:
+            raise e
+
+        return res
+
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
+
+

@@ -7,7 +7,7 @@
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 
 
-from app.modules.service.image.models import Image
+from app.modules.service.image.models import Image,ImageTag
 from sqlalchemy import or_,and_
 from sqlalchemy import or_,and_
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
@@ -23,6 +23,8 @@ class Api(ApiTemplate):
 
 
             alias = self.para.get("alias")
             alias = self.para.get("alias")
             name = self.para.get("name")
             name = self.para.get("name")
+            tag_guid = self.para.get("tag_guid")
+
             images = Image.query
             images = Image.query
 
 
             # 并集
             # 并集
@@ -33,6 +35,11 @@ class Api(ApiTemplate):
                     images = images.filter(Image.alias.like("%" + alias + "%"))
                     images = images.filter(Image.alias.like("%" + alias + "%"))
                 if name:
                 if name:
                     images = images.filter(Image.name.like("%" + name + "%"))
                     images = images.filter(Image.name.like("%" + name + "%"))
+            if tag_guid:
+                tag:ImageTag = ImageTag.query.filter_by(guid=tag_guid).one_or_none()
+                images_guid = [img.guid for img in tag.images.all()]
+                images = images.filter(Image.guid.in_(images_guid))
+
 
 
             images = images.limit(page_size).offset(page_index).all()
             images = images.limit(page_size).offset(page_index).all()
 
 
@@ -61,6 +68,9 @@ class Api(ApiTemplate):
             {"name": "name",
             {"name": "name",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
+            {"name": "tag_guid",
+             "in": "formData",
+             "type": "string"},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -47,11 +47,18 @@ class Api(ApiTemplate):
             image = Image.query.filter_by(guid=guid).one_or_none()
             image = Image.query.filter_by(guid=guid).one_or_none()
             # 该影像的服务器，随机选取一个
             # 该影像的服务器，随机选取一个
             image_servers = image.server.split(",")
             image_servers = image.server.split(",")
-            indx = int(random.random() * len(image_servers))
-            image_server = image_servers[indx]
+            image_servers = [ser for ser in image_servers if zoo.exists("/rpc/{}".format(ser)) or ser.__eq__("本地服务器") ]
+            if len(image_servers) > 0:
+                indx = int(random.random() * len(image_servers))
+                image_server = image_servers[indx]
+            else:
+                image_server = "None"
+
             wms_api = WMSApi()
             wms_api = WMSApi()
 
 
-            bands = [1,2,3] if image.band_count>=3 else [1,1,1]
+            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)
@@ -63,7 +70,7 @@ class Api(ApiTemplate):
                 query_extent = [query_extent[0] - offset, query_extent[1], query_extent[2] + offset, query_extent[3]]
                 query_extent = [query_extent[0] - offset, query_extent[1], query_extent[2] + offset, query_extent[3]]
 
 
 
 
-            pixel_array_t = wms_api.get_data(zoo, image_server, image, query_extent, bands, 256, 256)
+            pixel_array_t = wms_api.get_data(image_server, image, query_extent, bands, 256, 256)
 
 
 
 
             pixel_array = numpy.zeros((256, 256, 3), dtype=int)
             pixel_array = numpy.zeros((256, 256, 3), dtype=int)

@@ -14,7 +14,9 @@ import datetime
 from app.models import  db
 from app.models import  db
 import uuid
 import uuid
 import os
 import os
+from .models import ImageTag
 import math
 import math
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "注册影像数据"
     api_name = "注册影像数据"
@@ -28,6 +30,12 @@ class Api(ApiTemplate):
         try:
         try:
             data_server = self.para.get("data_server")
             data_server = self.para.get("data_server")
             paths = json.loads(self.para.get("paths"))
             paths = json.loads(self.para.get("paths"))
+            tag_guids = self.para.get("tag_guids")
+            if tag_guids:
+                tags = db.session.query(ImageTag).filter(ImageTag.guid.in_(tag_guids.split(","))).all()
+            else:
+                tags = []
+
 
 
             #注册某影像
             #注册某影像
             infos = []
             infos = []
@@ -43,7 +51,7 @@ class Api(ApiTemplate):
                     origin = osr.SpatialReference()
                     origin = osr.SpatialReference()
                     origin.ImportFromWkt(image.GetProjection())
                     origin.ImportFromWkt(image.GetProjection())
 
 
-                    authority_code = origin.GetAuthorityCode()
+                    authority_code = origin.GetAuthorityCode(None)
                     band_count = image.RasterCount
                     band_count = image.RasterCount
                     band: Band = image.GetRasterBand(1)
                     band: Band = image.GetRasterBand(1)
                     count = band.GetOverviewCount()
                     count = band.GetOverviewCount()
@@ -63,6 +71,7 @@ class Api(ApiTemplate):
                     # geo_origin_extent = [geo_left_top[1], geo_right_buttom[0], geo_right_buttom[1], geo_left_top[0]]
                     # geo_origin_extent = [geo_left_top[1], geo_right_buttom[0], geo_right_buttom[1], geo_left_top[0]]
 
 
                     info = {"band_count": band_count,
                     info = {"band_count": band_count,
+                            "band_view":"[1,2,3]" if band_count>=3 else "[1,1,1]",
                             "overview_count": count,
                             "overview_count": count,
                             "path":image_info["path"],
                             "path":image_info["path"],
                             "xy_size": [image.RasterXSize, image.RasterYSize],
                             "xy_size": [image.RasterXSize, image.RasterYSize],
@@ -108,17 +117,17 @@ class Api(ApiTemplate):
                     if exist_image.server.__contains__(data_server):
                     if exist_image.server.__contains__(data_server):
                         pass
                         pass
                     else:
                     else:
-                        exist_image.update({"server":"{},".format(data_server)})
+                        exist_image.update({"server":"{},{}".format(exist_image.server,data_server)})
                 else:
                 else:
-                    image = Image(guid= uuid.uuid1().__str__(),
+                    img:Image = Image(guid= uuid.uuid1().__str__(),
                                   overview_count=info.get("overview_count"),
                                   overview_count=info.get("overview_count"),
                                   raster_x_size=info["xy_size"][0],
                                   raster_x_size=info["xy_size"][0],
                                   raster_y_size=info["xy_size"][1],
                                   raster_y_size=info["xy_size"][1],
                                   cell_x_size = info.get("cell_x_size"),
                                   cell_x_size = info.get("cell_x_size"),
                                   cell_y_size = abs(info.get("cell_y_size")),
                                   cell_y_size = abs(info.get("cell_y_size")),
                                   name=os.path.basename(info.get("path")),
                                   name=os.path.basename(info.get("path")),
+                                  alias = os.path.basename(info.get("path")),
                                   extent=json.dumps(info["origin_extent"]),
                                   extent=json.dumps(info["origin_extent"]),
-                                  # geo_origin_extent = json.dumps(info["geo_origin_extent"]),
                                   null_value=info.get("null_value"),
                                   null_value=info.get("null_value"),
                                   server=data_server,
                                   server=data_server,
                                   path = os.path.normpath(info.get("path")),
                                   path = os.path.normpath(info.get("path")),
@@ -129,12 +138,10 @@ class Api(ApiTemplate):
                                   band_count=info.get("band_count"),
                                   band_count=info.get("band_count"),
                                   create_time=this_time
                                   create_time=this_time
                                   )
                                   )
-                    db.session.add(image)
+                    for tag in tags:
+                        img.image_tags.append(tag)
+                    db.session.add(img)
             db.session.commit()
             db.session.commit()
-            # res["data"] = guid
-
-
-
             res["result"] = True
             res["result"] = True
 
 
         except Exception as e:
         except Exception as e:
@@ -181,7 +188,11 @@ class Api(ApiTemplate):
             {"name": "paths",
             {"name": "paths",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "paths"}
+             "description": "paths"},
+            {"name": "tags",
+             "in": "formData",
+             "type": "string",
+             "description": "tags以,相隔"}
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -139,7 +139,7 @@ class Api(ApiTemplate):
             {"name": "type",
             {"name": "type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "enum": ["WMS", "WMTS", "影像WMS", "影像WMTS"],
+             "enum": ["WMS/WFS","WMTS","MTS","ImageWMS","ImageWMTS"],
              "required": "true",
              "required": "true",
              "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
              "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
             {"name": "catalog_guid",
             {"name": "catalog_guid",

@@ -19,21 +19,18 @@ 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
-import os
 import json
 import json
 from kazoo.client import KazooClient
 from kazoo.client import KazooClient
-
 from threading import Thread
 from threading import Thread
-
-from app.modules.service.image.util.ThriftConnect import ThriftConnect
-from flask import current_app
+from app.modules.service.image.util.ThriftConnect import ThriftConnect,ThriftPool
 import gzip
 import gzip
 import random
 import random
+import copy
+
+
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "切片"
     api_name = "切片"
@@ -46,7 +43,7 @@ class Api(ApiTemplate):
         self.col = col
         self.col = col
 
 
     def process(self):
     def process(self):
-        from app import GLOBAL_DIC
+
         result = {}
         result = {}
         parameter: dict = self.para
         parameter: dict = self.para
 
 
@@ -54,33 +51,13 @@ class Api(ApiTemplate):
             if parameter.get("guid"):
             if parameter.get("guid"):
                 self.guid = parameter.get("guid")
                 self.guid = parameter.get("guid")
 
 
-            #缓存服务信息
-            image_service_info = GLOBAL_DIC.get(self.guid)
-            if image_service_info is None:
-                image_service:ImageService = ImageService.query.filter_by(guid = self.guid).one_or_none()
-                images = image_service.images.all()
-                scheme:TileScheme = TileScheme.query.filter_by(guid=image_service.scheme_guid).one_or_none()
-                GLOBAL_DIC[self.guid] = {"service":image_service,"images":images,"scheme":json.loads(scheme.parameter)}
-                image_service_info = GLOBAL_DIC[self.guid]
-            else:
-                image_service_info = GLOBAL_DIC[self.guid]
-
-            zoo = GLOBAL_DIC.get("zookeeper")
-            if zoo is None:
-                zoo :KazooClient = KazooClient(hosts=configure.zookeeper, timeout=100)
-                zoo.start()
-                GLOBAL_DIC["zookeeper"] = zoo
-            else :
-                if not zoo.connected:
-                    zoo.start()
-
-            bands = [1, 2, 3]
+            image_service_info, zoo, servers = self.cache_data()
 
 
+            # bands = [1, 2, 3]
 
 
             # 转换参数
             # 转换参数
             parameter = ParameterUtil.to_lower(parameter)
             parameter = ParameterUtil.to_lower(parameter)
 
 
-
             if parameter.get("tilematrix"):
             if parameter.get("tilematrix"):
                 if parameter.get("tilematrix").__contains__(":"):
                 if parameter.get("tilematrix").__contains__(":"):
                     self.level = int(parameter.get("tilematrix").split(":")[-1])
                     self.level = int(parameter.get("tilematrix").split(":")[-1])
@@ -96,7 +73,6 @@ class Api(ApiTemplate):
             slice_para = image_service_info["scheme"]
             slice_para = image_service_info["scheme"]
             extent = SliceScheme.get_polygon(slice_para, self.level, self.row, self.col)
             extent = SliceScheme.get_polygon(slice_para, self.level, self.row, self.col)
 
 
-
             height, width = 256,256
             height, width = 256,256
 
 
             # 多线程获取分布式数据
             # 多线程获取分布式数据
@@ -106,20 +82,25 @@ class Api(ApiTemplate):
             if len(intersect_image) > 1:
             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) + 65536
 
 
-                pixel_array = numpy.zeros((height, width, 3), dtype=int)
                 thread_list = []
                 thread_list = []
 
 
                 for image in intersect_image:
                 for image in intersect_image:
+
                     # 该影像的服务器，随机选取一个
                     # 该影像的服务器，随机选取一个
                     image_servers = image.server.split(",")
                     image_servers = image.server.split(",")
-                    indx = int(random.random() * len(image_servers))
-                    image_server = image_servers[indx]
+                    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)
+
                     thread: MyThread = MyThread(self.get_data,
                     thread: MyThread = MyThread(self.get_data,
-                                                args=(zoo, image_server, image, extent, bands, height, width))
+                                                args=(image_server, image, extent, bands, height, width))
                     thread.start()
                     thread.start()
                     thread_list.append(thread)
                     thread_list.append(thread)
 
 
@@ -128,51 +109,106 @@ class Api(ApiTemplate):
                     data = thread.get_result()
                     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
+                    mask = numpy.zeros((height, width, 3), dtype=int)
+                    mask_data = numpy.zeros((height, width, 3), dtype=int)
 
 
-                for ii in [0, 1, 2]:
-                    # opencv 颜色排序为GBR
-                    pixel_array[:, :, 2 - ii] = empty_list[ii]
+                    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:
             elif len(intersect_image) == 1:
                 # 该影像的服务器，随机选取一个
                 # 该影像的服务器，随机选取一个
                 image = intersect_image[0]
                 image = intersect_image[0]
                 image_servers = image.server.split(",")
                 image_servers = image.server.split(",")
-                indx = int(random.random() * len(image_servers))
-
-                image_server = image_servers[indx]
-
-                pixel_array_t = self.get_data(zoo, image_server, image, extent, bands, height, width)
+                #判断可用服务器
+                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)
+                pixel_array_t:numpy.ndarray = self.get_data(image_server, image, extent, bands, height, width)
                 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 颜色排序为GBR
                     pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
                     pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
 
 
-
             else:
             else:
                 # 结果矩阵
                 # 结果矩阵
                 pixel_array = numpy.zeros((height, width, 3), dtype=int) + 65536
                 pixel_array = numpy.zeros((height, width, 3), dtype=int) + 65536
 
 
+
             # 将图片生成在内存中,然后直接返回response
             # 将图片生成在内存中,然后直接返回response
             im_data = self.create_by_opencv(image_type, pixel_array, quality)
             im_data = self.create_by_opencv(image_type, pixel_array, quality)
             return Response(im_data, mimetype=image_type.lower())
             return Response(im_data, mimetype=image_type.lower())
 
 
+
         except Exception as e:
         except Exception as e:
             print(traceback.format_exc())
             print(traceback.format_exc())
             result["state"] = -1
             result["state"] = -1
             result["message"] = e.__str__()
             result["message"] = e.__str__()
             return result
             return result
 
 
+    def cache_data(self):
+
+        from app import GLOBAL_DIC
+
+        # 缓存zookeeper
+        zoo = GLOBAL_DIC.get("zookeeper")
+        if zoo is None:
+            zoo: KazooClient = KazooClient(hosts=configure.zookeeper, timeout=100)
+            zoo.start()
+            GLOBAL_DIC["zookeeper"] = zoo
+        else:
+            if not zoo.connected:
+                zoo.start()
+
+        # 缓存数据服务器
+        servers = GLOBAL_DIC.get("servers")
+        if servers is None:
+            servers = zoo.get_children("/rpc")
+            servers.append("本地服务器")
+            GLOBAL_DIC["servers"] = servers
+            GLOBAL_DIC["servers_updatetime"] = time.time()
+        else:
+            servers = GLOBAL_DIC.get("servers")
+
+        # 更新缓存
+        if time.time() - GLOBAL_DIC["servers_updatetime"] > 10:
+            servers = zoo.get_children("/rpc")
+            servers.append("本地服务器")
+            GLOBAL_DIC["servers"] = servers
+            GLOBAL_DIC["servers_updatetime"] = time.time()
+
+
+        # 缓存服务信息
+        image_service_info = GLOBAL_DIC.get(self.guid)
+        if image_service_info is None or time.time() - GLOBAL_DIC.get("service_updatetime") > 20:
+            image_service: ImageService = ImageService.query.filter_by(guid=self.guid).one_or_none()
+            images = image_service.images.all()
+            scheme: TileScheme = TileScheme.query.filter_by(guid=image_service.scheme_guid).one_or_none()
+            GLOBAL_DIC[self.guid] = {"service": image_service, "images": images, "scheme": json.loads(scheme.parameter)}
+            GLOBAL_DIC["service_updatetime"] = time.time()
+            image_service_info = GLOBAL_DIC[self.guid]
+
+        else:
+            image_service_info = GLOBAL_DIC[self.guid]
+
+        return image_service_info,zoo,servers
+
     def determine_level(self, xysize, origin_extent, extent, max_level):
     def determine_level(self, xysize, origin_extent, extent, max_level):
         '''
         '''
         根据范围判断调用金字塔的哪一层
         根据范围判断调用金字塔的哪一层
@@ -195,10 +231,12 @@ class Api(ApiTemplate):
                     (origin_extent[2] - origin_extent[0]) * (origin_extent[3] - origin_extent[1])))
                     (origin_extent[2] - origin_extent[0]) * (origin_extent[3] - origin_extent[1])))
         return level
         return level
 
 
+
     def create_by_opencv(self, image_type, pixel_array, quality):
     def create_by_opencv(self, image_type, pixel_array, quality):
 
 
         if image_type.__eq__("image/jpeg") or image_type.__eq__("image/jpg"):
         if image_type.__eq__("image/jpeg") or image_type.__eq__("image/jpg"):
             r, buf = cv2.imencode(".jpg", pixel_array, [cv2.IMWRITE_JPEG_QUALITY, quality])
             r, buf = cv2.imencode(".jpg", pixel_array, [cv2.IMWRITE_JPEG_QUALITY, quality])
+            # r, buf = cv2.imencode(".jpg", pixel_array)
             image_out = buf.tobytes()
             image_out = buf.tobytes()
         else:
         else:
             height, width = pixel_array[:, :, 0].shape
             height, width = pixel_array[:, :, 0].shape
@@ -208,17 +246,14 @@ class Api(ApiTemplate):
             image_out = buf.tobytes()
             image_out = buf.tobytes()
         return image_out
         return image_out
 
 
-    def get_data(self, zoo, image_server, image, extent, bands, height, width):
+    def get_data(self,image_server, image, extent, bands, height, width):
 
 
         if image_server.__eq__("本地服务器"):
         if image_server.__eq__("本地服务器"):
-            data = self.get_local_wms_data(image, extent, bands, height, width)
+            data = self.get_local_wms_data2(image, extent, bands, height, width)
+        elif image_server.__eq__("None"):
+            data = numpy.zeros((height, width, 3), dtype=int) + 65536
         else:
         else:
-            ser = image_server
-            if zoo.exists("/rpc/{}".format(ser)):
-                data = self.get_remote_wms_data(ser,image, extent, bands, height, width)
-            else:
-                data = numpy.zeros((height, width, 3), dtype=int) + 65536
-
+            data = self.get_remote_wms_data(image_server,image, extent, bands, height, width)
         return data
         return data
 
 
     def get_remote_wms_data(self, image_server,image, extent, bands, height, width):
     def get_remote_wms_data(self, image_server,image, extent, bands, height, width):
@@ -230,24 +265,93 @@ class Api(ApiTemplate):
         :return:
         :return:
         '''
         '''
 
 
-
         #需要做thrift连接的缓存，连接池
         #需要做thrift连接的缓存，连接池
+        thrift_connect = ThriftConnect(image_server)
+        image_extent = image.extent
+
+        data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands, width, height)
+
+        thrift_connect.close()
+
+        data = gzip.decompress(data)
+        data = numpy.frombuffer(data, dtype='int64')
+        data = data.reshape((height, width, 3))
+
+        return data
+
 
 
+    def get_remote_wms_data_cpp(self, image_server,image, extent, bands, height, width):
+        '''
+        通过RPC获取远程数据
+        :param image:
+        :param extent:
+        :param bands:
+        :return:
+        '''
+
+        #需要做thrift连接的缓存，连接池
         thrift_connect = ThriftConnect(image_server)
         thrift_connect = ThriftConnect(image_server)
-        t1 = time.time()
         image_extent = image.extent
         image_extent = image.extent
 
 
         data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands, width, height)
         data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands, width, height)
 
 
         thrift_connect.close()
         thrift_connect.close()
 
 
-        # current_app.logger.info("time {}".format(time.time() - t1))
+        return data
+
+    def get_remote_wms_data_client(self,image_server,image, extent, bands, height, width):
+        '''
+        通过RPC获取远程数据
+        :param image:
+        :param extent:
+        :param bands:
+        :return:
+        '''
+        from app import GLOBAL_DIC
+
+        # 缓存thrift_pool
+        thrift_pool = GLOBAL_DIC.get(image_server)
+        if thrift_pool is None:
+            thrift_pool = ThriftPool(image_server)
+            GLOBAL_DIC["image_server"] = thrift_pool
+        image_extent = image.extent
+
+        client,transport = thrift_pool.get_client()
+        transport.open()
+        data = client.getData(image.path, extent, json.loads(image_extent), bands, width, height)
+        transport.close()
         data = gzip.decompress(data)
         data = gzip.decompress(data)
         data = numpy.frombuffer(data, dtype='int64')
         data = numpy.frombuffer(data, dtype='int64')
         data = data.reshape((height, width, 3))
         data = data.reshape((height, width, 3))
 
 
         return data
         return data
 
 
+    # def get_remote_wms_data_c(self, image_server,image, extent, bands, height, width):
+    #     '''
+    #     通过RPC获取远程数据
+    #     :param image:
+    #     :param extent:
+    #     :param bands:
+    #     :return:
+    #     '''
+    #
+    #     #需要做thrift连接的缓存，连接池
+    #     thrift_connect = ThriftConnect_C(image_server)
+    #     image_extent = image.extent
+    #
+    #     data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands, width, height)
+    #
+    #     thrift_connect.close()
+    #
+    #     data = gzip.decompress(data)
+    #     data = numpy.frombuffer(data, dtype='int64')
+    #
+    #
+    #     data = data.reshape((height, width, 3))
+    #
+    #     return data
+
+
     def get_local_wms_data(self, image, extent, bands, height, width):
     def get_local_wms_data(self, image, extent, bands, height, width):
         '''
         '''
         获取本地数据
         获取本地数据
@@ -259,20 +363,21 @@ class Api(ApiTemplate):
         pixel_array = numpy.zeros((height, width, 3), dtype=int)
         pixel_array = numpy.zeros((height, width, 3), dtype=int)
         ceng = 0
         ceng = 0
         img: Dataset = gdal.Open(image.path, 0)
         img: Dataset = gdal.Open(image.path, 0)
-        t1 = time.time()
+
+
+
         for band in bands:
         for band in bands:
 
 
             # 自决定金字塔等级
             # 自决定金字塔等级
             xysize = [img.RasterXSize, img.RasterYSize]
             xysize = [img.RasterXSize, img.RasterYSize]
 
 
-            origin_extent = image.extent
+            origin_extent = json.loads(image.extent)
             band_data: Band = img.GetRasterBand(band)
             band_data: Band = img.GetRasterBand(band)
 
 
             max_level = band_data.GetOverviewCount()
             max_level = band_data.GetOverviewCount()
 
 
             # 超出空间范围
             # 超出空间范围
-            if extent[2] < origin_extent[0] or extent[0] > origin_extent[2] or extent[1] > origin_extent[
-                3] or extent[3] < origin_extent[1]:
+            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
                 empty = numpy.zeros((height, width), dtype=int) + 65536
             # 空间范围相交
             # 空间范围相交
             else:
             else:
@@ -351,10 +456,96 @@ class Api(ApiTemplate):
             ceng += 1
             ceng += 1
         return pixel_array
         return pixel_array
 
 
+    def get_local_wms_data2(self, image, extent, bands, height, width):
+        '''
+        获取本地数据
+        :param image:
+        :param extent:
+        :param bands:
+        :return:
+        '''
+        pixel_array = numpy.zeros((height, width, 3), dtype=int)
+        ceng = 0
+        img: Dataset = gdal.Open(image.path, 0)
+
+        origin_extent = json.loads(image.extent)
+
+        # 超出空间范围
+        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:
+
+            ox = img.RasterXSize
+            oy = img.RasterYSize
+
+            # 网格大小
+            grid_x = (origin_extent[2] - origin_extent[0]) / (ox * 1.0)
+            grid_y = (origin_extent[3] - origin_extent[1]) / (oy * 1.0)
+
+            # 完全在影像范围内
+            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 = img.ReadRaster(off_x, off_y, x_g, y_g,256,256,band_list=[1,2,3])
+                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]
+
+                # 网格偏移量
+                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_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
+
+        return empty
+
     def determin_intersect(self, extent1, extent2):
     def determin_intersect(self, extent1, extent2):
-        g1 = GeometryAdapter.bbox_2_polygon(extent1)
-        g2 = GeometryAdapter.bbox_2_polygon(extent2)
-        return g1.Intersect(g2)
+        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 = {
     api_doc = {
         "tags": ["影像接口"],
         "tags": ["影像接口"],

+# coding=utf-8
+#author:        4N
+#createtime:    2021/3/24
+#email:         nheweijun@sina.com
+
+from app.util import *
+import traceback
+from osgeo import gdal
+from osgeo.gdal import *
+from numpy import ndarray
+import numpy
+from flask import Response
+import io
+import os
+from PIL import Image
+
+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
+import uuid
+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.GeometryAdapter import GeometryAdapter
+from app.util.component.Geometry2Raster import Geometry2Raster
+import os
+import json
+from kazoo.client import KazooClient
+
+from threading import Thread
+
+from app.modules.service.image.util.ThriftConnect import ThriftConnect
+from flask import current_app
+import gzip
+import random
+class Api(ApiTemplate):
+
+    api_name = "切片"
+
+    def __init__(self,guid,level, row, col):
+        super().__init__()
+        self.guid = guid
+        self.level = level
+        self.row = row
+        self.col = col
+
+    def process(self):
+        from app import GLOBAL_DIC
+        result = {}
+        parameter: dict = self.para
+
+
+
+
+
+        try:
+            if parameter.get("guid"):
+                self.guid = parameter.get("guid")
+
+            #缓存服务信息
+            image_service_info = GLOBAL_DIC.get(self.guid)
+            if image_service_info is None:
+                image_service:ImageService = ImageService.query.filter_by(guid = self.guid).one_or_none()
+                images = image_service.images.all()
+                scheme:TileScheme = TileScheme.query.filter_by(guid=image_service.scheme_guid).one_or_none()
+
+                # test mask
+                ring = ogr.Geometry(ogr.wkbLinearRing)
+                ring.AddPoint(111.62, 29)
+                ring.AddPoint(111.62, 29.03)
+                ring.AddPoint(111.727, 29.03)
+                ring.AddPoint(111.727, 29)
+                ring.AddPoint(111.62, 29)
+                # Create polygon
+                mask_poly = ogr.Geometry(ogr.wkbPolygon)
+                mask_poly.AddGeometry(ring)
+
+                GLOBAL_DIC[self.guid] = {"service": image_service, "images": images,
+                                         "scheme": json.loads(scheme.parameter),"mask":
+                                         mask_poly}
+
+
+                image_service_info = GLOBAL_DIC[self.guid]
+            else:
+                image_service_info = GLOBAL_DIC[self.guid]
+
+            zoo = GLOBAL_DIC.get("zookeeper")
+            if zoo is None:
+                zoo :KazooClient = KazooClient(hosts=configure.zookeeper, timeout=100)
+                zoo.start()
+                GLOBAL_DIC["zookeeper"] = zoo
+            else :
+                if not zoo.connected:
+                    zoo.start()
+
+            bands = [1, 2, 3]
+
+
+            # 转换参数
+            parameter = ParameterUtil.to_lower(parameter)
+
+
+            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,image_service_info["mask"])]
+
+            masker_raster = Geometry2Raster.convert(image_service_info["mask"],extent,height)
+
+            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 zoo.exists("/rpc/{}".format(ser))]
+                    if len(image_servers)>0:
+                        indx = int(random.random() * len(image_servers))
+                        image_server = image_servers[indx]
+                    else:
+                        image_server = "None"
+
+                    thread: MyThread = MyThread(self.get_data,
+                                                args=(image_server, image, 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
+
+                e = numpy.zeros((height, width), dtype=int) + 65536
+                e_mask = numpy.zeros((height, width), dtype=int)
+                e_mask[masker_raster == 1] = 0
+                e_mask[masker_raster == 0] = 1
+
+                for ii in [0, 1, 2]:
+                    # opencv 颜色排序为GBR
+                    # pixel_array[:, :, 2 - ii] = empty_list[ii]
+                    #mask
+                    pixel_array[:, :, 2 - ii] = e * e_mask + empty_list[ii] * masker_raster
+
+            elif len(intersect_image) == 1:
+                # 该影像的服务器，随机选取一个
+                image = intersect_image[0]
+                image_servers = image.server.split(",")
+                #判断可用服务器
+                image_servers = [ser for ser in image_servers if zoo.exists("/rpc/{}".format(ser))]
+                if len(image_servers) > 0:
+                    indx = int(random.random() * len(image_servers))
+                    image_server = image_servers[indx]
+                else:
+                    image_server = "None"
+                pixel_array_t = self.get_data(image_server, image, extent, bands, height, width)
+                pixel_array = numpy.zeros((height, width, 3), dtype=int)
+
+                e = numpy.zeros((height, width), dtype=int) + 65536
+                e_mask = numpy.zeros((height, width), dtype=int)
+                e_mask[masker_raster == 1] = 0
+                e_mask[masker_raster == 0] = 1
+
+                for ii in [0, 1, 2]:
+                    # opencv 颜色排序为GBR
+                    # pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
+                    pixel_array[:, :, 2 - ii] = e * e_mask + pixel_array_t[:, :, ii] * masker_raster
+            else:
+                # 结果矩阵
+                pixel_array = numpy.zeros((height, width, 3), dtype=int) + 65536
+
+
+            # 将图片生成在内存中,然后直接返回response
+            im_data = self.create_by_opencv(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 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
+
+    def create_by_opencv(self, image_type, pixel_array, quality):
+
+        if image_type.__eq__("image/jpeg") or image_type.__eq__("image/jpg"):
+            r, buf = cv2.imencode(".jpg", pixel_array, [cv2.IMWRITE_JPEG_QUALITY, quality])
+            image_out = buf.tobytes()
+        else:
+            height, width = pixel_array[:, :, 0].shape
+            four = numpy.zeros((height, width), dtype=int) + 255
+            four[pixel_array[:, :, 0] == 65536] = 0
+            r, buf = cv2.imencode(".png", numpy.dstack((pixel_array, four)))
+            image_out = buf.tobytes()
+        return image_out
+
+    def get_data(self,image_server, image, extent, bands, height, width):
+
+        if image_server.__eq__("本地服务器"):
+            data = self.get_local_wms_data(image, extent, bands, height, width)
+        elif image_server.__eq__("None"):
+            data = numpy.zeros((height, width, 3), dtype=int) + 65536
+        else:
+            data = self.get_remote_wms_data(image_server,image, extent, bands, height, width)
+        return data
+
+    def get_remote_wms_data(self, image_server,image, extent, bands, height, width):
+        '''
+        通过RPC获取远程数据
+        :param image:
+        :param extent:
+        :param bands:
+        :return:
+        '''
+
+        #需要做thrift连接的缓存，连接池
+        thrift_connect = ThriftConnect(image_server)
+        image_extent = image.extent
+
+        data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands, width, height)
+
+        thrift_connect.close()
+
+        data = gzip.decompress(data)
+        data = numpy.frombuffer(data, dtype='int64')
+        data = data.reshape((height, width, 3))
+
+        return data
+
+    def get_local_wms_data(self, image, extent, bands, height, width):
+        '''
+        获取本地数据
+        :param image:
+        :param extent:
+        :param bands:
+        :return:
+        '''
+        pixel_array = numpy.zeros((height, width, 3), dtype=int)
+        ceng = 0
+        img: Dataset = gdal.Open(image.path, 0)
+        t1 = time.time()
+        for band in bands:
+
+            # 自决定金字塔等级
+            xysize = [img.RasterXSize, img.RasterYSize]
+
+            origin_extent = image.extent
+            band_data: Band = img.GetRasterBand(band)
+
+            max_level = band_data.GetOverviewCount()
+
+            # 超出空间范围
+            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)
+
+                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
+
+                # 网格大小
+                grid_x = (origin_extent[2] - origin_extent[0]) / (ox * 1.0)
+                grid_y = (origin_extent[3] - origin_extent[1]) / (oy * 1.0)
+
+                # 完全在影像范围内
+                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)
+
+
+                # 部分相交
+                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]
+
+                    # 网格偏移量
+                    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_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 = overview.ReadAsArray(off_x, off_y, x_g, y_g, out_x_g,
+                                                                    out_y_g)
+
+                    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 determin_intersect(self, extent1, extent2, mask):
+        g1 = GeometryAdapter.bbox_2_polygon(extent1)
+        g2 = GeometryAdapter.bbox_2_polygon(extent2)
+        if g1.Intersect(g2):
+            return g2.Intersect(mask)
+        else:
+            return False
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string"},
+            {"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": {
+                    }
+                }
+            }
+        }
+    }
+
+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
+
+
+

@@ -16,7 +16,7 @@ import cv2
 from app.modules.service.image.models import ImageService
 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.GeometryAdapter import GeometryAdapter
 from app.util.component.GeometryAdapter import GeometryAdapter
-from app.modules.service.image.util.ThriftConnect import ThriftConnect
+from app.modules.service.image.util.ThriftConnect import ThriftConnect,ThriftPool
 from app.util.component.ParameterUtil import ParameterUtil
 from app.util.component.ParameterUtil import ParameterUtil
 import json
 import json
 from kazoo.client import KazooClient
 from kazoo.client import KazooClient
@@ -30,7 +30,7 @@ class Api(ApiTemplate):
     api_name = "WMS"
     api_name = "WMS"
 
 
     def process(self):
     def process(self):
-        from app import GLOBAL_DIC
+
 
 
         result = {}
         result = {}
         parameter: dict = self.para
         parameter: dict = self.para
@@ -38,41 +38,21 @@ class Api(ApiTemplate):
         try:
         try:
 
 
             parameter = ParameterUtil.to_lower(parameter)
             parameter = ParameterUtil.to_lower(parameter)
-            guid = parameter.get("guid")
+            self.guid = parameter.get("guid")
             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
             height = int(parameter.get("height")) if parameter.get("height") 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"
             image_type = parameter.get("format") if parameter.get("format") else "image/png"
             quality = int(parameter.get("quality")) if parameter.get("quality") else 30
             quality = int(parameter.get("quality")) if parameter.get("quality") else 30
 
 
-
-            #缓存起来
-            #缓存服务信息
-            image_service_info = GLOBAL_DIC.get(guid)
-            if image_service_info is None:
-                image_service:ImageService = ImageService.query.filter_by(guid=guid).one_or_none()
-                images = image_service.images.all()
-                GLOBAL_DIC[guid] = {"service":image_service,"images":images}
-                image_service_info = GLOBAL_DIC[guid]
-            else:
-                image_service_info = GLOBAL_DIC[guid]
-
+            image_service_info, zoo, servers = self.cache_data()
 
 
             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"])
 
 
-            zoo = GLOBAL_DIC.get("zookeeper")
-            if zoo is None:
-                zoo :KazooClient = KazooClient(hosts=configure.zookeeper, timeout=100)
-                zoo.start()
-                GLOBAL_DIC["zookeeper"] = zoo
-            else :
-                if not zoo.connected:
-                    zoo.start()
 
 
-            bands = [1, 2, 3]
+            # bands = [1, 2, 3]
 
 
             extent = [float(x) for x in bbox.split(",")]
             extent = [float(x) for x in bbox.split(",")]
 
 
@@ -91,10 +71,14 @@ class Api(ApiTemplate):
                 for image in intersect_image:
                 for image in intersect_image:
                     #该影像的服务器，随机选取一个
                     #该影像的服务器，随机选取一个
                     image_servers = image.server.split(",")
                     image_servers = image.server.split(",")
-                    indx = int(random.random()*len(image_servers))
-                    image_server = image_servers[indx]
-
-                    thread: MyThread = MyThread(self.get_data, args=(zoo,image_server,image,extent,bands,height,width))
+                    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)
+                    thread: MyThread = MyThread(self.get_data, args=(image_server,image,extent,bands,height,width))
                     thread.start()
                     thread.start()
                     thread_list.append(thread)
                     thread_list.append(thread)
 
 
@@ -124,9 +108,15 @@ class Api(ApiTemplate):
                 # 该影像的服务器，随机选取一个
                 # 该影像的服务器，随机选取一个
                 image = intersect_image[0]
                 image = intersect_image[0]
                 image_servers = image.server.split(",")
                 image_servers = image.server.split(",")
-                indx = int(random.random() * len(image_servers))
-                image_server = image_servers[indx]
-                pixel_array_t = self.get_data(zoo,image_server,image,extent,bands,height,width)
+                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)
+                pixel_array_t = self.get_data(image_server,image,extent,bands,height,width)
                 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 颜色排序为GBR
@@ -148,6 +138,55 @@ class Api(ApiTemplate):
             result["message"] = e.__str__()
             result["message"] = e.__str__()
             return result
             return result
 
 
+
+    def cache_data(self):
+
+        from app import GLOBAL_DIC
+
+        # 缓存zookeeper
+        zoo = GLOBAL_DIC.get("zookeeper")
+        if zoo is None:
+            zoo: KazooClient = KazooClient(hosts=configure.zookeeper, timeout=100)
+            zoo.start()
+            GLOBAL_DIC["zookeeper"] = zoo
+        else:
+            if not zoo.connected:
+                zoo.start()
+
+        # 缓存数据服务器
+        servers = GLOBAL_DIC.get("servers")
+        if servers is None:
+            servers = zoo.get_children("/rpc")
+            servers.append("本地服务器")
+            GLOBAL_DIC["servers"] = servers
+            GLOBAL_DIC["servers_updatetime"] = time.time()
+        else:
+            servers = GLOBAL_DIC.get("servers")
+
+        # 更新缓存
+        if time.time() - GLOBAL_DIC["servers_updatetime"] > 10:
+            servers = zoo.get_children("/rpc")
+            servers.append("本地服务器")
+            GLOBAL_DIC["servers"] = servers
+            GLOBAL_DIC["servers_updatetime"] = time.time()
+
+
+        # 缓存服务信息
+        image_service_info = GLOBAL_DIC.get(self.guid)
+        if image_service_info is None or time.time() - GLOBAL_DIC.get("service_updatetime") > 20:
+            image_service: ImageService = ImageService.query.filter_by(guid=self.guid).one_or_none()
+            images = image_service.images.all()
+            GLOBAL_DIC[self.guid] = {"service": image_service, "images": images}
+            GLOBAL_DIC["service_updatetime"] = time.time()
+            image_service_info = GLOBAL_DIC[self.guid]
+
+        else:
+            image_service_info = GLOBAL_DIC[self.guid]
+
+        return image_service_info,zoo,servers
+
+
+
     def determine_level(self,xysize,origin_extent,extent,max_level):
     def determine_level(self,xysize,origin_extent,extent,max_level):
         '''
         '''
         根据范围判断调用金字塔的哪一层
         根据范围判断调用金字塔的哪一层
@@ -182,17 +221,14 @@ class Api(ApiTemplate):
             image_out = buf.tobytes()
             image_out = buf.tobytes()
         return image_out
         return image_out
 
 
-    def get_data(self,zoo,image_server,image,extent,bands,height,width):
+    def get_data(self,image_server, image, extent, bands, height, width):
 
 
         if image_server.__eq__("本地服务器"):
         if image_server.__eq__("本地服务器"):
             data = self.get_local_wms_data(image, extent, bands, height, width)
             data = self.get_local_wms_data(image, extent, bands, height, width)
+        elif image_server.__eq__("None"):
+            data = numpy.zeros((height, width, 3), dtype=int) + 65536
         else:
         else:
-            ser = image_server
-            if zoo.exists("/rpc/{}".format(ser)):
-                data = self.get_remote_wms_data(image_server,image, extent, bands, height, width)
-            else:
-                data = numpy.zeros((height, width, 3), dtype=int) + 65536
-
+            data = self.get_remote_wms_data(image_server,image, extent, bands, height, width)
         return data
         return data
 
 
 
 
@@ -206,7 +242,6 @@ class Api(ApiTemplate):
         :return:
         :return:
         '''
         '''
         thrift_connect = ThriftConnect(image_server)
         thrift_connect = ThriftConnect(image_server)
-        t1 = time.time()
         image_extent = image.extent
         image_extent = image.extent
 
 
         data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands,width,height)
         data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands,width,height)
@@ -219,6 +254,33 @@ class Api(ApiTemplate):
 
 
         return data
         return data
 
 
+    def get_remote_wms_data_client(self,image_server,image, extent, bands, height, width):
+        '''
+        通过RPC获取远程数据
+        :param image:
+        :param extent:
+        :param bands:
+        :return:
+        '''
+        from app import GLOBAL_DIC
+
+        # 缓存thrift_pool
+        thrift_pool = GLOBAL_DIC.get(image_server)
+        if thrift_pool is None:
+            thrift_pool = ThriftPool(image_server)
+            GLOBAL_DIC["image_server"] = thrift_pool
+        client = thrift_pool.get_client()
+
+        image_extent = image.extent
+
+        data = client.getData(image.path, extent, json.loads(image_extent), bands, width, height)
+
+        data = gzip.decompress(data)
+        data = numpy.frombuffer(data, dtype='int64')
+        data = data.reshape((height, width, 3))
+
+        return data
+
     def get_local_wms_data(self,image,extent,bands,height,width):
     def get_local_wms_data(self,image,extent,bands,height,width):
         '''
         '''
         获取本地数据
         获取本地数据
@@ -236,7 +298,7 @@ class Api(ApiTemplate):
             # 自决定金字塔等级
             # 自决定金字塔等级
             xysize = [img.RasterXSize, img.RasterYSize]
             xysize = [img.RasterXSize, img.RasterYSize]
 
 
-            origin_extent = image.extent
+            origin_extent = json.loads(image.extent)
             band_data: Band = img.GetRasterBand(band)
             band_data: Band = img.GetRasterBand(band)
 
 
 
 
@@ -244,8 +306,7 @@ class Api(ApiTemplate):
             max_level = band_data.GetOverviewCount()
             max_level = band_data.GetOverviewCount()
 
 
             # 超出空间范围
             # 超出空间范围
-            if extent[2] < origin_extent[0] or extent[0] > origin_extent[2] or extent[1] > origin_extent[
-                3] or extent[3] < origin_extent[1]:
+            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
                 empty = numpy.zeros((height,width), dtype=int) + 65536
             # 空间范围相交
             # 空间范围相交
             else:
             else:
@@ -324,10 +385,12 @@ class Api(ApiTemplate):
             ceng += 1
             ceng += 1
         return pixel_array
         return pixel_array
 
 
-    def determin_intersect(self,extent1,extent2):
-        g1 = GeometryAdapter.bbox_2_polygon(extent1)
-        g2 = GeometryAdapter.bbox_2_polygon(extent2)
-        return g1.Intersect(g2)
+    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):
     def get_capabilities(self,image_service:ImageService):
 
 

@@ -25,6 +25,7 @@ class Image(db.Model):
     null_value = Column(Integer)
     null_value = Column(Integer)
     available = Column(Integer)#影像是否可用，不可用可能在创建金字塔中
     available = Column(Integer)#影像是否可用，不可用可能在创建金字塔中
     band_count = Column(Integer)
     band_count = Column(Integer)
+    band_view = Column(String)
     path = Column(String)
     path = Column(String)
     server = Column(String)
     server = Column(String)
 
 

@@ -3,13 +3,13 @@
 #createtime:    2021/9/26
 #createtime:    2021/9/26
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.modules.service.image.tutorial.ttypes import RasterData
+from app.modules.service.image.tutorial2.ttypes import RasterData
 
 
 from thrift.transport import TSocket
 from thrift.transport import TSocket
 from thrift.transport import TTransport
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol
 from thrift.protocol import TBinaryProtocol
 from app.modules.service.image.ImageDataService import ImageDataService
 from app.modules.service.image.ImageDataService import ImageDataService
-from app.modules.service.image.tutorial import Calculator
+from app.modules.service.image.tutorial2 import Calculator
 
 
 from struct import Struct
 from struct import Struct
 
 

@@ -16,15 +16,15 @@ else:
 from thrift.transport import TTransport, TSocket, TSSLSocket, THttpClient
 from thrift.transport import TTransport, TSocket, TSSLSocket, THttpClient
 from thrift.protocol.TBinaryProtocol import TBinaryProtocol
 from thrift.protocol.TBinaryProtocol import TBinaryProtocol
 
 
-from . import Calculator
-from .ttypes import *
+from tutorial import Calculator
+from tutorial.ttypes import *
 
 
 if len(sys.argv) <= 1 or sys.argv[1] == '--help':
 if len(sys.argv) <= 1 or sys.argv[1] == '--help':
     print('')
     print('')
     print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] [-novalidate] [-ca_certs certs] [-keyfile keyfile] [-certfile certfile] function [arg1 [arg2...]]')
     print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] [-novalidate] [-ca_certs certs] [-keyfile keyfile] [-certfile certfile] function [arg1 [arg2...]]')
     print('')
     print('')
     print('Functions:')
     print('Functions:')
-    print('  RasterData getData(string path,  queryRange,  originRange,  bands, i32 width, i32 height)')
+    print('   getData(string path,  queryRange,  originRange,  bands, i32 width, i32 height)')
     print('  Raster getInfo(string path)')
     print('  Raster getInfo(string path)')
     print('  bool buildOverview(string path)')
     print('  bool buildOverview(string path)')
     print('   getImageList(string path)')
     print('   getImageList(string path)')

@@ -505,9 +505,18 @@ class getData_result(object):
             if ftype == TType.STOP:
             if ftype == TType.STOP:
                 break
                 break
             if fid == 0:
             if fid == 0:
-                if ftype == TType.STRUCT:
-                    self.success = RasterData()
-                    self.success.read(iprot)
+                if ftype == TType.LIST:
+                    self.success = []
+                    (_etype59, _size56) = iprot.readListBegin()
+                    for _i60 in range(_size56):
+                        _elem61 = []
+                        (_etype65, _size62) = iprot.readListBegin()
+                        for _i66 in range(_size62):
+                            _elem67 = iprot.readI16()
+                            _elem61.append(_elem67)
+                        iprot.readListEnd()
+                        self.success.append(_elem61)
+                    iprot.readListEnd()
                 else:
                 else:
                     iprot.skip(ftype)
                     iprot.skip(ftype)
             else:
             else:
@@ -521,8 +530,14 @@ class getData_result(object):
             return
             return
         oprot.writeStructBegin('getData_result')
         oprot.writeStructBegin('getData_result')
         if self.success is not None:
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRUCT, 0)
-            self.success.write(oprot)
+            oprot.writeFieldBegin('success', TType.LIST, 0)
+            oprot.writeListBegin(TType.LIST, len(self.success))
+            for iter68 in self.success:
+                oprot.writeListBegin(TType.I16, len(iter68))
+                for iter69 in iter68:
+                    oprot.writeI16(iter69)
+                oprot.writeListEnd()
+            oprot.writeListEnd()
             oprot.writeFieldEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
         oprot.writeStructEnd()
@@ -542,7 +557,7 @@ class getData_result(object):
         return not (self == other)
         return not (self == other)
 all_structs.append(getData_result)
 all_structs.append(getData_result)
 getData_result.thrift_spec = (
 getData_result.thrift_spec = (
-    (0, TType.STRUCT, 'success', [RasterData, None], None, ),  # 0
+    (0, TType.LIST, 'success', (TType.LIST, (TType.I16, None, False), False), None, ),  # 0
 )
 )
 
 
 
 
@@ -878,11 +893,11 @@ class getImageList_result(object):
             if fid == 0:
             if fid == 0:
                 if ftype == TType.LIST:
                 if ftype == TType.LIST:
                     self.success = []
                     self.success = []
-                    (_etype59, _size56) = iprot.readListBegin()
-                    for _i60 in range(_size56):
-                        _elem61 = Image()
-                        _elem61.read(iprot)
-                        self.success.append(_elem61)
+                    (_etype73, _size70) = iprot.readListBegin()
+                    for _i74 in range(_size70):
+                        _elem75 = Image()
+                        _elem75.read(iprot)
+                        self.success.append(_elem75)
                     iprot.readListEnd()
                     iprot.readListEnd()
                 else:
                 else:
                     iprot.skip(ftype)
                     iprot.skip(ftype)
@@ -899,8 +914,8 @@ class getImageList_result(object):
         if self.success is not None:
         if self.success is not None:
             oprot.writeFieldBegin('success', TType.LIST, 0)
             oprot.writeFieldBegin('success', TType.LIST, 0)
             oprot.writeListBegin(TType.STRUCT, len(self.success))
             oprot.writeListBegin(TType.STRUCT, len(self.success))
-            for iter62 in self.success:
-                iter62.write(oprot)
+            for iter76 in self.success:
+                iter76.write(oprot)
             oprot.writeListEnd()
             oprot.writeListEnd()
             oprot.writeFieldEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeFieldStop()

@@ -9,21 +9,55 @@
 from thrift.transport import TSocket
 from thrift.transport import TSocket
 from thrift.transport import TTransport
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol
 from thrift.protocol import TBinaryProtocol
+
+from app.modules.service.image.tutorial import Calculator
 from app.modules.service.image.ImageDataService import ImageDataService
 from app.modules.service.image.ImageDataService import ImageDataService
-from . import Calculator
+import time
+
+def test1():
+
+    host = "172.26.60.100"
+    port = 8850
+
+    transport: TSocket = TSocket.TSocket(host, port)
+    transport = TTransport.TBufferedTransport(transport)
+    protocol = TBinaryProtocol.TBinaryProtocol(transport)
+    client = Calculator.Client(protocol)
+
+
+    transport.open()
+    import sys
+    test = client.getData("江南_01.tif",[1340.27, -1911.31, 4351.79, 5410.6],[1340.27, -1911.31, 4351.79, 5410.6],[3,2,1],768,768)
+    print(sys.getsizeof(test[1]))
+    # print(test)
+
+def test2():
+    host = "172.26.60.100"
+    port = 9090
 
 
-from struct import Struct
+    transport: TSocket = TSocket.TSocket(host, port)
+    transport = TTransport.TBufferedTransport(transport)
+    protocol = TBinaryProtocol.TBinaryProtocol(transport)
+    client = ImageDataService.Client(protocol)
 
 
-host = 1
-port = 9090
-transport: TSocket = TSocket.TSocket(host, port)
-transport = TTransport.TBufferedTransport(transport)
-protocol = TBinaryProtocol.TBinaryProtocol(transport)
+    transport.open()
 
 
-client = Calculator.Client(protocol)
+    test = client.getData("/usr/src/data/江南_01.tif", [1340.27, -1911.31, 4351.79, 5410.6], [1340.27, -1911.31, 4351.79, 5410.6],
+                          [1,2,3], 768, 768)
 
 
+    import gzip,numpy
+    data = gzip.decompress(test)
+    # data = numpy.frombuffer(data, dtype='int64')
+    # data = data.reshape((768, 768, 3))
 
 
-transport.open()
+    import sys
+    print(sys.getsizeof(data))
+    # print(test)
 
 
-test = client.getData("江南_01.tif",[1340.27, -1911.31, 4351.79, 5410.6],[1340.27, -1911.31, 4351.79, 5410.6],[3,2,1],768,768)
-print(type(test))
+if __name__ == '__main__':
+    t1 = time.time()
+    # test1()
+    print(time.time()-t1)
+    t2 = time.time()
+    test2()
+    print(time.time()-t2)

@@ -19,14 +19,64 @@ class ThriftConnect:
     def __init__(self,data_server):
     def __init__(self,data_server):
         host = data_server.split(":")[0]
         host = data_server.split(":")[0]
         port = int(data_server.split(":")[1])
         port = int(data_server.split(":")[1])
+        socket: TSocket = TSocket.TSocket(host, port)
+        self.transport = TTransport.TBufferedTransport(socket)
+        protocol = TBinaryProtocol.TBinaryProtocol(self.transport)
+        self.client = ImageDataService.Client(protocol)
+        self.transport.open()
+
+    def close(self):
+        self.transport.close()
+
+class ThriftConnectCpp:
+    '''
+    thrift连接类
+    '''
+
+    client = None
+    transport = None
+
+    def __init__(self,data_server):
+        host = data_server.split(":")[0]
+        port = int(data_server.split(":")[1])
         self.transport: TSocket = TSocket.TSocket(host, port)
         self.transport: TSocket = TSocket.TSocket(host, port)
         self.transport = TTransport.TBufferedTransport(self.transport)
         self.transport = TTransport.TBufferedTransport(self.transport)
         protocol = TBinaryProtocol.TBinaryProtocol(self.transport)
         protocol = TBinaryProtocol.TBinaryProtocol(self.transport)
-        self.client = ImageDataService.Client(protocol)
+        # self.client = ImageDataService.Client(protocol)
         self.transport.open()
         self.transport.open()
 
 
     def close(self):
     def close(self):
         self.transport.close()
         self.transport.close()
 
 
 class ThriftPool:
 class ThriftPool:
-    pass
+    '''
+    thrift线程池
+    '''
+    clients = []
+    transports = []
+    host = None
+    port = None
+    index = -1
+
+    def __init__(self,data_server):
+        self.host = data_server.split(":")[0]
+        self.port = int(data_server.split(":")[1])
+
+    def get_client(self):
+        if len(self.clients) < 20:
+            socket: TSocket = TSocket.TSocket(self.host, self.port)
+            transport = TTransport.TBufferedTransport(socket)
+            protocol = TBinaryProtocol.TBinaryProtocol(transport)
+            client = ImageDataService.Client(protocol)
+            self.clients.append(client)
+            self.transports.append(transport)
+            return client,transport
+        else:
+            self.index += 1
+            if self.index == 20:
+                self.index = 0
+            return self.clients[self.index],self.transports[self.index]
+
+
+    def close(self):
+        pass

@@ -17,6 +17,7 @@ from . import scheme_resolve
 class SchemeManager(BlueprintApi):
 class SchemeManager(BlueprintApi):
 
 
     bp = Blueprint("Scheme", __name__, url_prefix="/API/Service/Scheme")
     bp = Blueprint("Scheme", __name__, url_prefix="/API/Service/Scheme")
+    service_type = []
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Create', methods=['POST'])
     @bp.route('/Create', methods=['POST'])

@@ -24,6 +24,15 @@ class Api(ApiTemplate):
             # extent = [float(x) for x in  data.get("extent").split(",")] if data.get("extent") else [0,0,0,0]
             # 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]
             # top_left = [float(x) for x in data.get("top_left").split(",")] if data.get("top_left") else [0, 0]
 
 
+            paramenter = {}
+            for l_dict in json.loads(data.get("levels")):
+                paramenter[str(l_dict["level"])] = {"resolution":l_dict["resolution"],"scale":l_dict["scale"]}
+            paramenter["cols"] = int(data.get("cols"))
+            paramenter["rows"] = int(data.get("rows"))
+            paramenter["dpi"] = int(data.get("dpi"))
+            paramenter["wkt"] = data.get("crs_wkt")
+            paramenter["x"] = eval(data.get("top_left").split(",")[0])
+            paramenter["y"] = eval(data.get("top_left").split(",")[1])
 
 
 
 
             guid = uuid.uuid1().__str__()
             guid = uuid.uuid1().__str__()
@@ -46,7 +55,7 @@ class Api(ApiTemplate):
                 rows = int(data.get("rows")),
                 rows = int(data.get("rows")),
                 cols = int(data.get("cols")),
                 cols = int(data.get("cols")),
                 update_time = datetime.datetime.now(),
                 update_time = datetime.datetime.now(),
-                parameter=json.dumps(json.loads(data.get("parameter")))
+                parameter=json.dumps(paramenter)
             )
             )
 
 
             db.session.add(tile_scheme)
             db.session.add(tile_scheme)
@@ -92,9 +101,9 @@ class Api(ApiTemplate):
             {"name": "levels",
             {"name": "levels",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
-            {"name": "parameter",
-             "in": "formData",
-             "type": "string"},
+            # {"name": "parameter",
+            #  "in": "formData",
+            #  "type": "string"},
 
 
         ],
         ],
         "responses": {
         "responses": {

@@ -32,7 +32,7 @@ class Api(ApiTemplate):
                 "rows": scheme.parameter.get("rows"),
                 "rows": scheme.parameter.get("rows"),
                 "cols": scheme.parameter.get("cols"),
                 "cols": scheme.parameter.get("cols"),
                 "levels": scheme.levels,
                 "levels": scheme.levels,
-                "parameter":scheme.parameter
+                # "parameter":scheme.parameter
             }
             }
 
 
             res["data"] = data
             res["data"] = data

@@ -34,6 +34,128 @@ class Api(ApiTemplate):
     api_doc = {
     api_doc = {
         "tags": ["服务接口"],
         "tags": ["服务接口"],
         "parameters": [
         "parameters": [
+
+
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "required": "true",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+
+            {"name": "catalog_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+
+            # 影像参数
+            {"name": "guids",
+             "in": "formData",
+             "type": "string",
+             "description": "[影像WMS,影像WMTS]影像guids，以英文逗号相隔"},
+            {"name": "scheme_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS,影像WMTS]切片方案"},
+
+            # WMTS参数
+            {"name": "overview",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]缩略图"},
+            {"name": "wmts_type",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]wmts_type"},
+            {"name": "vendor",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]厂商"},
+            {"name": "crs",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]坐标系"},
+            {"name": "datasource",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]数据路径"},
+            {"name": "layer_name",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层名"},
+            {"name": "layer_alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层别名"},
+            {"name": "layer_title",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层标题"},
+            {"name": "layer_style",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS,WMS]图层样式"},
+            {"name": "layer_format",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层format"},
+            {"name": "layer_extent",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层范围"},
+            {"name": "layer_description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层描述"},
+
+            # WMS参数
+            {"name": "status",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]status"},
+            {"name": "username",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]username"},
+            {"name": "readonly",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]readonly"},
+            {"name": "sid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]sid"},
+            {"name": "stype",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]stype"},
+            {"name": "ssupply",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]ssupply"},
+            {"name": "sctime",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]sctime"},
+            {"name": "company",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]company"},
+            {"name": "abstract",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]abstract"},
+            {"name": "thumbnail",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]thumbnail"},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -26,9 +26,14 @@ class Api(ApiTemplate):
             name = self.para.get("name")
             name = self.para.get("name")
             type = self.para.get("type")
             type = self.para.get("type")
 
 
+            catalog_guid = self.para.get("catalog_guid")
+
             services = Service.query
             services = Service.query
             if type:
             if type:
                 services = services.filter_by(type=type)
                 services = services.filter_by(type=type)
+
+            if catalog_guid:
+                services = services.filter_by(catalog_guid=catalog_guid)
             # 并集
             # 并集
             if alias and name:
             if alias and name:
                 services = services.filter(
                 services = services.filter(
@@ -72,7 +77,12 @@ class Api(ApiTemplate):
             {"name": "type",
             {"name": "type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "服务类型"},
+             "description": "服务类型",
+             "enum":["WMTS","TMS","WMS/WFS","ImageWMTS","ImageWMS"]},
+            {"name": "catalog_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "服务目录"},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.models import Service,db
+class Api(ApiTemplate):
+    api_name = "修改服务状态"
+    def process(self):
+        res = {}
+        try:
+            guid = self.para.get("guid")
+            state = int(self.para.get("state"))
+            Service.query.filter_by(guid=guid).update({"state":state})
+
+
+            #更新缓存
+
+
+
+            db.session.commit()
+        except Exception as e:
+            raise e
+        return res
+
+
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "guid"},
+            {"name": "stat",
+             "in": "formData",
+             "type": "int",
+             "description": "state"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

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

@@ -53,9 +53,76 @@ class Api(ApiTemplate):
         return res
         return res
 
 
     api_doc = {
     api_doc = {
-        "tags": ["影像接口"],
+        "tags": ["WMS接口"],
         "parameters": [
         "parameters": [
 
 
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "required": "true",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "catalog_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+
+
+
+            {"name": "layer_style",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS,WMS]图层样式"},
+
+            # WMS参数
+            {"name": "status",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]status"},
+            {"name": "username",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]username"},
+            {"name": "readonly",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]readonly"},
+            {"name": "sid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]sid"},
+            {"name": "stype",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]stype"},
+            {"name": "ssupply",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]ssupply"},
+            {"name": "sctime",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]sctime"},
+            {"name": "company",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]company"},
+            {"name": "abstract",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]abstract"},
+            {"name": "thumbnail",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]thumbnail"},
+
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -12,7 +12,7 @@ import datetime
 import configure
 import configure
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
-    api_name = "注册WMTS服务"
+    api_name = "注册WMS服务"
 
 
     def process(self):
     def process(self):
         # 返回结果
         # 返回结果
@@ -74,7 +74,7 @@ class Api(ApiTemplate):
         return res
         return res
 
 
     api_doc = {
     api_doc = {
-        "tags": ["WMTS接口"],
+        "tags": ["WMS接口"],
         "parameters": [
         "parameters": [
 
 
             {"name": "name",
             {"name": "name",

@@ -7,16 +7,16 @@
 from flasgger import swag_from
 from flasgger import swag_from
 from flask import Blueprint
 from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
-from . import upload_oview
+from . import upload_oview,wmts_register,wmts_edit
 
 
-import os
-from flask import send_from_directory
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
     bp = Blueprint("WMTS", __name__, url_prefix="/API/Service/WMTS")
     bp = Blueprint("WMTS", __name__, url_prefix="/API/Service/WMTS")
 
 
+    service_type = ["WMTS","MTS"]
+
     @staticmethod
     @staticmethod
     @bp.route('/UploadOverview', methods=['POST'])
     @bp.route('/UploadOverview', methods=['POST'])
     @swag_from(upload_oview.Api.api_doc)
     @swag_from(upload_oview.Api.api_doc)
@@ -25,3 +25,23 @@ class DataManager(BlueprintApi):
         上传缩略图
         上传缩略图
         """
         """
         return upload_oview.Api().result
         return upload_oview.Api().result
+
+
+    @staticmethod
+    @bp.route('/Register', methods=['POST'])
+    @swag_from(wmts_register.Api.api_doc)
+    def api_wmts_register():
+        """
+        注册WMTS
+        """
+        return wmts_register.Api().result
+
+    @staticmethod
+    @bp.route('/Edit', methods=['POST'])
+    @swag_from(wmts_edit.Api.api_doc)
+    def api_wmts_edit():
+        """
+        修改WMTS
+        """
+        return wmts_edit.Api().result
+

@@ -51,9 +51,84 @@ class Api(ApiTemplate):
         return res
         return res
 
 
     api_doc = {
     api_doc = {
-        "tags": ["影像接口"],
+        "tags": ["WMTS接口"],
         "parameters": [
         "parameters": [
 
 
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "required": "true",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+
+            {"name": "catalog_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+
+            {"name": "scheme_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS,影像WMTS]切片方案"},
+
+            # WMTS参数
+            {"name": "overview",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]缩略图"},
+            {"name": "wmts_type",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]wmts_type"},
+            {"name": "vendor",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]厂商"},
+            {"name": "crs",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]坐标系"},
+            {"name": "datasource",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]数据路径"},
+            {"name": "layer_name",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层名"},
+            {"name": "layer_alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层别名"},
+            {"name": "layer_title",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层标题"},
+            {"name": "layer_style",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS,WMS]图层样式"},
+            {"name": "layer_format",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层format"},
+            {"name": "layer_extent",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层范围"},
+            {"name": "layer_description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层描述"},
+
+
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -75,7 +75,7 @@ class FileProcess:
             text_size = "{}KB".format(round(fsize / float(1024), 1))
             text_size = "{}KB".format(round(fsize / float(1024), 1))
         else:
         else:
             text_size = "{}B".format(round(fsize / float(1), 1))
             text_size = "{}B".format(round(fsize / float(1), 1))
-        return text_size
+        return text_size,fsize
 
 
 
 
 
 

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/29
+#email:         nheweijun@sina.com
+
+from osgeo.ogr import Layer,Geometry
+from osgeo import gdal,ogr
+
+
+class Geometry2Raster:
+
+
+    def __init__(self):
+        pass
+
+    @classmethod
+    def convert(cls,geometry:Geometry,bbox, xy_res):
+        '''
+        根据Geometry和bbox将空间对象栅格化
+        :param geometry: 空间对象
+        :param bbox: 栅格化范围
+        :param xy_res: 分辨率
+        :return:
+        '''
+
+        #计算像素大小
+        x_min,y_min,x_max, y_max = bbox
+        pixel_size = (x_max - x_min) / xy_res
+        #创建内存栅格对象
+        target_ds = gdal.GetDriverByName('MEM').Create('', xy_res, xy_res, gdal.GDT_Byte)
+        target_ds.SetGeoTransform((x_min, pixel_size, 0, y_max, 0, -pixel_size))
+        band = target_ds.GetRasterBand(1)
+        #创建内存图层对象，因为gdal只提供栅格化图层的方法
+        layer_ds = ogr.GetDriverByName('Memory').CreateDataSource('')
+        mem_layer= layer_ds.CreateLayer("mem", geom_type=ogr.wkbUnknown)
+        feature_defn = mem_layer.GetLayerDefn()
+        feature = ogr.Feature(feature_defn)
+        feature.SetGeometry(geometry)
+        mem_layer.CreateFeature(feature)
+        #栅格化
+        gdal.RasterizeLayer(target_ds, [1], mem_layer, burn_values=[1])
+        data = band.ReadAsArray()
+        del target_ds
+        del layer_ds
+        return data
+
+if __name__ == '__main__':
+
+    # Create ring
+    ring = ogr.Geometry(ogr.wkbLinearRing)
+    ring.AddPoint(111.62, 29)
+    ring.AddPoint(111.62, 29.03)
+    ring.AddPoint(111.727, 29.03)
+    ring.AddPoint(111.727, 29)
+    ring.AddPoint(111.62, 29)
+
+    # Create polygon
+    poly = ogr.Geometry(ogr.wkbPolygon)
+    poly.AddGeometry(ring)
+
+    poly.ExportToWkt()
+
+

@@ -2,7 +2,7 @@
 #author:        4N
 #author:        4N
 #createtime:    2021/6/3
 #createtime:    2021/6/3
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
-from osgeo import ogr
+from osgeo import ogr,gdal
 from osgeo.ogr import Geometry
 from osgeo.ogr import Geometry
 
 
 class GeometryAdapter:
 class GeometryAdapter:
@@ -182,4 +182,36 @@ class GeometryAdapter:
                 g: Geometry = fea.geometry()
                 g: Geometry = fea.geometry()
                 geom_type = g.GetGeometryType()
                 geom_type = g.GetGeometryType()
             layer.ResetReading()
             layer.ResetReading()
-        return geom_type
+        return geom_type
+
+    @classmethod
+    def convert(cls, geometry: Geometry, bbox, xy_res):
+        '''
+        根据Geometry和bbox将空间对象栅格化
+        :param geometry: 空间对象
+        :param bbox: 栅格化范围
+        :param xy_res: 分辨率
+        :return:
+        '''
+
+        # 计算像素大小
+        x_min, y_min, x_max, y_max = bbox
+        pixel_size = (x_max - x_min) / xy_res
+        # 创建内存栅格对象
+        target_ds = gdal.GetDriverByName('MEM').Create('', xy_res, xy_res, gdal.GDT_Byte)
+        target_ds.SetGeoTransform((x_min, pixel_size, 0, y_max, 0, -pixel_size))
+        band = target_ds.GetRasterBand(1)
+        # 创建内存图层对象，因为gdal只提供栅格化图层的方法
+        layer_ds = ogr.GetDriverByName('Memory').CreateDataSource('')
+        mem_layer = layer_ds.CreateLayer("mem", geom_type=ogr.wkbUnknown)
+        feature_defn = mem_layer.GetLayerDefn()
+        feature = ogr.Feature(feature_defn)
+        feature.SetGeometry(geometry)
+        mem_layer.CreateFeature(feature)
+        # 栅格化
+        gdal.RasterizeLayer(target_ds, [1], mem_layer, burn_values=[1])
+        data = band.ReadAsArray()
+        del target_ds
+        del layer_ds
+        # Read as array
+        return data

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/29
+#email:         nheweijun@sina.com
+
+def determine_level(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
+
+import math
+def determine_level2(xysize, origin_extent, extent, max_level):
+    '''
+    根据范围判断调用金字塔的哪一层
+    :param xysize:
+    :param origin_extent:
+    :param extent:
+    :param max_level:
+    :return:
+    '''
+    x = xysize[0]
+    y = xysize[1]
+
+    level_up = round (math.sqrt( round (math.sqrt((x * y * (((extent[2] - extent[0]) * (extent[3] - extent[1])) / (
+            (origin_extent[2] - origin_extent[0]) * (origin_extent[3] - origin_extent[1])))) / 100000))))
+
+
+    return level_up - 1 if level_up < max_level else max_level - 1
+
+import time
+t1 = time.time()
+
+print(determine_level2([108488,90777],[111.639350712, 28.9170588759, 111.751508603, 29.032941696],
+                       [111.739350712, 29.0070588759, 111.751508603, 29.032941696],9))
+print(time.time()-t1)
+t1 = time.time()
+
+print(determine_level([108488,90777],[111.639350712, 28.9170588759, 111.751508603, 29.032941696],
+                       [111.739350712, 29.0070588759, 111.751508603, 29.032941696],9))
+
+print(time.time()-t1)

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/28
+#email:         nheweijun@sina.com
+
+
+from osgeo import gdal,ogr
+from osgeo.ogr import Layer,Feature
+
+vector_fn = r'E:\Data\广东边界\gdsample.shp'
+
+# Define pixel_size and NoData value of new raster
+pixel_size = 0.1
+NoData_value = 255
+
+# Open the data source and read in the extent
+source_ds = ogr.Open(vector_fn)
+source_layer:Layer = source_ds.GetLayer()
+source_srs = source_layer.GetSpatialRef()
+x_min, x_max, y_min, y_max = source_layer.GetExtent()
+
+# Create the destination data source
+x_res = int((x_max - (x_min-2)) / pixel_size)
+y_res = int((y_max - y_min) / pixel_size)
+target_ds = gdal.GetDriverByName('GTiff').Create('t.tiff', x_res, y_res, gdal.GDT_Byte)
+target_ds.SetGeoTransform((x_min-2, pixel_size, 0, y_max, 0, -pixel_size))
+band = target_ds.GetRasterBand(1)
+band.SetNoDataValue(NoData_value)
+
+# Rasterize
+kk:Feature = source_layer.GetFeature(0)
+
+layer_ds = ogr.GetDriverByName('Memory').CreateDataSource('')
+outLayer = layer_ds.CreateLayer("mem",geom_type=ogr.wkbUnknown)
+featureDefn = outLayer.GetLayerDefn()
+outFeature = ogr.Feature(featureDefn)
+outFeature.SetGeometry(kk.geometry())
+outLayer.CreateFeature(outFeature)
+
+gdal.RasterizeLayer(target_ds, [1], outLayer, burn_values=[1])
+
+
+# Read as array
+array = band.ReadAsArray()
+print(array)