From d7fc8234b4995014acbd52bf33b4bda3c566807a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十一月 2024 15:56:37 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java | 5 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformDurationVO.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 161 ++++++++++++++++++++++++++++---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformWmsDetailMapper.java | 3
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java | 87 ++++++----------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 13 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java | 11 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java | 1
9 files changed, 204 insertions(+), 84 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
index 598439a..4f103d7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
@@ -102,5 +102,4 @@
}
-
}
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);
- }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformWmsDetailMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformWmsDetailMapper.java
index 719fdbc..730387a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformWmsDetailMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformWmsDetailMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.PlatformWmsDetail;
+import com.github.yulichang.base.MPJBaseMapper;
/**
* @author 姹熻箘韫�
* @date 2024/06/28 10:03
*/
-public interface PlatformWmsDetailMapper extends BaseMapper<PlatformWmsDetail> {
+public interface PlatformWmsDetailMapper extends MPJBaseMapper<PlatformWmsDetail> {
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java
index f673382..37132e4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java
@@ -69,8 +69,8 @@
@ExcelColumn(name="浠诲姟涓婚敭")
private Integer platformJobId;
- @ApiModelProperty(value = "棰勮绫诲瀷 0 = 浣滀笟瓒呮椂 锛�1=鍋滈潬閿欒", example = "1")
- @ExcelColumn(name="棰勮绫诲瀷 0 = 浣滀笟瓒呮椂 锛�1=鍋滈潬閿欒")
+ @ApiModelProperty(value = "棰勮绫诲瀷 0鍋滈潬閿欒 1-鍋滈潬閿欒 2-浣滀笟瓒呮椂", example = "1")
+ @ExcelColumn(name="棰勮绫诲瀷 0鍋滈潬閿欒 1-鍋滈潬閿欒 2-浣滀笟瓒呮椂")
private Integer eventType;
@ApiModelProperty(value = "鏈堝彴鍚嶇О")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
index 620b11a..872e112 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -87,4 +88,8 @@
@ApiModelProperty(value = "涓婇攣鏃堕棿")
@ExcelColumn(name="涓婇攣鏃堕棿")
private String lockDate;
+
+ @ApiModelProperty(value = "鏈堝垎缁勫悕绉�" ,hidden = true)
+ @TableField(exist = false)
+ private String groupName ;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java
index 6e1e84f..eb4e3d8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java
@@ -28,6 +28,14 @@
@ApiModelProperty(value = "鎺掗槦杞﹁締")
private int lineUpCar;
+ @ApiModelProperty(value = "杩涘叆杞﹁締浣滀笟鎯呭喌-绛惧埌鏁�")
+ private int signedNum;
+ @ApiModelProperty(value = "杩涘叆杞﹁締浣滀笟鎯呭喌-宸插彨鍙�")
+ private int calledNum;
+ @ApiModelProperty(value = "杩涘叆杞﹁締浣滀笟鎯呭喌-宸蹭綔涓�")
+ private int workedNum;
+ @ApiModelProperty(value = "杩涘叆杞﹁締浣滀笟鎯呭喌-宸插畬鎴�")
+ private int doneNum;
@ApiModelProperty(value = "浠婃棩鏈堝彴瀹屾垚璁㈠崟缁熻" , hidden = true)
private List<PlatformGroupFinishVO> platformGroupFinishList;
@@ -46,9 +54,6 @@
@ApiModelProperty(value = "瀹炴椂鏈堝彴浣滀笟淇℃伅" , hidden = true)
private List<PlatformWorkDataVO> platformWorkDataList;
-
- //TODO 瀹炴椂鍛婅淇℃伅
-
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformDurationVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformDurationVO.java
index ac1666e..8cb76a6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformDurationVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformDurationVO.java
@@ -25,7 +25,4 @@
@ApiModelProperty(value = "鏈堝彴鍚嶇О")
private String platformName;
-
-
-
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index b88eca5..c47964b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -15,14 +15,10 @@
import com.doumee.core.haikang.model.param.respose.PageSensorStatusResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.PlatformJobMapper;
-import com.doumee.dao.business.PlatformLogMapper;
-import com.doumee.dao.business.PlatformMapper;
-import com.doumee.dao.business.model.Platform;
-import com.doumee.dao.business.model.PlatformJob;
-import com.doumee.dao.web.response.platformReport.CarmeraListVO;
-import com.doumee.dao.web.response.platformReport.OnSitDispatchBoardVO;
-import com.doumee.dao.web.response.platformReport.RegionTreeVO;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
@@ -30,8 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -45,7 +40,11 @@
@Autowired
private PlatformLogMapper platformLogMapper;
@Autowired
+ private PlatformWarnEventMapper platformWarnEventMapper;
+ @Autowired
private PlatformJobMapper platformJobMapper;
+ @Autowired
+ private PlatformWmsDetailMapper platformWmsDetailMapper;
@Autowired
private PlatformMapper platformMapper;
/**
@@ -242,6 +241,77 @@
return allList;
}
@Override
+ public List<PlatformGroupFinishVO> platformGroupFinish(){
+ List<PlatformGroupFinishVO> data = new ArrayList<>();
+ List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
+ .selectSum( PlatformWmsDetail::getIoQty)
+ .selectAs(PlatformGroup::getName, PlatformWmsDetail::getGroupName)
+ .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
+ .rightJoin(PlatformGroup.class,PlatformGroup::getId,PlatformJob::getPlatformGroupId)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
+ .eq(PlatformJob::getIsdeleted, Constants.ZERO)
+ .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
+ , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+ , Constants.PlatformJobStatus.LEAVED.getKey())
+ .apply("to_days(t1.create_data) = to_days(now())")
+ .groupBy(PlatformGroup::getId)
+ );
+ if(jobList!=null){
+ for(PlatformWmsDetail d : jobList){
+ PlatformGroupFinishVO t = new PlatformGroupFinishVO();
+ t.setFinishData(Constants.formatBigdecimal(d.getIoQty()).intValue());
+ t.setPlatformGroupName(d.getGroupName());
+ }
+ }
+ return data;
+ }
+ @Override
+ public CarWorkSituationVO carWorkSituation(int limit){
+ CarWorkSituationVO carWorkSituationVO = new CarWorkSituationVO();
+ List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
+ .orderByDesc(PlatformLog::getCreateDate)
+ .last(" limit "+limit)
+ );
+ carWorkSituationVO.setPlatformLogList(platformLogList);
+ return carWorkSituationVO;
+ }
+ @Override
+ public List<PlatformDurationVO> platformDuration(){
+ List<PlatformDurationVO> platformDurationList = new ArrayList<>();
+ List<Platform> jobList = platformMapper.selectJoinList(Platform.class, new MPJLambdaWrapper<Platform>()
+ .selectAll( Platform.class)
+ .select(" ( select ROUND( ifnull(SUM(pl.PARAM3),0)/60 , 2 ) from platform_log pl where pl.remark = t.id and to_days(pl.CREATE_DATE) =to_days now())",Platform::getWorkCountTime)
+ .eq(Platform::getIsdeleted, Constants.ZERO)
+ );
+ if(jobList!=null){
+ //鎸夊伐浣滄椂闀跨疮璁″�掑簭鎺掑簭
+ Collections.sort(jobList, new Comparator<Platform>() {
+ @Override
+ public int compare(Platform o1, Platform o2) {
+ return Constants.formatBigdecimal(o2.getWorkCountTime())-Constants.formatBigdecimal(o1.getWorkCountTime());
+ }
+ });
+ for(Platform model : jobList){
+ PlatformDurationVO data = new PlatformDurationVO();
+ data.setPlatformId(model.getId());
+ data.setPlatformName(model.getName());
+ data.setWorkTotalTime(Constants.formatBigdecimal(model.getWorkCountTime()).intValue());
+ platformDurationList.add(data);
+ }
+ }
+
+ return platformDurationList;
+ }
+ @Override
+ public List<PlatformWarnEvent> warningList(int limit){
+ List<PlatformWarnEvent> platformLogList = platformWarnEventMapper.selectList(new QueryWrapper<PlatformWarnEvent>().lambda()
+ .eq(PlatformWarnEvent::getIsdeleted,Constants.ZERO)
+ .orderByDesc(PlatformWarnEvent::getCreateDate)
+ .last(" limit "+limit)
+ );
+ return platformLogList;
+ }
+ @Override
public OnSitDispatchBoardVO getCnddCenterData(){
OnSitDispatchBoardVO data = new OnSitDispatchBoardVO();
//鏈堝彴鎬绘暟
@@ -268,20 +338,75 @@
//-------------TODO----------銆愮湅鏉裤�戠埍纭闇�姹�--------------
// * 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12宸插彇娑�
for(PlatformJob model : jobList){
- //棰勭害杞﹁締
- if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
+ //寰呯‘璁� 锛堥绾﹁溅锛�
+ if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())){
data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
}
- // 浣滀笟杞﹁締
+ //寰呯鍒帮紙棰勭害杞︼級
+ if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ }
+ //绛夊緟鍙彿锛堥绾﹁溅銆佺鍒版暟銆佹帓闃熻溅锛�
+ if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
+ data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
+ }
+ //鍏ュ洯绛夊緟锛堥绾﹁溅銆佺鍒版暟锛�
+ if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
+ data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ }
+ //宸插彨鍙凤紙棰勭害杞︺�佺鍒版暟銆佸凡鍙彿锛�
+ if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.CALLED.getKey()) ){
+ data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
+ }
+ // 浣滀笟杞﹁締锛堥绾﹁溅銆佺鍒版暟銆佸凡鍙彿銆佷綔涓氳溅锛�
if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
+ data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setWorkedNum(data.getWorkedNum()+Constants.formatIntegerNum(model.getCountum()));
+ }
+ // 浣滀笟瀹屾垚锛堥绾﹁溅銆佺鍒版暟銆佸凡鍙彿銆佷綔涓氳溅銆佸凡瀹屾垚锛�
+ if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
+ data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setWorkedNum(data.getWorkedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setDoneNum(data.getDoneNum()+Constants.formatIntegerNum(model.getCountum()));
+ }
+ // 杞Щ涓紙棰勭害杞︺�佺鍒版暟銆佹帓闃熻溅锛�
+ if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())){
+ data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
+ }
+ // 宸叉巿鏉冪鍥紙棰勭害杞︺�佺鍒版暟銆佸凡鍙彿銆佷綔涓氳溅銆佸凡瀹屾垚锛�
+ if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
+ data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setWorkedNum(data.getWorkedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setDoneNum(data.getDoneNum()+Constants.formatIntegerNum(model.getCountum()));
+ }
+ // 宸茬鍥�
+ if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())){
data.setWorkingCar(data.getWorkingCar()+Constants.formatIntegerNum(model.getCountum()));
}
- //鎺掗槦杞﹁締
- if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
- data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
+ // 宸茶繃鍙凤紙棰勭害杞︺�佺鍒版暟銆佹帓闃熻溅锛�
+ if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.OVER_NUMBER.getKey())){
+ data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
}
+ // 宸插彇娑�(棰勭害杞︼級
+ if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.CANCEL.getKey())){
+ data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
+ }
+
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index a8a8c2b..3416950 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -10,9 +10,8 @@
import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
-import com.doumee.dao.web.response.platformReport.CarmeraListVO;
-import com.doumee.dao.web.response.platformReport.OnSitDispatchBoardVO;
-import com.doumee.dao.web.response.platformReport.RegionTreeVO;
+import com.doumee.dao.business.model.PlatformWarnEvent;
+import com.doumee.dao.web.response.platformReport.*;
import java.util.List;
@@ -37,4 +36,12 @@
List<PageSensorStatusResponse> sensorStatusList();
OnSitDispatchBoardVO getCnddCenterData();
+
+ List<PlatformGroupFinishVO> platformGroupFinish();
+
+ CarWorkSituationVO carWorkSituation(int limit);
+
+ List<PlatformWarnEvent> warningList(int limit);
+
+ List<PlatformDurationVO> platformDuration();
}
--
Gitblit v1.9.3