2021.12.15 删除影像模块前

@@ -8,7 +8,7 @@ from app.util import BlueprintApi
 
 from flask import send_from_directory
 import os
-from . import data_download,data_download_task
+from . import data_download_task
 from . import get_meta
 from . import data_entry_by_meta
 from . import get_data_list
@@ -55,14 +55,6 @@ class DataManager(BlueprintApi):
             result["message"] ="删除文件失败！"
         return result
 
-    @staticmethod
-    @bp.route('/DataDownload', methods=['POST'])
-    @swag_from(data_download.Api.api_doc)
-    def table_download():
-        """
-        下载数据
-        """
-        return data_download.Api().result
 
     @staticmethod
     @bp.route('/DataDownloadTask', methods=['POST'])

-# coding=utf-8
-#author:        4N
-#createtime:    2020/11/27
-#email:         nheweijun@sina.com
-
-
-from ..models import *
-
-
-from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn,Feature
-from osgeo import gdal,ogr
-import os
-import uuid
-import configure
-from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.PGUtil import PGUtil
-from app.util.component.ZipUtil import ZipUtil
-
-class Api(ApiTemplate):
-
-    def process(self):
-        #获取参数
-    
-        #返回结果
-        result={}
-        #设置编码
-        encoding = self.para.get("encoding")
-        if encoding:
-            gdal.SetConfigOption("SHAPE_ENCODING",encoding)
-        else:
-            gdal.SetConfigOption("SHAPE_ENCODING", "UTF-8")
-    
-        ds:DataSource = None
-        try:
-            table_names = self.para.get("table_name").split(",")
-            database_guid = self.para.get("database_guid")
-            database = Database.query.filter_by(guid=database_guid).one_or_none()
-            if not database:
-                raise Exception("数据库不存在！")
-
-    
-            ds:DataSource = PGUtil.open_pg_data_source(0,DES.decode(database.sqlalchemy_uri))
-    
-            download_type = self.para.get("download_type")
-    
-            data = None
-            if download_type.__eq__("shp"):
-                data = self.download_shp(table_names,ds)
-            if download_type.__eq__("gdb"):
-                data = self.download_gdb(table_names, ds,database_guid)
-    
-            result["data"] = data
-            result["result"] = True
-        except Exception as e:
-            raise e
-
-        finally:
-            if ds:
-                ds.Destroy()
-        return result
-    
-    
-    def download_shp(self,table_names,ds):
-        data = []
-        for table_name in table_names:
-            url = self.download_one(ds, table_name)
-            data.append({"name": table_name, "download_url": url})
-        return data
-    
-    def download_one(self,ds,table_name):
-    
-        layer: Layer = ds.GetLayerByName(table_name)
-        driver = ogr.GetDriverByName("ESRI Shapefile")
-        uuid_ = uuid.uuid1().__str__()
-        parent = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-        dirpath = os.path.join(parent, "file_tmp", uuid_)
-        os.makedirs(dirpath)
-        data_source: DataSource = driver.CreateDataSource(dirpath + "/{}.shp".format(table_name))
-
-        fid = layer.GetFIDColumn()
-        pg_layer: Layer = data_source.CreateLayer(table_name, layer.GetSpatialRef(), layer.GetGeomType())
-        schema = [sche for sche in layer.schema if not sche.name.__eq__(fid)]
-
-        pg_layer.CreateFields(schema)
-        layer.ResetReading()
-        for feature in layer:
-            pg_layer.CreateFeature(feature)
-
-        data_source.Destroy()
-
-
-        ZipUtil.create_zip(os.path.join(parent, "file_tmp", table_name+"_"+uuid_) + ".zip", [dirpath])
-
-        return "http://" + configure.deploy_ip_host + "/API/IO/Download/{}".format(table_name+"_"+uuid_ + ".zip")
-    
-    
-    def download_gdb(self,table_names,ds,database_guid):
-        ogr.RegisterAll()
-        data = []
-        gdal.UseExceptions()
-        gdal.SetConfigOption("GDAL_FILENAME_IS_UTF8", "YES")
-    
-        # 创建一个gdb datasource
-        gdb_driver = ogr.GetDriverByName('FileGDB')
-        uuid_ = uuid.uuid1().__str__()
-        parent = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-        gdb_path = os.path.join(parent, "file_tmp", uuid_+".gdb")
-        gdb_ds: DataSource = gdb_driver.CreateDataSource(gdb_path)
-    
-    
-        for table_name in table_names:
-    
-            layer: Layer = ds.GetLayerByName(table_name)
-            table = Table.query.filter_by(name=table_name, database_guid=database_guid).one_or_none()
-            feature_defn: FeatureDefn = layer.GetLayerDefn()
-    
-            for i in range(feature_defn.GetFieldCount()):
-                field_defn:FieldDefn = feature_defn.GetFieldDefn(i)
-                field_alias = Columns.query.filter_by(table_guid=table.guid,name=field_defn.GetName()).one_or_none().alias
-                field_defn.SetAlternativeName(field_alias)
-    
-            table_alias= table.alias
-
-
-            fid = layer.GetFIDColumn()
-            pg_layer: Layer = gdb_ds.CreateLayer(table_name, layer.GetSpatialRef(), layer.GetGeomType(),["LAYER_ALIAS={}".format(table_alias)])
-            schema = [sche for sche in layer.schema if not sche.name.__eq__(fid)]
-            pg_layer.CreateFields(schema)
-
-            # gdb 不支持fid=0的要素，所以识别到后要+1
-            offset = 0
-            f1:Feature =  layer.GetNextFeature()
-            if f1:
-                if f1.GetFID().__eq__(0):
-                    offset = 1
-            layer.ResetReading()
-            for feature in layer:
-                feature.SetFID(feature.GetFID()+offset)
-                pg_layer.CreateFeature(feature)
-
-        gdb_ds.Destroy()
-        ZipUtil.create_zip(gdb_path + ".zip", [gdb_path])
-        data.append({"name": ",".join(table_names), "download_url": "http://" + configure.deploy_ip_host + "/API/IO/Download/{}".format(uuid_+".gdb" + ".zip")})
-
-    
-        return data
-    
-    
-    
-    api_doc={
-    "tags":["IO接口"],
-    "description":"下载数据",
-    "parameters":[
-        {"name": "table_name",
-         "in": "formData",
-         "type":"string","description":"支持多图层下载，以逗号相隔","required":"true"},
-        {"name": "encoding",
-         "in": "formData",
-         "type": "string",
-         "enum":["GBK","UTF-8"]},
-        {"name": "download_type",
-        "in": "formData",
-        "type": "string",
-        "enum": ["shp", "gdb"],"required":"true"
-        },
-        {"name": "database_guid",
-         "in": "formData",
-         "type": "string","required":"true"
-         }
-    ],
-    "responses":{
-        200:{
-            "schema":{
-                "properties":{
-                    "content":{
-                        "type": "string",
-                        "description": "The name of the user"
-                    }
-                }
-            }
-            }
-        }
-}
\ No newline at end of file

