From c889784b65c6dd8ad089c25444f1ce3d404b868a Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 12 Feb 2026 14:47:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=A5=97=E4=BB=B6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DCToAcsController.java => KitToAcsController.java} | 11 +++++------ .../org/nl/acs/ext/wms/rest/LiKuToACSController.java | 2 -- .../acs/ext/wms/service/impl/AcsToNDCServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) rename acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/{NDCToAcsController.java => KitToAcsController.java} (80%) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/NDCToAcsController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/KitToAcsController.java similarity index 80% rename from acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/NDCToAcsController.java rename to acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/KitToAcsController.java index c303825..4fe30d7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/NDCToAcsController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/KitToAcsController.java @@ -6,7 +6,6 @@ import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.log.OthersToInterfaceLog; -import org.nl.acs.ext.wms.service.AcsToNDCService; import org.nl.acs.ext.wms.service.NDCToAcsService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -17,17 +16,17 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "ndc接口") -@RequestMapping("/ndcToAcs") +@Api(tags = "acs套件回传接口") +@RequestMapping("/api/kitToAcs") @Slf4j -public class NDCToAcsController { +public class KitToAcsController { private final NDCToAcsService ndcToAcsService; @SaIgnore - @PostMapping("/agv/agvCallbackService/agvCallback") - @OthersToInterfaceLog("NDC->ACS") + @PostMapping("/agvCallback") + @OthersToInterfaceLog("kit->ACS") public ResponseEntity agvCallback(@RequestBody JSONObject requestParam) throws Exception{ return new ResponseEntity<>(ndcToAcsService.agvCallback(requestParam), HttpStatus.OK); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java index e140f01..7e5eefe 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java @@ -5,11 +5,9 @@ package org.nl.acs.ext.wms.rest; import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import jdk.nashorn.internal.ir.annotations.Ignore; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.liKuData.*; -import org.nl.acs.ext.wms.service.AcsToLiKuService; import org.nl.acs.ext.wms.service.LiKuToAcsService; import org.nl.modules.logging.InterfaceLogType; import org.nl.modules.logging.annotation.Log; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java index a7ca0b1..2492bd1 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java @@ -82,7 +82,7 @@ public class AcsToNDCServiceImpl implements AcsToNDCService { .timeout(20000) .execute(); LuceneLogDto logDto1 = LuceneLogDto.builder() - .device_code("下发科聪任务") + .device_code("下发ACS套件") .content("任务号:" + instruction.getTask_code() + ",指令号:" + instruction.getInstruction_code() + ",下发wcs任务序列反馈参数:" + jo) .build(); logDto1.setLog_level(4); From 21dc65d379e4933fda60d6247d33d4ad426eebf8 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 12 Feb 2026 15:04:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96http=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=A4=96=E9=83=A8=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/AcsToNDCServiceImpl.java | 32 +++++++++++++++---- .../service/LuceneExecuteLogService.java | 2 +- .../impl/LuceneExecuteLogServiceImpl.java | 4 +-- .../main/resources/config/application-dev.yml | 2 +- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java index 2492bd1..9a8df00 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.acs.ext.wms.service.impl; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -11,6 +12,7 @@ import org.nl.acs.device.address.service.AddressService; import org.nl.acs.device.address.service.dto.AddressDto; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; +import org.nl.acs.ext.wms.IpUtil; import org.nl.acs.ext.wms.NdcHttpUtil; import org.nl.acs.ext.wms.UnifiedResponse; import org.nl.acs.ext.wms.service.AcsToNDCService; @@ -74,19 +76,35 @@ public class AcsToNDCServiceImpl implements AcsToNDCService { String wmsurl = paramService.findByCode(AcsConfig.WCSURL).getValue(); AddressDto addressDto = addressService.findByCode("applyTaskToWcs"); String url = wmsurl + addressDto.getMethods_url(); - + LuceneLogDto logDto = + LuceneLogDto.builder() + .logType("接口日志") + .request_url(wmsurl) + .request_direction("post") + .request_param(JSON.toJSONString(jo)) + .method(addressDto.getMethods_url()) + .content("开始请求") + .build(); + luceneExecuteLogService.interfaceExecuteLog(logDto); + long start = System.currentTimeMillis(); HttpResponse result = HttpRequest.post(url) //表单内容 .body(String.valueOf(jo)) //超时，毫秒 .timeout(20000) .execute(); - LuceneLogDto logDto1 = LuceneLogDto.builder() - .device_code("下发ACS套件") - .content("任务号:" + instruction.getTask_code() + ",指令号:" + instruction.getInstruction_code() + ",下发wcs任务序列反馈参数:" + jo) - .build(); - logDto1.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto1); + LuceneLogDto logResult = + LuceneLogDto.builder() + .logType("接口日志") + .request_url(wmsurl) + .request_direction("post") + .request_param(JSON.toJSONString(jo)) + .method(addressDto.getMethods_url()) + .response_param(JSON.toJSONString(result)) + .executeTime(System.currentTimeMillis() - start) + .content("响应请求") + .build(); + luceneExecuteLogService.deviceExecuteLog(logResult); log.info("任务号：{},指令号{},状态{},下发agv订单序列反馈:{}", instruction.getTask_code(), instruction.getInstruction_code(), result.getStatus(), result.body()); return result; } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneExecuteLogService.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneExecuteLogService.java index 861dc72..b740d3c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneExecuteLogService.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneExecuteLogService.java @@ -27,7 +27,7 @@ public interface LuceneExecuteLogService { * * @param luceneLogDto 日志结果对象 */ - void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException; + void interfaceExecuteLog(LuceneLogDto luceneLogDto); /** * 设备执行日志,会保留历史记录 diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java index f350977..1f87fcd 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java @@ -42,12 +42,12 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { } @Override - public void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException { + public void interfaceExecuteLog(LuceneLogDto luceneLogDto) { luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc()); addIndex(luceneLogDto); } - private void addIndex(LuceneLogDto luceneLogDto) throws IOException { + private void addIndex(LuceneLogDto luceneLogDto) { IndexWriter indexWriter = LuceneIndexWriter.getIndexWriter(); //创建一个Document对象 Document document = new Document(); diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml index 00fda1c..50fc7c8 100644 --- a/acs/nladmin-system/src/main/resources/config/application-dev.yml +++ b/acs/nladmin-system/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8010 + port: 8011 #配置数据源 spring: datasource: