From 6c13ac25351a3557754b710a307fa2bb006a92e5 Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 8 Dec 2023 20:05:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/MaterialService.java | 34 ++++++++++--------- .../aggreg/PublishMaterialService.java | 2 +- .../base/core/conmon/util/SessionUtil.java | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) 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 d30fc33f..b5f66662 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 @@ -28,44 +28,46 @@ public class MaterialService { /** * 申请物料 - * @param drawingNo 图号 - * @param materialName 名称 + * + * @param drawingNo 图号 + * @param materialName 名称 * @param materialCategoryCode 物料类别编码 * @return 物料编码 */ - public String addMaterial(String drawingNo, String materialName, String materialCategoryCode) throws IOException { - MaterialMainDTO materialMainDTO=new MaterialMainDTO(); + public String addMaterial(String drawingNo, String materialName, String materialCategoryCode) throws IOException { + MaterialMainDTO materialMainDTO = new MaterialMainDTO(); materialMainDTO.setMaterialName(materialName); materialMainDTO.setDrawingNo(drawingNo); - materialMainDTO.setMaterialDesc(StrUtil.join(" ",drawingNo,materialName)); + materialMainDTO.setMaterialDesc(StrUtil.join(" ", drawingNo, materialName)); materialMainDTO.setMaterialCategoryCode(materialCategoryCode); materialMainDTO.setOpEnum(1); materialMainDTO.setApplyDeptName(SessionUtil.getDepartName()); - String token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuS_oeaBr-a1geeoi-S4reW_gy9JVOaUr-aMgVwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk2OTc4NDEzNjk0OTc4LFwiZnVsbERlcHROYW1lXCI6XCJPVT1JVOaUr-aMgSxPVT3kv6Hmga_mtYHnqIvkuK3lv4MsT1U956aP5bu65Y2X5pa56Lev6Z2i5py65qKw5pyJ6ZmQ5YWs5Y-4LERDPW5mbGdcIixcInF1ZXJ5RGF0YVwiOjMsXCJyZWFsTmFtZVwiOlwi6YOR5Yab5qaVXCIsXCJyb3dJZFwiOjE1ODUxNjQ2NjgzMzU0Mzk4ODEsXCJ1c2VyQ29kZVwiOlwiUUhJMTcwNjIxMDBcIixcInVzZXJOYW1lXCI6XCJRSEkxNzA2MjEwMFwifSIsImV4cCI6MTcwMjAzMTg2MiwianRpIjoiMjdmMjg2MDUtNzgxZi00MDQwLWJkZDMtMzcwNGI2MWU1YzJiIn0.hpzLa9-ZYEqclA5iT-Jv62Ow3PduuP7Gqyvb7uYJcRE"; -// String token=SessionUtil.getsessionKey(); - HttpUtils httpUtils=new HttpUtils(); + String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuS_oeaBr-a1geeoi-S4reW_gy9JVOaUr-aMgVwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk2OTc4NDEzNjk0OTc4LFwiZnVsbERlcHROYW1lXCI6XCJPVT1JVOaUr-aMgSxPVT3kv6Hmga_mtYHnqIvkuK3lv4MsT1U956aP5bu65Y2X5pa56Lev6Z2i5py65qKw5pyJ6ZmQ5YWs5Y-4LERDPW5mbGdcIixcInF1ZXJ5RGF0YVwiOjMsXCJyZWFsTmFtZVwiOlwi6YOR5Yab5qaVXCIsXCJyb3dJZFwiOjE1ODUxNjQ2NjgzMzU0Mzk4ODEsXCJ1c2VyQ29kZVwiOlwiUUhJMTcwNjIxMDBcIixcInVzZXJOYW1lXCI6XCJRSEkxNzA2MjEwMFwifSIsImV4cCI6MTcwMjAzMTg2MiwianRpIjoiMjdmMjg2MDUtNzgxZi00MDQwLWJkZDMtMzcwNGI2MWU1YzJiIn0.hpzLa9-ZYEqclA5iT-Jv62Ow3PduuP7Gqyvb7uYJcRE"; +// String token=SessionUtil.getSessionKey(); + HttpUtils httpUtils = new HttpUtils(); - String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(),JSON.toJSONString(materialMainDTO),token); + String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(), JSON.toJSONString(materialMainDTO), token); return s; } - public String addMaterialPublish(String drawingNo, String materialName, String materialCategoryCode) throws IOException { - MaterialMainDTO materialMainDTO=new MaterialMainDTO(); + public String addMaterialPublish(String drawingNo, String materialName, String materialCategoryCode) throws IOException { + MaterialMainDTO materialMainDTO = new MaterialMainDTO(); materialMainDTO.setMaterialName(materialName); materialMainDTO.setDrawingNo(drawingNo); materialMainDTO.setMaterialDesc(materialName); materialMainDTO.setMaterialCategoryCode(materialCategoryCode); materialMainDTO.setOpEnum(1); - // materialMainDTO.setRowId(IdWorker.getId()); + // materialMainDTO.setRowId(IdWorker.getId()); materialMainDTO.setApplyDeptName(SessionUtil.getDepartName()); - // String token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI"; - String token=SessionUtil.getsessionKey(); - HttpUtils httpUtils=new HttpUtils(); + // String token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI"; + String token = SessionUtil.getSessionKey(); - String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(),JSON.toJSONString(materialMainDTO),token); + HttpUtils httpUtils = new HttpUtils(); + + String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(), JSON.toJSONString(materialMainDTO), token); return s; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java index b9c5c718..23286d72 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java @@ -273,7 +273,7 @@ public class PublishMaterialService { e.printStackTrace(); } - } else { + } else { //同物料号 material = Convert.convert(new TypeReference() { }, optionalMbomCompareEntity); material.setRowId(IdWorker.getId()); diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java index 8664b62c..35f8145a 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java @@ -88,7 +88,7 @@ public class SessionUtil { return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getLanguage).orElse(null); } - public static String getsessionKey() { + public static String getSessionKey() { return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getSessionKey).orElse(null); } }