From 259703a76d60972cc0ba8934b38864fd321005f3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 07 十一月 2024 11:39:02 +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 | 87 +++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 53 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/OnSitDispatchController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java
similarity index 65%
rename from server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/OnSitDispatchController.java
rename to server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java
index fe835b1..823f3fe 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/OnSitDispatchController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java
@@ -7,7 +7,9 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.PlatformLogMapper;
import com.doumee.dao.business.model.PlatformLog;
+import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.web.response.platformReport.*;
+import com.doumee.service.business.PlatformLogService;
import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -21,6 +23,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -36,28 +39,19 @@
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/onSitDispatch")
-public class OnSitDispatchController extends BaseController {
+public class ChangNeiDiaoduController extends BaseController {
- @Autowired
- private PlatformLogMapper platformLogMapper;
@Autowired
private BoardService boardService;
@LoginNoRequired
- @ApiOperation("涓績鏁版嵁")
+ @ApiOperation("涓績鏁版嵁-浠婃棩杞﹁締浣滀笟鎯呭喌缁熻鏁版嵁")
@GetMapping("/centerData")
public ApiResponse<OnSitDispatchBoardVO> centerData() {
OnSitDispatchBoardVO data = boardService.getCnddCenterData();
- if(data == null){
- data = new OnSitDispatchBoardVO();
- data.setPlatformTotal(100);
- data.setFreePlatform(8);
- data.setReservationCar(97);
- data.setWorkingCar(56);
- data.setLineUpCar(35);
- }
+
return ApiResponse.success(data);
}
@@ -66,39 +60,47 @@
@ApiOperation("浠婃棩鏈堝彴瀹屾垚璁㈠崟缁熻")
@GetMapping("/platformGroupFinish")
public ApiResponse<List<PlatformGroupFinishVO>> platformGroupFinish() {
- List<PlatformGroupFinishVO> platformGroupFinishVOList = new ArrayList<>();
- Random random = new Random();
- for (int i = 0; i < 3; i++) {
- PlatformGroupFinishVO platformGroupFinishVO = new PlatformGroupFinishVO();
- platformGroupFinishVO.setPlatformGroupName(i+"_鏈堝彴缁勫悕绉�");
- platformGroupFinishVO.setPlatformId(i);
- platformGroupFinishVO.setFinishData(300+random.nextInt(100));
- platformGroupFinishVOList.add(platformGroupFinishVO);
- }
+ List<PlatformGroupFinishVO> platformGroupFinishVOList = boardService.platformGroupFinish();
return ApiResponse.success(platformGroupFinishVOList);
}
+
+
+ @LoginNoRequired
+ @ApiOperation("浠婃棩杞﹁締浣滀笟鎯呭喌-杩慛鏉℃棩蹇楀垪琛�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "size", value = "鏌ヨ鏈�杩戣褰曟暟鐨勮褰曟潯鏁帮紝榛樿7鏉�", required = false)
+ })
+ @GetMapping("/carWorkSituation")
+ public ApiResponse<CarWorkSituationVO> carWorkSituation(@RequestParam Integer size) {
+ int limit = Constants.formatIntegerNum(size)>0?size:7;
+ CarWorkSituationVO carWorkSituationVO = boardService.carWorkSituation(limit);
+ return ApiResponse.success(carWorkSituationVO);
+ }
+ @LoginNoRequired
+ @ApiOperation("瀹炴椂鍛婅-杩慛鏉″垪琛�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "size", value = "鏌ヨ鏈�杩戣褰曟暟鐨勮褰曟潯鏁帮紝榛樿7鏉�", required = false)
+ })
+ @GetMapping("/warningList")
+ public ApiResponse<List<PlatformWarnEvent>> warningList(@RequestParam Integer size) {
+ int limit = Constants.formatIntegerNum(size)>0?size:7;
+ List<PlatformWarnEvent> data = boardService.warningList(limit);
+ return ApiResponse.success(data);
+ }
+
@LoginNoRequired
@ApiOperation("浠婃棩鏈堝彴宸ヤ綔鏃堕暱瓒嬪娍")
@GetMapping("/platformDuration")
public ApiResponse<List<PlatformDurationVO>> platformDuration() {
- List<PlatformDurationVO> platformDurationList = new ArrayList<>();
- Random random = new Random();
- for (int i = 0; i < 3; i++) {
- PlatformDurationVO platformDurationVO = new PlatformDurationVO();
- platformDurationVO.setPlatformName(i+"_鏈堝彴鍚嶇О");
- platformDurationVO.setPlatformId(i);
- platformDurationVO.setWorkTotalTime(100+random.nextInt(100));
- platformDurationVO.setOpenTotalTime(200+random.nextInt(100));
- platformDurationList.add(platformDurationVO);
- }
+ List<PlatformDurationVO> platformDurationList = boardService.platformDuration();
return ApiResponse.success(platformDurationList);
}
@LoginNoRequired
- @ApiOperation("浠婃棩鏈堝彴宸ヤ綔鏃堕暱瓒嬪娍")
+ @ApiOperation("瀹炴椂浣滀笟鏁堢巼")
@GetMapping("/workEfficiency")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "鏌ヨ绫诲瀷锛�0=鍏ュ簱锛�1=鍑哄簱", required = true),
@@ -120,27 +122,6 @@
return ApiResponse.success(workEfficiencyVOList);
}
-
- @LoginNoRequired
- @ApiOperation("浠婃棩杞﹁締浣滀笟鎯呭喌")
- @GetMapping("/carWorkSituation")
- public ApiResponse<CarWorkSituationVO> carWorkSituation() {
-
- Random random = new Random();
- CarWorkSituationVO carWorkSituationVO = new CarWorkSituationVO();
- carWorkSituationVO.setCallNum(200+random.nextInt(100));
- carWorkSituationVO.setFinishNum(100+random.nextInt(100));
- carWorkSituationVO.setCallNum(100+random.nextInt(100));
- carWorkSituationVO.setWorkingNum(100+random.nextInt(100));
- carWorkSituationVO.setFinishNum(100+random.nextInt(100));
- carWorkSituationVO.setInNum(100+random.nextInt(100));
- List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
- .orderByDesc(PlatformLog::getCreateDate)
- .last(" limit 7 ")
- );
- carWorkSituationVO.setPlatformLogList(platformLogList);
- return ApiResponse.success(carWorkSituationVO);
- }
--
Gitblit v1.9.3