|
@@ -80,29 +80,31 @@ class PostgreSQL:
|
|
|
|
|
|
# 保存元数据信息
|
|
|
def insertVectorStorage(self, id, name, year, xmlx, sjly, xzqh, xzqh_field, ywlx, sjlx, sjywz, glbm, table_alias):
|
|
|
- sql = "insert into {} (id, name, year, xmlx, sjly, xzqh, xzqh_field, ywlx, sjlx, sjywz, glbm, table_alias) values ('{}','{}', '{}', '{}', '{}', '{}', '{}', '{}', '{}', '{}', '{}', '{}')".format(
|
|
|
+ sql = "insert into {} (id, name, year, xmlx, sjly, xzqh, xzqh_field, ywlx, sjlx, sjywz, glbm, table_alias) values ('{}','{}', '{}', (select bsm from t_vector_zyml where name = '{}'), '{}', '{}', '{}', '{}', '{}', '{}', '{}', '{}')".format(
|
|
|
self.Vector_Storage, id, name, year.toString("yyyy"), xmlx, sjly, xzqh, xzqh_field, ywlx, sjlx, sjywz, glbm,
|
|
|
table_alias)
|
|
|
self.cur.execute(sql)
|
|
|
self.conn.commit()
|
|
|
|
|
|
# 元数据入库,参数parameters
|
|
|
- def metadataStorage(self, parameters, ssxzqh, fileliststr, ywlx, glbm, ogrLayer):
|
|
|
+ def metadataStorage(self, parameters, ssxzqh, fileliststr, ywlx, glbm, ogrLayer, zyml):
|
|
|
record_id = ""
|
|
|
id = uuid.uuid4().__str__()
|
|
|
id = id.replace("-", "")
|
|
|
# print(parameters)
|
|
|
if (parameters.get("TABLE") is None or parameters.get("TABLE") == "") and ogrLayer is not None:
|
|
|
- record_id = parameters.get("SCHEMA") + "." + getInputFileName(ogrLayer)
|
|
|
+ record_id = parameters.get("SCHEMA") + "." + getInputFileName(ogrLayer).lower()
|
|
|
else:
|
|
|
record_id = parameters.get("SCHEMA") + "." + parameters.get("TABLE")
|
|
|
table_alias = parameters.get("TABLE_ALIAS")
|
|
|
if table_alias != '' and table_alias is not None: # 配置表别名
|
|
|
self.setTableAlias(table=self.getTableName(recordid=record_id),
|
|
|
alias=table_alias)
|
|
|
+ else:
|
|
|
+ table_alias = ''
|
|
|
self.deleteVectorStorage(name=record_id)
|
|
|
self.insertVectorStorage(id=id, name=record_id, year=parameters.get("VECTOR_YEAR"),
|
|
|
- xmlx=parameters.get("VECTOR_XMLX"), sjly=parameters.get("VECTOR_SJLY"),
|
|
|
+ xmlx=zyml, sjly=parameters.get("VECTOR_SJLY"),
|
|
|
xzqh=ssxzqh, xzqh_field=parameters.get("XZQH_FIELD"),
|
|
|
ywlx=ywlx, sjlx=parameters.get("SOURCE_TYPE"), sjywz=ogrLayer,
|
|
|
glbm=glbm, table_alias=table_alias)
|
|
@@ -175,6 +177,12 @@ class PostgreSQL:
|
|
|
rows = self.cur.fetchall()
|
|
|
return rows
|
|
|
|
|
|
+ def getVectorZyml(self):
|
|
|
+ self.cur.execute(
|
|
|
+ "select bsm,name from t_vector_zyml t order by t.sort,t.name")
|
|
|
+ rows = self.cur.fetchall()
|
|
|
+ return rows
|
|
|
+
|
|
|
# 获取行政区划
|
|
|
def getXzqh(self):
|
|
|
self.cur.execute(
|
|
@@ -198,8 +206,8 @@ class PostgreSQL:
|
|
|
|
|
|
# 根据用户名称查询有权限维护的数据库表,返回别名或者表名
|
|
|
def getManagerTables(self, username):
|
|
|
- sql = f'select t.id "id",name "name", case when t.table_alias is not null then t.table_alias else t.name end as "alias", t.ywlx "ywlx" ' \
|
|
|
- f'from {self.Vector_Storage} t where t.glbm = (select dept_name from sys_dept d where d.dept_id = (select dept_id from sys_user u where u.user_name = \'{username}\' ))'
|
|
|
+ sql = f'select t.id "id",name "name", case when t.table_alias != \'\' then t.table_alias else t.name end as "alias", t.ywlx "ywlx" ' \
|
|
|
+ f'from {self.Vector_Storage} t where t.glbm = (select dept_name from sys_dept d where d.dept_id = (select dept_id from sys_user u where u.user_name = \'{username}\' )) and t.sjlx = \'vector\''
|
|
|
self.cur.execute(sql)
|
|
|
rows = self.cur.fetchall()
|
|
|
return rows
|