From ba37cc4e06a1b15442c3ca47958aab609a2708d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 13 Jul 2020 17:14:24 +0800 Subject: [PATCH] =?UTF-8?q?#1451=20=E6=96=B0=E5=A2=9E=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/data/tenant/TenantRequestInterceptor.java | 7 ++++++- .../com/pig4cloud/pigx/admin/api/entity/SysTenant.java | 5 ++--- .../pigx/admin/controller/SysTenantController.java | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantRequestInterceptor.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantRequestInterceptor.java index 7196f9397..168cb5525 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantRequestInterceptor.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantRequestInterceptor.java @@ -1,6 +1,7 @@ package com.pig4cloud.pigx.common.data.tenant; import com.pig4cloud.pigx.common.core.constant.CommonConstants; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestInterceptor; @@ -19,7 +20,11 @@ public class TenantRequestInterceptor implements ClientHttpRequestInterceptor { @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { - request.getHeaders().set(CommonConstants.TENANT_ID, String.valueOf(TenantContextHolder.getTenantId())); + + if (TenantContextHolder.getTenantId() != null) { + request.getHeaders().set(CommonConstants.TENANT_ID, String.valueOf(TenantContextHolder.getTenantId())); + } + return execution.execute(request, body); } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java index e21aaf8ad..d142357f6 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java @@ -25,7 +25,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -64,13 +63,13 @@ public class SysTenant extends Model { * 开始时间 */ @ApiModelProperty(value = "开始时间") - private LocalDate startTime; + private LocalDateTime startTime; /** * 结束时间 */ @ApiModelProperty(value = "结束时间") - private LocalDate endTime; + private LocalDateTime endTime; /** * 0正常 9-冻结 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java index 3cf81bdb2..be01c6d21 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java @@ -31,7 +31,7 @@ import org.springframework.cache.annotation.CacheEvict; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; @@ -117,8 +117,8 @@ public class SysTenantController { @GetMapping("/list") public R list() { List tenants = sysTenantService.getNormalTenant().stream() - .filter(tenant -> tenant.getStartTime().isBefore(LocalDate.now())) - .filter(tenant -> tenant.getEndTime().isAfter(LocalDate.now())).collect(Collectors.toList()); + .filter(tenant -> tenant.getStartTime().isBefore(LocalDateTime.now())) + .filter(tenant -> tenant.getEndTime().isAfter(LocalDateTime.now())).collect(Collectors.toList()); return R.ok(tenants); }