lsy/FT568-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化修正请求和响应逻辑

Browse Source
This commit is contained in:
lsymicc
2026-04-09 08:50:52 +08:00
parent 38d27e3cf2
commit 715fd4a017
16 changed files with 286 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/job/controller/JobCallBackController.java
View File

@@ -104,8 +104,10 @@ public class JobCallBackController extends BaseController
return toAjax(jobCallBackService.deleteJobCallBackByIds(ids));
}
@Scheduled(fixedDelay=2000)
@Scheduled(fixedDelay=3000)
public void jobCallBack() {
jobCallBackService.jobCallBack();
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/job/domain/MydoJob.java
View File

@@ -94,7 +94,7 @@ public class MydoJob extends BaseEntity
private String trayCode;
// private String inOut;
private String inOut;
private String flag;

8
ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java
View File

@@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cn.hutool.core.lang.UUID;
import com.ruoyi.api.domain.RequestLog;
import com.ruoyi.api.service.IApiService;
import com.ruoyi.common.utils.DateUtils;
@@ -110,12 +111,13 @@ public class JobCallBackServiceImpl implements IJobCallBackService
//设定请求参数
Map<String, Object> param = new HashMap<>();
param.put("taskTypeCode", jobCallBack.getTaskTypeCode());
param.put("reqCode", jobCallBack.getReqCode());
param.put("reqCode", UUID.randomUUID().toString().replace("-", ""));
param.put("taskCode", jobCallBack.getTaskCode());
//请求回传
RequestLog requestLog = apiService.finishMydoJob(param);
if ("0".equals(requestLog.getIsSuccessful())){
// RequestLog requestLog = apiService.finishMydoJob(param);
RequestLog requestLog = apiService.finishMydoJobForResponseResult(param);//@@@ FT568 返回自定义的wms响应格式
if ("1".equals(requestLog.getIsSuccessful())){
jobCallBack.setStatus("1");
}else{
jobCallBack.setStatus("99");