From 50353c2ae43cdddb8433358f4ba66bef30c5d628 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 05 十一月 2024 14:00:12 +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/OnSitDispatchController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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/OnSitDispatchController.java
index 60dd0bc..fe835b1 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/OnSitDispatchController.java
@@ -1,23 +1,18 @@
package com.doumee.cloud.board;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.PlatformLogMapper;
-import com.doumee.dao.business.model.Platform;
-import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.business.model.PlatformLog;
-import com.doumee.dao.openapi.request.HkBaseTokenRequest;
-import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.web.response.platformReport.*;
-import com.doumee.service.business.PlatformJobService;
-import com.doumee.service.business.PlatformLogService;
-import io.swagger.annotations.*;
+import com.doumee.service.business.third.BoardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +21,9 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
/**
* Created by IntelliJ IDEA.
@@ -43,6 +40,8 @@
@Autowired
private PlatformLogMapper platformLogMapper;
+ @Autowired
+ private BoardService boardService;
@@ -50,12 +49,15 @@
@ApiOperation("涓績鏁版嵁")
@GetMapping("/centerData")
public ApiResponse<OnSitDispatchBoardVO> centerData() {
- OnSitDispatchBoardVO data = new OnSitDispatchBoardVO();
- data.setPlatformTotal(100);
- data.setFreePlatform(8);
- data.setReservationCar(97);
- data.setWorkingCar(56);
- data.setLineUpCar(35);
+ 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);
}
--
Gitblit v1.9.3