Merge remote-tracking branch 'origin/master'

lixi
2 parents 6c5ac048 b6d10945
Showing 4 changed files with 27 additions and 130 deletions
commons/api/feedback_customer_disable.py
commons/api/zcApi.py
report/test.log
testcase/test_ZC/demo.py
@@ -5,3 +5,27 @@
 @File ：feedback_customer_disable.py
 @IDE ：PyCharm
 """
+from commons import common as com
+from commons.MySession import my
+
+class feedback_customer_disable():
+    url = "http://test.jmsf.diligrp.com:8385/FeedbackCustomerController/disable.action?id=44"
+
+    header = {
+         "Host": "test.jmsf.diligrp.com:8385", "Connection": "keep-alive", "Content-Length": "0",
+         "Accept": "application/json,text/javascript,*/*;q=0.01", "Origin": "http://test.jmsf.diligrp.com:8385",
+         "X-Requested-With": "XMLHttpRequest",
+         "User-Agent": "Mozilla/5.0(WindowsNT6.2;WOW64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/84.0.4147.105Safari/537.36",
+         "Accept-Language": "zh-CN,zh;q=0.9",
+         "Referer": "http://test.jmsf.diligrp.com:8385/FeedbackCustomerController/list",
+         "Accept-Encoding": "gzip,deflate",
+         "Cookie": "UAP_refreshToken=0e205e78-a656-4a85-a2ba-7226ce898ae5;UAP_firmId=9;UAP_accessToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiJXRUIiLCJuYmYiOjE2Mjc4OTI3MzYsImRhdGEiOiJ7XCJjZWxscGhvbmVcIjpcIjE1NTI2MzY0NDU2XCIsXCJjcmVhdGVkXCI6MTYwODc5NTk0OTAwMCxcImRlcGFydG1lbnRJZFwiOjU2LFwiZW1haWxcIjpcInNoZW55YW5nQGRpbGlncnAuY29tXCIsXCJmaXJtQ29kZVwiOlwic3lcIixcImZpcm1JZFwiOjksXCJmaXJtTmFtZVwiOlwi5rKI6Ziz5Zyw5Yip5Yac5om55biC5Zy65a6i5oi355S15a2Q57uT566X5Lit5b-DXCIsXCJpZFwiOjI1MSxcImxhc3RMb2dpblRpbWVcIjoxNjI3ODY1NTc3OTg5LFwibWV0YWRhdGFcIjp7fSxcIm1vZGlmaWVkXCI6MTYyNjE2MzAwNDAwMCxcInBhc3N3b3JkXCI6XCIxODk2NUVCNzJDOTJBNTQ5RERcIixcInJlYWxOYW1lXCI6XCLmsojpmLNcIixcInNlcmlhbE51bWJlclwiOlwiMDAwXCIsXCJzdGF0ZVwiOjEsXCJzeXN0ZW1UeXBlXCI6MSxcInVzZXJOYW1lXCI6XCI0NDQ0NDRcIn0iLCJpc3MiOiJVQVBfQVVUSDAiLCJleHAiOjE2Mjc4OTQ1MzYsImlhdCI6MTYyNzg5MjczNiwianRpIjoiNDYzMTY0MTUtYmUzYy00NTkzLWI3ODctYjRhZmI3MDQ1ODFiIn0.N5kEGcM9CR09wc3G7fLE0TwkdvO-hM3HQPKEFDUmdmewk-7iHlbzMHuRiY-Z_hPBbhv1v9y8Ibvyh6T6gikkt7C0movQ-oCqdNY-hzOrBZk9Ht-6mbf69zZKHOJv0TXcSs3y265eVviVbgZG6TgrptXWdSBvSt_Q94sfbMsQ7SA"
+
+    }
+    def __init__(self):
+        self.url = feedback_customer_disable.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
+        self.header = feedback_customer_disable.header
+
+fcd = feedback_customer_disable()
+re = my.post(url=fcd.url, headers=fcd.header)
+print(re.json())
 \ No newline at end of file
@@ -7,6 +7,8 @@
 """
 整车进门相关接口
