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

优化

Browse Source
This commit is contained in:
zj
2026-01-06 10:17:14 +08:00
parent 1c3f1147dd
commit 1f05708e4c
4 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/IRequestLogService.java
View File

@@ -75,4 +75,6 @@ public interface IRequestLogService
* @return * @return
*/ */
public RequestLog getRequestLog(String url, String param); public RequestLog getRequestLog(String url, String param);
RequestLog getRequestLog2(String url, String param, String endPoint);
} }

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
View File

@@ -72,7 +72,7 @@ public class ApiServiceImpl implements IApiService {
*/ */
@Override @Override
public GenAgvSchedulingTaskResponse genAgvSchedulingTask(GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest) { public GenAgvSchedulingTaskResponse genAgvSchedulingTask(GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest) {
RequestLog requestLog = requestLogService.getRequestLog(GEN_AGV_SCHEDULING_TASK, "生成AGV任务", JSONUtil.toJsonStr(genAgvSchedulingTaskRequest)); RequestLog requestLog = requestLogService.getRequestLog2(GEN_AGV_SCHEDULING_TASK, "生成AGV任务", JSONUtil.toJsonStr(genAgvSchedulingTaskRequest));
if ("1".equals(requestLog.getIsSuccessful())) { if ("1".equals(requestLog.getIsSuccessful())) {
AgvQueue agvQueue = agvQueueService.selectAgvQueueByTaskCode(genAgvSchedulingTaskRequest.getTaskCode()); AgvQueue agvQueue = agvQueueService.selectAgvQueueByTaskCode(genAgvSchedulingTaskRequest.getTaskCode());
if(agvQueue != null){ if(agvQueue != null){

45
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/RequestLogServiceImpl.java
View File

@@ -156,6 +156,49 @@ public class RequestLogServiceImpl implements IRequestLogService
return requestLog; return requestLog;
} }
@Override
public RequestLog getRequestLog2(String url, String endPoint,String param) {
RequestLog requestLog = new RequestLog();
Date requestTime = new Date();
requestLog.setRequestTime(DateUtil.format(requestTime, "yyyy-MM-dd HH:mm:ss"));
requestLog.setSourceSystem("wcs");
requestLog.setTargetSystem("rcs");
requestLog.setEndpoint(endPoint);
requestLog.setRequestMethod("post");
requestLog.setRequestHeaders(null);
requestLog.setRequestBody(param);
requestLog.setRequestUrl(url);
Date responseTime =new Date();
try {
String resStr = HttpUtil.post(url, param);
requestLog.setResponseBody(resStr);
InterfaceReceive bean = JSONUtil.toBean(resStr, InterfaceReceive.class);
if (bean.getCode() == 0) {
requestLog.setResponseTime(DateUtil.format(responseTime, "yyyy-MM-dd HH:mm:ss"));
requestLog.setResponseStatus("1");
requestLog.setDuration(Convert.toStr(DateUtil.between(requestTime, responseTime, DateUnit.MS)));
requestLog.setIsSuccessful("1");
}else {
requestLog.setResponseTime(DateUtil.format(responseTime, "yyyy-MM-dd HH:mm:ss"));
requestLog.setResponseStatus("0");
requestLog.setErrorDetails(bean.getMsg());
requestLog.setIsSuccessful("0");
requestLog.setDuration(Convert.toStr(DateUtil.between(requestTime, responseTime, DateUnit.MS)));
}
} catch (Exception e) {
requestLog.setResponseTime(DateUtil.format(responseTime, "yyyy-MM-dd HH:mm:ss"));
requestLog.setErrorDetails(e.getMessage());
requestLog.setIsSuccessful("0");
requestLog.setResponseStatus("0");
requestLog.setDuration(Convert.toStr(DateUtil.between(requestTime, responseTime, DateUnit.MS)));
} finally {
insertRequestLog(requestLog);
}
return requestLog;
}
/** /**
* 插入请求日志 * 插入请求日志
* *
@@ -175,4 +218,6 @@ public class RequestLogServiceImpl implements IRequestLogService
requestLog.setDuration(Convert.toStr(DateUtil.between(requestTime, requestTime, DateUnit.MS))); requestLog.setDuration(Convert.toStr(DateUtil.between(requestTime, requestTime, DateUnit.MS)));
return requestLog; return requestLog;
} }
} }

24
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java
View File

@@ -154,18 +154,18 @@ public class LineSsjThread implements Runnable {
* 9, "创建工艺入库单失败！" * 9, "创建工艺入库单失败！"
*/ */
//超大,给plc下发错误信息，AGV搬到缓存区 其余人工处理 //超大,给plc下发错误信息，AGV搬到缓存区 其余人工处理
if ((Integer) ajaxResult.get("code") == 5) { // if ((Integer) ajaxResult.get("code") == 5) {
int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "2222", 1, 1); // int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "2222", 1, 1);
if (i == 1) { // if (i == 1) {
log.info("G1005产线输送机下发超大托盘处理成功"); // log.info("G1005产线输送机下发超大托盘处理成功");
} // }
createMoveToPort(SsjDevice); // createMoveToPort(SsjDevice);
} else { // } else {
int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "99", Integer.parseInt(ajaxResult.get("code").toString()), 2); // int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "99", Integer.parseInt(ajaxResult.get("code").toString()), 2);
if (i == 1) { // if (i == 1) {
log.info("G1005产线输送机下发错误信息成功"); // log.info("G1005产线输送机下发错误信息成功");
} // }
} // }
} }
} }
} }