huangmp 4 år sedan
förälder
incheckning
175880ed46

+ 1 - 1
blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/GuestAuthorizeClientFallback.java

@@ -67,7 +67,7 @@ public class GuestAuthorizeClientFallback implements IGuestAuthorizeClient {
         }
 
     @Override
-    public BladePage<GuestAuthorize> page(GuestAuthorizeDTO guestAuthorizeDTO) {
+    public BladePage<GuestAuthorize> pageOfMonth(GuestAuthorizeDTO guestAuthorizeDTO) {
         return null;
     }
 

+ 2 - 2
blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/IGuestAuthorizeClient.java

@@ -66,6 +66,6 @@ public interface IGuestAuthorizeClient  {
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	@PostMapping("page")
-	BladePage<GuestAuthorize> page(@RequestBody GuestAuthorizeDTO guestAuthorizeDTO);
+	@PostMapping("pageOfMonth")
+	BladePage<GuestAuthorize> pageOfMonth(@RequestBody GuestAuthorizeDTO guestAuthorizeDTO);
 }

+ 13 - 4
blade-service/estate/src/main/java/org/springblade/estate/feign/GuestAuthorizeClient.java

@@ -1,5 +1,8 @@
 package org.springblade.estate.feign;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiParam;
@@ -19,6 +22,7 @@ import org.springblade.estate.vo.GuestAuthorizeVO;
 import org.springblade.estate.wrapper.GuestAuthorizeWrapper;
 import org.springblade.estate.service.IGuestAuthorizeService;
 
+import java.util.Date;
 import java.util.List;
 /**
  * 访客授权记录 client
@@ -104,12 +108,17 @@ public class GuestAuthorizeClient implements IGuestAuthorizeClient {
         }
 
     @Override
-	@PostMapping("page")
-    public BladePage<GuestAuthorize> page(@RequestBody GuestAuthorizeDTO guestAuthorizeDTO) {
+	@PostMapping("pageOfMonth")
+    public BladePage<GuestAuthorize> pageOfMonth(@RequestBody GuestAuthorizeDTO guestAuthorizeDTO) {
 		GuestAuthorize ga = new GuestAuthorize();
 		BeanUtil.copyProperties(guestAuthorizeDTO, ga);
-		IPage<GuestAuthorize> page = guestAuthorizeService.page(Condition.getPage(guestAuthorizeDTO.getQuery()),
-			Condition.getQueryWrapper(ga).lambda().orderByDesc(GuestAuthorize::getCreateTime));
+		DateTime now = DateUtil.date();
+		DateTime offsetMonth = DateUtil.offsetMonth(now, -1);
+		LambdaQueryWrapper<GuestAuthorize> queryWrapper = Condition.getQueryWrapper(ga)
+			.lambda()
+			.between(GuestAuthorize::getCreateTime,now,offsetMonth)
+			.orderByDesc(GuestAuthorize::getCreateTime);
+		IPage<GuestAuthorize> page = guestAuthorizeService.page(Condition.getPage(guestAuthorizeDTO.getQuery()),queryWrapper);
 		return BladePage.of(page);
     }
 

+ 5 - 3
community-app-gateway/src/main/java/org/springblade/app/controller/GuestAuthorizeController.java

@@ -1,5 +1,7 @@
 package org.springblade.app.controller;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -90,9 +92,9 @@ public class GuestAuthorizeController {
 		return hashMap;
 	}
 
-	@PostMapping("list")
-	public R list(@RequestBody GuestAuthorizeDTO guestAuthorizeDTO){
-		BladePage<GuestAuthorize> bladePage = guestAuthorizeClient.page(guestAuthorizeDTO);
+	@PostMapping("pageOfMonth")
+	public R pageOfMonth(@RequestBody GuestAuthorizeDTO guestAuthorizeDTO){
+		BladePage<GuestAuthorize> bladePage = guestAuthorizeClient.pageOfMonth(guestAuthorizeDTO);
 		return R.data(bladePage);
 	}