From 96916fb34cdc4907a194d0bafae22a5e2bf378bf Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Tue, 02 Jul 2024 17:40:20 +0800
Subject: [PATCH] 获取楼盘相关集合数据查询调整（改成sql会导致内存溢出）
---
src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java b/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
index 36716d8..b608531 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
@@ -28,6 +28,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.eCallEventTwo.dto.EcOrderDTO;
import org.springblade.modules.eCallEventTwo.dto.EcOrderParamDTO;
import org.springblade.modules.eCallEventTwo.entity.ECallEventTwoEntity;
import org.springblade.modules.eCallEventTwo.service.EcOrderService;
@@ -37,6 +38,9 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.Map;
@@ -137,7 +141,16 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "工单 同步")
public R synchronizeData() {
+ // 创建居住证发送短信定时任务
EcOrderParamDTO ecOrderParamDTO = new EcOrderParamDTO();
+ // 获取当前日期时间
+ LocalDateTime now = LocalDateTime.now();
+ // 获取前一天的开始时间
+ LocalDateTime yesterdayStart = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MIN);
+ // 获取前一天的结束时间
+ LocalDateTime yesterdayEnd = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MAX);
+ ecOrderParamDTO.setEndTime(yesterdayEnd);
+ ecOrderParamDTO.setStartTime(yesterdayStart);
boolean b = ecOrderService.SynchronizeData(ecOrderParamDTO);
return R.status(b);
}
@@ -146,12 +159,12 @@
/**
* 工单 同步
*/
- @PostMapping("/getCount")
+ @GetMapping("/getCount")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "工单统计")
- public R getCount(@Valid @RequestBody EcOrderParamDTO ecOrderParamDTO) {
- Map<String, String> count = ecOrderService.getCount(ecOrderParamDTO);
- return R.data(count);
+ public R getCount( EcOrderParamDTO ecOrderParamDTO, Query query) {
+ IPage<EcOrderDTO> pages = ecOrderService.getCount(Condition.getPage(query),ecOrderParamDTO);
+ return R.data(pages);
}
--
Gitblit v1.9.3