From 220d851f60727c7b85cdd96a333a570ddf41cb7d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 14 十月 2025 14:13:12 +0800
Subject: [PATCH] 定时自动叫号 与 WMS获取车辆是否在园接口开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 29 ++++++++++++++++++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 2 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 1 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 8 +++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 3 ++-
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 4 ----
server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java | 13 +++++++------
7 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
index 2a4aba8..1104a6f 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
+++ b/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();
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
index a8d8877..86461d0 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
+++ b/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("鏈堝彴鑷姩鍙彿鍏ュ洯");
+// }
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
index 4cf55a9..976577f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
+++ b/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("鎿嶄綔鎴愬姛");
+ }
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
index bc3e6a5..cac9921 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
+++ b/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);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 20303e5..d60b9ac 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/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())
+ );
+ }
+
+
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index 82598ea..377c814 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/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()
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 552d487..3cef32f 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
@@ -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)
);
--
Gitblit v1.9.3