From dbba9c3fc5187432c34329a2a18e07feca729de5 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 24 六月 2025 11:25:11 +0800
Subject: [PATCH] 2.5.1蓄电池对比分析同一时间同一品牌
---
src/main/java/com/whyc/controller/BattCompareController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattCompareController.java b/src/main/java/com/whyc/controller/BattCompareController.java
index f8ea218..5fc0086 100644
--- a/src/main/java/com/whyc/controller/BattCompareController.java
+++ b/src/main/java/com/whyc/controller/BattCompareController.java
@@ -13,6 +13,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.text.ParseException;
+import java.util.Map;
+
@RestController
@Api(tags = "钃勭數姹犲姣斿垎鏋愮鐞�")
@RequestMapping("compare")
@@ -24,9 +27,14 @@
@ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝鍚屼竴鏃堕棿锛�(1.2.15)")
@PostMapping("getBattCompare15Statistic")
- public Response getBattCompare15Statistic(@RequestBody BattCompareStic stic){
+ public Response getBattCompare15Statistic(@RequestBody BattCompareStic stic) throws ParseException {
User uinf= ActionUtil.getUser();
stic.setUid(uinf.getId());
+ if(stic.getInuserYear()!=null){
+ int year=ActionUtil.getNowYear();
+ stic.setInuseStartTime(ActionUtil.sdfwithday.parse(ActionUtil.getDayTime(year+1-stic.getInuserYear(),0,1,5)));
+ stic.setInuseEndTime(ActionUtil.sdfwithday.parse(ActionUtil.getDayTime(year,11,31,5)));
+ }
return battTinfService.getBattCompare15Statistic(stic);
}
--
Gitblit v1.9.1