From 38d6032c3433c830132739c0da2b52a82e959224 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Mon, 24 Jul 2023 17:24:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E5=90=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../converter/FirstPageCheckoutConverter.java | 2 +- .../collection/dto/FirstPageCheckoutInDTO.java | 6 +++--- .../dto/FirstPageCheckoutRequest.java | 6 +++--- .../server/collection/enums/FileSyncMethod.java | 17 +++++++++++++++++ .../docus/server/collection/enums/SyncType.java | 12 ------------ .../impl/FirstPageCheckoutRequestValidator.java | 7 ++++--- 6 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/docus/server/collection/enums/FileSyncMethod.java delete mode 100644 src/main/java/com/docus/server/collection/enums/SyncType.java diff --git a/src/main/java/com/docus/server/collection/converter/FirstPageCheckoutConverter.java b/src/main/java/com/docus/server/collection/converter/FirstPageCheckoutConverter.java index 7b48961..971c300 100644 --- a/src/main/java/com/docus/server/collection/converter/FirstPageCheckoutConverter.java +++ b/src/main/java/com/docus/server/collection/converter/FirstPageCheckoutConverter.java @@ -32,7 +32,7 @@ public class FirstPageCheckoutConverter { return null; } FirstPageCheckoutInDTO dto = new FirstPageCheckoutInDTO(); - dto.setSyncType(firstPageCheckoutRequest.getSyncType()); + dto.setSyncMethod(firstPageCheckoutRequest.getSyncMethod()); dto.setPatientInfo(firstPageCheckoutRequest.getPatientInfo()); dto.setSysId(firstPageCheckoutRequest.getSysId()); return dto; diff --git a/src/main/java/com/docus/server/collection/dto/FirstPageCheckoutInDTO.java b/src/main/java/com/docus/server/collection/dto/FirstPageCheckoutInDTO.java index 29a5eda..ec2698d 100644 --- a/src/main/java/com/docus/server/collection/dto/FirstPageCheckoutInDTO.java +++ b/src/main/java/com/docus/server/collection/dto/FirstPageCheckoutInDTO.java @@ -1,6 +1,6 @@ package com.docus.server.collection.dto; -import com.docus.server.collection.enums.SyncType; +import com.docus.server.collection.enums.FileSyncMethod; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,8 +16,8 @@ public class FirstPageCheckoutInDTO { @ApiModelProperty("患者基础信息") private PatientInfoDTO patientInfo; - @ApiModelProperty("同步类型：ALL 或者 BY_SYS_ID") - private SyncType syncType; + @ApiModelProperty("同步文件方式：ALL 或者 BY_SYS_ID") + private FileSyncMethod syncMethod; @ApiModelProperty("系统id") private List sysId; diff --git a/src/main/java/com/docus/server/collection/dto/FirstPageCheckoutRequest.java b/src/main/java/com/docus/server/collection/dto/FirstPageCheckoutRequest.java index 6065815..205360d 100644 --- a/src/main/java/com/docus/server/collection/dto/FirstPageCheckoutRequest.java +++ b/src/main/java/com/docus/server/collection/dto/FirstPageCheckoutRequest.java @@ -1,6 +1,6 @@ package com.docus.server.collection.dto; -import com.sun.star.sync.SyncType; +import com.docus.server.collection.enums.FileSyncMethod; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,8 +17,8 @@ public class FirstPageCheckoutRequest { @ApiModelProperty("患者基础信息") private PatientInfoDTO patientInfo; - @ApiModelProperty("同步类型：ALL 或者 BY_SYS_ID") - private SyncType syncType; + @ApiModelProperty("同步文件方式：ALL 或者 BY_SYS_ID") + private FileSyncMethod syncMethod; @ApiModelProperty("系统id") private List sysId; diff --git a/src/main/java/com/docus/server/collection/enums/FileSyncMethod.java b/src/main/java/com/docus/server/collection/enums/FileSyncMethod.java new file mode 100644 index 0000000..b9f0baa --- /dev/null +++ b/src/main/java/com/docus/server/collection/enums/FileSyncMethod.java @@ -0,0 +1,17 @@ +package com.docus.server.collection.enums; + +/** + * 同步文件的方式 全部或者根据系统id同步 + * + * @author wyb + */ +public enum FileSyncMethod { + /** + * 全部同步 + */ + ALL, + /** + * 根据系统id同步 + */ + BY_SYS_ID +} \ No newline at end of file diff --git a/src/main/java/com/docus/server/collection/enums/SyncType.java b/src/main/java/com/docus/server/collection/enums/SyncType.java deleted file mode 100644 index 2a09572..0000000 --- a/src/main/java/com/docus/server/collection/enums/SyncType.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.docus.server.collection.enums; - -public enum SyncType{ - /** - * 全部同步 - */ - ALL, - /** - * 根据系统id同步 - */ - BY_SYS_ID - } \ No newline at end of file diff --git a/src/main/java/com/docus/server/collection/validator/impl/FirstPageCheckoutRequestValidator.java b/src/main/java/com/docus/server/collection/validator/impl/FirstPageCheckoutRequestValidator.java index af54cd6..269a9fd 100644 --- a/src/main/java/com/docus/server/collection/validator/impl/FirstPageCheckoutRequestValidator.java +++ b/src/main/java/com/docus/server/collection/validator/impl/FirstPageCheckoutRequestValidator.java @@ -3,6 +3,7 @@ package com.docus.server.collection.validator.impl; import com.docus.core.util.Func; import com.docus.server.collection.dto.FirstPageCheckoutRequest; import com.docus.server.collection.dto.PatientInfoDTO; +import com.docus.server.collection.enums.FileSyncMethod; import com.docus.server.collection.util.DateTimeUtil; import com.docus.server.collection.validator.RequestValidator; import com.docus.server.collection.validator.ValidateResult; @@ -24,11 +25,11 @@ public class FirstPageCheckoutRequestValidator implements RequestValidator { @Override public ValidateResult validate() { FirstPageCheckoutRequest request = this.request; - FirstPageCheckoutRequest.SyncType syncType = request.getSyncType(); + FileSyncMethod syncType = request.getSyncMethod(); if (Objects.isNull(syncType)) { - return ValidateResult.failed("同步类型不能为空！"); + return ValidateResult.failed("同步文件方式不能为空！"); } - if (syncType == FirstPageCheckoutRequest.SyncType.BY_SYS_ID && Func.isEmpty(request.getSysId())) { + if (syncType == FileSyncMethod.BY_SYS_ID && Func.isEmpty(request.getSysId())) { return ValidateResult.failed("同步类型为BY_SYS_ID，系统id不能为空！"); } PatientInfoDTO patientInfo = request.getPatientInfo();