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 | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 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 48c0011..b608531 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
@@ -16,30 +16,33 @@
*/
package org.springblade.modules.eCallEventTwo.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
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.entity.EcOrder;
-import org.springblade.modules.eCallEventTwo.service.EcOrderService;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+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;
+import org.springblade.modules.eCallEventTwo.service.IECallEventTwoService;
import org.springblade.modules.eCallEventTwo.vo.ECallEventTwoVO;
import org.springblade.modules.eCallEventTwo.wrapper.ECallEventTwoWrapper;
-import org.springblade.modules.eCallEventTwo.service.IECallEventTwoService;
-import org.springblade.core.boot.ctrl.BladeController;
+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;
/**
* 工单 控制器
@@ -134,13 +137,47 @@
/**
* 工单 同步
*/
- @PostMapping("/synchronizeData")
+ @GetMapping("/synchronizeData")
@ApiOperationSupport(order = 8)
- @ApiOperation(value = "逻辑删除")
+ @ApiOperation(value = "工单 同步")
public R synchronizeData() {
- boolean b = ecOrderService.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);
}
+ /**
+ * 工单 同步
+ */
+ @GetMapping("/getCount")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "工单统计")
+ public R getCount( EcOrderParamDTO ecOrderParamDTO, Query query) {
+ IPage<EcOrderDTO> pages = ecOrderService.getCount(Condition.getPage(query),ecOrderParamDTO);
+ return R.data(pages);
+ }
+
+
+ /**
+ * 工单 同步
+ */
+ @GetMapping("/getUnitAssessmentIndicators")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "单位考核指标")
+ public R getUnitAssessmentIndicators( ) {
+ List<Map<String, String>> count = ecOrderService.getUnitAssessmentIndicators();
+ return R.data(count);
+ }
+
+
}
--
Gitblit v1.9.3