java/smart_screen.git

			@@ -21,10 +21,7 @@
			import javax.validation.Valid;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.util.ArrayList;
			import java.util.Comparator;
			import java.util.List;
			import java.util.Map;
			import java.util.*;
			import java.util.stream.Collectors;

			import static java.util.stream.Collectors.groupingBy;
			@@ -105,6 +102,8 @@
			if(task!=null){
			projectVo.setCheckTime(task.getUpdateTime());
			}
			List<DeviceCountVo> list = deviceUsageService.getProjectDeviceCount(id);
			projectVo.setDeviceCountVos(list);
			return R.ok(projectVo);
			}

			@@ -197,6 +196,17 @@
			@GetMapping("/getDeviceDetailCheckPlanList")
			public R<List<Check>> getDeviceDetailCheckPlanList(@RequestParam Integer planId) {
			List<Check> list = checkService.list(new LambdaQueryWrapper<Check>().eq(Check::getPlanId,planId).orderByDesc(Check::getTime));
			if(!list.isEmpty()){
			List<Integer> planIds = list.stream().map(Check::getPlanId).toList();
			List<Plan> plans = planService.listByIds(planIds);

			List<Integer> projectIds = list.stream().map(Check::getProjectId).toList();
			List<Project> projects = projectService.listByIds(projectIds);
			list.forEach(check -> {
			check.setPlanName(Objects.requireNonNull(plans.stream().filter(plan -> plan.getId().equals(check.getPlanId())).findFirst().orElse(null)).getName());
			check.setProjectName(Objects.requireNonNull(projects.stream().filter(project -> project.getId().equals(check.getProjectId())).findFirst().orElse(null)).getName());
			});
			}
			return R.ok(list);
			}