@@ -133,7 +133,7 @@ class Api(ApiTemplate):
 
 
         fid = layer.GetFIDColumn()
-        pg_layer: Layer = data_source.CreateLayer(table_name, layer.GetSpatialRef(), layer.GetGeomType())
+        pg_layer: Layer = data_source.CreateLayer(table_name, layer.GetSpatialRef(), layer.GetGeomType(),["ENCODING=UTF-8"])
         schema = [sche for sche in layer.schema if not sche.name.__eq__(fid)]
 
         pg_layer.CreateFields(schema)

@@ -18,7 +18,6 @@ class Api(ApiTemplate):
         try:
             task_guid = self.para.get("task_guid")
             task:Task = Task.query.filter_by(guid=task_guid).one_or_none()
-
             if not task :
                 raise Exception("任务不存在！")
             else:

-# coding=utf-8
-#author:        4N
-#createtime:    2021/11/2
-#email:         nheweijun@sina.com
-
-
-class DmpProject:
-    pass
\ No newline at end of file

-# coding=utf-8
-#author:        4N
-#createtime:    2021/11/2
-#email:         nheweijun@sina.com
-
-from .DmpProject import DmpProject
-
-
-class DmpServerProject:
-
-    project:DmpProject = None
-    flag : int = None
\ No newline at end of file

-# coding=utf-8
-#author:        4N
-#createtime:    2021/11/2
-#email:         nheweijun@sina.com
-
-from .DmpServerProject import DmpServerProject
-
-class ImageServer:
-    dmp_server_projects = []
-
-
-

