root/nl5_acs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:套件接口名称定义

Browse Source
This commit is contained in:
zhangzq
2026-02-12 14:47:12 +08:00
parent 39839495d8
commit c889784b65
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/NDCToAcsController.java → acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/KitToAcsController.java
View File

@@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.acs.ext.wms.log.OthersToInterfaceLog; 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.nl.acs.ext.wms.service.NDCToAcsService;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@@ -17,17 +16,17 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@Api(tags = "ndc接口") @Api(tags = "acs套件回传接口")
@RequestMapping("/ndcToAcs") @RequestMapping("/api/kitToAcs")
@Slf4j @Slf4j
public class NDCToAcsController { public class KitToAcsController {
private final NDCToAcsService ndcToAcsService; private final NDCToAcsService ndcToAcsService;
@SaIgnore @SaIgnore
@PostMapping("/agv/agvCallbackService/agvCallback") @PostMapping("/agvCallback")
@OthersToInterfaceLog("NDC->ACS") @OthersToInterfaceLog("kit->ACS")
public ResponseEntity<Object> agvCallback(@RequestBody JSONObject requestParam) throws Exception{ public ResponseEntity<Object> agvCallback(@RequestBody JSONObject requestParam) throws Exception{
return new ResponseEntity<>(ndcToAcsService.agvCallback(requestParam), HttpStatus.OK); return new ResponseEntity<>(ndcToAcsService.agvCallback(requestParam), HttpStatus.OK);
} }

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java
View File

@@ -5,11 +5,9 @@ package org.nl.acs.ext.wms.rest;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import jdk.nashorn.internal.ir.annotations.Ignore;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.acs.ext.wms.liKuData.*; 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.acs.ext.wms.service.LiKuToAcsService;
import org.nl.modules.logging.InterfaceLogType; import org.nl.modules.logging.InterfaceLogType;
import org.nl.modules.logging.annotation.Log; import org.nl.modules.logging.annotation.Log;

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToNDCServiceImpl.java
View File

@@ -82,7 +82,7 @@ public class AcsToNDCServiceImpl implements AcsToNDCService {
.timeout(20000) .timeout(20000)
.execute(); .execute();
LuceneLogDto logDto1 = LuceneLogDto.builder() LuceneLogDto logDto1 = LuceneLogDto.builder()
.device_code("下发科聪任务") .device_code("下发ACS套件")
.content("任务号:" + instruction.getTask_code() + ",指令号:" + instruction.getInstruction_code() + ",下发wcs任务序列反馈参数:" + jo) .content("任务号:" + instruction.getTask_code() + ",指令号:" + instruction.getInstruction_code() + ",下发wcs任务序列反馈参数:" + jo)
.build(); .build();
logDto1.setLog_level(4); logDto1.setLog_level(4);