From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java
index c44227f..e93e819 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java
@@ -20,6 +20,8 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.time.LocalDateTime;
+import java.util.HashMap;
import java.util.List;
/**
@@ -112,7 +114,7 @@
if(list==null|| list.isEmpty()){
return AjaxResult.success(tScreenContent);
}
- BeanUtils.copyProperties( list.get(0),tScreenContent);
+ BeanUtils.copyProperties(list.get(0),tScreenContent);
list.remove(0);
list.forEach(x->{
tScreenContent.setCarDischarge(tScreenContent.getCarDischarge().add(x.getCarDischarge()));
@@ -121,11 +123,28 @@
tScreenContent.setValueOne(tScreenContent.getValueOne().add(x.getValueOne()));
tScreenContent.setValueTwo(tScreenContent.getValueTwo().add(x.getValueTwo()));
tScreenContent.setValueThree(tScreenContent.getValueThree().add(x.getValueThree()));
- if(tScreenContent.getStatisticalDeadline().isBefore(x.getStatisticalDeadline())) tScreenContent.setStatisticalDeadline(x.getStatisticalDeadline());
+ if(tScreenContent.getStatisticalDeadline().getTime()<(x.getStatisticalDeadline().getTime())) {
+ tScreenContent.setStatisticalDeadline(x.getStatisticalDeadline());
+ }
});
return AjaxResult.success(tScreenContent);
}
+ @ApiOperation(tags = {"车位数据传输"},value = "充电桩数据大屏")
+ @PostMapping(value = "/carportData")
+ public AjaxResult<?> carportData(Integer parkingPlace,Integer remainPlace) {
+ screenContentService.carportData(parkingPlace,remainPlace);
+ return AjaxResult.success();
+ }
+
+ @ApiOperation(tags = {"获取车位数据传输"},value = "充电桩数据大屏")
+ @GetMapping(value = "/getCarportData")
+ public AjaxResult<?> getCarportData() {
+ HashMap<String,Object> map = screenContentService.getCarportData();
+ return AjaxResult.success(map);
+ }
+
+
/**
* 数据回显 站点id
*/
--
Gitblit v1.7.1