2022.01.14 合并前

@@ -7,23 +7,15 @@ ENV LANG=en_US.UTF-8
 #设置时区
 ENV TZ=Asia/Shanghai
 
+COPY . .
 
 RUN apt-get update
-#安装pip
+#安装pip3
 RUN apt-get install python3-pip -y
-
-#安装opencv所需依赖库
-RUN apt-get install libgl1-mesa-glx -y
-RUN apt-get install libglib2.0-dev -y
-
 #安装apache2
-RUN apt-get install apache2 -y
-RUN apt-get install apache2-dev -y
-
-
+RUN apt-get install apache2 -y && apt-get install apache2-dev -y
 #安装依赖
-COPY . .
 RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn
 
+RUN mod_wsgi-express install-module
 
-RUN mod_wsgi-express install-module
\ No newline at end of file

+flask==1.1.2
+SQLAlchemy==1.3.17
+Flask-SQLAlchemy==2.4.3
+flask_cors==3.0.8
+flasgger==0.9.5
+psycopg2-binary==2.8.5
+pyDes==2.0.1
+mod_wsgi==4.8.0
+opencv-python-headless==4.5.1.48
+thrift==0.13.0
+Authlib==0.13
+kazoo==2.8.0
+paramiko==2.8.0
+requests==2.26.0
+schedule==1.1.0

+From osgeo/gdal:ubuntu-small-3.4.1
+WORKDIR /root
+#设置编码
+ENV LANG=en_US.UTF-8
+#设置时区
+ENV TZ=Asia/Shanghai
+
+#安装apache2
+RUN apt-get update
+RUN apt-get install apache2 -y 
+
+COPY --from=dci/dmapserver:build-dev /usr/local /usr/local
+COPY --from=dci/dmapserver:build-dev /usr/lib/apache2/modules /usr/lib/apache2/modules
+
+

@@ -16,6 +16,10 @@ from app.util.component.StructuredPrint import StructurePrint
 from app.util.component.PGUtil import PGUtil
 import os
 from app.modules.monitor.schedule import start_schedule
+import datetime
+
+
+
 
 
 class JSONEncoder(_JSONEncoder):
@@ -76,11 +80,13 @@ def create_app():
     db.create_all(app=app)
 
     # 日志
+
     logging.basicConfig(level=configure.log_level)
     log_file = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "logs", "log.txt")
     handler = logging.FileHandler(log_file, encoding='UTF-8')   # 设置日志字符集和存储路径名字
     logging_format = logging.Formatter('[%(levelname)s] %(asctime)s %(message)s')
     handler.setFormatter(logging_format)
+
     app.logger.addHandler(handler)
 
     # 配置使用鉴权组件，不写无法认证授权

@@ -98,7 +98,7 @@ class DataManager(BlueprintApi):
         return database_info.Api().result
 
     @staticmethod
