2022年11月16日20:15:56

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IContainerDescClient.java

@@ -5,6 +5,8 @@ import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(
 	value = LauncherConstant.APPLICATION_CLIENT_NAME
@@ -15,7 +17,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 public interface IContainerDescClient {
 	String API_PREFIX = "/client";
 	String GET_CONTAINER_DESC_LIST = API_PREFIX + "/getContainerDescList";
-	String GET_CONTAINER_DESC = API_PREFIX + "/getContainerDesc";
+	String GET_CONTAINER = API_PREFIX + "/getContainer";
 
 	/**
 	 * 获取箱信息list
@@ -30,7 +32,7 @@ public interface IContainerDescClient {
 	 *
 	 * @return
 	 */
-	@GetMapping(GET_CONTAINER_DESC)
-	BasicContainerDesc getContainerDesc(BasicContainerDesc basicContainerDesc);
+	@GetMapping(GET_CONTAINER)
+	R<BasicContainerDesc> getContainer(@RequestParam("name") String name);
 
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/ArchivesServiceImpl.java

@@ -116,12 +116,10 @@ public class ArchivesServiceImpl extends ServiceImpl<ArchivesMapper, Archives> i
 			}
 			//箱类型
 			if (ObjectUtils.isNotNull(archives.getName())){
-				BasicContainerDesc basicContainerDesc = new BasicContainerDesc();
-				basicContainerDesc.setName(archives.getName());
-				BasicContainerDesc detail = containerDescClient.getContainerDesc(basicContainerDesc);
-				if (ObjectUtils.isNotNull(detail)){
-					archives.setName(detail.getName());
-					archives.setTypeId(detail.getId());
+				R<BasicContainerDesc> detail = containerDescClient.getContainer(archives.getName());
+				if (detail.isSuccess() &&  ObjectUtils.isNotNull(detail.getData())){
+					archives.setName(detail.getData().getName());
+					archives.setTypeId(detail.getData().getId());
 				}else{
 					throw new RuntimeException("箱型不存在");
 				}

blade-service/blade-client/src/main/java/org/springblade/client/container/feign/ContainerDescClient.java

@@ -10,6 +10,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -33,13 +34,13 @@ public class ContainerDescClient implements IContainerDescClient {
 	}
 
 	@Override
-	public BasicContainerDesc getContainerDesc(BasicContainerDesc basicContainerDesc) {
+	public R<BasicContainerDesc> getContainer(@RequestParam("name") String name) {
 		LambdaQueryWrapper<BasicContainerDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(BasicContainerDesc::getIsDeleted,0)
-			.eq(ObjectUtils.isNotNull(basicContainerDesc.getName()),BasicContainerDesc::getName, basicContainerDesc.getName())
-			.eq(ObjectUtils.isNotNull(basicContainerDesc.getCode()),BasicContainerDesc::getCode, basicContainerDesc.getCode())
-			.eq(ObjectUtils.isNotNull(basicContainerDesc.getId()),BasicContainerDesc::getId, basicContainerDesc.getId())
+			.eq(ObjectUtils.isNotNull(name),BasicContainerDesc::getName, name)
+//			.eq(ObjectUtils.isNotNull(basicContainerDesc.getCode()),BasicContainerDesc::getCode, basicContainerDesc.getCode())
+//			.eq(ObjectUtils.isNotNull(basicContainerDesc.getId()),BasicContainerDesc::getId, basicContainerDesc.getId())
 			.eq(BasicContainerDesc::getTenantId, AuthUtil.getTenantId());
-		return basicContainerDescService.getOne(lambdaQueryWrapper);
+		return R.data(basicContainerDescService.getOne(lambdaQueryWrapper));
 	}
 }