取名优化

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;

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")
+    @ApiModelProperty("同步文件方式：ALL 或者 BY_SYS_ID")
-    private SyncType syncType;
+    private FileSyncMethod syncMethod;
 
     @ApiModelProperty("系统id")
     private List<String> sysId;

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")
+    @ApiModelProperty("同步文件方式：ALL 或者 BY_SYS_ID")
-    private SyncType syncType;
+    private FileSyncMethod syncMethod;
 
     @ApiModelProperty("系统id")
     private List<String> sysId;

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
+}

src/main/java/com/docus/server/collection/enums/SyncType.java

@@ -1,12 +0,0 @@
-package com.docus.server.collection.enums;
-
-public enum SyncType{
-        /**
-         * 全部同步
-         */
-        ALL,
-        /**
-         * 根据系统id同步
-         */
-        BY_SYS_ID
-    }

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();