-# coding=utf-8
-#author:        4N
-#createtime:    2021/11/2
-#email:         nheweijun@sina.com

-# coding=utf-8
-#author:        4N
-#createtime:    2021/11/2
-#email:         nheweijun@sina.com

+# coding=utf-8
+#author:        4N
+#createtime:    2021/12/13
+#email:         nheweijun@sina.com
+
+
+from flasgger import swag_from
+from flask import Blueprint
+from app.util import BlueprintApi
+from . import service_engine_register
+from . import service_engine_delete
+from . import service_engine_edit
+from . import service_engine_list
+
+class EngineManager(BlueprintApi):
+
+    bp = Blueprint("Engine", __name__, url_prefix="/API/Service/Engine")
+
+    @staticmethod
+    @bp.route('/Register', methods=['POST'])
+    @swag_from(service_engine_register.Api.api_doc)
+    def service_engine_register():
+        """
+        Engine Register
+        """
+        return service_engine_register.Api().result
+
+    @staticmethod
+    @bp.route('/List', methods=['POST'])
+    @swag_from(service_engine_list.Api.api_doc)
+    def service_engine_list():
+        """
+        Engine List
+        """
+        return service_engine_list.Api().result
+
+    @staticmethod
+    @bp.route('/Edit', methods=['POST'])
+    @swag_from(service_engine_edit.Api.api_doc)
+    def service_engine_edit():
+        """
+        Engine Edit
+        """
+        return service_engine_edit.Api().result
+
+
+    @staticmethod
+    @bp.route('/Delete', methods=['POST'])
+    @swag_from(service_engine_delete.Api.api_doc)
+    def service_engine_delete():
+        """
+        Engine Delete
+        """
+        return service_engine_delete.Api().result

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.modules.service.models import ServiceEngine,db
+class Api(ApiTemplate):
+    api_name = "注销服务引擎"
+    def process(self):
+        res = {}
+        try:
+            guid = self.para.get("guid")
+            service_engine = ServiceEngine.query.filter_by(guid=guid).one_or_none()
+            if not service_engine:
+                raise Exception("服务不存在！")
+            db.session.delete(service_engine)
+            db.session.commit()
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc = {
+        "tags": ["引擎接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "guid"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+from app.util.component.ApiTemplate import ApiTemplate
+import requests
+from app.modules.service.models import ServiceEngine,db
+class Api(ApiTemplate):
+    api_name = "修改服务引擎"
+    def process(self):
+        res = {}
+        try:
+
+            udpate = {}
+            guid = self.para.get("guid")
+
+            for key in self.para.keys():
+                if key in ["name","url","out_url"]:
+                    udpate[key] = self.para.get(key)
+
+            ServiceEngine.query.filter_by(guid=guid).update(udpate)
+            db.session.commit()
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+
+    api_doc = {
+        "tags": ["引擎接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "guid"},
+            {"name": "name",
+             "in": "formData",
+             "type": "string"},
+            {"name": "url",
+             "in": "formData",
+             "type": "string"},
+            {"name": "out_url",
+             "in": "formData",
+             "type": "string"},
+
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.modules.service.models import ServiceEngine
+from app.util.component.ModelVisitor import ModelVisitor
+
+class Api(ApiTemplate):
+    api_name = "服务引擎List"
+    def process(self):
+        res = {}
+        try:
+            page_index = int(self.para.get("page_index", "0"))
+            page_size = int(self.para.get("page_size", "10"))
+            name = self.para.get("name")
+            s_type = self.para.get("type")
+
+            service_engines = ServiceEngine.query
+            if name:
+                service_engines = service_engines.filter_by(name=name)
+
+            if s_type:
+                service_engines = service_engines.filter_by(type=s_type)
+            res["data"] = {}
+            res["data"]["count"] = service_engines.count()
+            service_engines = service_engines.limit(page_size).offset(page_index * page_size).all()
+            res["data"]["list"] = ModelVisitor.objects_to_jsonarray(service_engines)
+        except Exception as e:
+            raise e
+        return res
+
+
+    api_doc = {
+        "tags": ["引擎接口"],
+        "parameters": [
+            {"name": "page_index",
+             "in": "formData",
+             "type": "int",
+             "description": "页"},
+            {"name": "page_size",
+             "in": "formData",
+             "type": "int",
+             "description": "页大小"},
+            {"name": "name",
+             "in": "formData",
+             "type": "string"},
+            {"name": "type",
+             "in": "formData",
+             "type": "string",
+             "enum":["ImageServer"]},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+from app.util.component.ApiTemplate import ApiTemplate
+import requests
+from app.modules.service.models import ServiceEngine,db
+import datetime
+import uuid
+
+class Api(ApiTemplate):
+    api_name = "注册服务引擎"
+    def process(self):
+        res = {}
+        try:
+            url = self.para.get("url")
+            response:requests.Response = requests.get(url)
+            if response.status_code != 200:
+                raise Exception("服务引擎连接失败！")
+            service_engine = ServiceEngine(guid=uuid.uuid1().__str__(),
+                                           name=response.json().get("Name"),
+                                           url=url,
+                                           type=response.json().get("Type"),
+                                           create_time=datetime.datetime.now()
+                                           )
+            db.session.add(service_engine)
+            db.session.commit()
+
+            res["result"] = True
+        except Exception as e:
+            raise Exception("引擎已注册!")
+        return res
+
+
+    api_doc = {
+        "tags": ["引擎接口"],
+        "parameters": [
+            {"name": "url",
+             "in": "formData",
+             "type": "string",
+             "description": "服务地址"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

@@ -29,7 +29,7 @@ class ImageServerInstance:
 class ImageManager(BlueprintApi):
 
     bp = Blueprint("ImageService", __name__, url_prefix="/API/Service/Image")
-    service_type = ["影像服务"]
+    # service_type = ["影像服务"]
 
     @staticmethod
     @bp.route('/Register', methods=['POST'])

@@ -253,3 +253,16 @@ class MapService(db.Model):
     thumbnail = Column(String)
     layer_style = Column(Text)
     service_guid = Column(String,ForeignKey('dmap_service.guid'))
+
+class ServiceEngine(db.Model):
+    '''
+    服务引擎
+    '''
+    __tablename__ = 'dmap_service_engine'
+
+    guid = Column(String(256), primary_key=True)
+    name = Column(String)
+    url = Column(String(256), unique=True)
+    out_url = Column(String(256))
+    type = Column(String(256))
+    create_time = Column(DateTime)
\ No newline at end of file

@@ -21,7 +21,6 @@ class Api(ApiTemplate):
 
         try:
             # 业务逻辑
-
             guid = self.para.get("guid")
             scheme = TileScheme.query.filter_by(guid=guid).one_or_none()
             if not scheme:

@@ -6,7 +6,7 @@ from app.util.component.ApiTemplate import ApiTemplate
 
 from app.models import db
 from app.modules.service.models import Service
-from app.modules.service.models import ImageService
+from app.modules.service.models import ServiceEngine
 from app.modules.service.models import TileService
 from app.modules.service.models import MapService
 class Api(ApiTemplate):
@@ -21,21 +21,25 @@ class Api(ApiTemplate):
         try:
             guid = self.para.get("guid")
 
+            #删除本地服务
             service = Service.query.filter_by(guid=guid).one_or_none()
-            if service.type.__eq__("影像服务"):
-                image_service = ImageService.query.filter_by(service_guid=guid).one_or_none()
-                db.session.delete(image_service)
-            if service.type.__eq__("切片服务"):
-                tile_service = TileService.query.filter_by(service_guid=guid).one_or_none()
-                db.session.delete(tile_service)
-            if service.type.__eq__("地图服务"):
-                map_service = MapService.query.filter_by(service_guid=guid).one_or_none()
-                db.session.delete(map_service)
-
-            service_functions = service.relate_service_functions.all()
-            for function in service_functions:
-                db.session.delete(function)
-            db.session.delete(service)
+            if service:
+                if service.type.__eq__("切片服务"):
+                    #调用接口
+                    tile_service = TileService.query.filter_by(service_guid=guid).one_or_none()
+                    db.session.delete(tile_service)
+                if service.type.__eq__("地图服务"):
+                    map_service = MapService.query.filter_by(service_guid=guid).one_or_none()
+                    db.session.delete(map_service)
+                service_functions = service.relate_service_functions.all()
+                for function in service_functions:
+                    db.session.delete(function)
+                db.session.delete(service)
+            else:
+                pass
+
+
+
             db.session.commit()
             res["result"] = True
         except Exception as e:

@@ -6,7 +6,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
-import configure
+from .models import ServiceEngine
 from app.util import find_class,BlueprintApi
 
 
@@ -21,7 +21,10 @@ class Api(ApiTemplate):
         try:
             for scan in ["app.modules.service"]:
                 for api in find_class(scan, BlueprintApi):
-                    service_types.extend(api.service_type)
+                    if hasattr(api,"service_type"):
+                        service_types.extend(api.service_type)
+            if ServiceEngine.query.filter_by(type="ImageServer").first():
+                service_types.append("影像服务")
             res["data"] = service_types
             res["result"] = True
 

@@ -14,8 +14,10 @@ class Api(ApiTemplate):
             service = Service.query.filter_by(name=self.para.get("name")).one_or_none()
             if service:
                 raise Exception("服务已存在！")
+
             if self.para.get("type").__eq__("影像服务"):
                 from app.modules.service.image.image_service_register import Api as RealApi
+
             elif self.para.get("type").__eq__("地图服务"):
                 from app.modules.service.map_service.map_service_register import Api as RealApi
             elif self.para.get("type").__eq__("切片服务"):

@@ -19,8 +19,6 @@ class Api(ApiTemplate):
 
             service = Service.query.filter_by(guid=guid).one_or_none()
 
-
-
             service.state=state
             db.session.commit()
             res["result"] = True

@@ -51,8 +51,10 @@ class Api(ApiTemplate):
 
             tile_service_edit_url = "{}/dmap/api/manager/RegService".format(configure.wmts_url)
 
-            resp: Response  = requests.post(tile_service_edit_url,para).json()
-            if not resp.json()["status"].__eq__("true"):
+            resp: Response  = requests.post(tile_service_edit_url,data=json.dumps(para),headers={'Content-Type':'application/json'})
+            resp.encoding="utf-8"
+            resp_json = resp.json()
+            if not resp_json["status"].__eq__("true"):
                 raise Exception("调用切片服务的注册服务接口失败！")
 
             #修改数据库

@@ -34,9 +34,10 @@ class Api(ApiTemplate):
                     "type":"tileserver","capabilities":1,"project":project_file}
 
             tile_service_register_url = "{}/dmap/api/manager/RegService".format(configure.wmts_url)
-
-            resp: Response  = requests.post(tile_service_register_url,para).json()
-            if not resp.json()["status"].__eq__("true"):
+            resp: Response  = requests.post(tile_service_register_url,data=json.dumps(para),headers={'Content-Type':'application/json'})
+            resp.encoding="utf-8"
+            resp_json = resp.json()
+            if not resp_json["status"].__eq__("true"):
                 raise Exception("调用切片服务的注册服务接口失败！")
 
             service = Service(

@@ -41,7 +41,7 @@ class ProjectFile:
       <extent>
         <xmin>{xmin}</xmin>
         <ymin>{xmax}</ymin>
-        <xmax>{xmax}</xmax>
+        <xmax>{ymin}</xmax>
         <ymax>{ymax}</ymax>
       </extent>
       <style>{layer_style}</style>
@@ -123,7 +123,7 @@ class ProjectFile:
     </spatialrefsys>
   </projectCrs>
   <projectlayers>
-    <maplayer name="{name}" alias="{alias}" type="3">
+    <maplayer name="{name}" alias="{alias}" type="0">
       <extent>
         <xmin>{xmin}</xmin>
         <ymin>{xmax}</ymin>

@@ -11,16 +11,11 @@ SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dma
 #VACUATE_DB_URI = None
 VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
-# 部署模式cluster，standalone
-# deployment_mode = "cluster"
-# 部署模式味cluster时有用，master，slave
-# application_name = "master"
-
 zookeeper = "172.26.99.168:2181"
 
 #WMTS服务器
-wmts_url = "http://172.26.99.160:6080"
-
+wmts_url = "http://172.26.99.160:6060"
+wms_url = ""
 
 # 固定配置不需要修改
 swagger_configure = {"title": "DMapManager"}

@@ -6,5 +6,5 @@ import os
 os.environ['AUTHLIB_INSECURE_TRANSPORT'] = '1'
 app: Flask = create_app()
 if __name__ == '__main__':
-    app.run(host="0.0.0.0", port="8840", threaded=True, debug=True)
+    app.run(host="0.0.0.0", port="8841", threaded=True, debug=True)
     # app.run(host="0.0.0.0", port="8840", threaded=True)