server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -100,10 +100,6 @@ @PostMapping("/timer/platformJob/sendUnFinishNotice") ApiResponse sendUnFinishNotice(); @ApiOperation("【数字化月台】月台自动叫号入园") @PostMapping("/timer/platformJob/autoCallInParkCar") ApiResponse autoCallInParkCar(); @ApiOperation("【数字化月台】月台自动叫号") @PostMapping("/timer/platformJob/autoPlatformCallCar") ApiResponse autoPlatformCallCar(); server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
@@ -76,16 +76,17 @@ @PostMapping("/autoPlatformCallCar") public ApiResponse autoPlatformCallCar() { platformJobService.autoPlatformCallCar(wmsService); platformJobService.autoCallInParkCar(wmsService); return ApiResponse.success("月台自动叫号"); } @ApiOperation("月台自动叫号入园") @PostMapping("/autoCallInParkCar") public ApiResponse autoCallInParkCar() { platformJobService.autoCallInParkCar(wmsService); return ApiResponse.success("月台自动叫号入园"); } // @ApiOperation("月台自动叫号入园") // @PostMapping("/autoCallInParkCar") // public ApiResponse autoCallInParkCar() { // platformJobService.autoCallInParkCar(wmsService); // return ApiResponse.success("月台自动叫号入园"); // } } server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
@@ -190,5 +190,11 @@ return ApiResponse.success("操作成功"); } @ApiOperation("任务加急") @PostMapping("/jobUrge") @CloudRequiredPermission("business:platformjob:update") public ApiResponse jobUrge (@RequestBody PlatformJob platformJob, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){ platformJobService.jobUrge(platformJob.getId(),getLoginUser(token)); return ApiResponse.success("操作成功"); } } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
@@ -272,4 +272,6 @@ void autoPlatformCallCar(WmsService wmsService); void autoCallInParkCar(WmsService wmsService); void jobUrge(Integer jobId,LoginUserInfo loginUserInfo); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -2870,7 +2870,7 @@ if(Objects.isNull(platformWmsJob)){ continue; } SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.IN_REPERTOTY_CODE); SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.IN_REPERTOTY_CODE); if(Objects.nonNull(systemDictData)){ //判断放置位置 if(platformWmsDetailMapper.selectCount(new QueryWrapper<PlatformWmsDetail>().lambda().eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO) @@ -2896,4 +2896,31 @@ return null; } @Override public void jobUrge(Integer jobId,LoginUserInfo loginUserInfo){ if(Objects.isNull(jobId)){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } PlatformJob platformJob = platformJobMapper.selectById(jobId); if(Objects.isNull(platformJob)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } if(!(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey()) || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey()) || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey()))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,状态已流转"); } platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda() .set(PlatformJob::getUrgeUser,loginUserInfo.getId()) .set(PlatformJob::getUrgeTime,DateUtil.getCurrDateTime()) .set(PlatformJob::getEditDate,DateUtil.getCurrDateTime()) .eq(PlatformJob::getId,platformJob.getId()) ); } } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -146,6 +146,7 @@ //如果月台分组发生变化 Long count = platformJobJoinMapper.selectCount( new QueryWrapper<PlatformJob>().lambda() .eq(PlatformJob::getIsdeleted,Constants.ZERO) .eq(PlatformJob::getPlatformId,model.getId()) .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.WART_SIGN_IN.getKey() ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey() ,Constants.PlatformJobStatus.DONE.getKey() server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2373,7 +2373,8 @@ .selectAs(Platform::getName,PlatformWarnEvent::getPlatformName) .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) .eq(PlatformWarnEvent::getIsdeleted,Constants.ZERO) .apply("to_days(t.create_date) = to_days(now())") //.apply(" to_days(t.create_date) = to_days(now()) ") .apply(" ( t.create_date > now() - INTERVAL 10 MINUTE ) ") .orderByDesc(PlatformWarnEvent::getCreateDate) .last(" limit "+limit) );