From f8930c428cbfcb37ba4940ca9c25f0a0bc6c3bbb Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 8 Jul 2022 09:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=92=8C=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/admin/client/http/PhxyyClient.java | 4 +- .../mipsdl/admin/client/http/TestClient.java | 132 ++++++------------ .../admin/entity/test/TestOrderResponse.java | 9 ++ .../glxp/mipsdl/admin/http/UdiwmsClient.java | 5 +- .../thread/system/TaskExecutorConfig.java | 8 +- .../com/glxp/mipsdl/admin/util/FileUtils.java | 34 ++++- .../main/resources/application-pro.properties | 2 +- 7 files changed, 95 insertions(+), 99 deletions(-) create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/entity/test/TestOrderResponse.java diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java index 9f2bf56..97b6207 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java @@ -55,7 +55,9 @@ public class PhxyyClient { headArray.add("secret_key"); headArray.add(thirdSysConfig.getThirdSysConfig().getSecretkey()); } - return (String[]) headArray.toArray(); + String[] strArray = new String[headArray.size()]; + headArray.toArray(strArray); + return strArray; } @Resource diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java index 11156b4..223eff8 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java @@ -1,21 +1,25 @@ package com.glxp.mipsdl.admin.client.http; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.mipsdl.admin.entity.test.TestOrderResponse; import com.glxp.mipsdl.admin.req.*; import com.glxp.mipsdl.admin.req.phxyy.PhUnitRequest; -import com.glxp.mipsdl.admin.res.system.UdiwmsWarehouseResponse; import com.glxp.mipsdl.admin.res.system.*; import com.glxp.mipsdl.admin.util.CustomUtil; +import com.glxp.mipsdl.admin.util.FileUtils; import com.glxp.mipsdl.common.res.BaseResponse; import com.glxp.mipsdl.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 测试客户端，用于模拟测试数据 @@ -32,21 +36,13 @@ public class TestClient { * @return */ public BaseResponse getUnit(PhUnitRequest testUnitRequest) { - List unitResponses = new ArrayList<>(); - AtomicInteger unitId = new AtomicInteger(2468); - for (int i = 0; i < 10; i++) { - UdiwmsUnitResponse response = new UdiwmsUnitResponse(); - response.setUnitId(String.valueOf(unitId.get())); - unitId.addAndGet(1); - response.setName("福建省诏安县医院"); - response.setSpell("ZAXYY"); - response.setAddr("诏安县南诏镇江厝前路65号"); - response.setCreditNo("123506244897495930"); - response.setContact("沈主任"); - response.setMobile("13306961860"); - unitResponses.add(response); - } - return ResultVOUtils.success(unitResponses); + + + String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方往来单位测试数据.json"); + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(data, new TypeReference>>() { + }); + return udiDlDeviceResponse; } /** @@ -56,36 +52,13 @@ public class TestClient { * @return */ public BaseResponse getProducuts(UdiwmsProductRequest udiwmsProductRequest) { - List productInfoResponses = new ArrayList<>(); - for (int i = 0; i < 10; i++) { - UdiwmsProductInfoResponse response = UdiwmsProductInfoResponse.builder() - .code("6555") - .name("下肢直型锁定钢板") - .measname("块") - .spec("12孔") - .model("12孔") - .registerNo("20153461024") - .manufactory("江苏艾迪尔") - .supName("南昌必理商贸有限公司") - .cplb("产品类别") - .flbm("分类编码") - .qxlb("器械类别") - .ybbm("医保编码") - .sptm("商品条码") - .tyshxydm("注册人社会信用号") - .zczbhhzbapzbh("注册证 备案证号") - .ylqxzcrbarmc("注册/备案人名称") - .ylqxzcrbarywmc("注册/备案人英文名称") - .cpms("产品描述") - .spmc("商品名称") - .qtbm("其他编码") - .zczyxqz("注册证有效期截止时间") - .updateTime(new Date()) - .build(); - productInfoResponses.add(response); - } - return ResultVOUtils.success(productInfoResponses); + String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方产品信息测试数据.json"); + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(data, new TypeReference>>() { + }); + return udiDlDeviceResponse; + } /** @@ -130,26 +103,16 @@ public class TestClient { public BaseResponse getBusType(UdiwmsBusTypeRequest udiwmsBusTypeRequest) { + + if (null == udiwmsBusTypeRequest) { return ResultVOUtils.error(500, "参数不能未空"); } - List udiwmsBusTypeResponses = new ArrayList<>(); - UdiwmsBusTypeResponse udiwmsBusTypeResponse = new UdiwmsBusTypeResponse(); - udiwmsBusTypeResponse.setId("1"); - udiwmsBusTypeResponse.setCode("cgrk"); - udiwmsBusTypeResponse.setName("采购入库单"); - udiwmsBusTypeResponse.setRemark("测试"); - udiwmsBusTypeResponses.add(udiwmsBusTypeResponse); - UdiwmsBusTypeResponse udiwmsBusTypeResponse2 = new UdiwmsBusTypeResponse(); - udiwmsBusTypeResponse2.setId("2"); - udiwmsBusTypeResponse2.setCode("syck"); - udiwmsBusTypeResponse2.setName("使用出库单"); - udiwmsBusTypeResponse2.setRemark("测试"); - udiwmsBusTypeResponses.add(udiwmsBusTypeResponse2); - udiwmsBusTypeResponses.add(udiwmsBusTypeResponse); - udiwmsBusTypeResponses.add(udiwmsBusTypeResponse2); - - return ResultVOUtils.success(udiwmsBusTypeResponses); + String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方单据类型测试数据.json"); + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(data, new TypeReference>>() { + }); + return udiDlDeviceResponse; } /** @@ -159,12 +122,14 @@ public class TestClient { * @return */ public BaseResponse addOrders(UdiwmsOrderRequest udiwmsOrderRequest) { - Map verifyResult = verifyOrderParams(udiwmsOrderRequest); - boolean flag = (boolean) verifyResult.get("flag"); - if (!flag) { - return ResultVOUtils.error(500, verifyResult.get("msg").toString()); - } - return ResultVOUtils.success(CustomUtil.getId()); +// Map verifyResult = verifyOrderParams(udiwmsOrderRequest); +// boolean flag = (boolean) verifyResult.get("flag"); +// if (!flag) { +// return ResultVOUtils.error(500, verifyResult.get("msg").toString()); +// } + TestOrderResponse udiwmsOrderResponse = new TestOrderResponse(); + udiwmsOrderResponse.setThirdBillNo(CustomUtil.getId()); + return ResultVOUtils.success(udiwmsOrderResponse); } /** @@ -184,7 +149,7 @@ public class TestClient { msg = "第三方系统ID不能为空"; } else if (StrUtil.isBlank(udiwmsOrderRequest.getBillDate()) || StrUtil.isBlank(udiwmsOrderRequest.getBillFlag()) || StrUtil.isBlank(udiwmsOrderRequest.getCorpName()) || StrUtil.isBlank(udiwmsOrderRequest.getCorpId()) || StrUtil.isBlank(udiwmsOrderRequest.getBillType()) || StrUtil.isBlank(udiwmsOrderRequest.getStatus()) - || StrUtil.isBlank(udiwmsOrderRequest.getStatus()) || CollUtil.isEmpty(udiwmsOrderRequest.getItem())) { + ) {// || StrUtil.isBlank(udiwmsOrderRequest.getStatus()) || CollUtil.isEmpty(udiwmsOrderRequest.getItem()) flag = false; msg = "订单关键参数缺失或错误"; } else { @@ -260,23 +225,10 @@ public class TestClient { if (null == udiwmsWarehouseRequest || StrUtil.isBlank(udiwmsWarehouseRequest.getThirdSys())) { return ResultVOUtils.error(500, "第三方系统ID不能为空"); } - List list = new ArrayList<>(); - for (int i = 0; i < 3; i++) { - UdiwmsWarehouseResponse response = new UdiwmsWarehouseResponse(); - response.setCode("1001"); - response.setName("总库"); - response.setRemark("备注"); - List details = new ArrayList<>(); - for (int j = 0; j < 3; j++) { - UdiwmsWarehouseDetail detail = new UdiwmsWarehouseDetail(); - detail.setCode("100101"); - detail.setName("货位1"); - detail.setRemark("货位备注"); - details.add(detail); - } - response.setDetails(details); - list.add(response); - } - return ResultVOUtils.success(list); + String data = FileUtils.readFileAll("E:\\第三方测试数据\\第三方仓库字段测试数据.json"); + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(data, new TypeReference>>() { + }); + return udiDlDeviceResponse; } } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/test/TestOrderResponse.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/test/TestOrderResponse.java new file mode 100644 index 0000000..a98b527 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/test/TestOrderResponse.java @@ -0,0 +1,9 @@ +package com.glxp.mipsdl.admin.entity.test; + +import lombok.Data; + +@Data +public class TestOrderResponse { + private String thirdBillNo; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/http/UdiwmsClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/http/UdiwmsClient.java index 8d201ef..87ed403 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/http/UdiwmsClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/http/UdiwmsClient.java @@ -51,7 +51,10 @@ public class UdiwmsClient { headArray.add("secret_key"); headArray.add("apiSecret"); } - return (String[]) headArray.toArray(); + + String[] strArray = new String[headArray.size()]; + headArray.toArray(strArray); + return strArray; } public BaseResponse postProducts(PostThrProductsRequest postThrProductsRequest) { diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/thread/system/TaskExecutorConfig.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/thread/system/TaskExecutorConfig.java index eff2f53..9121219 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/thread/system/TaskExecutorConfig.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/thread/system/TaskExecutorConfig.java @@ -32,10 +32,10 @@ public class TaskExecutorConfig implements AsyncConfigurer { return threadPool; } - public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { - - return new MyAsyncExceptionHandler(); - } +// public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { +// +// return new MyAsyncExceptionHandler(); +// } /** * 自定义异常处理类 diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/FileUtils.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/FileUtils.java index bc94e0f..41b5068 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/FileUtils.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/FileUtils.java @@ -1,7 +1,6 @@ package com.glxp.mipsdl.admin.util; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; +import java.io.*; public class FileUtils { /** @@ -31,4 +30,35 @@ public class FileUtils { return e.getMessage(); } } + + + /** + * 读取文件内容 + * + * @param fileName + * @return + */ + public static String readFileAll(String fileName) { + String encoding = "UTF-8"; + File file = new File(fileName); + + Long filelength = file.length(); + byte[] filecontent = new byte[filelength.intValue()]; + try { + FileInputStream in = new FileInputStream(file); + in.read(filecontent); + in.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + try { + return new String(filecontent, encoding); + } catch (UnsupportedEncodingException e) { + System.err.println("The OS does not support " + encoding); + e.printStackTrace(); + return ""; + } + } } diff --git a/api-sync/src/main/resources/application-pro.properties b/api-sync/src/main/resources/application-pro.properties index 7271553..e08bfc6 100644 --- a/api-sync/src/main/resources/application-pro.properties +++ b/api-sync/src/main/resources/application-pro.properties @@ -31,7 +31,7 @@ API_SECRET=4dc07484afd34e8083ba96e8fe564224 FILE_VERSION_FLAG=PHXYY #接口实时获取 #0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(诏安县医院) -ONLINE_VESRION_FLAG=PHXYY +ONLINE_VESRION_FLAG=TEST THIRD_ID=thirdId ok.http.connect-timeout=3000 ok.http.read-timeout=3000