From b2af9456c25a0c80aa54e1b726c4b34ae2f6ddab Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 12 May 2022 11:17:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=92=8C=E5=8E=BF=E5=8C=BB=E9=99=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ZaxyyClient.java => PhxyyClient.java} | 5 +++- .../admin/client/http/UdPlatClient.java | 3 +++ .../admin/client/http/YyUCloud31Client.java | 3 +++ .../admin/controller/UdiWmsController.java | 24 +++++++++---------- .../main/resources/application-pro.properties | 6 ++--- 5 files changed, 25 insertions(+), 16 deletions(-) rename api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/{ZaxyyClient.java => PhxyyClient.java} (98%) diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java similarity index 98% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java index a860e83..e894eef 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java @@ -20,8 +20,11 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +/** + * 平和县医院对接 + */ @Service -public class ZaxyyClient implements BaseHttpClient { +public class PhxyyClient implements BaseHttpClient { @Value("${UDIWMS_IP}") private String udiWmsUrl; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/UdPlatClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/UdPlatClient.java index 2e99c8c..da49171 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/UdPlatClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/UdPlatClient.java @@ -25,6 +25,9 @@ import org.springframework.stereotype.Service; import java.lang.reflect.Field; import java.util.*; +/** + * 阳光采购平台 + */ @Slf4j @Service public class UdPlatClient implements BaseHttpClient { diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java index 4fa3494..bba372a 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java @@ -25,6 +25,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +/** + * 片仔癀诊断用友ERP + */ @Service public class YyUCloud31Client implements BaseHttpClient { diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java index e7c97f3..f4e4713 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java @@ -4,7 +4,7 @@ import com.glxp.mipsdl.admin.annotation.AuthRuleAnnotation; import com.glxp.mipsdl.admin.client.http.TestClient; import com.glxp.mipsdl.admin.client.http.UdPlatClient; import com.glxp.mipsdl.admin.client.http.YyUCloud31Client; -import com.glxp.mipsdl.admin.client.http.ZaxyyClient; +import com.glxp.mipsdl.admin.client.http.PhxyyClient; import com.glxp.mipsdl.admin.http.request.USignRequest; import com.glxp.mipsdl.admin.req.*; import com.glxp.mipsdl.common.enums.ResultEnum; @@ -33,7 +33,7 @@ public class UdiWmsController { @Resource private UdPlatClient udPlatClient; @Resource - private ZaxyyClient zaxyyClient; + private PhxyyClient phxyyClient; //获取erp往来单位信息接口 @AuthRuleAnnotation("") @@ -47,8 +47,8 @@ public class UdiWmsController { return pzhzdClient.getUnit(testUnitRequest); } else if (curFlag.equals("TEST")) { return testClient.getUnit(testUnitRequest); - } else if (curFlag.equals("ZAXYY")) { - return zaxyyClient.getUnit(testUnitRequest); + } else if (curFlag.equals("PHXYY")) { + return phxyyClient.getUnit(testUnitRequest); } else return ResultVOUtils.error(500, "当前第三方系统不支持往来单位信息查询！"); } @@ -63,8 +63,8 @@ public class UdiWmsController { return udPlatClient.getPrdoucts(udiwmsProductRequest); } else if (curFlag.equals("TEST")) { return testClient.getProducuts(udiwmsProductRequest); - } else if (curFlag.equals("ZAXYY")) { - return zaxyyClient.getPrdoucts(udiwmsProductRequest); + } else if (curFlag.equals("PHXYY")) { + return phxyyClient.getPrdoucts(udiwmsProductRequest); } return ResultVOUtils.error(500, "当前第三方系统不支持产品信息查询！"); @@ -78,8 +78,8 @@ public class UdiWmsController { return pzhzdClient.getOrders(udiwmsOrderRequest); } else if (curFlag.equals("TEST")) { return testClient.getOrders(udiwmsOrderRequest); - } else if (curFlag.equals("ZAXYY")) { - return zaxyyClient.getOrders(udiwmsOrderRequest); + } else if (curFlag.equals("PHXYY")) { + return phxyyClient.getOrders(udiwmsOrderRequest); } else return ResultVOUtils.error(500, "当前第三方系统不支持业务单据查询！"); @@ -91,8 +91,8 @@ public class UdiWmsController { public BaseResponse getOrderTypes(@RequestBody UdiwmsBusTypeRequest udiwmsBusTypeRequest) { if (curFlag.equals("TEST")) { return testClient.getBusType(udiwmsBusTypeRequest); - } else if (curFlag.equals("ZAXYY")) { - return zaxyyClient.getOrderTypes(udiwmsBusTypeRequest); + } else if (curFlag.equals("PHXYY")) { + return phxyyClient.getOrderTypes(udiwmsBusTypeRequest); } else return ResultVOUtils.error(500, "当前第三方系统不支持业务单据类型查询！"); @@ -104,8 +104,8 @@ public class UdiWmsController { public BaseResponse submitOrders(@RequestBody UdiwmsOrderRequest udiwmsOrderRequest) { if (curFlag.equals("TEST")) { return testClient.addOrders(udiwmsOrderRequest); - } else if (curFlag.equals("ZAXYY")) { - return zaxyyClient.submitOrders(udiwmsOrderRequest); + } else if (curFlag.equals("PHXYY")) { + return phxyyClient.submitOrders(udiwmsOrderRequest); } return ResultVOUtils.error(500, ""); } diff --git a/api-sync/src/main/resources/application-pro.properties b/api-sync/src/main/resources/application-pro.properties index f23aed6..3e28780 100644 --- a/api-sync/src/main/resources/application-pro.properties +++ b/api-sync/src/main/resources/application-pro.properties @@ -23,14 +23,14 @@ server.connectionTimeout=180000 #U8参数 #udi管理系统IP地址（上传文件解析后回传） UDIWMS_IP=http://192.168.0.109:9991 -#UDIWMS_IP=http://139.159.187.130/UDI_WMS_MC +#UDIWMS_IP=http://139.9.178.73:8080/UDI_WMS_MC/ API_KEY=1102 API_SECRET=4dc07484afd34e8083ba96e8fe564224 #文件导入 #0.NULL(空，未配置），1.GLXP(自定义规范标准），2.ZHIYE_V1(智业V1,诏安医院),3.YG_UDPLAT_V1(阳光采购平台）,4.PHXYY(平和县医院) FILE_VERSION_FLAG=PHXYY #接口实时获取 -#0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.ZAXYY(诏安县医院) -ONLINE_VESRION_FLAG=ZAXYY +#0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(诏安县医院) +ONLINE_VESRION_FLAG=PHXYY