1.场站api类相互冲突问题修改

blade-service/blade-los/src/main/java/org/springblade/los/ftp/controller/ApiController.java → blade-service/blade-los/src/main/java/org/springblade/los/ftp/controller/ApiCyCtnrController.java

@@ -1,22 +1,17 @@
 package org.springblade.los.ftp.controller;
 
-import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.springblade.core.tool.api.R;
 import org.springblade.los.ftp.dto.ApiRequest;
-import org.springblade.los.ftp.dto.FtpDto;
 import org.springblade.los.ftp.service.CyFtpService;
-import org.springblade.los.ftp.service.FtpService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotNull;
-
 /**
  * @author :jixinyuan
  * @date : 2024/3/5
@@ -24,7 +19,7 @@ import javax.validation.constraints.NotNull;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/apicyctnr")
-public class ApiController {
+public class ApiCyCtnrController {
 
 	@Autowired
 	private final CyFtpService cyFtpService;

blade-service/blade-los/src/main/java/org/springblade/los/ftp/service/impl/CyFtpServiceImpl.java

@@ -24,6 +24,7 @@ import org.springblade.los.box.dynamics.mapper.BoxDynamicsRecordItemsMapper;
 import org.springblade.los.box.dynamics.mapper.BoxDynamicsRecordMapper;
 import org.springblade.los.box.entity.PutBox;
 import org.springblade.los.box.excel.EmptyContainerAppearanceAnalysis;
+import org.springblade.los.box.mapper.PutBoxMapper;
 import org.springblade.los.box.service.IPutBoxService;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.business.sea.mapper.BillsMapper;
@@ -68,7 +69,7 @@ public class CyFtpServiceImpl implements CyFtpService {
 
 	private final BoxDynamicsRecordMapper boxDynamicsRecordService;
 
-	private final IPutBoxService putBoxService;
+	private final PutBoxMapper putBoxService;
 
 	private final BillsMapper billsMapper;
 
@@ -484,7 +485,7 @@ public class CyFtpServiceImpl implements CyFtpService {
 			.distinct().collect(Collectors.toList());
 		List<PutBox> putBoxList = new ArrayList<>();
 		if (!releaseNoList.isEmpty()) {
-			putBoxList = putBoxService.list(new LambdaQueryWrapper<PutBox>()
+			putBoxList = putBoxService.selectList(new LambdaQueryWrapper<PutBox>()
 				.eq(PutBox::getTenantId, AuthUtil.getTenantId())
 				.eq(PutBox::getIsDeleted, 0)
 				.in(PutBox::getContainerNumber, releaseNoList));