From e3630c72b27bf11ebf2b47e7edc5e246676482b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Fri, 17 Mar 2023 13:48:39 +0800 Subject: [PATCH] =?UTF-8?q?wsdl=20=E9=9F=B3=E4=BF=A1=E9=80=9A=20=E9=9D=9E?= =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/dto/ExpertAdminExpertManageListDTO.java | 5 - .../pmapi/meta/helper/impl/TagsCacheImpl.java | 4 + pmapi/src/main/resources/application-dev.yml | 4 +- pmapi/src/main/resources/wsdl.xml | 120 +++++++++++++++++++++ 4 files changed, 126 insertions(+), 7 deletions(-) create mode 100644 pmapi/src/main/resources/wsdl.xml diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ExpertAdminExpertManageListDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ExpertAdminExpertManageListDTO.java index 4de1610..385e418 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ExpertAdminExpertManageListDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/dto/ExpertAdminExpertManageListDTO.java @@ -51,7 +51,6 @@ public class ExpertAdminExpertManageListDTO { */ private LocalDateTime birth; - /** * 籍贯 */ @@ -72,19 +71,16 @@ public class ExpertAdminExpertManageListDTO { */ private String idCard; - /** * 专家层级 */ private ExpertRegionInfo expertRegionInfo; - /** * 银行卡号 */ private String bankNo; - /** * 开户银行 */ @@ -95,7 +91,6 @@ public class ExpertAdminExpertManageListDTO { */ private List edu; - /** * 学位(字典code) */ diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/impl/TagsCacheImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/impl/TagsCacheImpl.java index b952ba6..0781219 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/impl/TagsCacheImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/impl/TagsCacheImpl.java @@ -6,6 +6,7 @@ import com.ningdatech.basic.util.CollUtils; import com.ningdatech.pmapi.meta.helper.basic.AbstractTagsCache; import com.ningdatech.pmapi.meta.model.dto.TagDTO; import com.ningdatech.pmapi.meta.model.dto.TagTreeDTO; +import io.micrometer.core.instrument.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -36,6 +37,9 @@ public class TagsCacheImpl extends AbstractTagsCache { @Override public TagDTO getByTagCode(String tagCode) { + if (StringUtils.isBlank(tagCode)) { + return null; + } return tagDtoMap.get(tagCode); } diff --git a/pmapi/src/main/resources/application-dev.yml b/pmapi/src/main/resources/application-dev.yml index b6df76f..8939195 100644 --- a/pmapi/src/main/resources/application-dev.yml +++ b/pmapi/src/main/resources/application-dev.yml @@ -176,8 +176,8 @@ organization: - GO_ff70e47bae684fdba0d64f4acab85661 yxt: - wsdl-url: http://115.239.137.23:9501/ws/v1?wsdl - #wsdl-url: file:///opt/nd-emapi/wsdl.xml +# wsdl-url: http://115.239.137.23:9501/ws/v1?wsdl + wsdl-url: classpath:/wsdl.xml #账号 user-code: hzndkj #密码 diff --git a/pmapi/src/main/resources/wsdl.xml b/pmapi/src/main/resources/wsdl.xml new file mode 100644 index 0000000..eed87a7 --- /dev/null +++ b/pmapi/src/main/resources/wsdl.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file