添加设备上线下线通知

smart-office-manager-ui/admin/src/views/workman/list.vue

@@ -203,6 +203,22 @@
                 isExport: false,
                 config: {
                     search: [
+                      {
+                        name: "name",
+                        type: "text",
+                        label: "姓名",
+                        fuzzy: true
+                      },
+                      {
+                        name: "roomId",
+                        type: "select",
+                        label: "所属房间"
+                      },
+                      {
+                        name: "workStatus",
+                        type: "select",
+                        label: "工作状态"
+                      }
                     ],
                     columns: [
                         {type: "selection", width: 60},

smart-office-manager/src/main/java/com/mortals/xhx/module/room/service/impl/RoomServiceImpl.java

 package com.mortals.xhx.module.room.service.impl;
 
+import com.mortals.framework.model.PageInfo;
 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.workman.model.WorkmanQuery;
+import com.mortals.xhx.module.workman.service.WorkmanService;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -19,6 +22,7 @@ import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
@@ -37,7 +41,20 @@ public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity
     private RoomDeviceService roomDeviceService;
     @Autowired
     private DeviceService deviceService;
+    @Autowired
+    private WorkmanService workmanService;
+
+
+    @Override
+    protected void findAfter(RoomEntity params, PageInfo pageInfo, Context context, List<RoomEntity> list) throws AppException {
+        super.findAfter(params, pageInfo, context, list);
 
+        Map<Long, Long> collect = workmanService.find(new WorkmanQuery()).stream().collect(Collectors.groupingBy(x -> x.getRoomId(), Collectors.counting()));
+
+        list.forEach(item->{
+           item.setCountPerson(collect.getOrDefault(item.getId(),item.getCountPerson()));
+        });
+    }
 
     @Override
     protected void saveAfter(RoomEntity entity, Context context) throws AppException {

smart-office-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

@@ -121,6 +121,11 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
                 uploadDeviceReq.setAction("refreshWorkman");
                 log.info("downMsg:{}", JSON.toJSONString(uploadDeviceReq));
                 messageFeign.downMsg(uploadDeviceReq);
+
+                RoomQuery roomQuery = new RoomQuery();
+                roomQuery.setId(roomEntity.getId());
+                roomQuery.setCountPersonIncrement(-1L);
+                roomService.update(roomQuery,context);
             }
         });