diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IRequestLogService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IRequestLogService.java index 25062d0..c5e729e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IRequestLogService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IRequestLogService.java @@ -75,4 +75,6 @@ public interface IRequestLogService * @return */ public RequestLog getRequestLog(String url, String param); + + RequestLog getRequestLog2(String url, String param, String endPoint); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index cbcf6b2..2282aa2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -72,7 +72,7 @@ public class ApiServiceImpl implements IApiService { */ @Override 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())) { AgvQueue agvQueue = agvQueueService.selectAgvQueueByTaskCode(genAgvSchedulingTaskRequest.getTaskCode()); if(agvQueue != null){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/RequestLogServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/RequestLogServiceImpl.java index adf18de..e1c0c5b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/RequestLogServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/RequestLogServiceImpl.java @@ -156,6 +156,49 @@ public class RequestLogServiceImpl implements IRequestLogService 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))); return requestLog; } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java index 034a3e0..79c5580 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java @@ -154,18 +154,18 @@ public class LineSsjThread implements Runnable { * 9, "创建工艺入库单失败!" */ //超大,给plc下发错误信息,AGV搬到缓存区 其余人工处理 - if ((Integer) ajaxResult.get("code") == 5) { - int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "2222", 1, 1); - if (i == 1) { - log.info("G1005产线输送机下发超大托盘处理成功"); - } - createMoveToPort(SsjDevice); - } else { - int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "99", Integer.parseInt(ajaxResult.get("code").toString()), 2); - if (i == 1) { - log.info("G1005产线输送机下发错误信息成功"); - } - } +// if ((Integer) ajaxResult.get("code") == 5) { +// int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "2222", 1, 1); +// if (i == 1) { +// log.info("G1005产线输送机下发超大托盘处理成功"); +// } +// createMoveToPort(SsjDevice); +// } else { +// int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "99", Integer.parseInt(ajaxResult.get("code").toString()), 2); +// if (i == 1) { +// log.info("G1005产线输送机下发错误信息成功"); +// } +// } } } }