update https上传文件

nb-common/src/main/java/com/nb/common/util/MinioUtil.java

@@ -29,7 +29,7 @@ public class MinioUtil {
     @Bean
     private MinioClient minioClient() {
         MinioClient minioClient = MinioClient.builder()
-                .endpoint(minioConfig.getEndpoint())
+                .endpoint(minioConfig.getEndpoint(),minioConfig.getPort(),minioConfig.isSecure())
                 .credentials(minioConfig.getAccessKey(), minioConfig.getSecretKey())
                 .build();
         return minioClient;
@@ -51,7 +51,7 @@ public class MinioUtil {
             log.error("上传文件失败，{}", e.getMessage());
             throw new CustomException("上传文件失败，" + e.getMessage());
         }
-        return minioConfig.getEndpoint() + "/" + minioConfig.getBucketName() + filepath;
+        return (minioConfig.isSecure()?"https:":"http:")+minioConfig.getEndpoint()+":"+minioConfig.getPort() + "/" + minioConfig.getBucketName() + filepath;
     }
 
 }

nb-system/src/main/java/com/nb/bus/service/dto/CombineQuery.java

@@ -153,10 +153,6 @@ public class CombineQuery {
     @ApiModelProperty("按照输注开始时间排序")
     private Boolean infusionStartTimeDesc;
 
-    @ApiModelProperty("按照输注是否结束排序")
-    @Deprecated
-    private Boolean infusionFinishedDesc;
-
     @ApiModelProperty("按照输注最后上传时间排序")
     private Boolean infusionLastUploadTimeDesc;
 
@@ -216,15 +212,6 @@ public class CombineQuery {
         }
     }
 
-    public void setInfusionFinishedDesc(Boolean infusionFinishedDesc) {
-        this.infusionFinishedDesc = infusionFinishedDesc;
-        if (Boolean.TRUE.equals(infusionFinishedDesc)) {
-            orderByDesc.add("infusion_finished");
-        }else if(Boolean.FALSE.equals(infusionFinishedDesc)){
-            orderByAsc.add("infusion_finished");
-        }
-    }
-
     public void setInfusionLastUploadTimeDesc(Boolean infusionLastUploadTimeDesc) {
         this.infusionLastUploadTimeDesc = infusionLastUploadTimeDesc;
         if (Boolean.TRUE.equals(infusionLastUploadTimeDesc)) {
@@ -241,9 +228,8 @@ public class CombineQuery {
                 CollUtil.isEmpty(orderByDesc)){
             orderByDesc.add("clinic_id");
         }
-        if(infusionFinishedDesc!=null&&
-                (CollUtil.size(orderByAsc)==1
-                        ||CollUtil.size(orderByDesc)==1)){
+        if(CollUtil.size(orderByAsc)==1
+                        ||CollUtil.size(orderByDesc)==1){
             //添加默认排序，否则顺序混乱
             orderByDesc.add("clinic_id");
         }