zhouz/huachuang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：框架

Browse Source
This commit is contained in:
liyongde
2026-07-15 15:45:32 +08:00
parent 90c4a9e8e9
commit 2b7ddc2313
8 changed files with 151 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nl-module-task/nl-module-task-server/src/main/java/cn/code/nl/module/task/framework/rpc/config/RpcConfiguration.java
View File

@@ -1,5 +1,7 @@
package cn.code.nl.module.task.framework.rpc.config;
import cn.code.nl.framework.execute.biz.lms.LmsTaskCommonApi;
import cn.code.nl.framework.execute.biz.wms.WmsTaskCommonApi;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration;
@@ -7,6 +9,6 @@ import org.springframework.context.annotation.Configuration;
* Task 服务 RPC 配置
*/
@Configuration(value = "taskRpcConfiguration", proxyBeanMethods = false)
@EnableFeignClients()
@EnableFeignClients(clients = {LmsTaskCommonApi.class, WmsTaskCommonApi.class})
public class RpcConfiguration {
}

37
nl-module-task/nl-module-task-server/src/main/java/cn/code/nl/module/task/service/transporttask/TransportTaskFeedbackServiceImpl.java
View File

@@ -1,12 +1,13 @@
package cn.code.nl.module.task.service.transporttask;
import cn.code.nl.framework.execute.biz.TaskCommonApi;
import cn.code.nl.framework.execute.core.TaskCommonApiFactory;
import cn.code.nl.module.task.client.TransportTaskStatusClient;
import cn.code.nl.module.task.dal.dataobject.transporttask.TransportTaskDO;
import cn.code.nl.module.task.dal.mysql.transporttask.TransportTaskMapper;
import cn.code.nl.module.task.dto.AcsFeedbackReqDTO;
import cn.code.nl.module.task.mq.message.TaskEventMessage;
import cn.code.nl.module.task.dto.TaskStatusCallbackReqDTO;
import cn.code.nl.module.task.dto.TaskStatusCallbackRespDTO;
import cn.code.nl.module.task.enums.CallbackStatusEnum;
import cn.code.nl.module.task.enums.TaskEventTypeEnum;
import cn.code.nl.module.task.enums.TransportTaskStatusEnum;
@@ -42,6 +43,9 @@ public class TransportTaskFeedbackServiceImpl implements TransportTaskFeedbackSe
@Resource
private TaskEventProducer taskEventProducer;
@Resource
private TaskCommonApiFactory taskCommonApiFactory;
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@Override
@@ -118,21 +122,26 @@ public class TransportTaskFeedbackServiceImpl implements TransportTaskFeedbackSe
transportTaskMapper.updateById(task);
log.info("任务已取货, taskId={}", task.getTaskId());
// 考虑可行性
TaskCommonApi byServerName = taskCommonApiFactory.getByServerName("lms-server");
byServerName.doHandlePicked();
// todo: 改成 feign 的 rpc 调用
// 同步 HTTP 回调 LMS/WMS
TaskStatusCallbackReqDTO callbackReq = buildCallbackReq(task, reqDTO);
TaskStatusCallbackRespDTO resp = transportTaskStatusClient.notifyStatus(callbackReq);
if (resp != null && Boolean.TRUE.equals(resp.getSuccess())) {
log.info("取货完成同步回调成功, taskId={}", task.getTaskId());
} else {
// 回调失败：记录但不阻塞 ACS 返回
task.setCallbackStatus(CallbackStatusEnum.FAILED.getCode());
task.setCallbackErrorMsg(resp != null ? resp.getMessage() : "回调无响应");
transportTaskMapper.updateById(task);
log.warn("取货完成同步回调失败, taskId={}, msg={}",
task.getTaskId(), task.getCallbackErrorMsg());
}
// TaskStatusCallbackReqDTO callbackReq = buildCallbackReq(task, reqDTO);
// TaskStatusCallbackRespDTO resp = transportTaskStatusClient.notifyStatus(callbackReq);
//
// if (resp != null && Boolean.TRUE.equals(resp.getSuccess())) {
// log.info("取货完成同步回调成功, taskId={}", task.getTaskId());
// } else {
// // 回调失败：记录但不阻塞 ACS 返回
// task.setCallbackStatus(CallbackStatusEnum.FAILED.getCode());
// task.setCallbackErrorMsg(resp != null ? resp.getMessage() : "回调无响应");
// transportTaskMapper.updateById(task);
// log.warn("取货完成同步回调失败, taskId={}, msg={}",
// task.getTaskId(), task.getCallbackErrorMsg());
// }
}
/**