ok

jobs/yst_job.py

@@ -13,5 +13,15 @@ from common import YzyApi
 from config import settings
 import traceback
 
-def daiban_proc(db = get_local_db()):
-    logger.info(datetime.now())
+def daiban_proc():
+    with get_local_db() as db:
+        logger.info(datetime.now())
+        db.query(YstQyjcxxEntity).update({"update_time": datetime.now()})
+        db.commit()
+
+        db.query(YstQyyjyaEntity).update({"update_time": datetime.now()})
+        db.commit()
+        
+        db.query(YstYjylzjEntity).update({"update_time": datetime.now()})
+        db.commit()
+    

models/yzy_base.py

@@ -107,6 +107,7 @@ class YstYhpcsbEntity(Base):
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
     bzid = Column(String, default='')
     sfzh = Column(String, default='')
+    xm = Column(String, default='')
     qymc = Column(String, default='')
     qydz = Column(String, default='')
     qyjb = Column(String, default='')
@@ -141,6 +142,7 @@ class YstQyjcxxEntity(Base):
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
     bzid = Column(String, default='')
     sfzh = Column(String, default='')
+    xm = Column(String, default='')
     qymc = Column(String, default='')
     qydz = Column(String, default='')
     qyjb = Column(String, default='')
@@ -160,13 +162,14 @@ class YstQyjcxxEntity(Base):
 class YstQyyjyaEntity(Base):
 
     """
-    粤商通_应急企业基础信息
+    粤商通_企业应急预案信息
     """
     __tablename__ = "yst_qyyjya"
 
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
     bzid = Column(String, default='')
     sfzh = Column(String, default='')
+    xm = Column(String, default='')
     qymc = Column(String, default='')
     qydz = Column(String, default='')
     qyjb = Column(String, default='')
@@ -198,6 +201,7 @@ class YstYjylzjEntity(Base):
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
     bzid = Column(String, default='')
     sfzh = Column(String, default='')
+    xm = Column(String, default='')
     qymc = Column(String, default='')
     qydz = Column(String, default='')
     qyjb = Column(String, default='')

routers/api/yst/qyjcxx.py

@@ -33,6 +33,7 @@ async def accept(
         zrrdh = get_req_param(param, 'zrrdh')
 
         sfzh = ext_info['cid']
+        xm = ext_info['name']
     
         redis_key = "mmyj_yhxx_" + uuid_str
         yhxx_info = redis_get_json(redis_key)
@@ -56,6 +57,7 @@ async def accept(
         db_entity = YstQyjcxxEntity()
         db_entity.bzid = uuid_str
         db_entity.sfzh = sfzh
+        db_entity.xm = xm
         db_entity.qymc = qymc
         db_entity.qydz = qydz
         db_entity.qyjb = qyjb

routers/api/yst/qyyjya.py

@@ -25,6 +25,8 @@ async def accept(
         print(param)
 
         sfzh = ext_info['cid']
+        xm = ext_info['name']
+        
 
         redis_key = "mmyj_yhxx_" + bzid
         yhxx_info = redis_get_json(redis_key)
@@ -48,6 +50,7 @@ async def accept(
         new_yhpcsb = YstQyyjyaEntity(
             bzid = bzid,
             sfzh = sfzh,
+            xm = xm,
             qymc = get_req_param(param, 'qymc'),
             qydz = get_req_param(param, 'qydz'),
             qyjb = get_req_param(param, 'qyjb'),

routers/api/yst/yhpcsb.py

@@ -24,6 +24,7 @@ async def accept(
         print(param)
 
         sfzh = ext_info['cid']
+        xm = ext_info['name']
 
         redis_key = "mmyj_yhxx_" + bzid
         yhxx_info = redis_get_json(redis_key)
@@ -47,6 +48,7 @@ async def accept(
         new_yhpcsb = YstYhpcsbEntity(
             bzid = bzid,
             sfzh = sfzh,
+            xm = xm,
             qymc = get_req_param(param, 'qymc'),
             qydz = get_req_param(param, 'qydz'),
             qyjb = get_req_param(param, 'qyjb'),
@@ -129,6 +131,7 @@ async def detail(
         bzid = row.bzid
         data = get_model_dict(row)
         data["create_time"] = get_datetime_str(row.create_time)
+        data["update_time"] = get_datetime_str(row.update_time)
 
         qtFile = []
         imageUrls = []

routers/api/yst/yjylzj.py

@@ -25,6 +25,7 @@ async def accept(
         print(param)
 
         sfzh = ext_info['cid']
+        xm = ext_info['name']
 
         redis_key = "mmyj_yhxx_" + bzid
         yhxx_info = redis_get_json(redis_key)
@@ -48,6 +49,7 @@ async def accept(
         new_yhpcsb = YstYjylzjEntity(
             bzid = bzid,
             sfzh = sfzh,
+            xm = xm,
             qymc = get_req_param(param, 'qymc'),
             qydz = get_req_param(param, 'qydz'),
             qyjb = get_req_param(param, 'qyjb'),