修改同步用户

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

@@ -7,7 +7,9 @@ import com.mortals.xhx.common.code.MeetStatusEnum;
 import com.mortals.xhx.common.pdu.UploadDeviceReq;
 import com.mortals.xhx.feign.device.IDeviceMessageFeign;
 import com.mortals.xhx.module.metting.model.MettingRecordQuery;
+import com.mortals.xhx.module.room.model.RoomDeviceQuery;
 import com.mortals.xhx.module.room.model.RoomEntity;
+import com.mortals.xhx.module.room.service.RoomDeviceService;
 import com.mortals.xhx.module.room.service.RoomService;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +43,8 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
     private IDeviceMessageFeign messageFeign;
     @Autowired
     private RoomService roomService;
+    @Autowired
+    private RoomDeviceService roomDeviceService;
 
     @Override
     protected void validData(MettingRecordEntity entity, Context context) throws AppException {
@@ -83,7 +87,8 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
         RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
         if(!ObjectUtils.isEmpty(roomEntity)){
-            uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomEntity.getDeviceCode()));
+            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/workman/service/impl/WorkmanServiceImpl.java

@@ -7,8 +7,10 @@ import com.mortals.xhx.common.pdu.UploadDeviceReq;
 import com.mortals.xhx.feign.device.IDeviceMessageFeign;
 import com.mortals.xhx.module.gocome.model.GocomeRecordEntity;
 import com.mortals.xhx.module.gocome.service.GocomeRecordService;
+import com.mortals.xhx.module.room.model.RoomDeviceQuery;
 import com.mortals.xhx.module.room.model.RoomEntity;
 import com.mortals.xhx.module.room.model.RoomQuery;
+import com.mortals.xhx.module.room.service.RoomDeviceService;
 import com.mortals.xhx.module.room.service.RoomService;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,7 @@ import org.springframework.util.ObjectUtils;
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.stream.Collectors;
 
 /**
  * WorkmanService
@@ -40,6 +43,8 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
     private GocomeRecordService gocomeRecordService;
      @Autowired
     private RoomService roomService;
+     @Autowired
+     private RoomDeviceService roomDeviceService;
     @Autowired
     private IDeviceMessageFeign messageFeign;
 
@@ -76,7 +81,7 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
         UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
         RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
         if(!ObjectUtils.isEmpty(roomEntity)){
-            uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomEntity.getDeviceCode()));
+            uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
             uploadDeviceReq.setAction("refreshWorkman");
             messageFeign.downMsg(uploadDeviceReq);
         }
@@ -90,7 +95,7 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
         UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
         RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
         if(!ObjectUtils.isEmpty(roomEntity)){
-            uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomEntity.getDeviceCode()));
+            uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
             uploadDeviceReq.setAction("refreshWorkman");
             messageFeign.downMsg(uploadDeviceReq);
         }
@@ -104,7 +109,7 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
             UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
             RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
             if(!ObjectUtils.isEmpty(roomEntity)){
-                uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomEntity.getDeviceCode()));
+                uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
                 uploadDeviceReq.setAction("refreshWorkman");
                 messageFeign.downMsg(uploadDeviceReq);
             }