Commit efdcd111 authored by wanli's avatar wanli

🐞 fix(设备管理模块): 设备管理权限划分

parent 150b6bc7
''' '''
Author: your name Author: your name
Date: 2021-07-15 09:33:39 Date: 2021-07-15 09:33:39
LastEditTime: 2021-07-19 18:21:58 LastEditTime: 2021-07-22 10:27:05
LastEditors: Please set LastEditors LastEditors: Please set LastEditors
Description: In User Settings Edit Description: In User Settings Edit
FilePath: \evm-store\tools\build_out\controllers\device.py FilePath: \evm-store\tools\build_out\controllers\device.py
...@@ -28,10 +28,14 @@ class DeviceResource(object): ...@@ -28,10 +28,14 @@ class DeviceResource(object):
return result, ResponseCode.HTTP_SUCCESS return result, ResponseCode.HTTP_SUCCESS
return None, ResponseCode.HTTP_NOT_FOUND return None, ResponseCode.HTTP_NOT_FOUND
def getList(self, params): def getList(self, params, jwt={}):
# handle business # handle business
user = UserModel.query.filter(UserModel.uuid==jwt.get("uuid"), UserModel.is_delete==False).one_or_none()
if not user:
return False, ResponseCode.USER_NOT_EXISTS
logger.warn(params) logger.warn(params)
filters = [DeviceModel.is_delete==False] filters = [DeviceModel.is_delete==False, DeviceModel.create_by==user.id]
if params.get("type"): filters.append(DeviceModel.type==params.get("type")) if params.get("type"): filters.append(DeviceModel.type==params.get("type"))
if params.get("name"): filters.append(DeviceModel.name==params.get("name")) if params.get("name"): filters.append(DeviceModel.name==params.get("name"))
if params.get("imei"): filters.append(DeviceModel.imei==params.get("imei")) if params.get("imei"): filters.append(DeviceModel.imei==params.get("imei"))
......
...@@ -26,6 +26,7 @@ class DeviceResourceList(Resource): ...@@ -26,6 +26,7 @@ class DeviceResourceList(Resource):
args = self.parser.parse_args() args = self.parser.parse_args()
try: try:
jwt = get_jwt_identity()
data = dict() data = dict()
for key, value in args.items(): for key, value in args.items():
if value != None: if value != None:
...@@ -34,7 +35,7 @@ class DeviceResourceList(Resource): ...@@ -34,7 +35,7 @@ class DeviceResourceList(Resource):
# logger.warn(json_payload) # logger.warn(json_payload)
# data = getListDeviceSchema.load(json_payload) # data = getListDeviceSchema.load(json_payload)
logger.info(data) logger.info(data)
result, message = signalManager.actionGetListDevice.emit(data) result, message = signalManager.actionGetListDevice.emit(data, jwt)
json_dumps = getListDeviceSchema.dump(result) json_dumps = getListDeviceSchema.dump(result)
if result: if result:
json_dumps = getListDevicesSchema.dump(result.items) json_dumps = getListDevicesSchema.dump(result.items)
......
...@@ -209,6 +209,9 @@ export default { ...@@ -209,6 +209,9 @@ export default {
}, },
handleTableChange(pagination, filters, sorter) { handleTableChange(pagination, filters, sorter) {
console.log(pagination, filters, sorter); console.log(pagination, filters, sorter);
this.post.page = pagination.current;
this.post.pageSize = pagination.pageSize;
this.getDataList();
}, },
getDataList() { getDataList() {
this.loading = true; this.loading = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment