最新版本541200007

jiangping

2024-11-06 d7fc8234b4995014acbd52bf33b4bda3c566807a

最新版本541200007

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java

@@ -102,5 +102,4 @@
    }



}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java

ÎļþÃû´Ó server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/OnSitDispatchController.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("今日车辆作业情况-近N条日志列表")
    @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("实时告警-近N条列表")
    @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);
    }




 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> {

}

 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 = "月台名称")

 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 ;
}

 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 å®žæ—¶å‘Šè­¦ä¿¡æ¯



}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformDurationVO.java

@@ -25,7 +25,4 @@
    @ApiModelProperty(value = "月台名称")
    private String platformName;




}

 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.WORKING.getKey())){
                    data.setWorkingCar(data.getWorkingCar()+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())
                        ||Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
                //等待叫号（预约车、签到数、排队车）
                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.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()));
                }

            }
        }


 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();
}