项目结构调整，调整data和service 2个大模块

@@ -3,7 +3,6 @@ import decimal
 from flask import Flask as _Flask
 from flask.json import JSONEncoder as _JSONEncoder
 from flask_cors import CORS
-import time
 
 from sqlalchemy.sql.expression import true
 import configure
@@ -12,24 +11,14 @@ from app.util import find_class
 from app.models import db, Table, InsertingLayerName, Database, DES, Task
 from app.modules.auth.oauth2 import config_oauth, myCodeIDToken
 from flasgger import Swagger
-# from rtree import index
 import logging
-from sqlalchemy.orm import Session
-import multiprocessing
 from app.util.component.EntryData import EntryData
 from app.util.component.EntryDataVacuate import EntryDataVacuate
-import json
 import threading
-import traceback
-from sqlalchemy import distinct
-import uuid
-from osgeo.ogr import DataSource
-import datetime
-from sqlalchemy import or_
 from app.util.component.StructuredPrint import StructurePrint
 from app.util.component.PGUtil import PGUtil
 import os
-
+from app.modules.data.io.data_entry_center import data_entry_center
 
 class JSONEncoder(_JSONEncoder):
     """
@@ -105,7 +94,6 @@ def create_app():
             app.register_blueprint(api.bp)
 
     # 入库监测线程
-
     @app.before_first_request
     def data_entry_process():
         StructurePrint.print("start listen")
@@ -120,99 +108,3 @@ def create_app():
 
     return app
 
-
-def data_entry_center():
-    running_dict = {}
-    sys_session: Session = PGUtil.get_db_session(
-        configure.SQLALCHEMY_DATABASE_URI)
-
-    while True:
-
-        try:
-            time.sleep(3)
-
-            # 已经结束的进程 从监测中删除
-            remove_process = []
-
-            # structured_print(running_dict.__len__().__str__())
-
-            for process, layer_names in running_dict.items():
-                if not process.is_alive():
-                    for l in layer_names:
-                        inserted = sys_session.query(
-                            InsertingLayerName).filter_by(name=l).one_or_none()
-                        if inserted:
-                            sys_session.delete(inserted)
-                    sys_session.commit()
-                    remove_process.append(process)
-            for process in remove_process:
-                running_dict.pop(process)
-
-            # StructurePrint.print("listening...")
-
-            # 入库进程少于阈值，开启入库进程
-
-            inter_size = sys_session.query(
-                distinct(InsertingLayerName.task_guid)).count()
-
-            if inter_size < configure.entry_data_thread:
-                # 锁表啊
-                ready_task: Task = sys_session.query(Task).filter_by(state=0, task_type=1).order_by(
-                    Task.create_time).with_lockmode("update").limit(1).one_or_none()
-                if ready_task:
-
-                    try:
-                        parameter = json.loads(ready_task.parameter)
-                        StructurePrint.print("检测到入库任务")
-                        ready_task.state = 2
-                        ready_task.process = "入库中"
-                        sys_session.commit()
-
-                        metas: list = json.loads(
-                            parameter.get("meta").__str__())
-                        parameter["meta"] = metas
-
-                        database = sys_session.query(Database).filter_by(
-                            guid=ready_task.database_guid).one_or_none()
-                        pg_ds: DataSource = PGUtil.open_pg_data_source(
-                            1, DES.decode(database.sqlalchemy_uri))
-
-                        this_task_layer = []
-                        for meta in metas:
-                            overwrite = parameter.get("overwrite", "no")
-
-                            for layer_name_origin, layer_name in meta.get("layer").items():
-                                origin_name = layer_name
-                                no = 1
-
-                                while (overwrite.__eq__("no") and pg_ds.GetLayerByName(layer_name)) or sys_session.query(InsertingLayerName).filter_by(name=layer_name).one_or_none():
-                                    layer_name = origin_name + "_{}".format(no)
-                                    no += 1
-
-                                # 添加到正在入库的列表中
-                                iln = InsertingLayerName(guid=uuid.uuid1().__str__(),
-                                                         task_guid=ready_task.guid,
-                                                         name=layer_name)
-
-                                sys_session.add(iln)
-                                sys_session.commit()
-                                this_task_layer.append(layer_name)
-                                # 修改表名
-                                meta["layer"][layer_name_origin] = layer_name
-
-                        pg_ds.Destroy()
-                        entry_data_process = multiprocessing.Process(
-                            target=EntryDataVacuate().entry, args=(parameter,))
-                        entry_data_process.start()
-                        running_dict[entry_data_process] = this_task_layer
-                    except Exception as e:
-                        sys_session.query(Task).filter_by(guid=ready_task.guid).update(
-                            {"state": -1, "process": "入库失败"})
-                        sys_session.commit()
-                        StructurePrint.print(e.__str__(), "error")
-                else:
-                    # 解表啊
-                    sys_session.commit()
-        except Exception as e:
-            sys_session.commit()
-            StructurePrint.print(e.__str__(), "error")
\ No newline at end of file

@@ -34,13 +34,14 @@ class DES():
 db = SQLAlchemy()
 
 # 动态加载Model
-module_dir = "modules"
-model_pkg = "models"
 current_dir = os.path.abspath(os.path.dirname(__file__))
-for pkg in glob.glob('%s/%s/*/%s' % (current_dir,module_dir,model_pkg)) :
-    module  = os.path.basename(os.path.dirname(pkg))
-    base_name = os.path.basename(pkg).split('.')[0]
-    pkg_name = ".".join(["app.modules",module,base_name])
+pkgs = list(glob.glob('%s/modules/*/models' % (current_dir)))
+pkgs.extend(list(glob.glob('%s/modules/*/*/models' % (current_dir))))
+
+for pkg in pkgs :
+    pkg = os.path.normpath(pkg)
+    node_list = pkg.split(os.path.sep)
+    pkg_name = ".".join(node_list[node_list.index("app"):])
     try:
         __import__(pkg_name)
     except:
@@ -199,21 +200,21 @@ class InsertingLayerName(db.Model):
     name = Column(String(256))
 
 
-# class Service(db.Model):
-#     '''
-#     '''
-#     __tablename__ = 'dmdms_service'
-#     guid = Column(String(256), primary_key=True)
-#     name=Column(String(256))
-#     alias = Column(String(256))
-#     #服务状态
-#     state= Column(Integer)
-#     create_time = Column(DateTime)
-#     update_time = Column(DateTime)
-#     #服务描述
-#     description = Column(Text)
-#     #服务节点
-#     node = Column(Integer)
-#     #服务缩略图
-#     overview = Column(Binary)
+class Service(db.Model):
+    '''
+    '''
+    __tablename__ = 'dmdms_service'
+    guid = Column(String(256), primary_key=True)
+    name=Column(String(256))
+    alias = Column(String(256))
+    #服务状态
+    state= Column(Integer)
+    create_time = Column(DateTime)
+    update_time = Column(DateTime)
+    #服务描述
+    description = Column(Text)
+    #服务节点
+    node = Column(Integer)
+    #服务缩略图
+    overview = Column(Binary)
 

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

@@ -8,7 +8,7 @@ from app.models import Database,db,DES,Table,Columns,TableVacuate
 import uuid
 from . import database_test
 # from app.util import open_pg_data_source
-from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn,Feature,Geometry
+from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn
 from sqlalchemy.orm import Session
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
@@ -17,7 +17,8 @@ from app.util.component.PGUtil import PGUtil
 from app.util.component.SQLUtil import SQLUtil
 from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.StructuredPrint import StructurePrint
-import configure
+
+
 class Api(ApiTemplate):
     api_name = "注册数据库"
     def process(self):

@@ -6,15 +6,13 @@ from flasgger import swag_from
 from flask import Blueprint
 from app.util import BlueprintApi
 
-from flask import send_from_directory,current_app,send_file
+from flask import send_from_directory
 import os
-import shutil
 from . import data_download
 from . import get_meta
 from . import data_entry_by_meta
 from . import get_data_list
-from flask import after_this_request
-import time
+
 
 class DataManager(BlueprintApi):
 

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+import configure
+from app.models import InsertingLayerName, Database, DES, Task
+from sqlalchemy.orm import Session
+import multiprocessing
+from app.util.component.EntryDataVacuate import EntryDataVacuate
+import json
+from sqlalchemy import distinct
+import uuid
+from osgeo.ogr import DataSource
+from app.util.component.StructuredPrint import StructurePrint
+from app.util.component.PGUtil import PGUtil
+import time
+
+def data_entry_center():
+    running_dict = {}
+    sys_session: Session = PGUtil.get_db_session(
+        configure.SQLALCHEMY_DATABASE_URI)
+
+    while True:
+
+        try:
+            time.sleep(3)
+
+            # 已经结束的进程 从监测中删除
+            remove_process = []
+
+            # structured_print(running_dict.__len__().__str__())
+
+            for process, layer_names in running_dict.items():
+                if not process.is_alive():
+                    for l in layer_names:
+                        inserted = sys_session.query(
+                            InsertingLayerName).filter_by(name=l).one_or_none()
+                        if inserted:
+                            sys_session.delete(inserted)
+                    sys_session.commit()
+                    remove_process.append(process)
+            for process in remove_process:
+                running_dict.pop(process)
+
+            # StructurePrint.print("listening...")
+
+            # 入库进程少于阈值，开启入库进程
+
+            inter_size = sys_session.query(
+                distinct(InsertingLayerName.task_guid)).count()
+
+            if inter_size < configure.entry_data_thread:
+                # 锁表啊
+                ready_task: Task = sys_session.query(Task).filter_by(state=0, task_type=1).order_by(
+                    Task.create_time).with_lockmode("update").limit(1).one_or_none()
+                if ready_task:
+
+                    try:
+                        parameter = json.loads(ready_task.parameter)
+                        StructurePrint.print("检测到入库任务")
+                        ready_task.state = 2
+                        ready_task.process = "入库中"
+                        sys_session.commit()
+
+                        metas: list = json.loads(
+                            parameter.get("meta").__str__())
+                        parameter["meta"] = metas
+
+                        database = sys_session.query(Database).filter_by(
+                            guid=ready_task.database_guid).one_or_none()
+                        pg_ds: DataSource = PGUtil.open_pg_data_source(
+                            1, DES.decode(database.sqlalchemy_uri))
+
+                        this_task_layer = []
+                        for meta in metas:
+                            overwrite = parameter.get("overwrite", "no")
+
+                            for layer_name_origin, layer_name in meta.get("layer").items():
+                                origin_name = layer_name
+                                no = 1
+
+                                while (overwrite.__eq__("no") and pg_ds.GetLayerByName(layer_name)) or sys_session.query(InsertingLayerName).filter_by(name=layer_name).one_or_none():
+                                    layer_name = origin_name + "_{}".format(no)
+                                    no += 1
+
+                                # 添加到正在入库的列表中
+                                iln = InsertingLayerName(guid=uuid.uuid1().__str__(),
+                                                         task_guid=ready_task.guid,
+                                                         name=layer_name)
+
+                                sys_session.add(iln)
+                                sys_session.commit()
+                                this_task_layer.append(layer_name)
+                                # 修改表名
+                                meta["layer"][layer_name_origin] = layer_name
+
+                        pg_ds.Destroy()
+                        entry_data_process = multiprocessing.Process(
+                            target=EntryDataVacuate().entry, args=(parameter,))
+                        entry_data_process.start()
+                        running_dict[entry_data_process] = this_task_layer
+                    except Exception as e:
+                        sys_session.query(Task).filter_by(guid=ready_task.guid).update(
+                            {"state": -1, "process": "入库失败"})
+                        sys_session.commit()
+                        StructurePrint.print(e.__str__(), "error")
+                else:
+                    # 解表啊
+                    sys_session.commit()
+        except Exception as e:
+            sys_session.commit()
+            StructurePrint.print(e.__str__(), "error")
\ No newline at end of file

-# 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.image.models import ImageService,Image
-from app.models import db
-from app.util.component.ApiTemplate import ApiTemplate
-import uuid
-from app.util.component.SliceScheme import SliceScheme
-from app.util.component.FileProcess import FileProcess
-from app.util.component.ParameterUtil import ParameterUtil
-from app.util.component.GeometryAdapter import GeometryAdapter
-import os
-import json
-from kazoo.client import KazooClient
-from app import GLOBAL_DIC
-from threading import Thread
-from thrift.transport import TSocket
-from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol
-from .ImageDataService import ImageDataService
-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):
-
-        result = {}
-        parameter: dict = self.para
-
-        try:
-            if parameter.get("guid"):
-                self.guid = parameter.get("guid")
-
-            image_service = ImageService.query.filter_by(guid = self.guid).one_or_none()
-            images = image_service.images.all()
-
-            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 = json.loads(image_service.slice_scheme)
-            extent = SliceScheme.get_polygon(slice_para, self.level, self.row, self.col)
-
-
-
-            # 多线程获取分布式数据
-
-            intersect_image = [im for im in images if self.determin_intersect(json.loads(im.extent),extent)]
-
-            pixel_array = numpy.zeros((256, 256,3), dtype=int)
-
-            if len(intersect_image) > 1:
-
-                # 结果矩阵
-                empty_list = [numpy.zeros((256,256), dtype=int) + 65536,
-                              numpy.zeros((256,256), dtype=int) + 65536,
-                              numpy.zeros((256,256), dtype=int) + 65536]
-
-                pixel_array = numpy.zeros((256,256,3), dtype=int)
-                thread_list = []
-
-                for image in intersect_image:
-                    #该影像的服务器，随机选取一个
-                    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))
-                    thread.start()
-                    thread_list.append(thread)
-
-
-                for thread in thread_list:
-                    thread.join()
-                    data = thread.get_result()
-
-                    # 掩膜在中央接口生成,合图
-                    mask = numpy.zeros((256,256), dtype=int)
-                    mask2 = numpy.zeros((256,256), dtype=int)
-                    jizhun = data[:, :, 0]
-                    mask[jizhun == 65536] = 1
-                    mask[jizhun != 65536] = 0
-                    mask2[jizhun == 65536] = 0
-                    mask2[jizhun != 65536] = 1
-                    # 掩膜计算
-                    for i, d in enumerate(empty_list):
-                        empty_list[i] = empty_list[i] * mask + data[:, :, i] * mask2
-                for ii in [0, 1, 2]:
-                    # opencv 颜色排序为GBR
-                    pixel_array[:, :, 2 - ii] = empty_list[ii]
-
-            elif len(intersect_image) == 1:
-
-                # 该影像的服务器，随机选取一个
-                image = intersect_image[0]
-                image_servers = image.server.split(",")
-                indx = int(random.random() * len(image_servers))
-                image_server = image_servers[indx]
-                pixel_array_t = self.get_data(zoo, image_server, image, extent, bands)
-                pixel_array = numpy.zeros((256,256, 3), dtype=int)
-                for ii in [0, 1, 2]:
-                    # opencv 颜色排序为GBR
-                    pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
-
-            else:
-                # 结果矩阵
-                pixel_array = numpy.zeros((256, 256, 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:
-            four = numpy.zeros((256, 256), 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,zoo,image_server,image,extent,bands):
-
-        if image_server.__eq__("本地服务器"):
-            data = self.get_local_data(image, extent, bands)
-        else:
-            ser = image_server
-            if zoo.exists("/rpc/{}".format(ser)):
-                data = self.get_remote_data(image, extent)
-            else:
-                data = numpy.zeros((256, 256, 3), dtype=int) + 65536
-        return data
-
-
-    def get_remote_data(self,image,extent,bands):
-        '''
-        通过RPC获取远程数据
-        :param image:
-        :param extent:
-        :param bands:
-        :return:
-        '''
-
-        transport = TSocket.TSocket(image.host, image.port)
-        transport = TTransport.TBufferedTransport(transport)
-        protocol = TBinaryProtocol.TBinaryProtocol(transport)
-        client = ImageDataService.Client(protocol)
-        transport.open()
-        t1 = time.time()
-        data = client.getData(image.path, extent, json.loads(image.extent), bands,256,256)
-        transport.close()
-        current_app.logger.info("time {}".format(time.time() - t1))
-
-        data = gzip.decompress(data)
-        data = numpy.frombuffer(data, dtype=int)
-        data = data.reshape((256, 256, 3))
-
-        return data
-
-    def get_local_data(self,image,extent,bands):
-        '''
-        获取本地数据
-        :param image:
-        :param extent:
-        :param bands:
-        :return:
-        '''
-        pixel_array = numpy.zeros((256, 256, 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((256, 256), 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, 256, 256)
-
-
-                # 部分相交
-                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]) / (256 * 1.0)
-                    out_grid_y = (extent[3] - extent[1]) / (256 * 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((256, 256), 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):
-        g1 = GeometryAdapter.envelop_2_polygon(extent1)
-        g2 = GeometryAdapter.envelop_2_polygon(extent2)
-        return g1.Intersect(g2)
-
-    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
-
-
-

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

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

@@ -5,14 +5,11 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
-from thrift.transport import TSocket
-from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol
+
 import json
-from app.modules.image.ImageDataService import ImageDataService
 from app.util.component.FileProcess import FileProcess
 import datetime
-from app.util.component.ThriftConnect import ThriftConnect
+from app.modules.service.image.util.ThriftConnect import ThriftConnect
 import os
 class Api(ApiTemplate):
 

+<?xml version="1.0" encoding="utf-8" ?><CacheInfo xsi:type='typens:CacheInfo' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:typens='http://www.esri.com/schemas/ArcGIS/10.1'><TileCacheInfo xsi:type='typens:TileCacheInfo'><SpatialReference xsi:type='typens:GeographicCoordinateSystem'><WKT>GEOGCS[&quot;GCS_China_Geodetic_Coordinate_System_2000&quot;,DATUM[&quot;D_China_2000&quot;,SPHEROID[&quot;CGCS2000&quot;,6378137.0,298.257222101]],PRIMEM[&quot;Greenwich&quot;,0.0],UNIT[&quot;Degree&quot;,0.0174532925199433],METADATA[&quot;China&quot;,73.66,7.16,134.85,53.59,0.0,0.0174532925199433,0.0,1067],AUTHORITY[&quot;EPSG&quot;,4490]]</WKT><XOrigin>-400</XOrigin><YOrigin>-400</YOrigin><XYScale>11258999068426.24</XYScale><ZOrigin>-100000</ZOrigin><ZScale>10000</ZScale><MOrigin>-100000</MOrigin><MScale>10000</MScale><XYTolerance>8.9831528411952133e-009</XYTolerance><ZTolerance>0.001</ZTolerance><MTolerance>0.001</MTolerance><HighPrecision>true</HighPrecision><LeftLongitude>-180</LeftLongitude><WKID>4490</WKID><LatestWKID>4490</LatestWKID></SpatialReference><TileOrigin xsi:type='typens:PointN'><X>-400</X><Y>399.99999999999977</Y></TileOrigin><TileCols>256</TileCols><TileRows>256</TileRows><DPI>96</DPI><PreciseDPI>96</PreciseDPI><LODInfos xsi:type='typens:ArrayOfLODInfo'><LODInfo xsi:type='typens:LODInfo'><LevelID>0</LevelID><Scale>1154287.473</Scale><Resolution>0.0027465820315218724</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>1</LevelID><Scale>577143.73640000005</Scale><Resolution>0.0013732910155229902</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>2</LevelID><Scale>288571.86820000003</Scale><Resolution>0.00068664550776149512</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>3</LevelID><Scale>144285.93410000001</Scale><Resolution>0.00034332275388074756</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>4</LevelID><Scale>72142.967059999995</Scale><Resolution>0.00017166137696416836</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>5</LevelID><Scale>36071.483529999998</Scale><Resolution>8.5830688482084179e-005</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>6</LevelID><Scale>18035.741760000001</Scale><Resolution>4.2915344229144793e-005</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>7</LevelID><Scale>9017.8708819999993</Scale><Resolution>2.1457672119331316e-005</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>8</LevelID><Scale>4508.9354409999996</Scale><Resolution>1.0728836059665658e-005</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>9</LevelID><Scale>2254.4677200000001</Scale><Resolution>5.3644180286430992e-006</Resolution></LODInfo><LODInfo xsi:type='typens:LODInfo'><LevelID>10</LevelID><Scale>1127.23386</Scale><Resolution>2.6822090143215496e-006</Resolution></LODInfo></LODInfos></TileCacheInfo><TileImageInfo xsi:type='typens:TileImageInfo'><CacheTileFormat>PNG32</CacheTileFormat><CompressionQuality>0</CompressionQuality><Antialiasing>false</Antialiasing></TileImageInfo><CacheStorageInfo xsi:type='typens:CacheStorageInfo'><StorageFormat>esriMapCacheStorageModeCompact</StorageFormat><PacketSize>128</PacketSize></CacheStorageInfo></CacheInfo>
\ No newline at end of file

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

@@ -7,8 +7,7 @@
 from osgeo import gdal,ogr,osr
 from osgeo.gdal import Dataset,Band
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ThriftConnect import ThriftConnect
-
+from app.modules.service.image.util.ThriftConnect import ThriftConnect
 import json
 from .models import Image
 import datetime

@@ -6,7 +6,7 @@
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
-from app.modules.image.models import ImageService
+from app.modules.service.image.models import ImageService
 from sqlalchemy import or_
 
 class Api(ApiTemplate):

@@ -3,7 +3,7 @@
 #createtime:    2021/7/19
 #email:         nheweijun@sina.com
 
-from app.modules.image.models import ImageService,Image
+from app.modules.service.image.models import ImageService,Image
 from app.models import db
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid

@@ -16,7 +16,7 @@ from PIL import Image
 
 import time
 import cv2
-from app.modules.image.models import ImageService,Image
+from app.modules.service.image.models import ImageService,Image
 from app.models import db
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
@@ -30,7 +30,7 @@ from kazoo.client import KazooClient
 from app import GLOBAL_DIC
 from threading import Thread
 
-from app.util.component.ThriftConnect import ThriftConnect
+from app.modules.service.image.util.ThriftConnect import ThriftConnect
 from flask import current_app
 import gzip
 import random

@@ -13,10 +13,10 @@ from flask import Response
 import random
 import time
 import cv2
-from app.modules.image.models import ImageService
+from app.modules.service.image.models import ImageService
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.GeometryAdapter import GeometryAdapter
-from app.util.component.ThriftConnect import ThriftConnect
+from app.modules.service.image.util.ThriftConnect import ThriftConnect
 from app.util.component.ParameterUtil import ParameterUtil
 import json
 from kazoo.client import KazooClient

@@ -6,7 +6,7 @@
 from thrift.transport import TSocket
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol
-from app.modules.image.ImageDataService import ImageDataService
+from app.modules.service.image.ImageDataService import ImageDataService
 
 class ThriftConnect:
     '''

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

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

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