From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java
index 4d1bc33..75f382b 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java
@@ -41,6 +41,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -106,6 +107,7 @@
TSystemBulletin systemBulletin = systemBulletinService.lambdaQuery().eq(TSystemBulletin::getStatus, 1).last("limit 1").one();
return R.ok(systemBulletin);
}
+
@ApiOperation(value = "首页-数据概览-更多")
@PostMapping(value = "/dataReport")
@@ -186,8 +188,10 @@
// 获取今天凌晨00:00:00 和今天23:59:59 类型为LocalDateTime
LocalDateTime startOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
LocalDateTime endOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
- tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, startOfToday);
- tTaskLambdaQueryWrapper.le(TTask::getImplementTime, endOfToday);
+ String startOfTodayStr = startOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ String endOfTodayStr = endOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ tTaskLambdaQueryWrapper.ge(TTask::getImplementTime, startOfTodayStr);
+ tTaskLambdaQueryWrapper.le(TTask::getImplementTime, endOfTodayStr);
}
// tTaskLambdaQueryWrapper.ne(TTask::getStatus, 1);
List<TTask> tasks = taskCleanerService.list(tTaskLambdaQueryWrapper);
@@ -330,12 +334,16 @@
List<TLocation> locationList = locationService.list();
List<TLocationType> locationTypeList = locationTypeService.list();
- List<TTask> taskAll = taskCleanerService.lambdaQuery().eq(TTask::getPatrolInspector, userId).list();
+ dto.setUserId(userId);
+ List<TTask> taskAll = taskCleanerService.indexTask(dto);
+// List<TTask> taskAll = taskCleanerService.lambdaQuery().eq(TTask::getPatrolInspector, userId).list();
// 获取今天凌晨00:00:00 和今天23:59:59 类型为LocalDateTime
LocalDateTime startOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
LocalDateTime endOfToday = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+ String startOfTodayStr = startOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ String endOfTodayStr = endOfToday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
List<TTask> taskToday = taskCleanerService.lambdaQuery()
- .between(TTask::getImplementTime, startOfToday, endOfToday)
+ .between(TTask::getImplementTime, startOfTodayStr, endOfTodayStr)
.eq(TTask::getPatrolInspector, userId).list();
List<SysUser> sysUsers = sysUserService.selectAllList();
SysUser sysUser = sysUserService.selectUserById(userId);
@@ -470,12 +478,13 @@
taskTodayVO.setLocationLat(tLocation.getLocationLat());
taskTodayVO.setLocationName(tLocation.getLocationName());
if(StringUtils.hasLength(dto.getLon())){
- Map<String, String> distance = amapApiClient.getDistance(dto.getLon() + "," + dto.getLat(), tLocation.getLocationLon() + "," + tLocation.getLocationLat(), 1);
- if (distance != null) {
- taskTodayVO.setDistance(new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN));
- } else {
- taskTodayVO.setDistance(new BigDecimal("0"));
- }
+ taskTodayVO.setDistance(tTask.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN));
+// Map<String, String> distance = amapApiClient.getDistance(dto.getLon() + "," + dto.getLat(), tLocation.getLocationLon() + "," + tLocation.getLocationLat(), 1);
+// if (distance != null) {
+// taskTodayVO.setDistance(new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+// } else {
+// taskTodayVO.setDistance(new BigDecimal("0"));
+// }
}else {
taskTodayVO.setDistance(new BigDecimal("0"));
}
--
Gitblit v1.7.1