在抽稀表中增加抽线表数据库的连接信息

@@ -93,7 +93,8 @@ class TableVacuate(db.Model):
     pixel_distance = Column(Float)
     pixel_distance = Column(Float)
     table_guid = Column(String(256), ForeignKey('dmdms_table.guid'))
     table_guid = Column(String(256), ForeignKey('dmdms_table.guid'))
 
 
-
+    #所在的库
+    connectstr= Column(Text)
 
 
 class Columns(db.Model):
 class Columns(db.Model):
     '''
     '''

@@ -143,6 +143,12 @@ class Api(ApiTemplate):
 
 
 
 
             #新增
             #新增
+            if configure.VACUATE_DB_URI:
+                user, passwd, host, port, datab = PGUtil.get_info_from_sqlachemy_uri(configure.VACUATE_DB_URI)
+            else:
+                user, passwd, host, port, datab = PGUtil.get_info_from_sqlachemy_uri(DES.decode(database.sqlalchemy_uri))
+            connectstr = "hostaddr={} port={} dbname='{}' user='{}' password='{}'".format(host, port, datab, user,
+                                                                                                  passwd)
             for l in range(vacuate_process.max_level):
             for l in range(vacuate_process.max_level):
                 lev = vacuate_process.t_grid_size.index(vacuate_process.this_gridsize[l])
                 lev = vacuate_process.t_grid_size.index(vacuate_process.this_gridsize[l])
 
 
@@ -150,7 +156,8 @@ class Api(ApiTemplate):
                                              table_guid=table.guid,
                                              table_guid=table.guid,
                                              level=lev,
                                              level=lev,
                                              name=vacuate_process.vacuate_layers[l].GetName(),
                                              name=vacuate_process.vacuate_layers[l].GetName(),
-                                             pixel_distance=vacuate_process.this_gridsize[l])
+                                             pixel_distance=vacuate_process.this_gridsize[l],
+                                             connectstr=DES.encode(connectstr))
                 sys_session.add(table_vacuate)
                 sys_session.add(table_vacuate)
 
 
             sys_session.query(Task).filter_by(guid=task_guid).update({"state":1,"update_time":datetime.datetime.now(),
             sys_session.query(Task).filter_by(guid=task_guid).update({"state":1,"update_time":datetime.datetime.now(),

@@ -147,6 +147,12 @@ class Api(ApiTemplate):
 
 
 
 
             #新增
             #新增
+            if configure.VACUATE_DB_URI:
+                user, passwd, host, port, datab = PGUtil.get_info_from_sqlachemy_uri(configure.VACUATE_DB_URI)
+            else:
+                user, passwd, host, port, datab = PGUtil.get_info_from_sqlachemy_uri(DES.decode(database.sqlalchemy_uri))
+            connectstr = "hostaddr={} port={} dbname='{}' user='{}' password='{}'".format(host, port, datab, user,
+                                                                                                  passwd)
             for l in range(vacuate_process.max_level):
             for l in range(vacuate_process.max_level):
                 layer_name = vacuate_process.vacuate_layers[l].GetName()
                 layer_name = vacuate_process.vacuate_layers[l].GetName()
                 lev = layer_name.split("_")[-2]
                 lev = layer_name.split("_")[-2]
@@ -155,7 +161,8 @@ class Api(ApiTemplate):
                                              table_guid=table.guid,
                                              table_guid=table.guid,
                                              level=int(lev),
                                              level=int(lev),
                                              name=layer_name,
                                              name=layer_name,
-                                             pixel_distance=vacuate_process.this_gridsize[l])
+                                             pixel_distance=vacuate_process.this_gridsize[l],
+                                             connectstr=DES.encode(connectstr))
                 sys_session.add(table_vacuate)
                 sys_session.add(table_vacuate)
 
 
             sys_session.query(Task).filter_by(guid=task_guid).update({"state":1,"update_time":datetime.datetime.now(),
             sys_session.query(Task).filter_by(guid=task_guid).update({"state":1,"update_time":datetime.datetime.now(),

@@ -9,7 +9,7 @@ curPath=$(readlink -f $(dirname $0))
 
 
 
 
 #设置日志权限
 #设置日志权限
-chmod -R 777 $curPath/logs/*
+chmod -R 777 $curPath
 
 
 #设置端口
 #设置端口
 port=""
 port=""