wms -> wcs、wcs -> wms 增加日志输出

ruoyi-admin/src/main/java/com/ruoyi/xuankuang/controller/WcsToWmsApiController.java

@@ -3,16 +3,15 @@ package com.ruoyi.xuankuang.controller;
 import com.ruoyi.ams.xuankuang.domain.form.*;
 import com.ruoyi.ams.xuankuang.service.WcsToWmsApiService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 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.RestController;
-import springfox.documentation.spring.web.json.Json;
-
-import java.util.Locale;
-import java.util.Stack;
 
 /**
  * WCS调WMS接口
@@ -22,6 +21,7 @@ import java.util.Stack;
  */
 @RestController
 @RequestMapping("/edi/wcs")
+@Slf4j
 public class WcsToWmsApiController {
 
     @Autowired
@@ -40,9 +40,11 @@ public class WcsToWmsApiController {
     @PostMapping("/stackingCompletion")
     public AjaxResult stackingCompletion(@RequestBody StackingCompletionForm stackingCompletion) {
         AjaxResult ajaxResult;
+        log.info("WcsToWmsApiController - stackingCompletion request stackingCompletion is :{}, time is :{}", stackingCompletion, DateUtils.getTime());
         synchronized(this) {
             ajaxResult = wcsToWmsApiService.stackingCompletion(stackingCompletion);
         }
+        log.info("WcsToWmsApiController - stackingCompletion response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
         return ajaxResult;
     }
 
@@ -55,10 +57,12 @@ public class WcsToWmsApiController {
     @ApiOperation("任务状态反馈")
     @PostMapping("/taskStatusResponse")
     public AjaxResult taskStatusResponse(@RequestBody TaskStatusForm taskStatusForm) {
+        log.info("WcsToWmsApiController - taskStatusResponse request taskStatusForm is :{}, time is :{}", taskStatusForm, DateUtils.getTime());
         AjaxResult ajaxResult;
         synchronized(this) {
             ajaxResult = wcsToWmsApiService.taskStatusResponse(taskStatusForm);
         }
+        log.info("WcsToWmsApiController - taskStatusResponse response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
         return ajaxResult;
     }
 
@@ -71,7 +75,10 @@ public class WcsToWmsApiController {
     @ApiOperation("破袋机开启通知")
     @PostMapping("/lineOpenNotification")
     public AjaxResult lineOpenNotification(@RequestBody LineOpenNotificationForm lineOpenNotificationForm) {
-        return wcsToWmsApiService.lineOpenNotification(lineOpenNotificationForm);
+        log.info("WcsToWmsApiController - lineOpenNotification request lineOpenNotificationForm is :{}, time is :{}", lineOpenNotificationForm, DateUtils.getTime());
+        AjaxResult ajaxResult = wcsToWmsApiService.lineOpenNotification(lineOpenNotificationForm);
+        log.info("WcsToWmsApiController - lineOpenNotification response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
+        return ajaxResult;
     }
 
     /**
@@ -83,7 +90,10 @@ public class WcsToWmsApiController {
     @ApiOperation("空托仓位请求")
     @PostMapping("/emptyPalletLocRequest")
     public AjaxResult emptyPalletLocRequest(@RequestBody EmptyPalletLocForm emptyPalletLocForm) {
-        return wcsToWmsApiService.emptyPalletLoc(emptyPalletLocForm);
+        log.info("WcsToWmsApiController - emptyPalletLocRequest request emptyPalletLocForm is :{}, time is :{}", emptyPalletLocForm, DateUtils.getTime());
+        AjaxResult ajaxResult = wcsToWmsApiService.emptyPalletLoc(emptyPalletLocForm);
+        log.info("WcsToWmsApiController - emptyPalletLocRequest response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
+        return ajaxResult;
     }
 
     /**
@@ -95,7 +105,9 @@ public class WcsToWmsApiController {
     @ApiOperation("异常上报接口")
     @PostMapping("/errorStatusResponse")
     public AjaxResult errorStatusResponse(@RequestBody ErrorStatusForm errorStatusForm) {
-        return AjaxResult.success("");
+        log.info("WcsToWmsApiController - errorStatusResponse request errorStatusForm is :{}, time is :{}", errorStatusForm, DateUtils.getTime());
+        log.info("WcsToWmsApiController - errorStatusResponse response ajaxResult is :{}, time is :{}", StringUtils.EMPTY, DateUtils.getTime());
+        return AjaxResult.success(StringUtils.EMPTY);
     }
 
     /**
@@ -107,7 +119,10 @@ public class WcsToWmsApiController {
     @ApiOperation("WCS安全交握AGV")
     @PostMapping("/callback/task")
     public AjaxResult callbackTask(@RequestBody CallbackTaskForm callbackForm) {
-        return AjaxResult.success(wcsToWmsApiService.callbackNotice(callbackForm));
+        log.info("WcsToWmsApiController - callbackTask request callbackForm is :{}, time is :{}", callbackForm, DateUtils.getTime());
+        Boolean data = wcsToWmsApiService.callbackNotice(callbackForm);
+        log.info("WcsToWmsApiController - callbackTask response data is :{}, time is :{}", data, DateUtils.getTime());
+        return AjaxResult.success(data);
     }
 
     /**
@@ -119,7 +134,10 @@ public class WcsToWmsApiController {
     @ApiOperation("WCS出库任务下发AGV")
     @PostMapping("/outboundRequest")
     public AjaxResult outboundRequest(@RequestBody OutboundForm outboundForm) {
-        return wcsToWmsApiService.outboundRequest(outboundForm);
+        log.info("WcsToWmsApiController - outboundRequest request outboundForm is :{}, time is :{}", outboundForm, DateUtils.getTime());
+        AjaxResult ajaxResult = wcsToWmsApiService.outboundRequest(outboundForm);
+        log.info("WcsToWmsApiController - outboundRequest response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
+        return ajaxResult;
     }
 
     /**
@@ -130,7 +148,10 @@ public class WcsToWmsApiController {
     @ApiOperation("入库数量不足更新数据")
     @PostMapping("/updateAsnData")
     public AjaxResult updateAsnData(@RequestBody UpdateForm updateForm) {
-        return wcsToWmsApiService.updateAsnData(updateForm);
+        log.info("WcsToWmsApiController - updateAsnData request updateForm is :{}, time is :{}", updateForm, DateUtils.getTime());
+        AjaxResult ajaxResult = wcsToWmsApiService.updateAsnData(updateForm);
+        log.info("WcsToWmsApiController - updateAsnData response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
+        return ajaxResult;
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/xuankuang/controller/WmsToWcsApiController.java

@@ -3,20 +3,20 @@ package com.ruoyi.xuankuang.controller;
 
 import com.ruoyi.ams.xuankuang.service.WmsDocAsnSubService;
 import com.ruoyi.ams.xuankuang.service.WmsDocOrderSubService;
-import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.core.domain.AjaxResult;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.utils.DateUtils;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.LinkedList;
-import java.util.Stack;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/Wms/Wcs")
+@Slf4j
 public class WmsToWcsApiController {
     @Autowired
     private WmsDocAsnSubService wmsDocAsnSubService;
@@ -27,14 +27,20 @@ public class WmsToWcsApiController {
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:push')")
     @GetMapping(value = "/queryDocAsnDetails/{asnNo}")
     public AjaxResult queryDocAsnDetails(@PathVariable("asnNo") String asnNo) {
-        return wmsDocAsnSubService.queryDocAsnDetails(asnNo);
+        log.info("WmsToWcsApiController - queryDocAsnDetails request asnNo is :{}, time is :{}", asnNo, DateUtils.getTime());
+        AjaxResult ajaxResult = wmsDocAsnSubService.queryDocAsnDetails(asnNo);
+        log.info("WmsToWcsApiController - queryDocAsnDetails response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
+        return ajaxResult;
     }
 
     //出库单同步
     @PreAuthorize("@ss.hasPermi('docOrder:docOrder:push')")
     @GetMapping(value = "/queryDocOrderDetails/{orderNo}")
     public AjaxResult queryDocOrderDetails(@PathVariable("orderNo") String orderNo) {
-        return wmsDocOrderSubService.initOrderDetails(orderNo);
+        log.info("WmsToWcsApiController - queryDocOrderDetails request orderNo is :{}, time is :{}", orderNo, DateUtils.getTime());
+        AjaxResult ajaxResult = wmsDocOrderSubService.initOrderDetails(orderNo);
+        log.info("WmsToWcsApiController - queryDocOrderDetails response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
+        return ajaxResult;
     }
 
 
@@ -42,13 +48,19 @@ public class WmsToWcsApiController {
     @ApiOperation("回调卸货完成")
     @GetMapping(value = "/wmsAgvCallbackIntask/{taskNo}")
     public AjaxResult wmsAgvCallbackIntask(@PathVariable("taskNo") String taskNo) {
-        return wmsDocAsnSubService.wmsAgvCallbackIntask(taskNo);
+        log.info("WmsToWcsApiController - wmsAgvCallbackIntask request taskNo is :{}, time is :{}", taskNo, DateUtils.getTime());
+        AjaxResult ajaxResult = wmsDocAsnSubService.wmsAgvCallbackIntask(taskNo);
+        log.info("WmsToWcsApiController - wmsAgvCallbackIntask response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
+        return ajaxResult;
     }
 
     //agv回调wcs取货完成
     @ApiOperation("回调取货完成")
     @GetMapping(value = "/wmsAgvCallbackOuttask/{wcsId}")
     public AjaxResult wmsAgvCallbackOuttask(@PathVariable("wcsId") String wcsId) {
-        return wmsDocAsnSubService.wmsAgvCallbackOuttask(wcsId);
+        log.info("WmsToWcsApiController - wmsAgvCallbackOuttask request wcsId is :{}, time is :{}", wcsId, DateUtils.getTime());
+        AjaxResult ajaxResult = wmsDocAsnSubService.wmsAgvCallbackOuttask(wcsId);
+        log.info("WmsToWcsApiController - wmsAgvCallbackOuttask response ajaxResult is :{}, time is :{}", ajaxResult, DateUtils.getTime());
+        return ajaxResult;
     }
 }