2022.02.16 修复数据库同步导致属性列名变小写的问题

@@ -164,7 +164,7 @@ class Api(ApiTemplate):
 
 
                 for i in range(feature_defn.GetFieldCount()):
                 for i in range(feature_defn.GetFieldCount()):
                     field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
                     field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
-                    field_name = field_defn.GetName().lower()
+                    field_name = field_defn.GetName()
                     field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                     field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                         "") else field_defn.GetAlternativeName()
                         "") else field_defn.GetAlternativeName()
                     column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,
                     column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,

@@ -106,6 +106,7 @@ class Api(ApiTemplate):
                 if not ds:
                 if not ds:
                     raise Exception("打开数据失败！")
                     raise Exception("打开数据失败！")
                 for i in range(ds.GetLayerCount()):
                 for i in range(ds.GetLayerCount()):
+
                     layer: Layer = ds.GetLayer(i)
                     layer: Layer = ds.GetLayer(i)
 
 
                     layer_name[layer.GetName()] = layer.GetName()
                     layer_name[layer.GetName()] = layer.GetName()

@@ -358,12 +358,16 @@ class ThisTask:
         feature_defn: FeatureDefn = layer.GetLayerDefn()
         feature_defn: FeatureDefn = layer.GetLayerDefn()
 
 
         for i in range(feature_defn.GetFieldCount()):
         for i in range(feature_defn.GetFieldCount()):
+
             field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
             field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
             field_name = field_defn.GetName()
             field_name = field_defn.GetName()
+
             field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
             field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                 "") else field_defn.GetAlternativeName()
                 "") else field_defn.GetAlternativeName()
+
             column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,
             column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,
                              name=field_name, alias=field_alias, create_time=this_time, update_time=this_time)
                              name=field_name, alias=field_alias, create_time=this_time, update_time=this_time)
+
             self.sys_session.add(column)
             self.sys_session.add(column)
         return table_guid
         return table_guid
 
 

@@ -250,7 +250,7 @@ class Api(ApiTemplate):
 
 
                 for i in range(feature_defn.GetFieldCount()):
                 for i in range(feature_defn.GetFieldCount()):
                     field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
                     field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
-                    field_name = field_defn.GetName().lower()
+                    field_name = field_defn.GetName()
                     field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                     field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                         "") else field_defn.GetAlternativeName()
                         "") else field_defn.GetAlternativeName()
                     column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,
                     column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,
@@ -337,7 +337,7 @@ class Api(ApiTemplate):
                 # 增加列
                 # 增加列
                 for i in range(feature_defn.GetFieldCount()):
                 for i in range(feature_defn.GetFieldCount()):
                     field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
                     field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
-                    field_name = field_defn.GetName().lower()
+                    field_name = field_defn.GetName()
                     db_columns_names.append(field_name)
                     db_columns_names.append(field_name)
 
 
                     if field_name not in columns_names:
                     if field_name not in columns_names:

@@ -484,7 +484,7 @@ def add_spatail_table(database,pg_ds,sys_session,spatial_tables_names,this_time,
 
 
             for i in range(feature_defn.GetFieldCount()):
             for i in range(feature_defn.GetFieldCount()):
                 field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
                 field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
-                field_name = field_defn.GetName().lower()
+                field_name = field_defn.GetName()
                 field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                 field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                     "") else field_defn.GetAlternativeName()
                     "") else field_defn.GetAlternativeName()
                 column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,
                 column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,
