icewint/wcs_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复少量BUG

Browse Source
This commit is contained in:
葛林强 2026-02-08 20:46:20 +08:00
parent 56340467d6
commit 1b48f9f9b2
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wcs/src/main/java/org/wcs/config/SaTokenConfigure.java
View File

@ -23,7 +23,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
registry.addInterceptor(new SaInterceptor(handle -> {
StpUtil.checkLogin();
})).addPathPatterns("/**").excludePathPatterns("/**/user/login", "/**/app/system/**", "/api/pub/**");
registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**").excludePathPatterns("/**/user/login", "/**/app/system/**", "/api/pub/**");
//registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**").excludePathPatterns("/**/user/login", "/**/app/system/**", "/api/pub/**");
}
/**

5
wcs/src/main/java/org/wcs/plugin/tcp/SocketClient.java
View File

@ -150,11 +150,12 @@ public class SocketClient {
while (true) {
try {
InputStream inputStream = socket.getInputStream();
byte[] bytes = inputStream.readAllBytes();
byte[] bytes = new byte[1024];
int read = inputStream.read(bytes);
socketDataItem.setLastReceiveMessageTime(LocalDateTime.now());
if(socketClientEvent != null) {
socketClientEvent.onBytes(socketDataItem, bytes);
String message = new String(bytes, StandardCharsets.US_ASCII);
String message = new String(bytes, 0, read, StandardCharsets.US_ASCII).trim();
socketClientEvent.onMessage(socketDataItem, message); // 触发收到数据事件
}
} catch (Exception e) {

18
wcs/src/main/java/org/wcs/quartzJob/ResolveStockTaskJob.java
View File

@ -140,15 +140,15 @@ public class ResolveStockTaskJob implements Job {
});
if(!createTransResult) {
log.info("组合任务解析 创建失败，组合任务ID：{}，数据库事务执行失败", stockComposeTask.getTaskId());
dataRecorder.recordStockMsg(stockComposeTask.getUpperTaskId(), stockComposeTask.getVehicleNo(), "初次任务创建失败，插入任务时数据库事务执行失败");
dataRecorder.recordStockMsg(stockComposeTask.getTaskId(), stockComposeTask.getVehicleNo(), "初次任务创建失败，插入任务时数据库事务执行失败");
return;
}
dataRecorder.recordStockMsg(stockComposeTask.getUpperTaskId(), stockComposeTask.getVehicleNo(), "任务解析完成");
dataRecorder.recordStockMsg(stockComposeTask.getTaskId(), stockComposeTask.getVehicleNo(), "任务解析完成");
log.info("组合任务解析 创建成功，组合任务ID：{}", stockComposeTask.getTaskId());
return;
}
log.info("组合任务解析 创建失败，组合任务ID：{}，错误信息：{}", stockComposeTask.getTaskId(), stockSingleTask.item1);
dataRecorder.recordStockMsg(stockComposeTask.getUpperTaskId(), stockComposeTask.getVehicleNo(), "初次任务创建失败，错误信息：" + stockSingleTask.item1);
dataRecorder.recordStockMsg(stockComposeTask.getTaskId(), stockComposeTask.getVehicleNo(), "初次任务创建失败，错误信息：" + stockSingleTask.item1);
stockComposeTaskService.setTaskStatusAndMsg(stockComposeTask.getTaskId(), StockComposeTaskStatusEnum.CANCEL, StockComposeTaskStepStatusEnum.ERROR, stockSingleTask.item1);
return;
}
@ -166,11 +166,11 @@ public class ResolveStockTaskJob implements Job {
composeTaskTimeout = composeTaskTimeout == null ? "180" : composeTaskTimeout;
if(executingTask.getStartTime().plusMinutes(Long.parseLong(composeTaskTimeout)).isBefore(LocalDateTime.now())) {
stockComposeTaskService.setTaskStatusAndMsg(executingTask.getTaskId(), StockComposeTaskStatusEnum.CANCEL, StockComposeTaskStepStatusEnum.ERROR, "超时自动取消，超时时间：" + composeTaskTimeout + " 分钟");
dataRecorder.recordStockMsg(executingTask.getUpperTaskId(), executingTask.getVehicleNo(), "任务超时自动取消，超时时间：" + composeTaskTimeout + " 分钟");
dataRecorder.recordStockMsg(executingTask.getTaskId(), executingTask.getVehicleNo(), "任务超时自动取消，超时时间：" + composeTaskTimeout + " 分钟");
return;
}
// 根据子任务判断动作
List<AppStockSingleTask> stockSingleTasks = stockSingleTaskService.queryByUpperTaskId(executingTask.getUpperTaskId());
List<AppStockSingleTask> stockSingleTasks = stockSingleTaskService.queryByUpperTaskId(executingTask.getTaskId());
if(stockSingleTasks == null) {
return; // 查询失败
}
@ -182,7 +182,7 @@ public class ResolveStockTaskJob implements Job {
if(stockSingleTask.getTaskStatus().equals(StockSingleTaskStatusEnum.CANCEL.getCode())) {
// 任务取消，一并取消组合任务
stockComposeTaskService.setTaskStatusAndMsg(executingTask.getTaskId(), StockComposeTaskStatusEnum.CANCEL, StockComposeTaskStepStatusEnum.ERROR, "任务取消，信息：" + stockSingleTask.getTaskMsg());
dataRecorder.recordStockMsg(executingTask.getUpperTaskId(), executingTask.getVehicleNo(), "任务取消，信息：" + stockSingleTask.getTaskMsg());
dataRecorder.recordStockMsg(executingTask.getTaskId(), executingTask.getVehicleNo(), "任务取消，信息：" + stockSingleTask.getTaskMsg());
return;
}
if(stockSingleTask.getTaskStatus().equals(StockSingleTaskStatusEnum.COMPLETE.getCode())) {
@ -194,7 +194,7 @@ public class ResolveStockTaskJob implements Job {
if(AppStringUtils.isEmpty(executingTask.getDestination()) || businessDestinationLocationId.equals(executingTask.getDestination())) {
// 组合任务终点为空或者子任务终点等于组合任务终点，任务完成
stockComposeTaskService.setTaskStatusAndMsg(executingTask.getTaskId(), StockComposeTaskStatusEnum.COMPLETE, StockComposeTaskStepStatusEnum.COMPLETE,"任务完成");
dataRecorder.recordStockMsg(executingTask.getUpperTaskId(), executingTask.getVehicleNo(), "任务完成");
dataRecorder.recordStockMsg(executingTask.getTaskId(), executingTask.getVehicleNo(), "任务完成");
log.info("任务完成，组合任务ID：{}", executingTask.getTaskId());
return;
}
@ -202,7 +202,7 @@ public class ResolveStockTaskJob implements Job {
Tuple2<String, AppStockSingleTask> nextAutoStockSingleTaskResult = stockComposeTaskManage.createStockSingleTask(executingTask, stockSingleTask.getDestination(), executingTask.getDestination());
if(nextAutoStockSingleTaskResult.getItem1() != null) {
log.info("生成下一个任务失败，组合任务ID：{}，错误信息：{}", executingTask.getTaskId(), nextAutoStockSingleTaskResult.getItem1());
dataRecorder.recordStockMsg(executingTask.getUpperTaskId(), executingTask.getVehicleNo(), "生成下一个任务失败，错误信息：" + nextAutoStockSingleTaskResult.getItem1());
dataRecorder.recordStockMsg(executingTask.getTaskId(), executingTask.getVehicleNo(), "生成下一个任务失败，错误信息：" + nextAutoStockSingleTaskResult.getItem1());
stockComposeTaskService.setTaskStatusAndMsg(executingTask.getTaskId(), StockComposeTaskStatusEnum.ERROR, StockComposeTaskStepStatusEnum.ERROR, "生成下一个任务失败，错误信息：" + nextAutoStockSingleTaskResult.getItem1());
return;
}
@ -212,7 +212,7 @@ public class ResolveStockTaskJob implements Job {
log.info("生成下一个任务失败，组合任务ID：{}，错误信息：数据服务异常", executingTask.getTaskId());
}
stockComposeTaskService.setTaskStatusAndMsg(executingTask.getTaskId(), StockComposeTaskStatusEnum.EXECUTING, StockComposeTaskStepStatusEnum.RUNNING, "接续任务创建：" + nextAutoStockSingleTask.getTaskId());
dataRecorder.recordStockMsg(executingTask.getUpperTaskId(), executingTask.getVehicleNo(), "接续任务创建：" + nextAutoStockSingleTask.getTaskId());
dataRecorder.recordStockMsg(executingTask.getTaskId(), executingTask.getVehicleNo(), "接续任务创建：" + nextAutoStockSingleTask.getTaskId());
log.info("任务继续，组合任务ID：{}", executingTask.getTaskId());
}
// 其他任务类型不处理