From 514f372270b181f82e4deff98f8d0f38ace63183 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 18:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/consumer/MesTraceConsumerScanController.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/consumer/MesTraceConsumerScanController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/consumer/MesTraceConsumerScanController.java
index e024b00..da47c39 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/consumer/MesTraceConsumerScanController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/consumer/MesTraceConsumerScanController.java
@@ -1,6 +1,11 @@
package cn.iocoder.yudao.module.mes.controller.admin.trace.consumer;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.trace.consumer.vo.MesTraceLocationVisitPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.trace.consumer.vo.MesTraceLocationDistributionRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.trace.consumer.MesTraceLocationVisitDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.trace.consumer.MesTraceLocationVisitMapper;
import cn.iocoder.yudao.module.mes.controller.admin.trace.consumer.vo.MesTraceConsumerScanDistributionReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.trace.consumer.vo.MesTraceConsumerScanDistributionRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.trace.consumer.vo.MesTraceConsumerScanSummaryRespVO;
@@ -20,7 +25,11 @@
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -33,6 +42,36 @@
@Resource
private MesTraceConsumerScanStatisticsService statisticsService;
+
+ @Resource
+ private MesTraceLocationVisitMapper locationVisitMapper;
+
+ @GetMapping("/location-visits")
+ @Operation(summary = "瀹氫綅鎺堟潈璁块棶璁板綍锛堝惈浣嶇疆涓庢�绘暟锛�")
+ @PreAuthorize("@ss.hasPermission('mes:trace-consumer-scan:query')")
+ public CommonResult<PageResult<MesTraceLocationVisitDO>> getLocationVisits(@Valid MesTraceLocationVisitPageReqVO reqVO) {
+ return success(locationVisitMapper.selectPage(reqVO));
+ }
+
+ @GetMapping("/location-distribution")
+ @Operation(summary = "瀹氫綅鎺堟潈璁块棶鐨勫潗鏍囩綉鏍煎垎甯�")
+ @PreAuthorize("@ss.hasPermission('mes:trace-consumer-scan:query')")
+ public CommonResult<List<MesTraceLocationDistributionRespVO>> getLocationDistribution(@Valid MesTraceLocationVisitPageReqVO reqVO) {
+ Map<String, List<MesTraceLocationVisitDO>> groups = locationVisitMapper.selectListByFilter(reqVO).stream()
+ .collect(Collectors.groupingBy(e -> e.getLatitude().setScale(2, RoundingMode.HALF_UP).toPlainString()
+ + "," + e.getLongitude().setScale(2, RoundingMode.HALF_UP).toPlainString()));
+ return success(groups.entrySet().stream()
+ .sorted((a, b) -> Long.compare(b.getValue().size(), a.getValue().size()))
+ .limit(20)
+ .map(entry -> {
+ MesTraceLocationDistributionRespVO vo = new MesTraceLocationDistributionRespVO();
+ String[] coordinates = entry.getKey().split(",");
+ vo.setLatitude(new BigDecimal(coordinates[0]));
+ vo.setLongitude(new BigDecimal(coordinates[1]));
+ vo.setCount((long) entry.getValue().size());
+ return vo;
+ }).toList());
+ }
@GetMapping("/summary")
@Operation(summary = "娑堣垂鑰呮壂鐮佽闂眹鎬�")
@@ -60,4 +99,4 @@
return success(statisticsService.getDistribution(reqVO));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3