[交委项目]新增风险管理相关用例

common/db.py

@@ -96,7 +96,9 @@ if __name__ == '__main__':
     mysql_config=("10.197.236.190", 3306, "root", "123456", "")
     mysql_config=("10.197.236.190", 3306, "root", "123456", "")
     # mysql = MYSQL(host="10.197.236.190", port=3306, user="root", pwd="123456", db="edl_private")
     # mysql = MYSQL(host="10.197.236.190", port=3306, user="root", pwd="123456", db="edl_private")
     mysql = MYSQL(*mysql_config)
     mysql = MYSQL(*mysql_config)
-    info = mysql.ExecuQuery("SELECT * FROM db_tbd_base1.project;")
+    # info = mysql.ExecuQuery("SELECT * FROM db_tbd_base1.project;")
+    info = mysql.ExecuQuery( "select id from db_tbd_base1.risk_info where risk_name='自动化新增';")
+
     print(info)
     print(info)
 
 
     # r = RedisString(0).get('bmc:captcha:1ad7d0e9-1e01-454c-8500-d7b5b15c90ff')
     # r = RedisString(0).get('bmc:captcha:1ad7d0e9-1e01-454c-8500-d7b5b15c90ff')

test_case/safe_transportation/jgd/test_riskManagement.py

@@ -49,12 +49,13 @@ def riskPointdelete():
     yield
     yield
     mysql = MYSQL(*BaseConfig.test_mysql)
     mysql = MYSQL(*BaseConfig.test_mysql)
     mysql.ExecuNonQuery("delete from db_tbd_base1.risk_info where risk_name like '自动化新增%'")
     mysql.ExecuNonQuery("delete from db_tbd_base1.risk_info where risk_name like '自动化新增%'")
-
+    mysql.ExecuNonQuery("delete from db_tbd_base1.risk_info_comment where content like '自动化测试%'")
 @allure.description("author:taoke")
 @allure.description("author:taoke")
 @pytest.mark.usefixtures("riskPointdelete")
 @pytest.mark.usefixtures("riskPointdelete")
 class TestRiskMan():
 class TestRiskMan():
     workBook = xlrd.open_workbook(f'{BaseConfig.root_path}/test_case_data/safe_transportation/jgd_riskCase.xlsx')
     workBook = xlrd.open_workbook(f'{BaseConfig.root_path}/test_case_data/safe_transportation/jgd_riskCase.xlsx')
 
 
+    @pytest.mark.run(order=661)  # 需要在绑定用例之后
     @allure.story("风险规则配置")
     @allure.story("风险规则配置")
     @allure.title("{inData[testPoint]}")
     @allure.title("{inData[testPoint]}")
     @allure.testcase("http://yapi.hikcreate.com/project/336/interface/api/73931")
     @allure.testcase("http://yapi.hikcreate.com/project/336/interface/api/73931")
@@ -110,8 +111,67 @@ class TestRiskMan():
         else:
         else:
             assert res['code'] == expectData['code']
             assert res['code'] == expectData['code']
 
 
+    # @pytest.mark.pppp
+    @allure.story("风险时间配置")
+    @allure.title("{inData[testPoint]}")
+    # @allure.testcase("")
+    @pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskTime"))
+    def test_riskTime(self, inData):
+        url = f"{SafeTransportationConfig().SSO_url}{inData['url']}"
+        headers = inData['headers']
+        method = inData['method']
+        data = inData['reqData']
+        expectData = inData['expectData']
+        res = request_main(url, headers, method, data)
+        allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
+        assert res['code'] == expectData['code']
+
+    # @pytest.mark.pppp
+    @allure.story("风险基础查询")
+    @allure.title("{inData[testPoint]}")
+    # @allure.testcase("")
+    @pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskBase"))
+    def test_riskBase(self, inData):
+        url = f"{SafeTransportationConfig().SSO_url}{inData['url']}"
+        headers = inData['headers']
+        method = inData['method']
+        data = inData['reqData']
+        expectData = inData['expectData']
+        res = request_main(url, headers, method, data)
+        allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
+        assert res['code'] == expectData['code']
 
 
+    # @pytest.mark.pppp
+    @allure.story("风险备注配置")
+    @allure.title("{inData[testPoint]}")
+    # @allure.testcase("")
+    @pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskComments"))
+    def test_riskComments(self, inData):
+        url = f"{SafeTransportationConfig().SSO_url}{inData['url']}"
+        headers = inData['headers']
+        method = inData['method']
+        data = inData['reqData']
+        expectData = inData['expectData']
+        res = request_main(url, headers, method, data)
+        allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
+        assert res['code'] == expectData['code']
 
 
+    @pytest.mark.run(order=662)  # 设置顺序为了在新增风险后执行
+    @allure.story("风险备注配置")
+    @allure.title("{inData[testPoint]}")
+    # @allure.testcase("")
+    @pytest.mark.parametrize("inData", get_excelData(workBook, "风险管理中心", "riskcommentCreate"))
+    def test_riskcommentCreate(self, inData,riskPointID):
+        url = f"{SafeTransportationConfig().SSO_url}{inData['url']}"
+        headers = inData['headers']
+        method = inData['method']
+        data = inData['reqData']
+        expectData = inData['expectData']
+        # 请求的风险id修改为新增的风险
+        data["parentRiskId"] = riskPointID
+        res = request_main(url, headers, method, data)
+        allure.attach(f"{res}", "响应结果", allure.attachment_type.TEXT)
+        assert res['code'] == expectData['code']
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     for one in os.listdir('../../../report/tmp'):
     for one in os.listdir('../../../report/tmp'):