修改同步用户

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java

@@ -88,7 +88,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
         if(!ObjectUtils.isEmpty(roomEntity)){
             uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
-
             uploadDeviceReq.setAction("refreshMetting");
             messageFeign.downMsg(uploadDeviceReq);
         }

smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomController.java

@@ -6,6 +6,7 @@ import com.mortals.xhx.common.code.DeviceTypeEnum;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.room.model.RoomDeviceEntity;
 import com.mortals.xhx.module.room.model.RoomDeviceQuery;
 import com.mortals.xhx.module.room.model.RoomQuery;
 import com.mortals.xhx.module.room.service.RoomDeviceService;
@@ -79,7 +80,8 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic
         super.doListBefore(query, model, context);
         if (!ObjectUtils.isEmpty(query.getDeviceCode())) {
             //根据设备编码 查询房间room
-            RoomEntity roomEntity = this.service.selectOne(new RoomQuery().deviceCode(query.getDeviceCode()));
+            RoomDeviceEntity roomEntity = roomDeviceService.selectOne(new RoomDeviceQuery().deviceCode(query.getDeviceCode()));
+          //  RoomEntity roomEntity = this.service.selectOne(new RoomQuery().deviceCode(query.getDeviceCode()));
             if (!ObjectUtils.isEmpty(roomEntity)) {
                 query.setId(roomEntity.getId());
             }else{

smart-office-manager/src/test/java/com/mortals/httpclient/metting/MettingRecordController.http

@@ -20,7 +20,7 @@ Content-Type: application/json
 {
     "page":1,
     "size":-1,
-    "deviceCode":"a0-9f-10-5a-e0-10"
+    "deviceCode":"11-22-33-44"
 }