From 0cb96a455c4d709c021018fe1c1f1f5558055ff6 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Fri, 12 Dec 2025 10:37:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(log):=20=E6=89=A9=E5=B1=95=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=97=A5=E5=BF=97=E6=9C=8D=E5=8A=A1=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=9D=A5=E6=BA=90=E5=92=8C=E7=9B=AE=E6=A0=87=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ToErpServiceImpl.java | 12 +++++-- .../api/service/impl/ToWcsServiceImpl.java | 16 ++++----- .../ruoyi/log/service/IRequestLogService.java | 2 +- .../service/impl/RequestLogServiceImpl.java | 22 ++++-------- .../ruoyi/pda/controller/PdaController.java | 34 +++---------------- 5 files changed, 29 insertions(+), 57 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 2e6fc94..fa2196b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java @@ -1,7 +1,6 @@ package com.ruoyi.api.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.ruoyi.api.domain.*; import com.ruoyi.api.service.IToErpService; @@ -13,6 +12,8 @@ import com.ruoyi.in.erp.service.ITransferBillCallbackService; import com.ruoyi.job.mydojob.service.IMydoJobService; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; +import com.ruoyi.log.domain.RequestLog; +import com.ruoyi.log.service.IRequestLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +37,9 @@ public class ToErpServiceImpl implements IToErpService { @Autowired private IBasJobIdService basJobIdService; + @Autowired + private IRequestLogService requestLogService; + private static final String TO_ERP_URL = "http://192.168.1.100:8080/api/"; //todo 需要调试 @@ -83,7 +87,8 @@ public class ToErpServiceImpl implements IToErpService { objectErpParameter.setDatas(List.of(wipTransferDoc)); erpStdData.setParameter(objectErpParameter); param.setStd_data(erpStdData); - String post = HttpUtil.post(OTHER_IN_OUTBOUND_ORDER_URL, JSONUtil.toJsonStr(param)); + RequestLog requestLog = requestLogService.getRequestLog(WORKSHOP_INBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建工艺单","wms","erp"); + String post = requestLog.getResponseBody(); ErpInterfaceParam bean = JSONUtil.toBean(post, ErpInterfaceParam.class); if ("0".equals(bean.getStd_data().getExecution().getCode())) { return AjaxResult.success(); @@ -140,7 +145,8 @@ public class ToErpServiceImpl implements IToErpService { objectErpParameter.setDatas(list); erpStdData.setParameter(objectErpParameter); param.setStd_data(erpStdData); - String post = HttpUtil.post(OTHER_IN_OUTBOUND_ORDER_URL, JSONUtil.toJsonStr(param)); + RequestLog requestLog = requestLogService.getRequestLog( OTHER_IN_OUTBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建其他入出库单","wms","erp"); + String post = requestLog.getResponseBody(); ErpInterfaceParam bean = JSONUtil.toBean(post, ErpInterfaceParam.class); if ("0".equals(bean.getStd_data().getExecution().getCode())) { return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index 2742b75..048ef4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -54,7 +54,7 @@ public class ToWcsServiceImpl implements IToWcsService { mydoJobParam.setInOutIds(list); List outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); for (MydoJob outMydoJob : outMydoJobs) { - RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); + RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB, JSONUtil.toJsonStr(outMydoJob), "推送出库任务","wms","wcs"); if ("1".equals(requestLog.getIsSuccessful())){ outMydoJob.setStatus("3"); outMydoJob.setExecutionPhase("1"); @@ -67,7 +67,7 @@ public class ToWcsServiceImpl implements IToWcsService { @Override public AjaxResult pushAgvMoveJob(AgvMoveParam agvMoveParam) { agvMoveParam.setTaskNo(IdUtil.fastSimpleUUID()); - RequestLog requestLog = requestLogService.getRequestLog(PUSH_AGV_MOVE_JOB, JSONUtil.toJsonStr(agvMoveParam), "推送搬运任务"); + RequestLog requestLog = requestLogService.getRequestLog(PUSH_AGV_MOVE_JOB, JSONUtil.toJsonStr(agvMoveParam), "推送搬运任务","wms","wcs"); if ("1".equals(requestLog.getIsSuccessful())){ AgvContainerTask agvContainerTask = new AgvContainerTask(); agvContainerTask.setContainer(agvMoveParam.getContainerCode()); @@ -90,7 +90,7 @@ public class ToWcsServiceImpl implements IToWcsService { List mydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); if (CollUtil.isNotEmpty(mydoJobs)){ for (MydoJob mydoJob : mydoJobs) { - RequestLog requestLog = requestLogService.getRequestLog(PUSH_IN_MYDO_JOB, JSONUtil.toJsonStr(mydoJob), "推送出库任务"); + RequestLog requestLog = requestLogService.getRequestLog(PUSH_IN_MYDO_JOB, JSONUtil.toJsonStr(mydoJob), "推送入库任务","wms","wcs"); if ("1".equals(requestLog.getIsSuccessful())){ mydoJob.setStatus("2"); mydoJobService.updateMydoJob(mydoJob); @@ -101,7 +101,7 @@ public class ToWcsServiceImpl implements IToWcsService { mydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); if (CollUtil.isNotEmpty(mydoJobs)){ for (MydoJob mydoJob : mydoJobs) { - RequestLog requestLog = requestLogService.getRequestLog(PUSH_IN_MYDO_JOB, JSONUtil.toJsonStr(mydoJob), "推送出库任务"); + RequestLog requestLog = requestLogService.getRequestLog(PUSH_IN_MYDO_JOB, JSONUtil.toJsonStr(mydoJob), "推送流利架入库任务","wms","wcs"); if ("1".equals(requestLog.getIsSuccessful())){ mydoJob.setStatus("2"); mydoJobService.updateMydoJob(mydoJob); @@ -112,7 +112,7 @@ public class ToWcsServiceImpl implements IToWcsService { @Override public AjaxResult outMydojobMakeSure(HashMap outMydojobMakeSureParam) { - RequestLog requestLog = requestLogService.getRequestLog(OUT_MYDOJOB_MS, JSONUtil.toJsonStr(outMydojobMakeSureParam), "推送出库任务"); + RequestLog requestLog = requestLogService.getRequestLog(OUT_MYDOJOB_MS, JSONUtil.toJsonStr(outMydojobMakeSureParam), "推送出库确认消息","wms","wcs"); if ("1".equals(requestLog.getIsSuccessful())){ return AjaxResult.success(); } @@ -123,7 +123,7 @@ public class ToWcsServiceImpl implements IToWcsService { public AjaxResult cancelTaskByTaskNo(String taskNo) { Map map = new HashMap<>(); map.put("taskNo", taskNo); - RequestLog requestLog = requestLogService.getRequestLog(CANCEL_MYDOJOB, JSONUtil.toJsonStr(map), "取消任务"); + RequestLog requestLog = requestLogService.getRequestLog(CANCEL_MYDOJOB, JSONUtil.toJsonStr(map), "取消任务","wms","wcs"); if ("1".equals(requestLog.getIsSuccessful())){ return AjaxResult.success(); } @@ -133,7 +133,7 @@ public class ToWcsServiceImpl implements IToWcsService { @Override public AjaxResult selectWcsPort() { Map map = new HashMap<>(); - RequestLog requestLog = requestLogService.getRequestLog(SELECT_WCS_PORT, JSONUtil.toJsonStr(map), "查询缓存点"); + RequestLog requestLog = requestLogService.getRequestLog(SELECT_WCS_PORT, JSONUtil.toJsonStr(map), "查询缓存点","wms","wcs"); if ("1".equals(requestLog.getIsSuccessful())){ //将requestLog中的responseBody转为List AjaxResult bean = JSONUtil.toBean(requestLog.getResponseBody(), AjaxResult.class); @@ -148,7 +148,7 @@ public class ToWcsServiceImpl implements IToWcsService { Map map = new HashMap<>(); map.put("portCode", wcsPort.getPortCode()); map.put("status", wcsPort.getStatus()); - RequestLog requestLog = requestLogService.getRequestLog(UPDATE_WCS_PORT, JSONUtil.toJsonStr(map), "修改缓存点状态"); + RequestLog requestLog = requestLogService.getRequestLog(UPDATE_WCS_PORT, JSONUtil.toJsonStr(map), "修改缓存点状态","wms","wcs"); if ("1".equals(requestLog.getIsSuccessful())){ return AjaxResult.success(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java b/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java index 48c15c8..bda1022 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java @@ -68,7 +68,7 @@ public interface IRequestLogService * @param remark * @return */ - public RequestLog getRequestLog(String url, String param, String remark); + public RequestLog getRequestLog(String url, String param, String remark,String source,String target); /** * 接收接口记录 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java index 6ce8db7..eaf7e63 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java @@ -113,11 +113,11 @@ public class RequestLogServiceImpl implements IRequestLogService * @return requestLog */ @Override - public RequestLog getRequestLog(String url, String param, String remark) { + public RequestLog getRequestLog(String url, String param, String remark,String source,String target) { RequestLog requestLog = new RequestLog(); requestLog.setRequestTime(DateUtil.formatDateTime(new Date())); - requestLog.setSourceSystem("wcs"); - requestLog.setTargetSystem("wms"); + requestLog.setSourceSystem(source); + requestLog.setTargetSystem(target); requestLog.setEndpoint(remark); requestLog.setRequestMethod("post"); requestLog.setRequestHeaders(null); @@ -126,18 +126,10 @@ public class RequestLogServiceImpl implements IRequestLogService try { String resStr = HttpUtil.post(url, param); requestLog.setResponseBody(resStr); - AjaxResult bean = JSONUtil.toBean(resStr, AjaxResult.class); - if (Convert.toInt(bean.get("code")) == 200) { - requestLog.setResponseTime(DateUtil.formatDateTime(new Date())); - requestLog.setResponseStatus("1"); - requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS))); - requestLog.setIsSuccessful("1"); - }else { - requestLog.setResponseStatus("0"); - requestLog.setErrorDetails(Convert.toStr(bean.get("msg"))); - requestLog.setIsSuccessful("0"); - } - + requestLog.setResponseTime(DateUtil.formatDateTime(new Date())); + requestLog.setResponseStatus("1"); + requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS))); + requestLog.setIsSuccessful("1"); } catch (Exception e) { requestLog.setErrorDetails(e.getMessage()); requestLog.setIsSuccessful("0"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java index 53efa1b..7c03b4a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java @@ -1,47 +1,21 @@ package com.ruoyi.pda.controller; -import cn.hutool.core.util.StrUtil; import com.ruoyi.api.domain.RequestEnter; import com.ruoyi.api.domain.WcsPort; -import com.ruoyi.api.service.IToWcsService; -import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; -import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; -import com.ruoyi.bas.container.domain.BasContainer; -import com.ruoyi.bas.warehouse.domain.BasWarehouse; -import com.ruoyi.bas.warehouse.service.IBasWarehouseService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.in.stockin.domain.InStockin; -import com.ruoyi.in.stockin.service.IInStockinService; -import com.ruoyi.in.stockindetail.domain.InStockinDetail; -import com.ruoyi.in.stockindetail.service.IInStockinDetailService; -import com.ruoyi.job.mydojob.domain.MydoJob; -import com.ruoyi.job.mydojob.service.IMydoJobService; -import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; -import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; -import com.ruoyi.out.outStockout.domain.OutStockout; -import com.ruoyi.out.outStockout.service.IOutStockoutService; import com.ruoyi.pda.domain.TrayCodeMakeSure; -import com.ruoyi.pda.domain.TrayCodeMsg; import com.ruoyi.pda.service.PdaService; -import com.ruoyi.pda.trayMsg.domain.TrayMsg; -import com.ruoyi.pda.trayMsg.service.ITrayMsgService; -import com.ruoyi.stock.stock.domain.BasStock; -import com.ruoyi.stock.stock.service.IBasStockService; -import com.ruoyi.system.service.ISysDictTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; @Controller @RequestMapping("/pda")