From 45f372cec859ae4ed36e9fafb1a5900bc14c1f39 Mon Sep 17 00:00:00 2001 From: huzhengkao <562572218@qq.com> Date: Tue, 3 Jun 2025 16:04:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E9=9B=86?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=A4=84=E7=90=86=E5=8F=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HELP.md | 16 - d2d.pfx | Bin 2477 -> 0 bytes mvnw | 310 ------------------ mvnw.cmd.folderdownload.crdownload | Bin 6608 -> 0 bytes pom.xml | 6 + .../controller/ProvTestServerController.java | 41 ++- .../domain/DomesticPharmaBaseInfo.java | 115 +++++-- .../d2d/provtest/domain/DomesticProducer.java | 138 -------- .../d2d/provtest/domain/ReceiveDataLog.java | 57 ++++ .../d2d/provtest/entity/BaseEntity.java | 2 + .../d2d/provtest/entity/VTTSBasic.java | 41 ++- .../DomesticPharmaBaseInfoFactory.java | 57 ++-- .../provtest/mapper/ReceiveDataLogMapper.java | 11 + .../service/IReceiveDataLogService.java | 7 + .../provtest/service/XmlParserService.java | 66 ++-- .../impl/ReceiveDataLogServiceImpl.java | 15 + .../d2d/provtest/utils/XmlStringParser.java | 1 - .../resources/mapper/ReceiveDataLogMapper.xml | 8 + .../controller/ProvTestServerController.class | Bin 7501 -> 9682 bytes .../domain/DomesticPharmaBaseInfo.class | Bin 16460 -> 15501 bytes .../provtest/domain/DomesticProducer.class | Bin 15230 -> 0 bytes .../d2d/provtest/entity/BaseEntity.class | Bin 1580 -> 4534 bytes .../d2d/provtest/entity/VTTSBasic.class | Bin 3314 -> 1617 bytes .../DomesticPharmaBaseInfoFactory.class | Bin 4135 -> 2780 bytes .../provtest/service/XmlParserService.class | Bin 7078 -> 8139 bytes .../d2d/provtest/utils/XmlStringParser.class | Bin 4580 -> 4580 bytes .../compile/default-compile/createdFiles.lst | 2 +- .../compile/default-compile/inputFiles.lst | 2 +- 28 files changed, 326 insertions(+), 569 deletions(-) delete mode 100644 HELP.md delete mode 100644 d2d.pfx delete mode 100644 mvnw delete mode 100644 mvnw.cmd.folderdownload.crdownload delete mode 100644 src/main/java/com/alihealth/d2d/provtest/domain/DomesticProducer.java create mode 100644 src/main/java/com/alihealth/d2d/provtest/domain/ReceiveDataLog.java create mode 100644 src/main/java/com/alihealth/d2d/provtest/mapper/ReceiveDataLogMapper.java create mode 100644 src/main/java/com/alihealth/d2d/provtest/service/IReceiveDataLogService.java create mode 100644 src/main/java/com/alihealth/d2d/provtest/service/impl/ReceiveDataLogServiceImpl.java create mode 100644 src/main/resources/mapper/ReceiveDataLogMapper.xml delete mode 100644 target/classes/com/alihealth/d2d/provtest/domain/DomesticProducer.class diff --git a/HELP.md b/HELP.md deleted file mode 100644 index 5517db2..0000000 --- a/HELP.md +++ /dev/null @@ -1,16 +0,0 @@ -# Getting Started - -### Reference Documentation -For further reference, please consider the following sections: - -* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) -* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.2.5.RELEASE/maven-plugin/) -* [Spring Web](https://docs.spring.io/spring-boot/docs/2.2.5.RELEASE/reference/htmlsingle/#boot-features-developing-web-applications) - -### Guides -The following guides illustrate how to use some features concretely: - -* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) -* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) -* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/) - diff --git a/d2d.pfx b/d2d.pfx deleted file mode 100644 index 15cf0f4ec514c59560a330373d13a057ae9706af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2477 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 diff --git a/mvnw b/mvnw deleted file mode 100644 index a16b543..0000000 --- a/mvnw +++ /dev/null @@ -1,310 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd.folderdownload.crdownload b/mvnw.cmd.folderdownload.crdownload deleted file mode 100644 index 457b7a603fe4dfb959af9a720968825b012e1dad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6608 zcmeIuF#!Mo0K%a4Pi+kkh(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFz`Gu8PEU$ diff --git a/pom.xml b/pom.xml index 1226589..59d15cd 100644 --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,12 @@ spring-boot-starter-data-jpa + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + diff --git a/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java b/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java index da29b5b..c00ab12 100644 --- a/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java +++ b/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java @@ -2,10 +2,11 @@ package com.alihealth.d2d.provtest.controller; import com.alibaba.fastjson.JSON; import com.alihealth.d2d.provtest.domain.DomesticPharmaBaseInfo; -import com.alihealth.d2d.provtest.domain.DomesticProducer; +import com.alihealth.d2d.provtest.domain.ReceiveDataLog; import com.alihealth.d2d.provtest.entity.VTTSBasic; import com.alihealth.d2d.provtest.enums.BuzStatusEnum; import com.alihealth.d2d.provtest.service.IDomesticPharmaBaseInfoService; +import com.alihealth.d2d.provtest.service.IReceiveDataLogService; import com.alihealth.d2d.provtest.service.XmlParserService; import com.alihealth.d2d.provtest.utils.*; import org.slf4j.Logger; @@ -58,6 +59,9 @@ public class ProvTestServerController { @Autowired private XmlParserService xmlParserService; + @Autowired + private IReceiveDataLogService receiveDataLogService; + @RequestMapping("/receive") public @ResponseBody Map receive(HttpServletRequest request) throws IOException { @@ -96,20 +100,41 @@ public class ProvTestServerController { String xml = StreamUtil.getUnStreamContent(de); logger.info("解密之后的文件内容:{}", xml); + //保存数据日志 + ReceiveDataLog log=new ReceiveDataLog(); + log.setEventId(eventId); + log.setProcessId(processId); + log.setEventType(eventType); + log.setSubType(eventPojo.getSubType()); + log.setData(eventPojo.getData()); + log.setVer(ver); + receiveDataLogService.save(log); + //解析xml // List list= XmlStringParser.parseVaccineManufacturers(xml,eventPojo.getSubType()); //解析并保存数据 - XmlStringParser.parseXml(xml, "1011", data -> { - domesticPharmaBaseInfoService.save((DomesticPharmaBaseInfo) data); - }); +// XmlStringParser.parseXml(xml, "1011", data -> { +// domesticPharmaBaseInfoService.save((DomesticPharmaBaseInfo) data); +// }); -// List producers = xmlParserService.parseMultiDataXml( +// List producers = xmlParserService.parseXml1( // xml, -// DomesticProducer.class +// DomesticPharmaBaseInfo.class // ); - - logger.info("解析后的数据条数:{}", ""); + VTTSBasic result = xmlParserService.parseDataXml( + xml, + DomesticPharmaBaseInfo.class + ); + List list = result.getDataset(); + if(list!=null && !list.isEmpty()){ + list.stream() + .forEach(item -> { + item.setEventId(eventId); + }); + domesticPharmaBaseInfoService.saveBatch(list); + } + logger.info("入库的数据条数:{}", list.size()); return ResponseBuilder.success(); }catch (Exception e){ diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DomesticPharmaBaseInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DomesticPharmaBaseInfo.java index 0cebafe..19d4112 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DomesticPharmaBaseInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DomesticPharmaBaseInfo.java @@ -1,69 +1,134 @@ package com.alihealth.d2d.provtest.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import com.alihealth.d2d.provtest.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Data; -import java.io.Serializable; -import java.time.LocalDate; -import java.util.Date; +import javax.persistence.Column; +import javax.xml.bind.annotation.*; /** - * @author Jason 境内药品生产企业基本信息实体 - * @date 2025年05月29日 10:28:21 + * @author Jason + * @date 2025年05月30日 09:59:21 */ @Data @TableName("domestic_pharma_base_info") -public class DomesticPharmaBaseInfo implements Serializable { - private static final long serialVersionUID = 1L; +@JacksonXmlRootElement(localName = "data") +public class DomesticPharmaBaseInfo extends BaseEntity{ + @Column(name = "tyshxydm", unique = true) + @JacksonXmlProperty(localName = "TYSHXYDM") + private String tyshxydm; - /** - * 主键id - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; + @Column(name = "jnypscqymc") + @JacksonXmlProperty(localName = "JNYPSCQYMC") + private String jnypscqymc; - // 企业基础信息 - private String tyshxydm; // 统一社会信用代码 - private String jnypscqymc; // 疫苗生产企业名称 - private String jnypscqylx; // 企业类型 + @Column(name = "jnypscqylx") + @JacksonXmlProperty(localName = "JNYPSCQYLX") + private String jnypscqylx; - // 注册地址信息 - private String zsdz; // 注册地址 + @Column(name = "zsdz") + @JacksonXmlProperty(localName = "ZSDZ") + private String zsdz; + + @Column(name = "zsdzgjhdq") + @JacksonXmlProperty(localName = "ZSDZGJHDQ") private String zsdzgjhdq; // 注册地址国家/地区代码 + + @Column(name = "zsdzszxszzq") + @JacksonXmlProperty(localName = "ZSDZSZXSZZQ") private String zsdzszxszzq; // 注册地址所在行政区 + + @Column(name = "zsdzsqzzzm") + @JacksonXmlProperty(localName = "ZSDZSQZZZM") private String zsdzsqzzzm; // 注册地址社区/镇/村 + + @Column(name = "zsdzxzzxxjs") + @JacksonXmlProperty(localName = "ZSDZXZZXXJS") private String zsdzxzzxxjs; // 注册地址乡镇/街道 + + @Column(name = "zsdzxzjdbsc") + @JacksonXmlProperty(localName = "ZSDZXZJDBSC") private String zsdzxzjdbsc; // 注册地址详细街道办/社区 + + @Column(name = "zsdzcjlld") + @JacksonXmlProperty(localName = "ZSDZCJLLD") private String zsdzcjlld; // 注册地址村居/路/楼栋 + + @Column(name = "zsdzmphm") + @JacksonXmlProperty(localName = "ZSDZMPHM") private String zsdzmphm; // 注册地址门牌号码 // 企业负责人信息 + @Column(name = "fddbr") + @JacksonXmlProperty(localName = "FDDBR") private String fddbr; // 法定代表人 + + @Column(name = "zczb") + @JacksonXmlProperty(localName = "ZCZB") private String zczb; // 注册资本(万元) // 日期信息 - private LocalDate clrq; // 成立日期 + @Column(name = "clrq") + @JacksonXmlProperty(localName = "CLRQ") + private String clrq; // 成立日期 + + @Column(name = "yyqx") + @JacksonXmlProperty(localName = "YYQX") private String yyqx; // 营业期限 // 经营信息 + @Column(name = "jyfw") + @JacksonXmlProperty(localName = "JYFW") private String jyfw; // 经营范围 + + @Column(name = "djjg") + @JacksonXmlProperty(localName = "DJJG") private String djjg; // 登记机关 // 联系方式 + @Column(name = "gddhhm") + @JacksonXmlProperty(localName = "GDDHHM") private String gddhhm; // 固定电话号码 + + @Column(name = "czhm") + @JacksonXmlProperty(localName = "CZHM") private String czhm; // 传真号码 + + @Column(name = "dzxx") + @JacksonXmlProperty(localName = "DZXX") private String dzxx; // 电子信箱 + + @Column(name = "qywz") + @JacksonXmlProperty(localName = "QYWZ") private String qywz; // 企业网址 + + @Column(name = "lxr") + @JacksonXmlProperty(localName = "LXR") private String lxr; // 联系人 + + @Column(name = "lxdh") + @JacksonXmlProperty(localName = "LXDH") private String lxdh; // 联系电话 // 地理坐标 + @Column(name = "zsgps") + @JacksonXmlProperty(localName = "ZSGPS") private String zsgps; // GPS坐标(经度,纬度) - // 系统字段 - private Date createTime; // 创建时间 - private Date updateTime; // 更新时间 - private Integer isDeleted; // 是否删除(0-否 1-是) + + + @Override + public Class getEntityClass() { + return DomesticPharmaBaseInfo.class; + } + + @Override + public String getDatasetName() { + return "境内药品生产企业基本信息数据子集"; + } + + } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DomesticProducer.java b/src/main/java/com/alihealth/d2d/provtest/domain/DomesticProducer.java deleted file mode 100644 index 0664632..0000000 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DomesticProducer.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.alihealth.d2d.provtest.domain; - -import com.alihealth.d2d.provtest.entity.BaseEntity; -import com.alihealth.d2d.provtest.entity.XmlEntity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.xml.bind.annotation.*; -import java.time.LocalDate; - -/** - * @author Jason - * @date 2025年05月30日 09:59:21 - */ -@Data -@TableName("domestic_pharma_base_info") -@XmlRootElement(name = "data") -@XmlAccessorType(XmlAccessType.FIELD) // 明确指定字段访问 -public class DomesticProducer extends BaseEntity{ - @Column(name = "tyshxydm", unique = true) - @XmlElement(name = "TYSHXYDM") - private String tyshxydm; - - @Column(name = "jnypscqymc") - @XmlElement(name = "JNYPSCQYMC") - private String jnypscqymc; - - @Column(name = "jnypscqylx") - @XmlElement(name = "JNYPSCQYLX") - private String jnypscqylx; - - @Column(name = "zsdz") - @XmlElement(name = "ZSDZ") - private String zsdz; - - @Column(name = "zsdzgjhdq") - @XmlElement(name = "ZSDZGJHDQ") - private String zsdzgjhdq; // 注册地址国家/地区代码 - - @Column(name = "zsdzszxszzq") - @XmlElement(name = "ZSDZSZXSZZQ") - private String zsdzszxszzq; // 注册地址所在行政区 - - @Column(name = "zsdzsqzzzm") - @XmlElement(name = "ZSDZSQZZZM") - private String zsdzsqzzzm; // 注册地址社区/镇/村 - - @Column(name = "zsdzxzzxxjs") - @XmlElement(name = "ZSDZXZZXXJS") - private String zsdzxzzxxjs; // 注册地址乡镇/街道 - - @Column(name = "zsdzxzjdbsc") - @XmlElement(name = "ZSDZXZJDBSC") - private String zsdzxzjdbsc; // 注册地址详细街道办/社区 - - @Column(name = "zsdzcjlld") - @XmlElement(name = "ZSDZCJLLD") - private String zsdzcjlld; // 注册地址村居/路/楼栋 - - @Column(name = "zsdzmphm") - @XmlElement(name = "ZSDZMPHM") - private String zsdzmphm; // 注册地址门牌号码 - - // 企业负责人信息 - @Column(name = "fddbr") - @XmlElement(name = "FDDBR") - private String fddbr; // 法定代表人 - - @Column(name = "zczb") - @XmlElement(name = "ZCZB") - private String zczb; // 注册资本(万元) - - // 日期信息 - @Column(name = "clrq") - @XmlElement(name = "CLRQ") - private LocalDate clrq; // 成立日期 - - @Column(name = "yyqx") - @XmlElement(name = "YYQX") - private String yyqx; // 营业期限 - - // 经营信息 - @Column(name = "jyfw") - @XmlElement(name = "JYFW") - private String jyfw; // 经营范围 - - @Column(name = "djjg") - @XmlElement(name = "DJJG") - private String djjg; // 登记机关 - - // 联系方式 - @Column(name = "gddhhm") - @XmlElement(name = "GDDHHM") - private String gddhhm; // 固定电话号码 - - @Column(name = "czhm") - @XmlElement(name = "CZHM") - private String czhm; // 传真号码 - - @Column(name = "dzxx") - @XmlElement(name = "DZXX") - private String dzxx; // 电子信箱 - - @Column(name = "qywz") - @XmlElement(name = "QYWZ") - private String qywz; // 企业网址 - - @Column(name = "lxr") - @XmlElement(name = "LXR") - private String lxr; // 联系人 - - @Column(name = "lxdh") - @XmlElement(name = "LXDH") - private String lxdh; // 联系电话 - - // 地理坐标 - @Column(name = "zsgps") - @XmlElement(name = "ZSGPS") - private String zsgps; // GPS坐标(经度,纬度) - - - - @Override - public Class getEntityClass() { - return DomesticProducer.class; - } - - @Override - public String getDatasetName() { - return "境内药品生产企业基本信息数据子集1111"; - } - - -} diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/ReceiveDataLog.java b/src/main/java/com/alihealth/d2d/provtest/domain/ReceiveDataLog.java new file mode 100644 index 0000000..a6482da --- /dev/null +++ b/src/main/java/com/alihealth/d2d/provtest/domain/ReceiveDataLog.java @@ -0,0 +1,57 @@ +package com.alihealth.d2d.provtest.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; + +import javax.persistence.Column; +import java.util.Date; + +/** + * @author Jason 接收数据日志 + * @date 2025年06月03日 15:28:25 + */ +@Data +@TableName("receive_data_log") +public class ReceiveDataLog { + + @Column(name = "event_id", unique = true) + private String eventId; + + + @Column(name = "process_id") + private String processId; + + + @Column(name = "event_type") + private String eventType; + + + + @Column(name = "sub_type") + private String subType; + + + + @Column(name = "data") + private String data; + + + + @Column(name = "ver") + private String ver; + + + @Column(name = "create_time") + private Date createTime; + + + @Column(name = "update_time") + private Date updateTime; + + + @Column(name = "is_deleted") + private Date isDeleted; + + +} diff --git a/src/main/java/com/alihealth/d2d/provtest/entity/BaseEntity.java b/src/main/java/com/alihealth/d2d/provtest/entity/BaseEntity.java index bda5a8b..4386a7e 100644 --- a/src/main/java/com/alihealth/d2d/provtest/entity/BaseEntity.java +++ b/src/main/java/com/alihealth/d2d/provtest/entity/BaseEntity.java @@ -1,5 +1,6 @@ package com.alihealth.d2d.provtest.entity; +import lombok.Data; import org.springframework.data.annotation.Id; import javax.persistence.*; @@ -12,6 +13,7 @@ import java.time.LocalDateTime; */ @MappedSuperclass @XmlTransient +@Data public abstract class BaseEntity> implements XmlEntity{ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/alihealth/d2d/provtest/entity/VTTSBasic.java b/src/main/java/com/alihealth/d2d/provtest/entity/VTTSBasic.java index dd430ec..a83025a 100644 --- a/src/main/java/com/alihealth/d2d/provtest/entity/VTTSBasic.java +++ b/src/main/java/com/alihealth/d2d/provtest/entity/VTTSBasic.java @@ -1,30 +1,43 @@ package com.alihealth.d2d.provtest.entity; -import com.alihealth.d2d.provtest.domain.DomesticProducer; -import lombok.Data; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import javax.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; /** - * @author Jason + * @author Jason 基本信息集公共类 * @date 2025年05月30日 11:45:00 */ -@XmlRootElement(name = "VTTSBasic") -@XmlAccessorType(XmlAccessType.FIELD) -@Data -@XmlSeeAlso({DomesticProducer.class}) +@JacksonXmlRootElement(localName = "VTTSBasic") public class VTTSBasic { - @XmlElement(name = "datasetName") + @JacksonXmlProperty(localName = "datasetName") private String datasetName; - @XmlElementWrapper(name = "dataset") - //@XmlElements(@XmlElement(name = "data")) - @XmlElement(name = "data") - // private List dataset; // 必须初始化集合 - private List dataset; + @JacksonXmlElementWrapper(localName = "dataset") + @JacksonXmlProperty(localName = "data") + private List dataset=new ArrayList<>(); // 必须初始化集合 + // 确保有无参构造器 public VTTSBasic() {} + + + public String getDatasetName() { + return datasetName; + } + + public void setDatasetName(String datasetName) { + this.datasetName = datasetName; + } + + public List getDataset() { + return dataset; + } + + public void setDataset(List dataset) { + this.dataset = dataset; + } } diff --git a/src/main/java/com/alihealth/d2d/provtest/factory/DomesticPharmaBaseInfoFactory.java b/src/main/java/com/alihealth/d2d/provtest/factory/DomesticPharmaBaseInfoFactory.java index 8c0dd8b..9f28271 100644 --- a/src/main/java/com/alihealth/d2d/provtest/factory/DomesticPharmaBaseInfoFactory.java +++ b/src/main/java/com/alihealth/d2d/provtest/factory/DomesticPharmaBaseInfoFactory.java @@ -1,7 +1,6 @@ package com.alihealth.d2d.provtest.factory; import com.alihealth.d2d.provtest.domain.DomesticPharmaBaseInfo; -import com.alihealth.d2d.provtest.utils.XmlStringParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Node; @@ -35,34 +34,34 @@ public class DomesticPharmaBaseInfoFactory implements EntityFactory { return; } - DomesticPharmaBaseInfo baseInfo = (DomesticPharmaBaseInfo) entity; - baseInfo.setTyshxydm(getElementText(dataElement, "TYSHXYDM")); - baseInfo.setJnypscqymc(getElementText(dataElement, "JNYPSCQYMC")); - baseInfo.setJnypscqylx(getElementText(dataElement, "JNYPSCQYLX")); - baseInfo.setZsdz(getElementText(dataElement, "ZSDZ")); - baseInfo.setZsdzgjhdq(getElementText(dataElement, "ZSDZGJHDQ")); - baseInfo.setZsdzszxszzq(getElementText(dataElement, "ZSDZSZXSZZQ")); - baseInfo.setJnypscqylx(getElementText(dataElement, "JNYPSCQYLX")); - baseInfo.setZsdzsqzzzm(getElementText(dataElement, "ZSDZSQZZZM")); - baseInfo.setZsdzxzzxxjs(getElementText(dataElement, "ZSDZXZZXXJS")); - baseInfo.setZsdzxzjdbsc(getElementText(dataElement, "ZSDZXZJDBSC")); - - baseInfo.setZsdzcjlld(getElementText(dataElement, "ZSDZCJLLD")); - baseInfo.setZsdzmphm(getElementText(dataElement, "ZSDZMPHM")); - baseInfo.setFddbr(getElementText(dataElement, "FDDBR")); - baseInfo.setZczb(getElementText(dataElement, "ZCZB")); - baseInfo.setClrq(parseDate(getElementText(dataElement, "CLRQ"))); - baseInfo.setYyqx(getElementText(dataElement, "YYQX")); - baseInfo.setJyfw(getElementText(dataElement, "JYFW")); - baseInfo.setDjjg(getElementText(dataElement, "DJJG")); - baseInfo.setGddhhm(getElementText(dataElement, "GDDHHM")); - baseInfo.setCzhm(getElementText(dataElement, "CZHM")); - baseInfo.setDzxx(getElementText(dataElement, "DZXX")); - baseInfo.setQywz(getElementText(dataElement, "QYWZ")); - baseInfo.setLxr(getElementText(dataElement, "LXR")); - - baseInfo.setLxdh(getElementText(dataElement, "LXDH")); - baseInfo.setZsgps(getElementText(dataElement, "ZSGPS")); +// DomesticPharmaBaseInfo baseInfo = (DomesticPharmaBaseInfo) entity; +// baseInfo.setTyshxydm(getElementText(dataElement, "TYSHXYDM")); +// baseInfo.setJnypscqymc(getElementText(dataElement, "JNYPSCQYMC")); +// baseInfo.setJnypscqylx(getElementText(dataElement, "JNYPSCQYLX")); +// baseInfo.setZsdz(getElementText(dataElement, "ZSDZ")); +// baseInfo.setZsdzgjhdq(getElementText(dataElement, "ZSDZGJHDQ")); +// baseInfo.setZsdzszxszzq(getElementText(dataElement, "ZSDZSZXSZZQ")); +// baseInfo.setJnypscqylx(getElementText(dataElement, "JNYPSCQYLX")); +// baseInfo.setZsdzsqzzzm(getElementText(dataElement, "ZSDZSQZZZM")); +// baseInfo.setZsdzxzzxxjs(getElementText(dataElement, "ZSDZXZZXXJS")); +// baseInfo.setZsdzxzjdbsc(getElementText(dataElement, "ZSDZXZJDBSC")); +// +// baseInfo.setZsdzcjlld(getElementText(dataElement, "ZSDZCJLLD")); +// baseInfo.setZsdzmphm(getElementText(dataElement, "ZSDZMPHM")); +// baseInfo.setFddbr(getElementText(dataElement, "FDDBR")); +// baseInfo.setZczb(getElementText(dataElement, "ZCZB")); +// baseInfo.setClrq(parseDate(getElementText(dataElement, "CLRQ"))); +// baseInfo.setYyqx(getElementText(dataElement, "YYQX")); +// baseInfo.setJyfw(getElementText(dataElement, "JYFW")); +// baseInfo.setDjjg(getElementText(dataElement, "DJJG")); +// baseInfo.setGddhhm(getElementText(dataElement, "GDDHHM")); +// baseInfo.setCzhm(getElementText(dataElement, "CZHM")); +// baseInfo.setDzxx(getElementText(dataElement, "DZXX")); +// baseInfo.setQywz(getElementText(dataElement, "QYWZ")); +// baseInfo.setLxr(getElementText(dataElement, "LXR")); +// +// baseInfo.setLxdh(getElementText(dataElement, "LXDH")); +// baseInfo.setZsgps(getElementText(dataElement, "ZSGPS")); } diff --git a/src/main/java/com/alihealth/d2d/provtest/mapper/ReceiveDataLogMapper.java b/src/main/java/com/alihealth/d2d/provtest/mapper/ReceiveDataLogMapper.java new file mode 100644 index 0000000..00da97a --- /dev/null +++ b/src/main/java/com/alihealth/d2d/provtest/mapper/ReceiveDataLogMapper.java @@ -0,0 +1,11 @@ +package com.alihealth.d2d.provtest.mapper; + +import com.alihealth.d2d.provtest.domain.ReceiveDataLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @author Jason + * @date 2025年06月03日 15:35:00 + */ +public interface ReceiveDataLogMapper extends BaseMapper { +} diff --git a/src/main/java/com/alihealth/d2d/provtest/service/IReceiveDataLogService.java b/src/main/java/com/alihealth/d2d/provtest/service/IReceiveDataLogService.java new file mode 100644 index 0000000..0b887d2 --- /dev/null +++ b/src/main/java/com/alihealth/d2d/provtest/service/IReceiveDataLogService.java @@ -0,0 +1,7 @@ +package com.alihealth.d2d.provtest.service; + +import com.alihealth.d2d.provtest.domain.ReceiveDataLog; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface IReceiveDataLogService extends IService { +} diff --git a/src/main/java/com/alihealth/d2d/provtest/service/XmlParserService.java b/src/main/java/com/alihealth/d2d/provtest/service/XmlParserService.java index bacdee8..0934b48 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/XmlParserService.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/XmlParserService.java @@ -1,21 +1,18 @@ package com.alihealth.d2d.provtest.service; -import com.alihealth.d2d.provtest.domain.DomesticProducer; +import com.alihealth.d2d.provtest.domain.DomesticPharmaBaseInfo; import com.alihealth.d2d.provtest.entity.VTTSBasic; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import org.springframework.stereotype.Service; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import javax.xml.XMLConstants; import javax.xml.bind.*; -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import javax.xml.transform.stream.StreamSource; +import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; -import java.lang.reflect.Field; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -29,13 +26,32 @@ public class XmlParserService { private static final Map, JAXBContext> CONTEXT_CACHE = new ConcurrentHashMap<>(); + private static final XmlMapper xmlMapper = new XmlMapper(); + + + /** + * 使用Jackson XML 解析xml + * @param xml + * @param dataType + * @return + * @param + * @throws IOException + */ + public static VTTSBasic parseDataXml(String xml, Class dataType) throws IOException { + JavaType type = xmlMapper.getTypeFactory().constructParametricType( + VTTSBasic.class, + dataType + ); + return xmlMapper.readValue(xml, type); + } + /** * 解析包含多个data节点的XML * @param xml 完整XML内容 * @param dataClass 内部data节点对应的实体类 */ - public List parseMultiDataXml( + public List parseMultiDataXml( String xml, Class dataClass) throws Exception { @@ -57,30 +73,13 @@ public class XmlParserService { // 4. 解析XML try (StringReader reader = new StringReader(xml)) { -// XMLStreamReader xsr = xif.createXMLStreamReader(reader); -// JAXBElement root = unmarshaller.unmarshal(xsr, VTTSBasic.class); -// -// // 5. 获取解析结果 -// VTTSBasic wrapper = root.getValue(); -// List result = wrapper.getDataset(); -// -// // 6. 类型安全检查 -// if (!result.isEmpty() && !dataClass.isInstance(result.get(0))) { -// throw new ClassCastException("XML中包含类型不匹配的数据"); -// } -// -// return result; - // 创建 JAXBContext 时包含所有相关类 - // JAXBContext jc = JAXBContext.newInstance(VTTSBasic.class, Data.class); - //Unmarshaller unmarshaller = jc.createUnmarshaller(); - // 解析 XML XMLStreamReader xsr = xif.createXMLStreamReader(reader); JAXBElement root = unmarshaller.unmarshal(xsr, VTTSBasic.class); // 获取解析结果 VTTSBasic wrapper = root.getValue(); - List result = wrapper.getDataset(); + List result = wrapper.getDataset(); return result; } @@ -100,6 +99,21 @@ public class XmlParserService { return element.getValue(); } + public static VTTSBasic parse(String xml, Class dataType) throws Exception { + // 创建包含具体类型的JAXBContext + JAXBContext context = JAXBContext.newInstance( + VTTSBasic.class, + dataType + ); + + Unmarshaller unmarshaller = context.createUnmarshaller(); + StringReader reader = new StringReader(xml); + + @SuppressWarnings("unchecked") + VTTSBasic result = (VTTSBasic) unmarshaller.unmarshal(reader); + return result; + } + public static String toXml(VTTSBasic vttsBasic, Class dataType) throws Exception { JAXBContext context = getOrCreateContext(VTTSBasic.class, dataType); diff --git a/src/main/java/com/alihealth/d2d/provtest/service/impl/ReceiveDataLogServiceImpl.java b/src/main/java/com/alihealth/d2d/provtest/service/impl/ReceiveDataLogServiceImpl.java new file mode 100644 index 0000000..4140151 --- /dev/null +++ b/src/main/java/com/alihealth/d2d/provtest/service/impl/ReceiveDataLogServiceImpl.java @@ -0,0 +1,15 @@ +package com.alihealth.d2d.provtest.service.impl; + +import com.alihealth.d2d.provtest.domain.ReceiveDataLog; +import com.alihealth.d2d.provtest.mapper.ReceiveDataLogMapper; +import com.alihealth.d2d.provtest.service.IReceiveDataLogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author Jason + * @date 2025年06月03日 15:37:17 + */ +@Service +public class ReceiveDataLogServiceImpl extends ServiceImpl implements IReceiveDataLogService { +} diff --git a/src/main/java/com/alihealth/d2d/provtest/utils/XmlStringParser.java b/src/main/java/com/alihealth/d2d/provtest/utils/XmlStringParser.java index 34b9ae3..aab45f3 100644 --- a/src/main/java/com/alihealth/d2d/provtest/utils/XmlStringParser.java +++ b/src/main/java/com/alihealth/d2d/provtest/utils/XmlStringParser.java @@ -1,6 +1,5 @@ package com.alihealth.d2d.provtest.utils; -import com.alihealth.d2d.provtest.domain.DomesticPharmaBaseInfo; import com.alihealth.d2d.provtest.factory.EntityFactory; import com.alihealth.d2d.provtest.factory.EntityFactoryManager; import org.slf4j.Logger; diff --git a/src/main/resources/mapper/ReceiveDataLogMapper.xml b/src/main/resources/mapper/ReceiveDataLogMapper.xml new file mode 100644 index 0000000..efc1728 --- /dev/null +++ b/src/main/resources/mapper/ReceiveDataLogMapper.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/target/classes/com/alihealth/d2d/provtest/controller/ProvTestServerController.class b/target/classes/com/alihealth/d2d/provtest/controller/ProvTestServerController.class index 1ae921dfd2dc7e645ff9d5ba1faef9c732e16ce3..e7bdf629b7d76173cdea6ce1f1c185cef2e00b88 100644 GIT binary patch delta 4159 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 L^2mweFu(4XjlnxV diff --git a/target/classes/com/alihealth/d2d/provtest/entity/BaseEntity.class b/target/classes/com/alihealth/d2d/provtest/entity/BaseEntity.class index 01bae4b10537ff38e19feb7b8ce8a3a38d720d8f..7400de35ddc220a0af660caf3ea101c863c2ec66 100644 GIT binary patch literal 4534 zcmbVO>vI!T6hE8nW;e-(hVqP{qEsz?5Jg2zO9e`mN?VY|3i!ZnvNTJR-LTmd@cn*2 zKj}E*SDA76po|npXB_>4GyY8~{?6V_vPn}EW|F<<-t*h@KIiVA|NQ(b5j{YkC+G~h zaZ;(4pbU9T)%mf+kFzSBOJF_Ej~5y65>qep;}w3q%4e^s^m>AN$kXTzUf<-$TN=Hs z(K{NwtI>OW@V-hPsPv&k5vwRsdg`>XWMs>Ry^x)9?1d4DGDqvSXI0EOt7grY&3(4* zc!p;=c1@!GDaT#N)~c>$FPw6Xih0&?7qdmfGqOe#mz^v^%$>gEbJ?ot)~uRm+66QF zxM`cN;hDubqg*!u(rO;>7tUW758e6mRUbcjU}7denLjR(YA%_!HwhnlLq5!UY#Jor z(nbBaQ?6HRFl8I2L%T2HB*!69a7`GJhu?^R5XeD5Pzpx*K)}MQNdY{`Oo`(4Dm#xb zMUh5=9RDDYlN6fArylm89@VfpTp#=GdfW>F61>5lIF5KO`64B7c(hz<4 ztWEym`O{{>8`*I}BFSm*uz-cIIbO+h(TH4^ecVKv zf8vw6f7oo%l;AY?Jw7|!b7_GH9|@4?ArZj<6h6A|#)^1=OE@*_8HL4Zqv|&TW-CS_ ztS=b$1P23T$*7e?bD~ox;p>s3lhYFj2I!b;*6L*sO)Q-5YkHOJ3!9(p3)`uAj!2qB zFOBANH)gfpdSjug36k(Xq#Uc1MK?A&DlzNS-Gcd;#e=4&H7R!TMIcdMm-a@as%CMv zj!|CVo<;~ok)6w)tCX|zmR$^wf2hp6hF!BTjYd@ZNT-kKF`b5Khfa^uy*l+XwS~6o zw4M4S8oH5zrjtQW>a?H6bvnY-0UFb3f)zZ@k9jIcw5fHeiJzbCs{Z?_0 zPM^@H{P+yrHnc6s?L@xNSHV2mMW1Hi3b1MpJrAXwyx|})R*m? zMY(bCZFJXgw*e5Ui8fD>qBeY^p;yJrci=N3gB$D?k}1O30evg(w6)mXhV^#rx0!SY z-H8L_Enp|H-i80&HM$23q&8rreMW>C12lMohQLJ$1l-VTJBguLx)*@^py(i039B~n z6G@jT@&o87?ZPtw4ne;P{r7{?1rDE24`R2w?c^cs*!&nU4-?4}JwiFqBRGrDDE513 z479{08EDQ2n)QJz6cyU#miAr*hG46VFewO75^Ku}eT5Z#!dC3XpRL%3RpP=8wC%%= z{Zs~iB;|V$!bye_tq+M-R*2@4m7>uJT|~z^MQ^$Z(de%(qUBD}TW&%$y0(kxNT=xA zZbI}ynnX~!rlz2RYbQ1^c$t(|PDQZOzU++x5d@oaCYqpCSFs@MPe77_PYo2qUKWas ziR2!FqAm(!|5u@Ct5p?lU!icCX1Xa1RqgdX6z#gI!u}Ns4|i7>YSQZ~6cb=og~KZp zV#W&(rLT~mB*J}ZaNt`~kvcszuuPi21reVa!XqaS|3S%&e3jN- zAbmI^FH@p{NahqklDSw$VNC2Q^EVM>~=y^Hm*`=OH-84XAL|I3D3)7w*5t zumcoP;CQr(r7`vbefbW35?}t%f`<2tMTMGbdSq1Ip``~ekUG3fYhK{< zWKL#AMh-X{mx*BMImKt8Lj0GsjM8AGaxtG3YqC%`cx!9-R3AiYU`vqdC{?J4Hwrq%^d`{Dw7K)*5XB`v74`-hXq6P7bl#-V;3J`o SJn_eZ?SDw{$A^P`mFQm=40(P4 delta 513 zcmZWl%Q6E&6g@pNnNB8y2!aUmK!|w9D?%)NKy2(3S!AP9krk!#5xwydHnZ?3RURt~ zA7rVVo(x4Tt*okcPNnR(q>B{BCCV;#P;oJYgo`8+0!6iN zXF1}iS9zjd%v8t9Fvf;}gard(MA$oAsGlgx>Js7W8?^()r_{)U!=cn2CxM3 em}Ngl&Om{99!2(Mz${?VSC;%&I%%1B1^5Epi!bQ_ diff --git a/target/classes/com/alihealth/d2d/provtest/entity/VTTSBasic.class b/target/classes/com/alihealth/d2d/provtest/entity/VTTSBasic.class index 8bbf188c116e9eeb3d6e36ac1e573c99f1770d82..f484dfc38697fd646e86d1a9cc0a06e681e3d1fd 100644 GIT binary patch literal 1617 zcmbtU>rN9v6h7Oll(tmv;0;u?l*>xvFCio-YCYSGj5BuyI{ zjW(EM9+&&f;u?)tPS`2aO=dUss&s|j+|+39uwzSM@tW|&k;!*#+mTEP$M!VZt<)V$ zKW3if?q|!?Pgwnv=h(VJJ$77+NnNQ~-$&mIEZ$q@f$OxnE4v6WVmftZ1{~5MBaI3H zn~oHwUJ;&DhE>tDne4bAJ9X)L%P=;#VY7D)PA^Svaa+D~SsUB{mQZXoN^J>S$Zd_{ z#pN2bFPsJ#j8%lq_dC`RcMXQpr~;})YRnbt94ZsCB~Yt1pBFPli!)QU^hUX%w_WE{ za!=|ADr8r$8AkOv^F$q?r!Qi4+daJU{{Z!>l5cXkJJ{>V;_~0RoyRa-u$w9lo2eQU z-f-D+8VAh9=%D?`FcZZDlhgBe1bvkaHzY?ln`F_FI)#PjR`WnM?=r}SQAT_Fe=qydpB$D#qmY>p&>$0vI z=`7_apQRf#qS1>~Yls|f@LAJDrcb&$gkKqSELaI28LaKk(gEFSVVIA|$3ckT4 z&Nl;tT+ecxlF)!P)+yK;6vvLJP&y~A^n+p_&MAIIiLcPbX&P%Dl0YFr^FUvu8Jx0# z56#jXPV*Nuw{X(vHr)v$>_Dmr$nNHmmHfc_)(vkan%w^UZ~$t1dXI$Zowqk%k>G66 za%yYN1MP}o8?Npd6*}78QcVP!YNM&V`V#Yv6WGVVSy{^c-ajxq~|S9K~&y311Y z43`<`Zrv3)5Z-I~DR0epa^KKVsViZ8+t4lAZFBMZ+I^$!O$^@=5KeoKg+~Ia<5dlp zG04g}88%7Kll%Rnc3wIvCeYg^B5>xl>SaW>N$-lMmme(X8-59MtoYL*Ro3lU8IwS& zs@JPQ7qBJf>GIO@{K70_BAsxJdc*Pr((Qhxnp@uYoM55|^NR)0(EWQ78u?A;&i!e)a#C0Vha)*byK$*v>&w3 zj^=_}%{z1Rv&EVJ9gr)AF>Tcy8acOH&UPAbX}pEE(>Q?sGzO7lV7pAo&WV%8G(Jq@ zJ>=8;vXC0ZSQ?jbS>RCTXW&x9v?{Vd2ewhnN2>H<8sA`@=^7gfxjv`L>KIOA9(h)F zOJ$I7R*jswc7=oTRUI8EhoEpmABa_(e6ziFl*c>#Bxd>fjPZ|9f&Ix{57z-chw5a; zBz$}y_Qj6)0{z?{4Fm?8lE=_R4ngO8h_cgM1y^<2QU>iYMjZkV^E`4O(H2aHk25b3Duc&F;adr}>MGmdr> zr=f)=ii{#A&5w-!j94cc8Q;c0AQ7S=T@5nQ!X?2oiOU&2DyKFw9R}aWStfLd$E#6; z@x2<9nHGK`TFyv=(wRXV;aO;Ukfwu}Kj?6Q?GnT+GISxytJTqw@1ZJBM*o2F9n|=f z(chsgjE!tT^|vGvi(`Bhl<_~&lT)5y|6`=bbIKNyO^H-NrAVrf$f;5$@eJ9==*_9Q zL{mt4LR(6t#sXBY20m<~TE%&M#6S*W1s7O%F+MZ+n7lX(V+sXQ3a(Jk1Su5@411DP zA_7Y_%tN5#B6UpB_7J*~sejOy#3#=&ki@6_Pl@Lk49Ko+@XmMSO<@Iwpy4yRCJRNC zXvv78Wge{)bvq)Jama{Tbt2Cqb#kG@o{*D_R)(nlZ>}oWLS|x8x#*|jXlA0yM5HpK zkC7bTLf1XXPZbn-kW<2wluQqgj=mc9bAi^-$v7RH!7QCr8R;CU7=LD;A@_GaD54NpAqXafc)@F}eM~YALTw5(Wt4Un#X5?W<2S^i!d1{#{#SJ0 zeu|!KdJDZ04ldcgfKF{;Up7N}3;R3AM39Z<30F?T*(EtDd diff --git a/target/classes/com/alihealth/d2d/provtest/factory/DomesticPharmaBaseInfoFactory.class b/target/classes/com/alihealth/d2d/provtest/factory/DomesticPharmaBaseInfoFactory.class index f08df51497e8fd2b4b022c01792105009d8bca40..a24a0b53e0b6c331c3862fab6c1fc57a2c020989 100644 GIT binary patch delta 1074 zcmZ9L$!`=_5XOJ6d&aM)r&&CXCpN}r3{2vT?Kp%00YX?DcAGVT&E_~P4qyy~otO*> z3vV2Fs<@=CB9JU;>95sw?G{YvI=D#!p@xOj-_Qu1hm3|X*;wPy! zCoDfi9OJlUAmRjr5hoe4oQgP2i{(tjkF-RbWzgXN^T+LobDTE>m-TdaA6AtM5f`~+ zxg2qYpA0p}`!Do&4E7HVbgaE}=*a1F$4(7J%%(AZQMIsUn5z*#JLq!6HGVOyil3$$ z;+r;zpPR#?>a=xmJ=boTESHH9LjM~x|;mqJRQ7$Vp`jfO7$xRz)dRM7+oEals z52$`jPIp+7`(P}IuN@<=9zXO^A4WfoyZ)J#cA7L>^mpaiF3&FQ({6e9h;R?9>75*S z(~vf41z!uGsGyasN+#Z^pd|uu6A$q7X0v5Y(oNdPO@cfC literal 4135 zcma)933wYv75-PUt+l*KQ|B&i$mP~{;wV?!G)~*ZQhX?~Yey!r#JQH%l3ZPu*0H2= zL%9mHoFS#8fi^97owhg^lom>XQYiO*LqmXYL%B-fpV_r6CBa|(ect!an>TOXylX~} zKYQXK0GpLsHv%ZRaFZJjlvKP_#mn6A3Dq;g8P>`l$GPt^tqX z^DcbBjW6PH7rx}e6AJ2*nOMxoDQFC2axqUnIkI`w6Og=i&TdPj6XtaaoXstJ6x4V# zQA5E+fkfKq8&3@zxj}t6Ne&lB^yD5rmk?u{S!2c%c?BJTNG9dclZm*YC(XDgx-sg> z<}&+CBX4>}^oW_s6+OO8io-;tKd$FedWW7jdeS4APHUEiXpx+uo5s$xnJ|kA7Bsg6 zM)iHVC#k1no*RZojfhF9`7y%`j%Tx(oM}XZbAIoh3D0xKpnQvsbK4DPU7Br zBK?1S#FNYkntJ5MUOj6&eqOI(#xv1=J*TG()5tLhbLkn|o(lQaOoSAk{A9=K-9sT?uLc7n8oq)j6}bID_DMCN02*z zN3f)BuRjp*Y51;Ss6tV1e>c^9PmF6jeZG#}8oncZ0+{*HgR@J|i@!oS&}W(uL4T^jmugM!5~Q&wts zj3<&&k-iH~?LU0#jyq4^d)KLhw>@?Dk<$+z-nv}FGx(2&XN4jE)tJ1Bg6*?p)dh80 zm*UVAr&6O}-i$R?dsVRh0<>EV+V0!5T-+&@{lTjDhP+`87W45!F`8n@ov*6dV&_oG zpDt$ek+EVbQaw%`l+ZBz*#U4V^Tbf2b+G+6yiW59=9cKdtd;dTo8n=uJ z=VMu(W`3pD%eT;inJXaQQ5>A^%~iKvxu;fYDEDJpNF4zq9W%Khp9DQD&4g*l81}TB z)5O^}=bf#{x{AadK|bnT#JnW=-OZ7QR3WWxJqqOr zfdfH)>m;)ggT$I8fahTkM+)|0h+naIBc;V+^&}jjqi{|VSFT@Nv0g2&4V+fYaWK9uWfB(?J?9%!9}D>R8QoV zsDVh6Xb#a_i7q0VC(*@Ka*dKVpS%SUEhJhb(PE+{5-laVM55;qT`JLKM9U<4F41zL zV^}eTl^m>+?A1g~5?xMog+$FnEfTd7t&wOgQJX~Th&&RlC)yy->qN_yo zoHBa*a2fGRhI$oLT#h-o0*leibZEgEwBkyBug6;SppEkD@It0R4C^t*h~9)vxEY&q zE2R$LD%^vsF^MfWfot$6w(=p=&iBSP-u>6&46eh|*v=5{P{eN_ku9xOSnQB7K-B&s z5oMwm<0TB=9NwxrhG}a=TCAvu64W~=3CaL&@#eAujax_=Xf(C1IgYCx=v{jpTNE6` z!nMxhxW<9Lw&U2U@V8p~q$0A&a={|h5_j|XJ-C=vuoS!KjNY<|OSwr5aY|D)5;RQw zHDMGt(pZ%aOd`dtg^4PZXRykJ^t7D`GDrFE7LO>~&ikm!L7unuF)VDI!nS$pA!v=) z5?*%zwaR4U^~bP1(8}=cm<-$x?@9PrGdmkQr_e>At|@f$ggs916ujkV?P_$`r&-2O zf;GE{xxa*ExQs=(nq}C85O%PfgyWY}b{PwI3^}fEBF@7kqDdI%sbHVQxk%aN!ajMH nT7^^MfD`40utF|jI2!%OuMp-sW diff --git a/target/classes/com/alihealth/d2d/provtest/service/XmlParserService.class b/target/classes/com/alihealth/d2d/provtest/service/XmlParserService.class index 5db6331b55f2e0952a5c3e6e05da04afaa2b4221..e790179bc78f4b22c06ac97875751db3b9e075ef 100644 GIT binary patch literal 8139 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 delta 2593 zcmZux33yaj75?wMnYlA>-Yj_`6CTiz09DB(rO-fNQb`w}8==}jaZr|lObHN@m<*dz zUQyF(ZMErbtF%_BO2Oiik~&F9DY!tj)wd_|vG>91{(&#r)kGu6pN!$~{y(av)PvQd-A2cxs`}F626BZtj_)rKB zn)on2qR;z7cu3--CdzQ1K7TBNkK=%ehjGwE2#2)d6B3V@n25tB7T}W-pEBW2#;3LA zXLR5JiAO^?62VmLml!lL4gLD?nBINXL;*uKb3GQp6F9CvCqnp~iO=H;`tU`GlVJuv zr3-n|hQL!1JdLkNd{yEZiLZt5brTKvhQv2bG@@VPThfPTRgK82XT|Qp7mW&`9`jAE z3b$qR*(*D;y}bfuOE+h?XJ>U}J2%eqL`}*J^r;%d5!b2yaD{UHL3KDVM=Vj#2QH2F zbhT~Ukn3q$*d<`;FuxfoN+!yJ1U9wtIPYeMe5;ijy9s%zp1OUSK_qFGPPUP4&!olAlPJ|dr7D}+tZsPlOZ|~{ap)s-WC;Zuhi(Axiq%P5nm$ds|Ec_LJ6L8dk?I_#2*u~%R z4-5aqa}qCG_!s^ykhr3&E8m;%$#%Eo^6g!1z40JkN#NCZ0A~^cmJq@xg<%Q52v{O0 zq=48hMaU9iVOk<0EXEj5sWsoTsdJ-+CR}QXsEEabBAyTl9i~i5VOyeHOi<0Sq^b@} z^@6q9XciS}aWthKie7VftZ(qi_+g*gXCE_?qEcnbQ-%~12X8CCR~QR~qo!88l9*(P z$zrM{sx|z#;x<*6oGYfO^~sm~(*-V6dn>EdgGs6ORL*c0kjfyFC+UQ^zMdx^7D95* z9`buRC9}8+u7TPih(|q>EBFn1!YR0td#h-GMOe&}z!F@=mrZA1AJ+tBr&Fg8O%>oP zz}ScADEt}Q4GbZ8Ja7y$W7whAjK8jR7~y601(<37Fe2%I6R@MkFk%J7xlNR|qbSRy zhG3_IA}yVO6D*)S9di6m$PSHQf`N3{2^Uat0-?0&m<1%$5hs$ioZu{kVriW+mQ%L#0(?a*T80B+rL1 z2z~ZLW3+^02}mJ^I_fUQOw1*m^Ef6N3GjSeOW;>x8P?%?Y{d=OfmZB+yMn=Q!~v{e zxF&|X(F3^~5gK02-!&Y0TdBDg*C9-&*;tAem~^dWuT-bTaiWJa;X z$GPef(_EjEH01EZLhafdKH?XRzO{3DoQK-YQUc#)GlQnfSr%}jd> z6W>aPcaqcH=MQj2+(yD7Pu?bzd` zq#tUK5A)r4j|V_mDLFss7=>edvBZ1NzKp$z1a41&1LY2!9r!m*_xyp#C>k?E zm_LY%^h^^T$%}Kpis{@*nGf&7`-@?57fq_THzC9nQ6nyZgJGUERwGRADB1ORY4;_3 F`9D5H*0=xw diff --git a/target/classes/com/alihealth/d2d/provtest/utils/XmlStringParser.class b/target/classes/com/alihealth/d2d/provtest/utils/XmlStringParser.class index d230a454f13ca3635ac607804716663ce54d534b..1b50ac53286ced36cacdbeb50ef2902638154ff5 100644 GIT binary patch delta 157 zcmWNIy$-=p07lO>5ou{8(sn3v2@-!b*bGLA*`46*38>0XK delta 157 zcmWNI%L)Ne06@>RBF!)Da+{UfWSsga>ho(2|8DzxZf2X-PR`W-cm(V39K wA&aZxDQ#wSnKNL)h^1o1jx}dCT-kD0?!gg{Jx>n2I0d)lP{eZx6+wi{AH9Yf!~g&Q diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index c79b389..e6c29a3 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -2,6 +2,7 @@ com\alihealth\d2d\provtest\entity\BaseEntity.class com\alihealth\d2d\provtest\factory\EntityFactoryManager.class com\alihealth\d2d\provtest\utils\XmlStringParser.class com\alihealth\d2d\provtest\service\impl\DomesticPharmaBaseInfoServiceImpl.class +com\alihealth\d2d\provtest\domain\Test.class com\alihealth\d2d\provtest\service\XmlParserService.class com\alihealth\d2d\provtest\mapper\DomesticPharmaBaseInfoMapper.class com\alihealth\d2d\provtest\service\IDomesticPharmaBaseInfoService.class @@ -20,7 +21,6 @@ com\alihealth\d2d\provtest\entity\XmlEntity.class com\alihealth\d2d\provtest\utils\KeyStoreUtil.class com\alihealth\d2d\provtest\enums\BuzStatusEnum.class com\alihealth\d2d\provtest\enums\StatusEnum.class -com\alihealth\d2d\provtest\domain\DomesticProducer.class com\alihealth\d2d\provtest\ProvtestApplication.class com\alihealth\d2d\provtest\entity\VTTSBasic.class com\alihealth\d2d\provtest\ProvTestClient.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 77b3a0d..9d73f30 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -16,6 +16,7 @@ D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\utils\EntityProce D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\service\XmlParserService.java D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\utils\KeyStoreUtil.java D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\service\IDomesticPharmaBaseInfoService.java +D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\domain\Test.java D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\utils\Base64.java D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\utils\ResponseBuilder.java D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\domain\DomesticPharmaBaseInfo.java @@ -23,4 +24,3 @@ D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\factory\EntityFac D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\entity\BaseEntity.java D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\factory\EntityFactory.java D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\entity\VTTSBasic.java -D:\work-tcct\provtest\src\main\java\com\alihealth\d2d\provtest\domain\DomesticProducer.java