Merge branch 'master' of http://gitlab.ctune.cn/weijunh/DMapManager

@@ -4,6 +4,7 @@
 #email:         nheweijun@sina.com
 import datetime
 from ..models import Database,db,Table,Columns,TableVacuate,DES
+from app.models import AESHelper
 
 import uuid
 from . import database_test
@@ -30,8 +31,10 @@ class Api(ApiTemplate):
             passwd = self.para.get("passwd")
             database = self.para.get("database")
             encryption = int(self.para.get("encryption","0"))
-            if encryption:
-                passwd = DES.decode(passwd)
+            if encryption == 1:
+                # passwd = DES.decode(passwd)
+                passwd = AESHelper.decode(passwd)
+
 
             sqlalchemy_uri = "postgresql://{}:{}@{}:{}/{}".format(user,passwd,host,port,database)
             connectsrt = "hostaddr={} port={} dbname='{}' user='{}' password='{}'".format(host,port,database,user,passwd)
@@ -309,6 +312,9 @@ class Api(ApiTemplate):
         {"name": "alias",
          "in": "formData",
          "type": "string","description":"数据库别名","required": "true"},
+        {"name": "encryption",
+         "in": "formData",
+         "type": "int", "description": "密码是否加密", "enum": [0, 1]}
     ],
     "responses":{
         200:{

@@ -7,7 +7,7 @@ from contextlib import closing
 from sqlalchemy import create_engine
 
 from ..models import Database,db,DES
-
+from app.models import AESHelper
 
 from sqlalchemy.orm import sessionmaker
 from app.util.component.ApiTemplate import ApiTemplate
@@ -26,8 +26,9 @@ class Api(ApiTemplate):
             database = self.para.get("database")
 
             encryption = int(self.para.get("encryption", "0"))
-            if encryption:
-                passwd = DES.decode(passwd)
+            if encryption == 1:
+                #passwd = DES.decode(passwd)
+                passwd = AESHelper.decode(passwd)
 
             sqlalchemy_uri = "postgresql://{}:{}@{}:{}/{}".format(user,passwd,host,port,database)
 

@@ -92,7 +92,7 @@ class Api(ApiTemplate):
             if data_path.endswith("shp"):
                 info["type"]="shp"
                 driver: Driver = ogr.GetDriverByName("ESRI Shapefile")
-                ds: DataSource = driver.Open(data_path, 1)
+                ds: DataSource = driver.Open(data_path, 0)
                 if not ds:
                     raise Exception("打开数据失败！")
                 layer: Layer = ds.GetLayer(0)
@@ -112,8 +112,7 @@ class Api(ApiTemplate):
                     layer_name[layer.GetName()] = layer.GetName()
 
         except Exception as e :
-            print(traceback.format_exc())
-            info={}
+            raise e
         finally:
             if ds:
                 ds.Destroy()

@@ -120,7 +120,7 @@ class EntryDataVacuate:
         '''
 
         driver: Driver = ogr.GetDriverByName("ESRI Shapefile")
-        ds: DataSource = driver.Open(data_path, 1)
+        ds: DataSource = driver.Open(data_path, 0)
         if not ds:
             raise Exception("打开数据失败！")
         layer: Layer = ds.GetLayer(0)

@@ -80,7 +80,7 @@ class Api(ApiTemplate):
                     rename_sql = 'alter table "{}" rename to "{}"'.format(this_table.name,name)
                     sys_session.execute(rename_sql)
                     sys_session.commit()
-                    print(rename_sql)
+
                     # 更新所有相关业务表
                     same_databases = Database.query.filter_by(sqlalchemy_uri=this_table.relate_database.sqlalchemy_uri).all()
                     same_databases_database_guid = [d.guid for d in same_databases]

@@ -14,6 +14,7 @@ class Api(ApiTemplate):
     api_name = "表信息"
     def process(self):
         res = {}
+        pg_ds = None
         try:
             table_guid = self.para.get("guid")
             table = Table.query.filter_by(guid=table_guid).one_or_none()
@@ -48,6 +49,9 @@ class Api(ApiTemplate):
     
         except Exception as e:
             raise e
+        finally:
+            if pg_ds:
+                pg_ds.Destroy()
         return res
     
     api_doc={

@@ -58,10 +58,11 @@ class Api(ApiTemplate):
             if pg_ds:
                 pg_ds.Destroy()
 
-            if Task.query.filter_by(table_guid=table_guid,state=0).one_or_none():
+            if Task.query.filter_by(table_guid=table_guid,state=0).one_or_none() or table.is_vacuate==2:
                 res["result"] = False
                 res["msg"] = "矢量金字塔构建中！"
                 return res
+
             if table.table_type==0:
                 res["result"] = False
                 res["msg"] = "非空间表！"

@@ -64,11 +64,13 @@ class Api(ApiTemplate):
                 res["result"] = False
                 res["msg"] = "矢量金字塔构建中！"
                 return res
-            if table.table_type==0:
+
+            if Task.query.filter_by(table_guid=table_guid,state=0).one_or_none() or table.is_vacuate==2:
                 res["result"] = False
-                res["msg"] = "非空间表！"
+                res["msg"] = "矢量金字塔构建中！"
                 return res
 
+
             # 初始化task
             task_guid = uuid.uuid1().__str__()
 

@@ -6,10 +6,11 @@
 from flasgger import swag_from
 from flask import Blueprint
 from app.util import BlueprintApi
-from . import map_service_register, map_service_edit
+from . import map_service_register, map_service_edit, map_service_sample_register
 from app.decorators.token_decorator import token_decorator
 from ..util.ServiceType import ServiceType
 
+
 class DataManager(BlueprintApi):
 
     bp = Blueprint("MapService", __name__,
@@ -27,6 +28,15 @@ class DataManager(BlueprintApi):
         return map_service_register.Api().result
 
     @staticmethod
+    @bp.route('/SampleRegister', methods=['POST'])
+    @swag_from(map_service_sample_register.Api.api_doc)
+    def api_wms_sample_register():
+        """
+        注册简单MapService
+        """
+        return map_service_sample_register.Api().result
+
+    @staticmethod
     @bp.route('/Edit', methods=['POST'])
     @swag_from(map_service_edit.Api.api_doc)
     @token_decorator("profile")

@@ -47,7 +47,8 @@ class Api(ApiTemplate):
             else:
                 raise Exception("调用矢量服务的注册服务接口失败！")
             # 并获得服务缩略图
-
+            if Service.query.filter_by(name = self.para.get("name")).one_or_none():
+                raise Exception("同名服务已存在！")
             service = Service(
                 guid = service_guid,
                 name = self.para.get("name"),

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/17
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.PGUtil import PGUtil
+from app.util.component.GeometryAdapter import GeometryAdapter
+import uuid
+from ..models import Service,db,MapService,ServiceFunction
+from app.modules.data.models import Database,Table,DES,Columns
+import datetime
+import configure
+import requests
+import json
+from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn
+import base64
+
+
+class Api(ApiTemplate):
+
+    api_name = "注册MapService服务"
+
+    def para_check(self):
+        if not self.para.get("name"):
+            raise Exception("缺乏服务名！")
+        if not self.para.get("title"):
+            raise Exception("缺乏标题！")
+        if not self.para.get("database_guid"):
+            raise Exception("缺乏数据库id！")
+        if not self.para.get("table_name"):
+            raise Exception("缺乏表名！")
+
+    def process(self):
+        # 返回结果
+        res = {}
+
+        try:
+
+            this_time = datetime.datetime.now()
+            service_guid = uuid.uuid1().__str__()
+            map_service_guid = uuid.uuid1().__str__()
+
+            # 逻辑是，先调用引擎接口，引擎说可以，才做持久化
+            project_file = self.create_projectfile(self.para)
+            para = {"name":self.para.get("name"),
+                    "title":self.para.get("title"),
+                    "type":"mapserver",
+                    "capabilities":2,
+                    "project":project_file}
+
+
+            map_service_register_url = "{}/dmap/api/manager/regservice".format(configure.dmap_engine)
+            resp: requests.Response  = requests.post(map_service_register_url,data=json.dumps(para),
+                                            headers={'Content-Type':'application/json'},timeout=3
+                                            )
+
+            if resp.status_code == 200:
+                resp.encoding="utf-8"
+                resp_json = resp.json()
+                if not resp_json["status"]=="1":
+                    raise Exception("调用矢量服务的注册服务接口失败！")
+            else:
+                raise Exception("调用矢量服务的注册服务接口失败！")
+            # 并获得服务缩略图
+
+            if Service.query.filter_by(name = self.para.get("name")).one_or_none():
+                raise Exception("同名服务已存在！")
+
+            service = Service(
+                guid = service_guid,
+                name = self.para.get("name"),
+                title = self.para.get("title"),
+                creator=self.para.get("creator"),
+                state = 1,
+                create_time = this_time,
+                update_time = this_time,
+                description = self.para.get("description"),
+                node = 1 ,
+                overview = resp_json["url"],
+                type = "矢量地图",
+                catalog_guid = self.para.get("catalog_guid")
+            )
+
+            map_service = MapService(
+                guid = map_service_guid,
+                name = self.para.get("name"),
+                title = self.para.get("title"),
+                type = "mapserver",
+                capabilities = int(self.para.get("capabilities",2)),
+                project = project_file,
+                service_guid = service_guid
+            )
+
+            service_function_wms = ServiceFunction(guid=uuid.uuid1().__str__(),type="WMS",service_guid=service_guid)
+            service_function_wfs = ServiceFunction(guid=uuid.uuid1().__str__(),type="WFS",service_guid=service_guid)
+
+            db.session.add(service)
+            db.session.add(map_service)
+            db.session.add(service_function_wms)
+            db.session.add(service_function_wfs)
+            db.session.commit()
+
+            res["data"] = service_guid
+            res["result"] = True
+        except Exception as e:
+            db.session.rollback()
+            raise e
+        return res
+
+
+    def create_projectfile(self,para):
+
+        database = Database.query.filter_by(guid=para.get("database_guid")).one_or_none()
+        if not database:
+            raise Exception("数据库不存在，请先注册数据库！")
+        pg_ds: DataSource = PGUtil.open_pg_data_source(0, DES.decode(database.sqlalchemy_uri))
+        table = Table.query.filter_by(database_guid=database.guid,name=self.para.get("table_name")).first()
+        layer: Layer = pg_ds.GetLayerByName(self.para.get("table_name"))
+        #注册数据表
+        if not table:
+            if not layer:
+                raise Exception("图层不存在！")
+            table = self.register_table(layer,para)
+
+        gemetry_type = ["MULTIPOINT","MULTILINESTRING","MULTIPOLYGON"][table.table_type-1]
+
+        geom_column = layer.GetGeometryColumn()
+        srid = PGUtil.get_srid(pg_ds,self.para.get("table_name"))
+        if not table.table_type in [1,2,3]:
+            raise Exception("数据表是非空间表！")
+
+        xml_format='''
+<dmap projectname="{name}" version="">
+	<projectCrs>
+		<spatialrefsys>
+			<wkt/>
+			<proj4/>
+			<srid>0</srid>
+		</spatialrefsys>
+	</projectCrs>
+	<projectlayers>
+		<maplayer alias="" alwaysShow="false" featurecount="{feature_count}" geometry="{gemetry_type}" geomfield="{geom_column}" id="{table_guid}" name="{table_name}" schema="public" srid="{srid}" tag="" type="1" visible="true" workspace="">
+			<extent>
+				<xmin>{xmin}</xmin>
+				<ymin>{ymin}</ymin>
+				<xmax>{xmax}</xmax>
+				<ymax>{ymax}</ymax>
+			</extent>
+			<datasource>{database_guid}</datasource>
+            {renderer}
+		</maplayer>
+	</projectlayers>
+</dmap>  
+        '''
+        point_renderer='''
+			<renderer>
+				<GROUPRENDERER>
+					<SIMPLERENDERER alwaysShow="false" maxscale="10000000000" minscale="0">
+						<SIMPLEMARKERSYMBOL png="" type="circle" color="255,255,255" transparency="1" boundary="true" outline="0,0,0" outlinetransparency="1" width="1.5" size="10.00" />
+					</SIMPLERENDERER>
+				</GROUPRENDERER>
+			</renderer>
+        '''
+        line_renderer = '''
+			<renderer>
+				<GROUPRENDERER>
+					<SIMPLERENDERER alwaysShow="true" maxscale="10000000000" minscale="0">
+						<SIMPLELINESYMBOL type="solid" png="" color="0,0,0" transparency="1.00" width="2.00" captype="cap_butt" jiontype="jion_miter" />
+					</SIMPLERENDERER>
+				</GROUPRENDERER>
+			</renderer>
+        '''
+
+        polygon_renderer='''
+			<renderer>
+				<GROUPRENDERER>
+					<SIMPLERENDERER alwaysShow="true" maxscale="10000000000" minscale="0">
+						<SIMPLEPOLYGONSYMBOL png="" boundary="true" linetype="solid" width="0.5" boundarycolor="0,0,0" boundarytransparency="1.00" needfill="false" filltype="solid" filltransparency="1.00" fillinterval="1" font="" fontname="" fillsize="0" fillcolor="0,0,0" icon="" needbackground="true" diagalignment="true" backgroundcolor="255,255,255" backgroundtransparency="1.00" />
+					</SIMPLERENDERER>
+				</GROUPRENDERER>
+			</renderer>
+        '''
+
+        renderer = point_renderer
+        if table.table_type==2:
+            renderer = line_renderer
+        if table.table_type==3:
+            renderer = polygon_renderer
+
+        extent = [float(x) for x in table.extent.split(",")]
+
+        xml = xml_format.format(name = para.get("name"),
+                                xmin = extent[0],
+                                xmax = extent[1],
+                                ymin = extent[2],
+                                ymax = extent[3],
+                                feature_count = table.feature_count,
+                                database_guid = table.database_guid,
+                                gemetry_type = gemetry_type,
+                                geom_column = geom_column,
+                                table_guid = table.guid,
+                                table_name = table.name,
+                                srid = srid,
+                                renderer= renderer
+                                )
+
+
+        if pg_ds:
+            pg_ds.Destroy()
+
+        project_xml = xml.strip()
+        print(project_xml)
+        return str(base64.b64encode(project_xml.encode('utf-8')), encoding="utf8")
+
+    def register_table(self, layer: Layer,para):
+        '''
+        注册表
+        :param layer: 图层
+        :param new_layer_name: 图层名
+        :return: 表名
+        '''
+
+        table_guid = uuid.uuid1().__str__()
+        this_time = datetime.datetime.now()
+        ext = layer.GetExtent()
+        if ext[0] < 360:
+            ext = [round(e, 6) for e in ext]
+        else:
+            ext = [round(e, 2) for e in ext]
+
+        geom_type = GeometryAdapter.get_geometry_type(layer)
+
+        extent = "{},{},{},{}".format(ext[0], ext[1], ext[2], ext[3])
+
+        table = Table(guid=table_guid,
+                      database_guid=para.get("database_guid"),
+                      name=layer.GetName(),
+                      create_time=this_time, update_time=this_time,
+                      table_type=GeometryAdapter.get_table_type(geom_type),
+                      extent=extent,
+                      feature_count=layer.GetFeatureCount()
+                      )
+        # 删除遗留业务数据
+        history_table = Table.query.filter_by(name=layer.GetName(),database_guid=para.get("database_guid")).all()
+
+        if history_table:
+            for ht in history_table:
+                db.session.delete(ht)
+        db.session.add(table)
+
+        feature_defn: FeatureDefn = layer.GetLayerDefn()
+
+        for i in range(feature_defn.GetFieldCount()):
+
+            field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
+            field_name = field_defn.GetName()
+
+            field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
+                "") else field_defn.GetAlternativeName()
+
+            column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,
+                             name=field_name, alias=field_alias, create_time=this_time, update_time=this_time)
+            db.session.add(column)
+        db.session.commit()
+
+        return table
+
+
+
+
+    api_doc = {
+        "tags": ["矢量地图接口"],
+        "parameters": [
+
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "required": "true"},
+
+            {"name": "title",
+             "in": "formData",
+             "type": "string",
+             "required": "true"},
+
+            {"name": "database_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "DMapServer中数据库的guid",
+             "required": "true"},
+
+            {"name": "table_name",
+             "in": "formData",
+             "type": "string",
+             "description": "表名",
+             "required": "true"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file

@@ -49,6 +49,9 @@ class Api(ApiTemplate):
             else:
                 raise Exception("调用电子地图的注册服务接口失败！")
 
+            if Service.query.filter_by(name = self.para.get("name")).one_or_none():
+                raise Exception("同名服务已存在！")
+
             service = Service(
                 guid = service_guid,
                 name = self.para.get("name"),

@@ -184,6 +184,7 @@ class GeometryAdapter:
             layer.ResetReading()
         return geom_type
 
+
     @classmethod
     def convert(cls, geometry: Geometry, bbox, xy_res):
         '''

@@ -122,6 +122,21 @@ class PGUtil:
 
 
     @classmethod
+    def get_srid(cls,pg_ds,table_name):
+        layer = pg_ds.GetLayerByName(table_name)
+        if not layer:
+            return None
+        srid_sql = '''select st_srid({}) from public."{}" limit 1'''.format(layer.GetGeometryColumn(), layer.GetName())
+        srid_layer = pg_ds.ExecuteSQL(srid_sql)
+        srid_feature = srid_layer.GetNextFeature()
+        if srid_feature:
+            if srid_feature.GetField(0):
+                return int(srid_feature.GetField(0))
+        else:
+            return None
+
+
+    @classmethod
     def check_database_privilege(cls,table_name,pri_type,user,session):
         pass
 

@@ -42,7 +42,6 @@ class SQLUtil:
             return False
 
 
-
     @classmethod
     def check_database_privilege(cls,table_name,pri_type,user,session):
         pass

@@ -11,7 +11,7 @@ VACUATE_DB_URI = None
 #VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
 #DMap引擎
-dmap_engine = "http://172.26.99.160:8820"
+dmap_engine = "http://172.26.60.101:8820"
 
 # 固定配置不需要修改