From 3a08dee5cc3345331d2bedfe7cadbde4a63869ed Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:18:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor(buildpackage):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=89=A7=E8=A1=8C=E6=97=A5=E5=BF=97=E5=92=8C?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 SoSaleOutPluginInitializerToC 和 SoSaleReturnPluginInitializerToC 类中： - 添加 requestJsonParam 变量以获取请求参数 - 在创建线程时，将插件名称和请求参数作为线程名称 - 优化日志输出，增加请求参数信息 - 在 DeleteU8cDataUtil 类中： - 更新 JsonRootBean 属性名称，使用驼峰命名法 - 修改 deleteinfo 和 queryinfo 的 getter 和 setter 方法 - 在 DeleteU8cDataUtilTest 类中： - 注释掉删除销售发票的测试方法 - 新增删除销售出库单和销售订单的测试方法 --- .../sales/SoSaleOutPluginInitializerToC.java | 4 ++- .../SoSaleReturnPluginInitializerToC.java | 6 ++-- .../lets/util/DeleteU8cDataUtilTest.java | 6 +++- .../frame/deletedata/DeleteU8cDataUtil.java | 8 +++--- .../frame/deletedata/vo/JsonRootBean.java | 28 +++++++++++++++---- 5 files changed, 39 insertions(+), 13 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 0ea35107..84d5815d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -124,6 +124,8 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { logger.info("触发调用：{}" + getPluginName()); try { + String requestJsonParam = String.valueOf(requestJson.get("param")); + Thread thread = new Thread(new Runnable() { @Override public void run() { @@ -162,7 +164,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { logger.info("executeBusiness方法调用结束：" + getPluginName() + "-插件 执行耗时：{}", (endMillis - startMillis)); // return null; } - }, "执行插件：" + getPluginName()); + }, "执行插件：" + getPluginName() + " " + requestJsonParam); thread.start(); if (requestJson != null && requestJson.get("type") != null && ProfilesActiveConstant.TYPE_DETAIL_ERROR.equals(requestJson.get("type"))) { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index 3d38917f..daeb4f03 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -113,6 +113,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { logger.info("触发调用：{}" + getPluginName()); try { + String requestJsonParam = String.valueOf(requestJson.get("param")); + Thread thread = new Thread(new Runnable() { @Override public void run() { @@ -149,9 +151,9 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { logger.info("executeBusiness方法调用结束：" + getPluginName() + "-插件 执行耗时：{}", (endMillis - startMillis)); // return null; } - }, "执行插件：" + getPluginName()); + }, "执行插件：" + getPluginName() + " " + requestJsonParam); thread.start(); - + if (requestJson != null && requestJson.get("type") != null && ProfilesActiveConstant.TYPE_DETAIL_ERROR.equals(requestJson.get("type"))) { try { thread.join(); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java index 1ca4ea9f..e188c125 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java @@ -26,7 +26,11 @@ public class DeleteU8cDataUtilTest { @Test public void deleteSoSaleinvoice() { try { - deleteU8cDataUtil.deleteSoSaleinvoice(); + //删除销售发票 +// deleteU8cDataUtil.deleteSoSaleinvoice(); + //删除销售出库单 + deleteU8cDataUtil.deleteIcGeneralH(); + //删除销售订单 } catch (Exception e) { e.printStackTrace(); } diff --git a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java index a0c9bd4c..da56c31c 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -89,8 +89,8 @@ public class DeleteU8cDataUtil { queryinfo.setBillcode(deleteU8cDataUtilEntity.getVbillcode()); JsonRootBean jsonRootBean = new JsonRootBean(); - jsonRootBean.setDeleteinfo(deleteinfo); - jsonRootBean.setQueryinfo(queryinfo); + jsonRootBean.setDeleteInfo(deleteinfo); + jsonRootBean.setQueryInfo(queryinfo); sendU8C("http://39.170.109.90:8088/u8cloud/api/ic/saleout/delete", JSON.toJSONString(jsonRootBean)); } } @@ -122,8 +122,8 @@ public class DeleteU8cDataUtil { queryinfo.setCode(deleteU8cDataUtilEntity.getVreceiptcode()); JsonRootBean jsonRootBean = new JsonRootBean(); - jsonRootBean.setDeleteinfo(deleteinfo); - jsonRootBean.setQueryinfo(queryinfo); + jsonRootBean.setDeleteInfo(deleteinfo); + jsonRootBean.setQueryInfo(queryinfo); sendU8C("http://39.170.109.90:8088/u8cloud/api/so/saleinvoice/delete", JSON.toJSONString(jsonRootBean)); } } diff --git a/service/src/main/java/com/hzya/frame/deletedata/vo/JsonRootBean.java b/service/src/main/java/com/hzya/frame/deletedata/vo/JsonRootBean.java index c9feba0e..f37dc0ee 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/vo/JsonRootBean.java +++ b/service/src/main/java/com/hzya/frame/deletedata/vo/JsonRootBean.java @@ -14,20 +14,38 @@ public class JsonRootBean { private Deleteinfo deleteinfo; private Queryinfo queryinfo; - public void setDeleteinfo(Deleteinfo deleteinfo) { - this.deleteinfo = deleteinfo; - } + private Deleteinfo deleteInfo; + private Queryinfo queryInfo; public Deleteinfo getDeleteinfo() { return deleteinfo; } - public void setQueryinfo(Queryinfo queryinfo) { - this.queryinfo = queryinfo; + public void setDeleteinfo(Deleteinfo deleteinfo) { + this.deleteinfo = deleteinfo; } public Queryinfo getQueryinfo() { return queryinfo; } + public void setQueryinfo(Queryinfo queryinfo) { + this.queryinfo = queryinfo; + } + + public Deleteinfo getDeleteInfo() { + return deleteInfo; + } + + public void setDeleteInfo(Deleteinfo deleteInfo) { + this.deleteInfo = deleteInfo; + } + + public Queryinfo getQueryInfo() { + return queryInfo; + } + + public void setQueryInfo(Queryinfo queryInfo) { + this.queryInfo = queryInfo; + } } \ No newline at end of file