+1.整车进门基础接口封装
+2.整车进门create_jmsf进门单一步创建接口封装
 """
 import json,time,random
-[2021-08-02 16:53:41] [INFO] : ======================================================================================
-[2021-08-02 16:53:41] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
-{"businessCode": "jmsf"}
-{}
-
-[2021-08-02 16:53:41] [INFO] : ======================================================================================
-[2021-08-02 16:53:41] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
-{"marketId": 9, "state": 1, "keyword": "\u5c71\u836f"}
-{}
-
-[2021-08-02 16:53:41] [INFO] : ======================================================================================
-[2021-08-02 16:53:41] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
-{"firmCode": "sy", "departmentId": 58, "keyword": ""}
-{}
-
-[2021-08-02 16:53:42] [INFO] : ======================================================================================
-[2021-08-02 16:53:42] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
-{"pageNum": 100, "pageSize": 100, "marketId": 9}
-{}
-
-[2021-08-02 16:53:42] [INFO] : ======================================================================================
-[2021-08-02 16:53:42] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
-None
-{'params': {'pid': 'goods_tag'}}
-
-[2021-08-02 16:53:42] [INFO] : ======================================================================================
-[2021-08-02 16:53:42] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
-{"province": "C", "city": null, "area": null}
-{}
-
-[2021-08-02 16:53:42] [INFO] : ======================================================================================
-[2021-08-02 16:53:42] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
-{"keyword": ""}
-{}
-
-[2021-08-02 16:53:43] [INFO] : ======================================================================================
-[2021-08-02 16:53:43] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
-None
-{'params': {'pid': 'prove_type'}}
-
-[2021-08-02 16:53:43] [INFO] : ======================================================================================
-[2021-08-02 16:53:43] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
-None
-{}
-
-[2021-08-02 16:53:43] [INFO] : ======================================================================================
-[2021-08-02 16:53:43] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
-{"carTypeCode": "gc", "carTypeId": 59, "carTypeName": "\u6302\u8f66", "carTypeWeight": 1, "plate": "\u5dddB00001", "inGreeterId": 274, "inGreeterName": "\u901a\u7528\u6d4b\u8bd5", "productId": 14156, "productName": "\u5c71\u836f", "proveTypeCode": 1621, "proveTypeName": "\u7eff\u8272\u852c\u83dc", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 21, "grossWeightDate": "2021-08-02 16:53:43", "newWeight": 20, "tareWeight": 1, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddB00001", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 103, "depName": "\u63a5\u8f66\u90e8", "cateId": 14156, "notice": 0, "backSkinTwo": -1, "recordOriginId": 0, "recordOriginName": null, "recordProductId": 0, "recordProductName": null, "recordWeight": null, "codeIc": null, "codeId": 0, "difference": 0, "bindRecordSign": 0, "recordDesc": null, "hasCodeItems": false, "customerId": 0, "customerName": "", "driverIc": null, "driverName": null, "totalPrice": null, "originId": 500101, "origin": "\u4e07\u5dde\u533a", "originCode": "023", "tradeType": "9002", "tradeTypeName": "\u6c88\u96332\u53f7", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": 71, "id": 0, "protocolId": null, "goodsTagId": 1900}
-{}
-
-[2021-08-02 16:53:44] [INFO] : ======================================================================================
-[2021-08-02 16:53:44] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
-{"businessCode": "jmsf"}
-{}
-
-[2021-08-02 16:53:44] [INFO] : ======================================================================================
-[2021-08-02 16:53:44] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
-{"marketId": 9, "state": 1, "keyword": "\u852c\u83dc"}
-{}
-
-[2021-08-02 16:53:45] [INFO] : ======================================================================================
-[2021-08-02 16:53:45] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
-{"firmCode": "sy", "departmentId": 58, "keyword": ""}
-{}
-
-[2021-08-02 16:53:45] [INFO] : ======================================================================================
-[2021-08-02 16:53:45] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
-{"pageNum": 100, "pageSize": 100, "marketId": 9}
-{}
-
-[2021-08-02 16:53:45] [INFO] : ======================================================================================
-[2021-08-02 16:53:45] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
-None
-{'params': {'pid': 'goods_tag'}}
-
-[2021-08-02 16:53:45] [INFO] : ======================================================================================
-[2021-08-02 16:53:45] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
-{"province": "C", "city": null, "area": null}
-{}
-
-[2021-08-02 16:53:46] [INFO] : ======================================================================================
-[2021-08-02 16:53:46] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
-{"keyword": ""}
-{}
-
-[2021-08-02 16:53:46] [INFO] : ======================================================================================
-[2021-08-02 16:53:46] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
-None
-{'params': {'pid': 'prove_type'}}
-
-[2021-08-02 16:53:46] [INFO] : ======================================================================================
-[2021-08-02 16:53:46] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
-None
-{}
-
-[2021-08-02 16:53:47] [INFO] : ======================================================================================
-[2021-08-02 16:53:47] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
-{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddB00002", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 14152, "productName": "\u852c\u83dc", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 353, "grossWeightDate": "2021-08-02 16:53:47", "newWeight": 20, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddB00002", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 14152, "notice": 0, "backSkinTwo": -1, "recordOriginId": 0, "recordOriginName": null, "recordProductId": 0, "recordProductName": null, "recordWeight": null, "codeIc": null, "codeId": 0, "difference": 0, "bindRecordSign": 0, "recordDesc": null, "hasCodeItems": false, "customerId": 0, "customerName": "", "driverIc": null, "driverName": null, "totalPrice": null, "originId": 500101, "origin": "\u4e07\u5dde\u533a", "originCode": "023", "tradeType": "9001", "tradeTypeName": "\u6c88\u96331\u53f7", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": 70, "id": 0, "protocolId": null, "goodsTagId": 663}
-{}
-
@@ -7,33 +7,4 @@
 """
