hk-cdp 1.0.76__tar.gz → 1.0.78__tar.gz

{hk_cdp-1.0.76 → hk_cdp-1.0.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk_cdp
-Version: 1.0.76
+Version: 1.0.78
 Summary: hk cdp
 Home-page: http://gitlab.tdtech.gao7.com/newfire/hk_cap/hk_cdp/server/hk_cdp.git
 Author: seven

{hk_cdp-1.0.76 → hk_cdp-1.0.78}/hk_cdp/models/db_models/cdp/cdp_work_info_model.py

@@ -21,40 +21,43 @@ class CdpWorkInfoModel(CacheModel):
         self.db.context = context
 
     # 方法扩展请继承此类
-    
-    def start_work(self, store_id, work_name, progress_type=0, dependency_key=''):
+
+    def start_work(self, store_id, work_name, progress_type=0, dependency_key='', scheme_id=0):
         """
         开始作业
         :param store_id: 店铺标识
         :param work_name: 作业名称
         :param progress_type: 当前进度值
         :param dependency_key: 依赖建
+        :param scheme_id: 体系标识
         :return: 
         """
         if progress_type == 0:
-            self.update_table("run_start_date=%s,progress_type=1", "store_id=%s and work_name=%s", params=[TimeHelper.get_now_format_time(), store_id, work_name])
+            self.update_table("run_start_date=%s,progress_type=1", "scheme_id=%s and store_id=%s and work_name=%s", params=[TimeHelper.get_now_format_time(), scheme_id, store_id, work_name])
             self.delete_dependency_key(dependency_key)
-    
-    def end_work(self, store_id, work_name, run_desc='处理结束', dependency_key=''):
+
+    def end_work(self, store_id, work_name, run_desc='处理结束', dependency_key='', scheme_id=0):
         """
         结束作业
         :param store_id: 店铺标识
         :param work_name: 作业名称
         :param run_desc: 运行描述
         :param dependency_key: 依赖建
+        :param scheme_id: 体系标识
         :return: 
         """
-        self.update_table("run_desc=%s,run_end_date=%s,progress_type=2", "store_id=%s and work_name=%s", params=[run_desc, TimeHelper.get_now_format_time(), store_id, work_name])
+        self.update_table("run_desc=%s,run_end_date=%s,progress_type=2", "scheme_id=%s and store_id=%s and work_name=%s", params=[run_desc, TimeHelper.get_now_format_time(), scheme_id, store_id, work_name])
         self.delete_dependency_key(dependency_key)
-    
-    def run_work(self, store_id, work_name):
+
+    def run_work(self, store_id, work_name, scheme_id=0):
         """
         运行作业
         :param store_id: 店铺标识
         :param work_name: 作业名称
+        :param scheme_id: 体系标识
         :return: 
         """
-        return self.update_table("run_last_date=%s", "store_id=%s and work_name=%s", params=[TimeHelper.get_now_format_time(), store_id, work_name])
+        return self.update_table("run_last_date=%s", "scheme_id=%s and store_id=%s and work_name=%s", params=[TimeHelper.get_now_format_time(), scheme_id, store_id, work_name])
 
 
 class CdpWorkInfo:
@@ -63,6 +66,7 @@ class CdpWorkInfo:
         super(CdpWorkInfo, self).__init__()
         self.id = 0  # id
         self.business_id = 0  # 商家标识
+        self.scheme_id = 0  # 体系标识
         self.store_id = 0  # 店铺标识
         self.work_name = ""  # 作业名称(对应函数名)
         self.work_desc = ""  # 作业描述
@@ -78,7 +82,7 @@ class CdpWorkInfo:
     @classmethod
     def get_field_list(self):
         return [
-            'id', 'business_id', 'store_id', 'work_name', 'work_desc',
+            'id', 'business_id', 'scheme_id', 'store_id', 'work_name', 'work_desc',
             'is_open', 'progress_type', 'step_value', 'run_desc',
             'run_start_date', 'run_end_date', 'run_last_date', 'create_date'
         ]

{hk_cdp-1.0.76 → hk_cdp-1.0.78}/hk_cdp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hk-cdp
-Version: 1.0.76
+Version: 1.0.78
 Summary: hk cdp
 Home-page: http://gitlab.tdtech.gao7.com/newfire/hk_cap/hk_cdp/server/hk_cdp.git
 Author: seven

{hk_cdp-1.0.76 → hk_cdp-1.0.78}/setup.py

@@ -14,7 +14,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setup(
     name="hk_cdp",
-    version="1.0.76",
+    version="1.0.78",
     author="seven",
     author_email="tech@gao7.com",
     description="hk cdp",