-    @bp.route('/Detail', methods=["POST"])
+    @bp.route('/Detail', methods=["GET","POST"])
     @swag_from(database_detail.Api.api_doc)
     def api_database_detail():
         """

@@ -13,14 +13,20 @@ from app.util.component.PGUtil import PGUtil
 import configure
 from osgeo.ogr import DataSource
 from flask import current_app
+from authlib.integrations.flask_oauth2 import current_token
+
+
 class Api(ApiTemplate):
     api_name = "删除数据库"
     def process(self):
         re ={}
         va_ds = None
         try:
-    
+
             database = db.session.query(Database).filter_by(guid=self.para.get("guid")).one_or_none()
+            if database.creator != current_token.user.username:
+                raise Exception("缺乏权限！")
+
             if configure.VACUATE_DB_URI:
                 va_ds: DataSource = PGUtil.open_pg_data_source(1, configure.VACUATE_DB_URI)
             else:
@@ -62,7 +68,7 @@ class Api(ApiTemplate):
     "parameters":[
         {"name": "guid",
          "in": "formData",
-         "type": "string","description":"数据库guid","required": "true"},
+         "type": "string","description":"数据库guid","required": "true"}
     
     ],
     "responses":{

@@ -28,6 +28,9 @@ class Api(ApiTemplate):
             database = Database.query.filter_by(guid=guid)
             dbase:Database = database.one_or_none()
 
+            if dbase.creator != "":
+                raise Exception("缺乏权限！")
+
             update_dict={}
     
             if not dbase:

@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session
 import configure
 import datetime
 import multiprocessing
-from ..util.EntryDataVacuate import EntryDataVacuate
+from .util.EntryDataVacuate import EntryDataVacuate
 from app.util.component.TaskController import TaskController
 from app.util.component.TaskWriter import TaskWriter
 class Api(ApiTemplate):
@@ -212,6 +212,13 @@ class Api(ApiTemplate):
          "in": "formData",
          "type": "string",
          "description": "目录guid"},
+
+        {"name": "vacuate",
+         "in": "formData",
+         "type": "string",
+         "description": "是否抽稀",
+         "enum":[1,0]},
+
         {"name": "check_meta_only",
          "in": "formData",
          "type": "int",

@@ -15,7 +15,7 @@ import json
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ZipUtil import ZipUtil
 from app.util.component.FileProcess import FileProcess
-
+import platform
 
 class Api(ApiTemplate):
     api_name = "获取meta"
@@ -53,7 +53,12 @@ class Api(ApiTemplate):
 
             else:
                 # 保存文件
-                parent = os.path.dirname(os.path.realpath(__file__))
+                # 保存在项目外
+                if platform.system().lower() == 'windows':
+                    parent = "C:/"
+                else:
+                    parent = "/tmp"
+
                 dir_path, store_file = FileProcess.save(parent)
                 store_path = ZipUtil.unzip(store_file)
 

@@ -18,7 +18,6 @@ import datetime
 class EntryDataVacuate:
 
     def entry(self,parameter):
-        # meta:dict = parameter.get("meta")
 
         # 初始化任务
         this_task = ThisTask(parameter)
@@ -28,6 +27,9 @@ class EntryDataVacuate:
         _data_path=None
         try:
             metas: list = parameter.get("meta")
+
+            vacuate = int(parameter.get("vacuate",1))
+
             # 总的入库是否成功
             is_success=True
 
@@ -75,7 +77,10 @@ class EntryDataVacuate:
             if is_success:
                 # 更新任务为成功任务
                 this_task.update({"state": 1,"process":"入库完成","update_time": datetime.datetime.now()})
-                this_task.commit()
+                try:
+                    this_task.commit()
+                except:
+                    raise Exception("可能编码出错！")
             else:
                 # 更新任务为失败任务
                 this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
@@ -83,6 +88,7 @@ class EntryDataVacuate:
                 this_task.rollback()
 
         except Exception as e:
+            StructurePrint().print("herehere")
             this_task.write_process("{} 任务结束！".format(e.__str__()))
             this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
             StructurePrint().print(e.__str__(),"ERROR")
@@ -98,7 +104,7 @@ class EntryDataVacuate:
                     dir_path = os.path.dirname(dir_path)
                     i+=1
                 if i<30:
-                    shutil.rmtree(dir_path,True)
+                    # shutil.rmtree(dir_path,True)
                     StructurePrint().print("删除文件成功！")
                 else:
                     raise Exception("找不到文件！")
@@ -156,15 +162,18 @@ class EntryDataVacuate:
 
     def entry_one_layer(self,layer: Layer,this_task,meta):
 
-        # this_task.pg_ds.StartTransaction()
+
         new_layer_name = None
-        # vacuate_process= None
+        vacuate_process= None
+        vacuate = int(this_task.parameter.get("vacuate", 1))
         success = True
         table_guid = uuid.uuid1().__str__()
         try:
             # 图层设置
             parameter = this_task.parameter
 
+
+
             overwrite = parameter.get("overwrite") if parameter.get("overwrite") is not None and parameter.get("overwrite")=="yes" else "no"
             geom_name = parameter.get("geom_name") if parameter.get("geom_name") is not None else "geom"
             fid =  parameter.get("fid") if parameter.get("fid") is not None else "fid"
@@ -201,9 +210,8 @@ class EntryDataVacuate:
             pg_layer.CreateFields(schema)
 
             #创建抽稀过程
-            # vacuate_process = VacuateProcess(layer,table_guid,options)
-
-
+            if vacuate:
+                vacuate_process = VacuateProcess(layer,table_guid,options)
 
             count =0
 
@@ -231,18 +239,18 @@ class EntryDataVacuate:
                 pg_layer.CreateFeature(out_feature)
 
                 #插入抽稀图层
-                # if out_geom is not None:
-                #     vacuate_process.vacuate(out_geom)
+                if out_geom is not None and vacuate:
+                    vacuate_process.vacuate(out_geom)
 
             # 注册图层信息
             # 是否抽吸过
-            # is_vacuate = 1 if vacuate_process.max_level>0 else 0
-            is_vacuate = 0
+            is_vacuate = 1 if vacuate_process.max_level>0 else 0
 
             this_task.register_table(pg_layer,new_layer_name,overwrite,parameter.get("creator"),is_vacuate,table_guid)
 
             # 注册抽稀表
-            # this_task.register_table_vacuate(table_guid,vacuate_process.vacuate_layers)
+            if vacuate:
+                this_task.register_table_vacuate(table_guid,vacuate_process.vacuate_layers)
 
             this_task.write_process("{}图层入库成功。".format(new_layer_name))
 
@@ -252,11 +260,13 @@ class EntryDataVacuate:
             StructurePrint().print("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()), "error")
             print(traceback.format_exc())
             # 抽稀回滚
-            # vacuate_process.rollback()
+            if vacuate:
+                vacuate_process.rollback()
             success =False
 
         finally:
-            # vacuate_process.end()
+            if vacuate:
+                vacuate_process.end()
             pass
         return success,new_layer_name
 
@@ -459,12 +469,6 @@ class VacuateProcess:
             # 固有疏密程度
             original_density=8
 
-
-            # 额外一层
-            # self.this_gridsize.append(0.000075)
-            # self.max_level += 1
-            ######
-
             if extent[0]>180:
                 self.t_grid_size=self.project_gridsize
             else:

@@ -19,6 +19,14 @@ class Api(ApiTemplate):
 
         column_guid = self.para.get("column_guid")
         update_dict = {}
+
+        column:Columns =  Columns.query.filter_by(guid = column_guid).one_or_none()
+        if not column:
+            raise Exception("数据不存在！")
+
+        if column.relate_table.relate_database.creator != "":
+            raise Exception("缺乏权限！")
+
         try:
             if self.para.get("column_alias"):
                 update_dict["alias"] = self.para.get("column_alias")

@@ -47,7 +47,10 @@ class Api(ApiTemplate):
                 res["msg"]= "数据库不存在!"
                 return res
 
-    
+            if database.creator != "":
+                raise Exception("缺乏权限！")
+
+
             pg_ds: DataSource = PGUtil.open_pg_data_source(1, DES.decode(database.sqlalchemy_uri))
             
             if configure.VACUATE_DB_URI:

@@ -34,6 +34,8 @@ class Api(ApiTemplate):
                 res["msg"]= "数据不存在！"
                 return res
 
+            if table.relate_database.creator != "":
+                raise Exception("缺乏权限！")
     
             if self.para.__contains__("catalog_guid"):
                 if catalog_guid is None:

@@ -21,9 +21,10 @@ class Api(ApiTemplate):
                 raise Exception("数据不存在！")
             pg_ds = PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
             layer:Layer = pg_ds.GetLayerByName(table.name)
-            append_dict ={"srid":None,"sr_wkt":None,"sr_proj4":None,"exist":1}
+            append_dict ={"srid":None,"sr_wkt":None,"sr_proj4":None,"exist":1,"schema":"public","geomfield":layer.GetGeometryColumn()}
             if layer:
                 sr:SpatialReference = layer.GetSpatialRef()
+
                 if sr:
                     append_dict["srid"] = sr.GetAuthorityCode(None)
                     append_dict["sr_wkt"] = sr.ExportToWkt()

@@ -32,6 +32,9 @@ class Api(ApiTemplate):
             database_guid = self.para.get("database_guid")
             database = Database.query.filter_by(guid=database_guid).one_or_none()
 
+            if database.creator != "":
+                raise Exception("缺乏权限！")
+
             if not database:
                 raise Exception("数据库不存在!")
                 # 初始化task

@@ -42,6 +42,9 @@ class Api(ApiTemplate):
             if not table:
                 raise Exception("数据不存在！")
 
+            if table.relate_database.creator != "":
+                raise Exception("缺乏权限！")
+
             pg_ds :DataSource= PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
             layer = pg_ds.GetLayerByName(table.name)
             # 判断图层是否存在
@@ -73,7 +76,7 @@ class Api(ApiTemplate):
 
 
             task = Task(guid=task_guid,
-                        name="{}矢量金字塔构建".format(table.name),
+                        name="{}构建矢量金字塔".format(table.name),
                         table_guid=table_guid,
                         create_time=datetime.datetime.now(),
                         state=0,

@@ -40,6 +40,9 @@ class Api(ApiTemplate):
             if not table:
                 raise Exception("数据不存在！")
 
+            if table.relate_database.creator != "":
+                raise Exception("缺乏权限！")
+
             # 判断图层是否存在
 
             pg_ds :DataSource= PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
@@ -73,7 +76,7 @@ class Api(ApiTemplate):
 
 
             task = Task(guid=task_guid,
-                        name="{}矢量金字塔构建,网格大小:{}".format(table.name,self.para.get("grids")),
+                        name="{}构建矢量金字塔,网格大小:{}".format(table.name,self.para.get("grids")),
                         table_guid=table_guid,
                         create_time=datetime.datetime.now(),
                         state=0,

-
-from osgeo.ogr import *
-from osgeo import ogr
-from osgeo import gdal
-import os
-import uuid
-import shutil
-import time
-from app.modules.data.models import *
-from app.util.component.PGUtil import PGUtil
-from app.util.component.StructuredPrint import StructurePrint
-from sqlalchemy.orm import Session
-import configure
-import math
-from functools import lru_cache
-import traceback
-import copy
-from app.util.component.GeometryAdapter import GeometryAdapter
-from app.util.component.VacuateConf import VacuateConf
-import datetime
-class EntryDataVacuate:
-
-    def entry(self,parameter):
-        # meta:dict = parameter.get("meta")
-
-        # 初始化任务
-        this_task = ThisTask(parameter)
-        this_task.write_process("入库任务初始化...")
-
-        # 数据路径，用作删除
-        _data_path=None
-        try:
-            metas: list = parameter.get("meta")
-            # 总的入库是否成功
-            is_success=True
-
-            this_task.update({"process": "入库中"})
-
-            # 开始入库事务
-            this_task.start()
-
-            # 多个文件依次入库
-            for meta in metas:
-                #设置编码
-                encoding = parameter.get("encoding")
-                if encoding:
-                    gdal.SetConfigOption("SHAPE_ENCODING",encoding)
-                else:
-                    gdal.SetConfigOption("SHAPE_ENCODING", "GBK")
-
-                #如果包含cpg文件，优先使用cpg文件中声明的编码
-                encoding_cpg = meta.get("encoding")
-                if encoding_cpg:
-                    gdal.SetConfigOption("SHAPE_ENCODING", encoding_cpg)
-
-                data_path = meta.get("data_path")
-
-                #设定删除路径
-                if not _data_path:
-                    _data_path=data_path
-
-
-                if not data_path:
-                    raise Exception("数据错误！")
-                # 分为shp和gdb 2种录入形式
-
-                if data_path.endswith("shp"):
-                    is_success_one,new_layer_name = self.entry_shp(data_path,this_task,meta)
-                else:
-                    is_success_one,new_layer_names = self.entry_gdb(data_path,this_task,meta)
-
-                #如果其中一个失败，总的入库就失败
-                if not is_success_one:
-                    is_success=False
-
-            this_task.write_process("数据入库结束。")
-
-            if is_success:
-                # 更新任务为成功任务
-                this_task.update({"state": 1,"process":"入库完成","update_time": datetime.datetime.now()})
-                this_task.commit()
-            else:
-                # 更新任务为失败任务
-                this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
-                # rollback
-                this_task.rollback()
-
-        except Exception as e:
-            this_task.write_process(e.__str__())
-            this_task.write_process("任务中止！")
-
-            this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
-            StructurePrint().print(e.__str__(),"ERROR")
-            # rollback
-            this_task.rollback()
-        finally:
-            this_task.end()
-            try:
-                file_tmp_path = os.path.join(_data_path.split("file_tmp")[0],"file_tmp")
-                dir_path = os.path.dirname(_data_path)
-                i=0
-                while not os.path.dirname(dir_path).__eq__(file_tmp_path) and i<30:
-                    dir_path = os.path.dirname(dir_path)
-                    i+=1
-                if i<30:
-                    shutil.rmtree(dir_path,True)
-                    StructurePrint().print("删除文件成功！")
-                else:
-                    raise Exception("找不到文件！")
-
-            except Exception as e:
-                StructurePrint().print(e.__str__(), "ERROR")
-                StructurePrint().print("删除文件失败！","ERROR")
-
-
-    def entry_shp(self,data_path,this_task,meta):
-        '''
-        录入shp
-        :param data_path:
-        :return:
-        '''
-
-        driver: Driver = ogr.GetDriverByName("ESRI Shapefile")
-        ds: DataSource = driver.Open(data_path, 1)
-        if not ds:
-            raise Exception("打开数据失败！")
-        layer: Layer = ds.GetLayer(0)
-
-        is_success_one, new_layer_name =self.entry_one_layer(layer, this_task,meta)
-        ds.Destroy()
-        return is_success_one, new_layer_name
-
-    def entry_gdb(self,data_path,this_task,meta):
-        '''
-        录入gdb
-        :param data_path:
-        :return:
-        '''
-
-        is_successes = []
-        new_layer_names=[]
-        driver: Driver = ogr.GetDriverByName("OpenFileGDB")
-        ds: DataSource = driver.Open(data_path, 0)
-        if not ds:
-            raise Exception("打开数据失败！")
-
-
-        for i in range(ds.GetLayerCount()):
-
-            layer: Layer = ds.GetLayer(i)
-            if layer.GetName().lower() not in meta.get("layer").keys():
-                continue
-            is_success, new_layer_name = self.entry_one_layer(layer,this_task,meta)
-            new_layer_names.append(new_layer_name)
-            is_successes.append(is_success)
-        ds.Destroy()
-        if is_successes.__contains__(False):
-            return False,new_layer_names
-        else:
-            return True,new_layer_names
-
-    def entry_one_layer(self,layer: Layer,this_task,meta):
-
-        # this_task.pg_ds.StartTransaction()
-        new_layer_name = None
-        # vacuate_process= None
-        success = True
-        table_guid = uuid.uuid1().__str__()
-        try:
-            # 图层设置
-            parameter = this_task.parameter
-
-            overwrite = parameter.get("overwrite") if parameter.get("overwrite") is not None and parameter.get("overwrite")=="yes" else "no"
-            geom_name = parameter.get("geom_name") if parameter.get("geom_name") is not None else "geom"
-            fid =  parameter.get("fid") if parameter.get("fid") is not None else "fid"
-            options = ["OVERWRITE={}".format(overwrite), "FID={}".format(fid), "GEOMETRY_NAME={}".format(geom_name),"PRECISION=NO"]
-
-
-            # 将线/面转多线多面
-            geom_type = GeometryAdapter.change_geom_type(layer.GetGeomType())
-
-            # 更改图层名
-            change_name = False
-            origin_name = layer.GetName().lower()
-
-            # 新图层名
-            new_layer_name: str = meta.get("layer").get(origin_name)
-            origin_name = new_layer_name
-            no = 1
-            while overwrite.__eq__("no") and this_task.pg_ds.GetLayerByName(new_layer_name) :
-                change_name=True
-                new_layer_name = origin_name+"_{}".format(no)
-                no+=1
-
-            if change_name:
-                this_task.write_process("{}图层已存在，更名为{}入库".format(origin_name, new_layer_name))
-
-
-            this_task.write_process("{}图层正在入库...".format(new_layer_name))
-
-            pg_layer: Layer = this_task.pg_ds.CreateLayer(new_layer_name, layer.GetSpatialRef(), geom_type, options)
-
-            # 复制原图层的属性
-            # 去掉fid的属性
-            schema = [sche for sche in layer.schema if not sche.name.__eq__(fid)]
-            pg_layer.CreateFields(schema)
-
-            #创建抽稀过程
-            # vacuate_process = VacuateProcess(layer,table_guid,options)
-
-
-
-            count =0
-
-            for feature in layer:
-                count+=1
-                if count%10000==0:
-                    StructurePrint().print("{}图层已入库{}个对象".format(new_layer_name,count))
-                    # print(time.time()-this_time)
-                    #this_time=time.time()
-                geo :Geometry = feature.GetGeometryRef()
-                # 如果是空对象不录入
-                if geo is not None:
-                    if geo.IsEmpty():
-                        this_task.write_process("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()))
-                        StructurePrint().print("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()),"WARN")
-                        continue
-
-                out_feature: Feature = copy.copy(feature)
-                out_geom = None
-                if geo is not None:
-                    out_geom:Geometry = GeometryAdapter.change_geom(geo, geom_type)
-                    out_feature.SetGeometry(out_geom)
-                # 出现fid为0经常有问题
-                out_feature.SetFID(out_feature.GetFID() + 1)
-                pg_layer.CreateFeature(out_feature)
-
-                #插入抽稀图层
-                # if out_geom is not None:
-                #     vacuate_process.vacuate(out_geom)
-
-            # 注册图层信息
-            # 是否抽吸过
-            # is_vacuate = 1 if vacuate_process.max_level>0 else 0
-            is_vacuate = 0
-
-            this_task.register_table(pg_layer,new_layer_name,overwrite,parameter.get("creator"),is_vacuate,table_guid)
-
-            # 注册抽稀表
-            # this_task.register_table_vacuate(table_guid,vacuate_process.vacuate_layers)
-
-            this_task.write_process("{}图层入库成功。".format(new_layer_name))
-
-        except Exception as e:
-
-            this_task.write_process("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()))
-            StructurePrint().print("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()), "error")
-            print(traceback.format_exc())
-            # 抽稀回滚
-            # vacuate_process.rollback()
-            success =False
-
-        finally:
-            # vacuate_process.end()
-            pass
-        return success,new_layer_name
-
-
-
-class ThisTask:
-
-    def __init__(self, parameter):
-        try:
-            # 该任务事务的连接
-            self.sys_session: Session = PGUtil.get_db_session(configure.SQLALCHEMY_DATABASE_URI)
-            # 专门的写过程的连接
-            self.process_session: Session = PGUtil.get_db_session(configure.SQLALCHEMY_DATABASE_URI)
-
-        except Exception as e:
-            raise Exception("打开数据库失败！")
-        self.parameter = parameter
-
-        self.task = self.process_session.query(Task).filter_by(guid=parameter.get("task_guid"))
-
-        self.database = self.sys_session.query(Database).filter_by(
-            guid=parameter.get("database_guid")).one_or_none()
-
-        self.catalog_guid = parameter.get("catalog_guid")
-
-        self.pg_ds: DataSource = PGUtil.open_pg_data_source(1, DES.decode(self.database.sqlalchemy_uri))
-
-
-    def start(self):
-        self.pg_ds.StartTransaction()
-
-    def update(self, update_dict):
-        self.task.update(update_dict)
-        self.process_session.commit()
-
-    def write_process(self, message):
-        message = "{} {}".format(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), message)
-        task_process_guid = uuid.uuid1().__str__()
-        task_process = Process(guid=task_process_guid, message=message, time=datetime.datetime.now(),
-                               task_guid=self.parameter.get("task_guid"))
-        self.process_session.add(task_process)
-        self.process_session.commit()
-
-    def register_table(self, layer: Layer, new_layer_name, overwrite, creator,is_vacuate,table_guid):
-        '''
-        注册表
-        :param layer: 图层
-        :param new_layer_name: 图层名
-        :return: 表名
-        '''
-
-        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=self.database.guid,
-                      creator=creator,
-                      name=new_layer_name, create_time=this_time, update_time=this_time,
-                      catalog_guid=self.catalog_guid, table_type=GeometryAdapter.get_table_type(geom_type),
-                      extent=extent,
-                      feature_count=layer.GetFeatureCount(),
-                      is_vacuate=is_vacuate
-                      )
-        # 删除遗留业务数据
-        try:
-            history_table = self.sys_session.query(Table).filter_by(name=new_layer_name,database_guid=self.database.guid).all()
-        except:
-            self.sys_session: Session = PGUtil.get_db_session(configure.SQLALCHEMY_DATABASE_URI)
-            history_table = self.sys_session.query(Table).filter_by(name=new_layer_name,database_guid=self.database.guid).all()
-
-        if history_table:
-            for ht in history_table:
-                self.sys_session.delete(ht)
-        self.sys_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().lower()
-            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)
-            self.sys_session.add(column)
-        return table_guid
-
-
-    def register_table_vacuate(self,table_guid,vacuate_layers:dict):
-
-        # 抽稀表有固定的命名规则
-        for level,layer in vacuate_layers.items():
-            pixel_distance_str:str=layer.GetName().split("_")[-1]
-            lev = layer.GetName().split("_")[-2]
-
-            if pixel_distance_str.startswith("0"):
-                pixel_distance_str="0.{}".format(pixel_distance_str)
-
-            pixel_distance = float(pixel_distance_str)
-
-            table_vacuate = TableVacuate(guid=uuid.uuid1().__str__(),
-                                         table_guid=table_guid,
-                                         level=int(lev),
-                                         name=layer.GetName(),
-                                         pixel_distance=pixel_distance)
-            self.sys_session.add(table_vacuate)
-
-
-    def commit(self):
-        if self.sys_session:
-            self.sys_session.commit()
-        if self.pg_ds:
-            self.pg_ds.CommitTransaction()
-        if self.process_session:
-            self.process_session.commit()
-
-
-    def end(self):
-        if self.sys_session:
-            self.sys_session.close()
-        if self.pg_ds:
-            self.pg_ds.Destroy()
-        if self.process_session:
-            self.process_session.close()
-
-    def rollback(self):
-        if self.sys_session:
-            self.sys_session.rollback()
-        if self.pg_ds:
-            self.pg_ds.RollbackTransaction()
-
-
-
-class VacuateProcess:
-
-    max_level=0
-    fill_dict={}
-    vacuate_layers={}
-    vacuate_layers_gridsize={}
-    pg_ds_dict = {}
-    # 图层要素大于5W才抽稀
-    least_vacuate_count = VacuateConf.least_vacuate_count
-
-    extent=[]
-    is_spatial=False
-
-    lonlat_gridsize = VacuateConf.lonlat_gridsize
-    project_gridsize = VacuateConf.project_gridsize
-
-    # 该抽稀过程使用的grid_size
-    t_grid_size = []
-
-    # 该抽稀过程的抽稀网格
-    this_gridsize=[]
-
-
-    def __init__(self,layer:Layer,table_guid, options,sqlalchemy_uri):
-
-        #是空间图层才初始化
-        if layer.GetExtent()[0] > 0 or layer.GetExtent()[0] < 0:
-
-            self.is_spatial=True
-
-            # 判断需要抽稀多少级
-
-            lc = layer.GetFeatureCount()
-            extent = layer.GetExtent()
-            self.extent=extent
-
-            #判断疏密程度
-            p_x = (extent[1]-extent[0])/10.0
-            p_y = (extent[3] - extent[2]) / 10.0
-            fill_precent=0
-            StructurePrint().print("判断疏密")
-            for ix in range(10):
-                for iy in range(10):
-                    grid_extent = [extent[0]+ix*p_x,extent[0]+ix*p_x+p_x,extent[2]+iy*p_y,extent[2]+iy*p_y+p_y]
-                    poly = GeometryAdapter.envelop_2_polygon(grid_extent)
-
-                    layer.SetSpatialFilter(None)
-                    layer.SetSpatialFilter(poly)
-                    layer.ResetReading()
-                    if layer.GetNextFeature():
-                        fill_precent += 1
-
-            print(fill_precent)
-            StructurePrint().print("判断疏密结束")
-
-            layer.SetSpatialFilter(None)
-            layer.ResetReading()
-            # 固有疏密程度
-            original_density=8
-
-
-            # 额外一层
-            # self.this_gridsize.append(0.000075)
-            # self.max_level += 1
-            ######
-
-            if extent[0]>180:
-                self.t_grid_size=self.project_gridsize
-            else:
-                self.t_grid_size = self.lonlat_gridsize
-
-            for grid_size in self.t_grid_size:
-                # 最少抽稀个数
-                if lc > self.least_vacuate_count:
-                    # 网格数至少大于
-                    if ((extent[1] - extent[0]) * (extent[3] - extent[2])) / (grid_size**2)>self.least_vacuate_count:
-                        # 要素数量大于网格数量
-                        # 要考虑图层的疏密程度，original_density*(100.0/fill_precent) 为疏密指数
-                        if lc * original_density * (100.0/fill_precent)>((extent[1] - extent[0])*(extent[3] - extent[2]))/(grid_size**2) :
-                            print(grid_size)
-                            self.this_gridsize.append(grid_size)
-                            self.max_level += 1
-
-
-
-            # 创建抽稀ds
-            for l in range(self.max_level):
-                # pg_ds_l: DataSource = PGUtil.open_pg_data_source(1, DES.decode(sqlalchemy_uri))
-                if configure.VACUATE_DB_URI:
-                    pg_ds_l: DataSource = PGUtil.open_pg_data_source(1, configure.VACUATE_DB_URI)
-                else:
-                    pg_ds_l: DataSource = PGUtil.open_pg_data_source(1, DES.decode(sqlalchemy_uri))
-                pg_ds_l.StartTransaction()
-                self.pg_ds_dict[l] = pg_ds_l
-
-            # 生成抽稀图层
-            options = options[1:]
-            options.append("OVERWRITE=yes")
-            options.append("LAUNDER=no")
-
-            schema = layer.schema
-            # 增加统计字段
-            schema.append(ogr.FieldDefn("_dcigrid_count_", ogr.OFTInteger))
-            schema.append(ogr.FieldDefn("_dcigrid_name_", ogr.OFTString))
-
-            for l in range(self.max_level):
-                this_grid_len = self.this_gridsize[l]
-
-                self.vacuate_layers_gridsize[l] = this_grid_len
-
-                pg = self.pg_ds_dict[l]
-
-                grid_name = str(this_grid_len)
-                if this_grid_len<1:
-                    grid_name = str(this_grid_len).split(".")[-1]
-                    if this_grid_len.__eq__(0.00008):
-                        grid_name = "00008"
-
-                # 抽稀图层是点面混合的
-                # 抽稀表有固定的命名规则
-                # 抽稀表一定要覆盖
-
-
-                print("{}:{}".format(self.t_grid_size.index(this_grid_len),this_grid_len))
-
-
-                v_ln = "z{}_vacuate_{}_{}".format(table_guid, self.t_grid_size.index(this_grid_len), grid_name)
-                vl = pg.CreateLayer(v_ln, layer.GetSpatialRef(),ogr.wkbUnknown, options)
-                # 抽稀表需要属性
-                vl.CreateFields(schema)
-                self.vacuate_layers[l] = vl
-
-        else:
-            pass
-
-
-    def vacuate(self,g,feature):
-
-        if self.is_spatial:
-
-            # 插入到所有抽稀图层中
-            for level in range(self.max_level):
-
-                center: Geometry = g.Centroid()
-
-                extent = g.GetEnvelope()
-                long_extent= extent[1]-extent[0]
-                lat_extent = extent[3]-extent[2]
-
-                this_grid_len =self.vacuate_layers_gridsize[level]
-                #超大的直接加入
-                # if long_extent > 10*this_grid_len or lat_extent >10*this_grid_len:
-                #     vacuate_layer: Layer = self.vacuate_layers.get(level)
-                #     feat = ogr.Feature(vacuate_layer.GetLayerDefn())
-                #     feat.SetGeometry(g)
-                #     vacuate_layer.CreateFeature(feat)
-                # else:
-
-                row = int((center.GetY() - self.extent[2]) / this_grid_len)
-                col = int((center.GetX() - self.extent[0]) / this_grid_len)
-                key = "{}.{}.{}".format(level, row, col)
-
-                if not self.fill_dict.get(key):
-                    self.fill_dict[key] = 0
-                if self.fill_dict[key] == 0:
-
-                    vacuate_layer: Layer = self.vacuate_layers.get(level)
-                    feat = ogr.Feature(vacuate_layer.GetLayerDefn())
-                    # 如果图形比网格小，直接存储其中心点
-                    if this_grid_len>long_extent and this_grid_len>lat_extent:
-                        feat.SetGeometry(center)
-                    else:
-                        feat.SetGeometry(g)
-
-                    # 复制旧feature属性
-                    field_dict = feature.items()
-                    for field_name in field_dict:
-                        feat.SetField(field_name, field_dict[field_name])
-                    feat.SetField("_dcigrid_name_",".".join(key.split(".")[1:]))
-
-                    vacuate_layer.CreateFeature(feat)
-                    self.fill_dict[key] += 1
-                #超大的还有机会
-                elif (long_extent > 10*this_grid_len or lat_extent >10*this_grid_len) and self.fill_dict[key]<5:
-                    vacuate_layer: Layer = self.vacuate_layers.get(level)
-                    feat = ogr.Feature(vacuate_layer.GetLayerDefn())
-                    feat.SetGeometry(g)
-
-                    # 复制旧feature属性
-                    field_dict = feature.items()
-                    for field_name in field_dict:
-                        feat.SetField(field_name, field_dict[field_name])
-                    feat.SetField("_dcigrid_name_",".".join(key.split(".")[1:]))
-
-                    vacuate_layer.CreateFeature(feat)
-                    self.fill_dict[key] += 1
-                else:
-                    self.fill_dict[key] += 1
-
-    def set_vacuate_count(self):
-        if self.is_spatial:
-            # 插入到所有抽稀图层中
-            for level in range(self.max_level):
-                vacuate_layer: Layer = self.vacuate_layers.get(level)
-                for feat in vacuate_layer:
-                    key = "{}.{}".format(level,feat.GetField("_dcigrid_name_"))
-                    feat.SetField("_dcigrid_count_",self.fill_dict.get(key))
-                    vacuate_layer.SetFeature(feat)
-
-    def end(self):
-        for pg in self.pg_ds_dict.values():
-            pg.Destroy()
-
-    def rollback(self):
-        for pg in self.pg_ds_dict.values():
-            pg.RollbackTransaction()

@@ -6,8 +6,9 @@
 from flask import request
 import uuid
 import os
-
-
+import stat
+import platform
+from app.util.component.StructuredPrint import StructurePrint
 class FileProcess:
     @classmethod
     def save(cls,parent):
@@ -21,9 +22,15 @@ class FileProcess:
         os.makedirs(dir_path)
         #有时候文件最后会多一个"
         filename = file.filename.split('"')[0]
+
         store_file = os.path.join(dir_path, filename)
+        StructurePrint().print(store_file)
+
         file.save(store_file)
 
+        if platform.system().lower() == 'linux':
+            #设置为444权限
+            os.chmod(store_file, stat.S_IRUSR + stat.S_IRGRP + stat.S_IROTH)
         return dir_path, store_file
 
     @classmethod

@@ -36,6 +36,7 @@ class ZipUtil:
                 name_t = names.encode('cp437').decode('gbk')
             except:
                 name_t = names.encode('utf-8').decode('utf-8')
+            # name_t = names
 
             zip_file.extract(names,store_path)
 

+# envvars - default environment variables for apache2ctl
+
+# this won't be correct after changing uid
+unset HOME
+
+# for supporting multiple apache2 instances
+if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then
+	SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}"
+else
+	SUFFIX=
+fi
+
+# Since there is no sane way to get the parsed apache2 config in scripts, some
+# settings are defined via environment variables and then used in apache2ctl,
+# /etc/init.d/apache2, /etc/logrotate.d/apache2, etc.
+export APACHE_RUN_USER=www-data
+export APACHE_RUN_GROUP=www-data
+# temporary state file location. This might be changed to /run in Wheezy+1
+export APACHE_PID_FILE=/var/run/apache2$SUFFIX/apache2.pid
+export APACHE_RUN_DIR=/var/run/apache2$SUFFIX
+export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
+# Only /var/log/apache2 is handled by /etc/logrotate.d/apache2.
+export APACHE_LOG_DIR=/var/log/apache2$SUFFIX
+
+## The locale used by some modules like mod_dav
+export LANG="C.UTF-8"
+## Uncomment the following line to use the system default locale instead:
+export LANG
+
+export TZ="Asia/Shanghai"
+
+## The command to get the status for 'apache2ctl status'.
+## Some packages providing 'www-browser' need '--dump' instead of '-dump'.
+#export APACHE_LYNX='www-browser -dump'
+
+## If you need a higher file descriptor limit, uncomment and adjust the
+## following line (default is 8192):
+#APACHE_ULIMIT_MAX_FILES='ulimit -n 65536'
+
+## If you would like to pass arguments to the web server, add them below
+## to the APACHE_ARGUMENTS environment.
+#export APACHE_ARGUMENTS=''
+
+## Enable the debug mode for maintainer scripts.
+## This will produce a verbose output on package installations of web server modules and web application
+## installations which interact with Apache
+#export APACHE2_MAINTSCRIPT_DEBUG=1

-flask==1.1.2
-SQLAlchemy==1.3.17
-Flask-SQLAlchemy==2.4.3
-gevent==20.9.0
-gunicorn==20.0.4
-flask_cors==3.0.8
-flasgger==0.9.5
-#GDAL==3.2.1
-psycopg2-binary==2.8.5
-pyDes==2.0.1
-gevent-websocket==0.10.1
-opencv-python==4.5.1.48
-mod_wsgi==4.8.0
-thrift==0.13.0
-Authlib==0.13
-kazoo==2.8.0
-paramiko==2.8.0
-requests==2.26.0
-schedule==1.1.0
+flask==1.1.2
+SQLAlchemy==1.3.17
+Flask-SQLAlchemy==2.4.3
+gevent==20.9.0
+gunicorn==20.0.4
+flask_cors==3.0.8
+flasgger==0.9.5
+#GDAL==3.2.1
+psycopg2-binary==2.8.5
+pyDes==2.0.1
+gevent-websocket==0.10.1
+opencv-python==4.5.1.48
+mod_wsgi==4.8.0
+thrift==0.13.0
+Authlib==0.13
+kazoo==2.8.0
+paramiko==2.8.0
+requests==2.26.0
+schedule==1.1.0

@@ -16,7 +16,7 @@ else
   echo "端口设置为$1 ..."
 fi
 
-docker run -d --name $dn -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapdms:3.0 python3 ./run.py
+docker run -d --name $dn -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapserver:build python3 ./run.py
 # 清除未完成的任务任务
 sleep 5
 curl localhost:$port/release
\ No newline at end of file

@@ -33,8 +33,8 @@ fi
 
 #启动容器和apache
 echo "正在启动容器..."
-set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0"
-docker run -it -d --name $container_name $set -p ${port}:80 -p ${port2}:81 -v ${curPath}:/usr/src/app -v ${curPath}/apache2.conf:/etc/apache2/apache2.conf -v ${curPath}/dmapmanager.conf:/etc/apache2/sites-enabled/dmapmanager.conf dci/dmapserver:base
+set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0 -e LAND=C.UTF-8"
+docker run -it -d --name ${container_name} ${set} -p ${port}:80 -p ${port2}:81 -v ${curPath}:/usr/src/app -v ${curPath}/apache2.conf:/etc/apache2/apache2.conf -v ${curPath}/dmapmanager.conf:/etc/apache2/sites-enabled/dmapmanager.conf -v ${curPath}/envvars:/etc/apache2/envvars dci/dmapserver:build
 docker exec -d $container_name service apache2 start
 sleep 5
 curl localhost:$port/release