From d1dfb6e35f38e27fd960dc3ad0130c8d0f5c39bb Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 25 三月 2026 09:11:35 +0800
Subject: [PATCH] 3.25标签功能
---
jyz-base-start/src/main/java/com/tievd/jyz/controller/ActivityController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/jyz-base-start/src/main/java/com/tievd/jyz/controller/ActivityController.java b/jyz-base-start/src/main/java/com/tievd/jyz/controller/ActivityController.java
index 6aa7a2b..b3ccea3 100644
--- a/jyz-base-start/src/main/java/com/tievd/jyz/controller/ActivityController.java
+++ b/jyz-base-start/src/main/java/com/tievd/jyz/controller/ActivityController.java
@@ -47,6 +47,9 @@
@Autowired
IActOrgRefService actOrgRefService;
+ @Autowired
+ private com.tievd.jyz.mapper.OilRecordMapper oilRecordMapper;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*/
@@ -156,6 +159,41 @@
Activity activity = activityService.getById(id);
return Result.ok(activity);
}
+
+ /**
+ * 鏌ョ湅杞﹁締鍔犳补棰戞
+ */
+ @GetMapping("/getVehicleFrequency")
+ @Operation(description = "鏌ョ湅杞﹁締鍔犳补棰戞")
+ public Result<?> getVehicleFrequency(@RequestParam Integer actId) {
+ Activity activity = activityService.getById(actId);
+ if (activity == null) {
+ return Result.error("娲诲姩涓嶅瓨鍦�");
+ }
+
+ List<ActOrgRef> orgRefs = actOrgRefService.list(new LambdaQueryWrapper<ActOrgRef>().eq(ActOrgRef::getActId, actId));
+ if (orgRefs == null || orgRefs.isEmpty()) {
+ return Result.error("娲诲姩鏈叧鑱旀満鏋�");
+ }
+
+ List<String> orgCodes = new ArrayList<>();
+ for (ActOrgRef ref : orgRefs) {
+ orgCodes.add(ref.getOrgCode());
+ }
+
+ java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String startTimeStr = sdf.format(activity.getStartTime());
+ String endTimeStr = sdf.format(activity.getEndTime());
+
+ java.util.Map<String, Object> result = new java.util.HashMap<>();
+
+ result.put("activity", activity);
+ result.put("beforeActivity", oilRecordMapper.getVehicleFrequencyBeforeActivity(startTimeStr, orgCodes));
+ result.put("duringActivity", oilRecordMapper.getVehicleFrequencyDuringActivity(startTimeStr, endTimeStr, orgCodes));
+ result.put("afterActivity", oilRecordMapper.getVehicleFrequencyAfterActivity(endTimeStr, orgCodes));
+
+ return Result.ok(result);
+ }
/**
* 瀵煎嚭excel
--
Gitblit v1.8.0