@@ -571,7 +571,7 @@ def edit_spatial_table(pg_ds,sys_session,spatial_tables,db_tables_names,this_tim
             # 增加列
             # 增加列
             for i in range(feature_defn.GetFieldCount()):
             for i in range(feature_defn.GetFieldCount()):
                 field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
                 field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
-                field_name = field_defn.GetName().lower()
+                field_name = field_defn.GetName()
                 db_columns_names.append(field_name)
                 db_columns_names.append(field_name)
 
 
                 if field_name not in columns_names:
                 if field_name not in columns_names:

@@ -12,7 +12,7 @@ import platform
 import datetime
 import datetime
 import uuid
 import uuid
 from app.util.component.UserCheck import UserCheck
 from app.util.component.UserCheck import UserCheck
-
+import requests
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "停止任务"
     api_name = "停止任务"
     def para_check(self):
     def para_check(self):
@@ -35,11 +35,21 @@ class Api(ApiTemplate):
                     exec_result = os.popen('taskkill.exe /pid:' + str(pid))
                     exec_result = os.popen('taskkill.exe /pid:' + str(pid))
 
 
                 else:
                 else:
-                    #分布式下，很难吧，还需要记录机器，分布式是不可行的
-                    os.kill(pid,signal.SIGILL)
+                    if task.task_type == 5:
+                        url = "{}/API/Image/TaskKill".format(task.parameter)
+                        StructurePrint().print(url)
+                        response: requests.Response = requests.post(url, {"pid":pid})
+                        if response.status_code == 200:
+                            if response.json()["result"]:
+                                pass
+                            else:
+                                raise Exception(response.json()["msg"])
+                        else:
+                            raise Exception("影像服务器连接失败！")
+                    else:
+                        os.kill(pid,signal.SIGILL)
             except Exception as e:
             except Exception as e:
-                StructurePrint.print("Kill task 失败")
-                raise e
+                StructurePrint().print("Kill task 失败")
 
 
             #处理kill任务后的事情
             #处理kill任务后的事情
             self.fix_task(task)
             self.fix_task(task)

@@ -21,7 +21,9 @@ class Api(ApiTemplate):
             task_guid = self.para.get("task_guid")
             task_guid = self.para.get("task_guid")
             msg = self.para.get("msg")
             msg = self.para.get("msg")
             task:Task = Task.query.filter_by(guid=task_guid)
             task:Task = Task.query.filter_by(guid=task_guid)
-            task.update(json.loads(self.para.get("update")))
+            update = json.loads(self.para.get("update"))
+            update["update_time"] = datetime.datetime.now()
+            task.update(update)
 
 
             if msg:
             if msg:
                 message = "{} {}".format(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), msg)
                 message = "{} {}".format(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), msg)

@@ -38,7 +38,8 @@ class Api(ApiTemplate):
                         state=0,
                         state=0,
                         task_type=5,
                         task_type=5,
                         creator=self.para.get("creator"),
                         creator=self.para.get("creator"),
-                        process="影像创建金字塔中")
+                        process="影像创建金字塔中",
+                        parameter=self.para.get("url"))
 
 
             db.session.add(task)
             db.session.add(task)
             db.session.commit()
             db.session.commit()

-# coding=utf-8
-#author:        4N
-#createtime:    2021/7/19
-#email:         nheweijun@sina.com
-
-import configure
-from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.StructurePrint import StructurePrint
-from app.models import db
-from app.modules.data.models import Task
-import multiprocessing
-import uuid
-import datetime
-import requests
-from app.util.component.TaskController import TaskController
-from app.util.component.TaskWriter import TaskWriter
-class Api(ApiTemplate):
-
-    api_name = "创建影像金字塔"
-
-    def process(self):
-
-        # 返回结果
-        res = {}
-        try:
-            task_guid = uuid.uuid1().__str__()
-
-
-            pyramid_process = multiprocessing.Process(target=self.task, args=(task_guid,self.para))
-            pyramid_process.start()
-
-            task = Task(guid=task_guid,
-                        name="{}构建影像金字塔".format(self.para.get("alias")),
-                        create_time=datetime.datetime.now(),
-                        state=0,
-                        task_type=5,
-                        creator=self.para.get("creator"),
-                        process="影像创建金字塔中",
-                        task_pid=pyramid_process.pid)
-
-            db.session.add(task)
-            db.session.commit()
-
-            res["data"] = "创建影像金字塔任务已提交！"
-            res["result"] = True
-
-        except Exception as e:
-            raise Exception("数据库错误！")
-
-        return res
-
-
-    def task(self,task_guid,para):
-        task_writer = None
-        try:
-
-            #任务控制,等待执行
-            TaskController.wait(task_guid)
-            task_writer = TaskWriter(task_guid)
-
-            task_writer.update_task({"state":2,"update_time":datetime.datetime.now(),"process" : "创建中"})
-            task_writer.update_process("开始创建...")
-
-            url = "{}/API/Service/Image/BuildPyramid".format(para.get("url"))
-
-            # s = requests.session()
-            # s.keep_alive = True
-            # s.post()
-
-            self.para["from"] = configure.deploy_ip_host
-
-            response:requests.Response = requests.post(url,data=self.para)
-
-            if response.status_code==200:
-                if not response.json().get("result"):
-                    raise Exception("由于{}，影像服务修改失败！".format(response.json().get("msg")))
-
-                task_writer.update_task({"state":1,"update_time":datetime.datetime.now(),"process" : "创建完成"})
-                task_writer.update_process("创建完成！")
-            else:
-                raise Exception("影像服务器连接失败！")
-        except Exception as e:
-            try:
-                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "创建失败"})
-                task_writer.update_process(e.__str__())
-                task_writer.update_process("任务中止！")
-            except Exception as ee:
-                StructurePrint().print(ee.__str__())
-            raise e
-        finally:
-            try:
-                task_writer.close()
-            except Exception as e:
-                StructurePrint().print(e.__str__())
-
-
-    api_doc = {
-        "tags": ["影像服务接口"],
-        "parameters": [
-            {"name": "guid",
-             "in": "formData",
-             "type": "string",
-             "description": "guid"},
-            {"name": "url",
-             "in": "formData",
-             "type": "string",
-             "description": "url"},
-            {"name": "alias",
-             "in": "formData",
-             "type": "string",
-             "description": "影像alias"},
-        ],
-        "responses": {
-            200: {
-                "schema": {
-                    "properties": {
-                    }
-                }
-            }
-        }
-    }
-

 Listen 81
 Listen 81
 <VirtualHost *:81>
 <VirtualHost *:81>
-    ServerName 172.26.60.100
+    ServerName 172.26.60.101
     WSGIDaemonProcess yourapplication processes=4 threads=16
     WSGIDaemonProcess yourapplication processes=4 threads=16
     WSGIScriptAlias / /usr/src/app/run.wsgi
     WSGIScriptAlias / /usr/src/app/run.wsgi
     WSGIPassAuthorization On
     WSGIPassAuthorization On
@@ -14,7 +14,7 @@ Listen 81
 </VirtualHost>
 </VirtualHost>
 Listen 82
 Listen 82
 <VirtualHost *:82>
 <VirtualHost *:82>
-    ServerName 172.26.60.100
+    ServerName 172.26.60.101
     WSGIDaemonProcess monitormanager processes=1 threads=8
     WSGIDaemonProcess monitormanager processes=1 threads=8
     WSGIScriptAlias / /usr/src/app/monitor.wsgi
     WSGIScriptAlias / /usr/src/app/monitor.wsgi
     WSGIPassAuthorization On
     WSGIPassAuthorization On

@@ -7,7 +7,7 @@ from osgeo import gdal,osr,ogr
 from osgeo.gdal import *
 from osgeo.gdal import *
 from osgeo.ogr import *
 from osgeo.ogr import *
 
 
-
+import os
 import json
 import json
 
 
 
 
@@ -65,9 +65,18 @@ def getInfo( path):
     return json.dumps(info)
     return json.dumps(info)
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
+    data_path = r"E:\Data\矢量数据\广州\广州\dataset.gdb"
+
+    driver: Driver = ogr.GetDriverByName("OpenFileGDB")
+    ds: DataSource = driver.Open(data_path, 0)
+    layer : Layer = ds.GetLayer(0)
+
+
+    print(layer.GetMetadata())
+    print(layer.GetDescription())
+    print(layer.GetStyleTable())
 
 
-    path = r"E:\Data\zh.gdb"
-    print(getInfo(path))
+    print(ds.GetStyleTable())