From 658c1d5fcc47ca30c72c51f98f2df739700fe125 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 12 十一月 2024 17:26:22 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java | 30 ++++-------------------------- 1 files changed, 4 insertions(+), 26 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java index 823f3fe..f125304 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java @@ -103,22 +103,10 @@ @ApiOperation("瀹炴椂浣滀笟鏁堢巼") @GetMapping("/workEfficiency") @ApiImplicitParams({ - @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "鏌ヨ绫诲瀷锛�0=鍏ュ簱锛�1=鍑哄簱", required = true), + @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "鏌ヨ绫诲瀷锛�0=鍏ュ簱锛�1=鍑哄簱,榛樿 0", required = true), }) public ApiResponse<List<WorkEfficiencyVO>> workEfficiency(@RequestParam Integer type) { - List<WorkEfficiencyVO> workEfficiencyVOList = new ArrayList<>(); - Random random = new Random(); - Integer totalWorkNum = 0; - for (int i = 8; i <= 20; i++) { - if(i%2==0){ - WorkEfficiencyVO workEfficiencyVO = new WorkEfficiencyVO(); - workEfficiencyVO.setWorkNum(200+random.nextInt(100)); - totalWorkNum = totalWorkNum + workEfficiencyVO.getWorkNum(); - workEfficiencyVO.setTotalWorkNum(totalWorkNum); - workEfficiencyVO.setWorkTime(StringUtils.leftPad(i+"",2,"0") +":00"); - workEfficiencyVOList.add(workEfficiencyVO); - } - } + List<WorkEfficiencyVO> workEfficiencyVOList = boardService.workEfficiency(type); return ApiResponse.success(workEfficiencyVOList); } @@ -129,19 +117,9 @@ @ApiOperation("瀹炴椂鏈堝彴浣滀笟淇℃伅") @GetMapping("/platformWorkData") public ApiResponse<List<PlatformWorkDataVO>> platformWorkData() { - List<PlatformWorkDataVO> platformWorkDataVOList = new ArrayList<>(); - Random random = new Random(); - for (int i = 0; i < 3; i++) { - PlatformWorkDataVO platformDurationVO = new PlatformWorkDataVO(); - platformDurationVO.setPlatformName(i+"_鏈堝彴鍚嶇О"); - platformDurationVO.setCarNo("鐨朅8" + random.nextInt(9) + random.nextInt(9) + random.nextInt(9) + random.nextInt(9)); - platformDurationVO.setWorkType(random.nextInt(1)); - platformDurationVO.setWorkNum(100+random.nextInt(100)); - platformDurationVO.setFinishTime(Long.valueOf(System.currentTimeMillis()/1000 + 200+random.nextInt(100))); - platformDurationVO.setStatus(random.nextInt(2)); - platformWorkDataVOList.add(platformDurationVO); - } + List<PlatformWorkDataVO> platformWorkDataVOList = boardService.platformWorkData(); return ApiResponse.success(platformWorkDataVOList); + } -- Gitblit v1.9.3