From 0c51ea5f39e11279ccebbad241cbb09aa74ee1a2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 13 十二月 2024 20:03:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 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..d33fcc9 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
@@ -35,7 +35,7 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "鍦哄唴璋冨害鐪嬫澘")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝満鍐呰皟搴︾湅鏉�")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/onSitDispatch")
@@ -85,6 +85,8 @@
public ApiResponse<List<PlatformWarnEvent>> warningList(@RequestParam Integer size) {
int limit = Constants.formatIntegerNum(size)>0?size:7;
List<PlatformWarnEvent> data = boardService.warningList(limit);
+ if(data ==null || data.size()==0){
+ }
return ApiResponse.success(data);
}
@@ -103,22 +105,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 +119,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