获取看板增加设备类型

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -82,10 +82,10 @@ public class BoxKanbanController {
         List<Group> allGroup = groupManager.findAll();
         List<Group> allGroup = groupManager.findAll();
         allGroup.add(Group.defaulGroup());
         allGroup.add(Group.defaulGroup());
         Locale locale = servletRequest.getLocale();
         Locale locale = servletRequest.getLocale();
-        return getGroupDto(allGroup,locale);
+        return getGroupDto(allGroup,locale,"");
     }
     }
 
 
-    private BoxKanbanDto getGroupDto(List<Group> groupList,Locale locale){
+    private BoxKanbanDto getGroupDto(List<Group> groupList,Locale locale,String type){
         List<DataLog> allTasks=taskService.getAllTasks();
         List<DataLog> allTasks=taskService.getAllTasks();
         BoxKanbanDto boxKanbanDto = getKanBan(allTasks,locale);
         BoxKanbanDto boxKanbanDto = getKanBan(allTasks,locale);
         ArrayList<GroupStatusDto> groupStatusDtos = new ArrayList<>();
         ArrayList<GroupStatusDto> groupStatusDtos = new ArrayList<>();
@@ -98,9 +98,11 @@ public class BoxKanbanController {
                 if(storage==null){
                 if(storage==null){
                     continue;
                     continue;
                 }
                 }
-                boxStatusDtos.add(getBoxDto(storage,allTasks,locale));
-                if(storage.isNLPShelf()){
-                    groupType=1;
+                if(ObjectUtil.isEmpty(type)||storage.getType().equals(type)) {
+                    boxStatusDtos.add(getBoxDto(storage, allTasks, locale));
+                    if (storage.isNLPShelf()) {
+                        groupType = 1;
+                    }
                 }
                 }
             }
             }
             if(boxStatusDtos.size()>0){
             if(boxStatusDtos.size()>0){
@@ -115,7 +117,7 @@ public class BoxKanbanController {
     @ApiOperation("获取看板数据")
     @ApiOperation("获取看板数据")
     @GetMapping("api/boxkanban")
     @GetMapping("api/boxkanban")
     @PreAuthorize("@el.check('boxkanban:info')")
     @PreAuthorize("@el.check('boxkanban:info')")
-    public BoxKanbanDto info(HttpServletRequest servletRequest) {
+    public BoxKanbanDto info(String type, HttpServletRequest servletRequest) {
 
 
         List<Group> groupList = new ArrayList<>();
         List<Group> groupList = new ArrayList<>();
         groupList.add(Group.defaulGroup());
         groupList.add(Group.defaulGroup());
@@ -130,7 +132,7 @@ public class BoxKanbanController {
                 }
                 }
             }
             }
         }
         }
-        return getGroupDto(groupList,locale);
+        return getGroupDto(groupList,locale,type);
     }
     }
 
 
     @ApiOperation("查询看板任务列表")
     @ApiOperation("查询看板任务列表")