-"""
-
-import json
-import datetime,time
-import urllib
-
-# print(time.localtime())
-import urllib3
-
-# print(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
-
-# a = {"aa":"阿三大苏打","bb":"bb","cc":{"cc1":"啊实打","cc2":"ad"}}
-# print(a)
-# data = {"cc":{"cc1":"2"}}
-# b = dict(a,**data)
-# print(b)
-
-# def doDcit(**kwargs):
-#     a = {"aa": "阿三大苏打", "bb": "bb", "cc": {"cc1": "啊实打","cc2":"ad"}}
-#     print(a)
-#     b = dict(a,**kwargs)
-#     print(b)
-
-a = {"code":"200","data":[{"autoPass":2,"autoSave":1,"carTypeName":"板车","code":"003","id":53,"number":"0007","remark":"","status":1,"tag":"jmsf","weight":333},{"autoPass":1,"autoSave":1,"carTypeName":"挂车","code":"gc","id":59,"number":"0030","remark":"","status":1,"tag":"jmsf","weight":1},{"autoPass":2,"carTypeName":"柜车","code":"23","id":60,"number":"0031","remark":"","status":1,"tag":"jmsf","weight":0},{"autoPass":1,"autoSave":1,"carTypeName":"地排车","code":"008","id":87,"number":"0001","remark":"","status":1,"tag":"jmsf","weight":2},{"autoPass":2,"autoSave":1,"carTypeName":"玉玺","code":"888","id":128,"number":"0042","remark":"","status":1,"tag":"jmsf","weight":0},{"autoPass":2,"carTypeName":"军车","code":"555","id":61,"number":"0013","remark":"","status":1,"tag":"jmsf","weight":0},{"autoPass":2,"carTypeName":"小面包","code":"","id":142,"number":"0008","remark":"","status":1,"tag":"jmsf","weight":22},{"autoPass":1,"autoSave":1,"carTypeName":"小轿车","code":"001","id":51,"number":"0002","remark":"","status":1,"tag":"jmsf","weight":0},{"autoPass":2,"carTypeName":"123456789012345","code":"1245","id":160,"number":"0044","remark":"","status":1,"tag":"jmsf","weight":11},{"autoPass":2,"carTypeName":"111111111222222","code":"6432","id":161,"number":"0045","remark":"","status":1,"tag":"jmsf","weight":22},{"autoPass":2,"autoSave":1,"carTypeName":"test0731","code":"12345","id":162,"number":"0047","remark":"asdf g hgsaf","status":1,"tag":"jmsf","weight":11}],"message":"OK","result":"OK","success":True}
-print(a["data"])
-# lambda file_name: os.path.getmtime(report_path + file_name)
-b = a["data"].index([i for i in a["data"] if i["carTypeName"]=="地排车"][0])
-print(b)
-# c ="2" if b !=None else "1"
-# print(c)
 \ No newline at end of file
+"""
 \ No newline at end of file