Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

3 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

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

@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformGroup;
@@ -19,8 +19,10 @@
import com.doumee.service.business.PlatformJobService;
import com.doumee.service.business.PlatformService;
import com.doumee.service.business.PlatformShowParamService;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -47,6 +49,10 @@

    @Autowired
    private PlatformShowParamService platformShowParamService;

    @Autowired
    private WmsService wmsService;


    @PreventRepeat
    @ApiOperation("新建")
@@ -103,7 +109,6 @@
        return ApiResponse.success(platformService.platformWorkReportList(platform));
    }


    @ApiOperation("根据月台组获取月台列表信息")
    @GetMapping("/listByGroupId")
    @CloudRequiredPermission("business:platform:query")
@@ -128,18 +133,27 @@

    @ApiOperation("获取月台组信息")
    @PostMapping("/getPlatformGroupList")
    @CloudRequiredPermission("business:platform:query")
    public ApiResponse<List<PlatformGroup>>  getPlatformGroupList (@RequestBody PlatformDataDTO platformDataDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(platformGroupService.getAllPlatformGroup(platformDataDTO,getLoginUser(token)));
    }
    @ApiOperation("获取月台组信息(平台端）")
    @PostMapping("/getPlatformGroupListNew")
    @CloudRequiredPermission("business:platform:query")
    public ApiResponse<List<PlatformGroup>>  getPlatformGroupListNew (@RequestBody PlatformDataDTO platformDataDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(platformGroupService.getAllPlatformGroup(platformDataDTO,getLoginUser(token)));
    }

    @ApiOperation("获取月台任务信息")
    @GetMapping("/getPlatformWorkData")
    @CloudRequiredPermission("business:platform:query")
    public ApiResponse<PlatformWorkVO>  getPlatformWorkData (@RequestParam Integer platformId, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(platformJobService.getPlatformWorkVOById(platformId));
    }

    @ApiOperation("更新月台配置信息")
    @GetMapping("/updUserPlatformConfig")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse  updUserPlatformConfig (@RequestParam List<Integer> ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        platformShowParamService.updUserConfig(ids,getLoginUser(token));
        return ApiResponse.success("操作成功");
@@ -148,6 +162,7 @@

    @ApiOperation("车辆排队情况")
    @PostMapping("/platformLineUpPage")
    @CloudRequiredPermission("business:platform:query")
    public ApiResponse<PageData<PlatformJob>> platformLineUpPage (@RequestBody PageWrap<PlatformJob> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(platformJobService.platformCallList(pageWrap));
    }
@@ -155,6 +170,7 @@

    @ApiOperation("叫号列表")
    @PostMapping("/platformCallList")
    @CloudRequiredPermission("business:platform:query")
    public ApiResponse<PageData<PlatformJob>> platformCallList (@RequestBody PageWrap<PlatformJob> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(platformJobService.platformCallList(pageWrap));
    }
@@ -162,6 +178,7 @@

    @ApiOperation("叫号入园")
    @PostMapping("/platformInPark")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse platformInPark (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        PlatformJob platformJob = platformJobService.platformInPark(jobOperateDTO);
@@ -171,6 +188,7 @@

    @ApiOperation("月台叫号")
    @PostMapping("/platformCallNumber")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse platformCallNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        PlatformJob oldPlatformJob = platformJobService.findById(jobOperateDTO.getJobId());
@@ -178,12 +196,18 @@
        if(Constants.equalsInteger(oldPlatformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
            platformJobService.sendInPark(platformJob);
        }
        if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
                && StringUtils.isNotBlank(platformJob.getBillCode())){
            //通知WMS绑定月台信息
            wmsService.orderPlatformBind(platformJob);
        }
        return ApiResponse.success("操作成功");
    }


    @ApiOperation("转移月台")
    @PostMapping("/platformMove")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse platformMove (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        platformJobService.platformMove(jobOperateDTO);
@@ -192,14 +216,17 @@

    @ApiOperation("月台过号")
    @PostMapping("/platformOverNumber")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse platformOverNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        platformJobService.platformOverNumber(jobOperateDTO);
        PlatformJob platformJob = platformJobService.platformOverNumber(jobOperateDTO);
        platformJobService.cancelInPark(platformJob);
        return ApiResponse.success("操作成功");
    }

    @ApiOperation("异常挂起")
    @PostMapping("/platformErr")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse platformErr (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        platformJobService.platformErr(jobOperateDTO);
@@ -208,6 +235,7 @@

    @ApiOperation("手动开始作业")
    @PostMapping("/beginWork")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse beginWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        PlatformJob platformJob = platformJobService.beginWork(jobOperateDTO);
@@ -216,8 +244,19 @@
    }


    @ApiOperation("恢复作业")
    @PostMapping("/restoreWork")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse restoreWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        PlatformJob platformJob = platformJobService.restoreWork(jobOperateDTO);
        return ApiResponse.success("操作成功");
    }


    @ApiOperation("完成作业")
    @PostMapping("/finishWork")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse finishWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        PlatformJob platformJob = platformJobService.finishWork(jobOperateDTO);
@@ -228,6 +267,7 @@

    @ApiOperation("授权离场")
    @PostMapping("/powerLevel")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse powerLevel (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        PlatformJob platformJob =  platformJobService.powerLevel(jobOperateDTO);
@@ -238,6 +278,7 @@

    @ApiOperation("获取月台组 等待与异常挂起数据")
    @GetMapping("/getPlatformGroupWork")
    @CloudRequiredPermission("business:platform:query")
    public ApiResponse<PlatformGroupWorkVO> getPlatformGroupWork (@RequestParam Integer platformGroupId, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(platformGroupService.getPlatformGroupWork(platformGroupId));
    }