From e456a257a532e00fb30489bd6c148bbcd7fe5e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Fri, 8 Dec 2023 18:49:22 +0800 Subject: [PATCH] =?UTF-8?q?1,=E7=94=B3=E8=AF=B7=E7=89=A9=E6=96=99=E7=BC=96?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/api/user/OriginalBomApi.java | 4 ++-- .../bomnew/pojo/dto/AddMaterialResultDTO.java | 15 +++++++++++++++ .../product/bomnew/pojo/dto/MaterialMainDTO.java | 7 +++++++ .../product/bomnew/service/MaterialService.java | 7 +++++++ .../bomnew/service/test/MaterialServiceTest.java | 2 +- 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddMaterialResultDTO.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java index 0e96bcb0..7f5b2277 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java @@ -153,8 +153,8 @@ public class OriginalBomApi extends BaseApi { @ApiOperation("testaddMaterial") @GetMapping("新增物料") @Transactional(rollbackFor = Exception.class) - public ResultVO importBom(@RequestParam("drawingNo")String drawingNo, - @RequestParam("materialName")String materialName, + public ResultVO importBom(@RequestParam(value = "drawingNo" ,required = false)String drawingNo, + @RequestParam(value = "materialName" ,required = false)String materialName, @RequestParam("materialCategoryCode")String materialCategoryCode) throws IOException { materialService.addMaterial(drawingNo, materialName,materialCategoryCode); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddMaterialResultDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddMaterialResultDTO.java new file mode 100644 index 00000000..29c914b6 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddMaterialResultDTO.java @@ -0,0 +1,15 @@ +package com.nflg.product.bomnew.pojo.dto; + + +import io.swagger.models.auth.In; +import lombok.Data; + +@Data +public class AddMaterialResultDTO { + + private String data; + + private String msg; + + private Integer state; +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/MaterialMainDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/MaterialMainDTO.java index 223b89be..28718abc 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/MaterialMainDTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/MaterialMainDTO.java @@ -1,5 +1,6 @@ package com.nflg.product.bomnew.pojo.dto; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -98,6 +99,12 @@ public class MaterialMainDTO implements Serializable { private List attrs=new ArrayList<>(); + private OptionalEbomConfigEntity materialTypeZeroFile=new OptionalEbomConfigEntity(); + private OptionalEbomConfigEntity materialTypeOneFile=new OptionalEbomConfigEntity(); + + private OptionalEbomConfigEntity materialTypeTwoFile=new OptionalEbomConfigEntity(); + + private static final long serialVersionUID = 1L; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java index 2896034f..46aff1a2 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java @@ -1,12 +1,14 @@ package com.nflg.product.bomnew.service; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.client.MaterialMainClient; import com.nflg.product.bomnew.config.NacosConfig; +import com.nflg.product.bomnew.pojo.dto.AddMaterialResultDTO; import com.nflg.product.bomnew.pojo.dto.MaterialMainDTO; import com.nflg.product.bomnew.util.HttpUtils; import nflg.product.common.constant.STATE; @@ -45,6 +47,11 @@ public class MaterialService { HttpUtils httpUtils=new HttpUtils(); String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(),JSON.toJSONString(materialMainDTO),token); + + AddMaterialResultDTO result= JSON.parseObject(s,AddMaterialResultDTO.class); + if(STATE.Success.getState().equals(result.getState()) ){ + return result.getData().toString(); + } return s; diff --git a/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java b/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java index b3c852f0..c8a0a654 100644 --- a/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java +++ b/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java @@ -22,7 +22,7 @@ public class MaterialServiceTest { String data = materialService.addMaterial("1111", "afafafa", "1234"); System.out.println(data); - } catch (NflgBusinessException e) { + } catch (Exception e) { e.getMessage(); } }