Commit 3ae63120 authored by 赵啸非's avatar 赵啸非

修改同步用户

parent 00e970b4
...@@ -69,7 +69,6 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M ...@@ -69,7 +69,6 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
if (!ObjectUtils.isEmpty(query.getDeviceCode())) { if (!ObjectUtils.isEmpty(query.getDeviceCode())) {
//根据设备编码 查询房间room //根据设备编码 查询房间room
RoomDeviceEntity roomEntity = roomDeviceService.selectOne(new RoomDeviceQuery().deviceCode(query.getDeviceCode())); RoomDeviceEntity roomEntity = roomDeviceService.selectOne(new RoomDeviceQuery().deviceCode(query.getDeviceCode()));
//RoomEntity roomEntity = roomService.selectOne(new RoomQuery().deviceCode(query.getDeviceCode()));
if (!ObjectUtils.isEmpty(roomEntity)) { if (!ObjectUtils.isEmpty(roomEntity)) {
query.setRoomId(roomEntity.getId()); query.setRoomId(roomEntity.getId());
} else { } else {
......
package com.mortals.xhx.module.workman.service.impl; package com.mortals.xhx.module.workman.service.impl;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.util.SecurityUtil; import com.mortals.framework.util.SecurityUtil;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
...@@ -83,6 +84,7 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work ...@@ -83,6 +84,7 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
if(!ObjectUtils.isEmpty(roomEntity)){ if(!ObjectUtils.isEmpty(roomEntity)){
uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList())); uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
uploadDeviceReq.setAction("refreshWorkman"); uploadDeviceReq.setAction("refreshWorkman");
log.info("downMsg:{}", JSON.toJSONString(uploadDeviceReq));
messageFeign.downMsg(uploadDeviceReq); messageFeign.downMsg(uploadDeviceReq);
} }
} }
...@@ -96,7 +98,10 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work ...@@ -96,7 +98,10 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
RoomEntity roomEntity = roomService.get(entity.getRoomId(), context); RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
if(!ObjectUtils.isEmpty(roomEntity)){ if(!ObjectUtils.isEmpty(roomEntity)){
uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList())); uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
uploadDeviceReq.setAction("refreshWorkman"); uploadDeviceReq.setAction("refreshWorkman");
log.info("downMsg:{}", JSON.toJSONString(uploadDeviceReq));
messageFeign.downMsg(uploadDeviceReq); messageFeign.downMsg(uploadDeviceReq);
} }
} }
...@@ -111,6 +116,7 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work ...@@ -111,6 +116,7 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
if(!ObjectUtils.isEmpty(roomEntity)){ if(!ObjectUtils.isEmpty(roomEntity)){
uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList())); uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
uploadDeviceReq.setAction("refreshWorkman"); uploadDeviceReq.setAction("refreshWorkman");
log.info("downMsg:{}", JSON.toJSONString(uploadDeviceReq));
messageFeign.downMsg(uploadDeviceReq); messageFeign.downMsg(uploadDeviceReq);
} }
}); });
......
...@@ -15,12 +15,12 @@ client.global.set("authToken", JSON.parse(response.body).data.token); ...@@ -15,12 +15,12 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
###会议记录列表 ###会议记录列表
POST {{baseUrl}}/metting/record/list POST {{baseUrl}}/metting/record/list
Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"page":1, "page":1,
"size":10 "size":-1,
"deviceCode":"a0-9f-10-5a-e0-10"
} }
......
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