Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-25 75310c871f4cb82a6985161fbc7e3c7d86f066a4

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

@@ -164,7 +164,8 @@
    @PostMapping("/platformInPark")
    public ApiResponse platformInPark (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        platformJobService.platformInPark(jobOperateDTO);
        PlatformJob platformJob = platformJobService.platformInPark(jobOperateDTO);
        platformJobService.sendInPark(platformJob);
        return ApiResponse.success("操作成功");
    }

@@ -172,7 +173,11 @@
    @PostMapping("/platformCallNumber")
    public ApiResponse platformCallNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        platformJobService.platformCallNumber(jobOperateDTO);
        PlatformJob oldPlatformJob = platformJobService.findById(jobOperateDTO.getJobId());
        PlatformJob platformJob = platformJobService.platformCallNumber(jobOperateDTO);
        if(Constants.equalsInteger(oldPlatformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
            platformJobService.sendInPark(platformJob);
        }
        return ApiResponse.success("操作成功");
    }

@@ -205,7 +210,8 @@
    @PostMapping("/beginWork")
    public ApiResponse beginWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        platformJobService.beginWork(jobOperateDTO);
        PlatformJob platformJob = platformJobService.beginWork(jobOperateDTO);
        platformJobService.cancelInPark(platformJob);
        return ApiResponse.success("操作成功");
    }

@@ -214,7 +220,9 @@
    @PostMapping("/finishWork")
    public ApiResponse finishWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jobOperateDTO.setLoginUserInfo(getLoginUser(token));
        platformJobService.finishWork(jobOperateDTO);
        PlatformJob platformJob = platformJobService.finishWork(jobOperateDTO);
        //下发离园权限
        platformJobService.sendInPark(platformJob);
        return ApiResponse.success("操作成功");
    }