From 4158164db6bbdbbcf2c2c096ba619307dc4148d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 17 十一月 2025 15:05:01 +0800
Subject: [PATCH] 任务下发功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 92 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 43 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 582c8af..810f26b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.cfg.CoercionAction;
import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
+import com.vincent.rsf.framework.common.DateUtils;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.config.RemotesInfoProperties;
@@ -240,7 +241,7 @@
/**
* 闈炲厜鐢电珯鐐逛换鍔′笅鍙�
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/55 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void pubTaskToWcs() {
Long loginUserId = SystemAuthUtils.getLoginUserId();
@@ -250,21 +251,35 @@
List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.in(Task::getTaskType, list)
- .in(Task::getTaskStatus, integers).last("limit 1")
+ .in(Task::getTaskStatus, integers)
.orderByDesc(Task::getSort));
- for (Task task : tasks) {
- /**绉诲簱涓嶅仛绔欑偣鎿嶄綔*/
- if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
- BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
- .eq(BasStation::getStationName,
- task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id) ? task.getOrgSite() : task.getTargSite()));
- if (station.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
- continue;
+ if (tasks.isEmpty()) {
+ return;
+ }
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_PUB_TASK));
+ if (!Objects.isNull(config) && !Objects.isNull(config.getVal())) {
+ Integer val = Integer.parseInt(config.getVal());
+ if (val > 1) {
+ List<Task> tasks1 = tasks.stream().sorted(Comparator.comparing(Task::getCreateTime)).collect(Collectors.toList());
+ Task task = tasks1.stream().findFirst().get();
+ if (DateUtils.diffToSeconds(task.getCreateTime(), new Date()) < val) {
+ return;
}
}
- /**涓嬪彂鏅�氱珯鐐逛换鍔★紝鎶ラ敊鍥炴粴锛屼笉鍐嶅線涓嬫墽琛�*/
- pubTaskToWcs(tasks);
}
+// for (Task task : tasks) {
+// /**绉诲簱涓嶅仛绔欑偣鎿嶄綔*/
+// if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+// BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+// .eq(BasStation::getStationName,
+// task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id) ? task.getOrgSite() : task.getTargSite()));
+// if (station.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
+// continue;
+// }
+// }
+// }
+ /**涓嬪彂鏅�氱珯鐐逛换鍔★紝鎶ラ敊鍥炴粴锛屼笉鍐嶅線涓嬫墽琛�*/
+ pubTaskToWcs(tasks);
}
/**
@@ -388,17 +403,11 @@
/**鍒ゆ柇鏄惁鍏夌數绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/
if (!Objects.isNull(station) && station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type && !task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
-// if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
-// throw new CoolException( "褰撳墠绔欑偣涓嶆槸F.鍦ㄥ簱鐘舵�佺姸鎬侊紒锛�");
-// }
station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
if (!basStationService.updateById(station)) {
throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
}
} else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type) {
- if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
- throw new CoolException("鐩爣绔欑偣涓嶅O.绌洪棽鐘舵�侊紝鏃犳硶棰勭害鍑哄簱銆�");
- }
station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
if (!basStationService.updateById(station)) {
throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
@@ -512,7 +521,8 @@
}
});
} else {
- throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
+ log.error(JSONObject.toJSONString(result));
+// throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
}
} catch (JsonProcessingException e) {
throw new CoolException(e.getMessage());
@@ -558,27 +568,25 @@
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
//鍏ュ簱鍗曟嵁鏄庣粏涓婃姤
- for (TaskItem taskItem : taskItems) {
- if (Objects.isNull(taskItem.getOrderId())) {
- continue;
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
+ for (TaskItem taskItem : taskItems) {
+ if (Objects.isNull(taskItem.getOrderId())) {
+ continue;
+ }
+ WkOrder order = asnOrderService.getById(taskItem.getOrderId());
+ if (Objects.isNull(order)) {
+ continue;
+ }
+ //鍏ュ簱鍗曚换鍔℃槑缁嗕笂鎶�
+ WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId())
+ .eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex()));
+ if (Objects.isNull(wkOrderItem)) {
+ throw new CoolException("鏁版嵁閿欒锛屽崟鎹槑缁嗕笉瀛樺湪鎴栧凡瀹屾垚锛侊紒");
+ }
+ /**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
+ reportMsgService.reportOrderItem(wkOrderItem);
}
- WkOrder order = asnOrderService.getById(taskItem.getOrderId());
- if (Objects.isNull(order)) {
- continue;
- }
- //鍏ュ簱鍗曚换鍔℃槑缁嗕笂鎶�
- WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, order.getId())
- .eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex()));
- if (Objects.isNull(wkOrderItem)) {
- throw new CoolException("鏁版嵁閿欒锛屽崟鎹槑缁嗕笉瀛樺湪鎴栧凡瀹屾垚锛侊紒");
- }
- /**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
- reportMsgService.reportOrderItem(wkOrderItem);
- }
-
- if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type) {
-
} else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {
//鍑哄簱鍗曚笂鎶CS淇敼搴撲綅鐘舵��
try {
@@ -636,11 +644,9 @@
}
LocSiteParams locSiteParams = new LocSiteParams();
- locSiteParams
- .setStatus(LocStsType.getRcsLocSts(LocStsType.LOC_STS_TYPE_O.type))
+ locSiteParams.setStatus(LocStsType.getRcsLocSts(LocStsType.LOC_STS_TYPE_O.type))
.setType("site")
.setCode(station.getStationName());
-
/**WMS鍩虹閰嶇疆閾炬帴*/
String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.REPORT_SITE_STATUS;
log.info("涓婃姤宸插畬鎴愯鍗曪細{}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(locSiteParams));
@@ -651,6 +657,7 @@
HttpEntity httpEntity = new HttpEntity(locSiteParams, headers);
ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
log.info("涓婃姤宸插畬鎴愯鍗曪紝杩斿洖缁撴灉锛� {}", exchange);
+
if (Objects.isNull(exchange.getBody())) {
throw new CoolException("淇敼澶辫触锛侊紒");
} else {
@@ -663,7 +670,6 @@
throw new CoolException(e.getMessage());
}
}
-
}
}
--
Gitblit v1.9.1