From add5c816a5281cf6b1df4a0988e8b3a0c2b59bee Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 17:37:03 +0800
Subject: [PATCH] 电源表和电池信息表加入新的字段，添加，编辑需要修改
---
src/main/java/com/whyc/controller/BattCompareController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattCompareController.java b/src/main/java/com/whyc/controller/BattCompareController.java
index 5ded782..35432dd 100644
--- a/src/main/java/com/whyc/controller/BattCompareController.java
+++ b/src/main/java/com/whyc/controller/BattCompareController.java
@@ -1,8 +1,11 @@
package com.whyc.controller;
import com.whyc.dto.Response;
+import com.whyc.dto.SocreHehaviorDto;
import com.whyc.dto.Statistic.BattCompareStic;
+import com.whyc.pojo.db_param.AppParam;
import com.whyc.pojo.db_user.User;
+import com.whyc.service.AppParamService;
import com.whyc.service.BattresdataInfService;
import com.whyc.service.BatttestdataInfService;
import com.whyc.util.ActionUtil;
@@ -12,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
+import java.util.List;
import java.util.Map;
@RestController
@@ -25,15 +29,17 @@
@Autowired
private BattresdataInfService battRinfService;
+ @Autowired
+ private AppParamService appParamService;
- @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鏃堕棿鍚屼竴鍝佺墝/鍚屼竴鏃堕棿涓嶅悓涓�鍝佺墝/涓嶅悓涓�鏃堕棿鍚屼竴鍝佺墝锛�(1.2.15/16/17)")
+ @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鏃堕棿鍚屼竴鍝佺墝/鍚屼竴鏃堕棿涓嶅悓涓�鍝佺墝/涓嶅悓涓�鏃堕棿鍚屼竴鍝佺墝锛�(2.5.1/2/3)")
@PostMapping("getBattCompare15Statistic")
public Response getBattCompare15Statistic(@RequestBody BattCompareStic stic) throws ParseException {
User uinf= ActionUtil.getUser();
stic.setUid(uinf.getId());
- if(stic.getInuserYear()!=null){
+ if(stic.getInuseYear()!=null){
int year=ActionUtil.getNowYear();
- stic.setInuseStartTime(ActionUtil.sdfwithday.parse(ActionUtil.getDayTime(year+1-stic.getInuserYear(),0,1,5)));
+ stic.setInuseStartTime(ActionUtil.sdfwithday.parse(ActionUtil.getDayTime(year+1-stic.getInuseYear(),0,1,5)));
stic.setInuseEndTime(ActionUtil.sdfwithday.parse(ActionUtil.getDayTime(year,11,31,5)));
}
return battTinfService.getBattCompare15Statistic(stic);
@@ -56,4 +62,42 @@
public Response getMonResChangeByBattgroupId(@RequestParam Integer battgroupId,@RequestParam Integer monNum){
return battRinfService.getMonResChangeByBattgroupId(battgroupId,monNum);
}
+
+ @ApiOperation(value = "寮圭獥鏍规嵁璁剧疆鐨勬潈閲嶈〃鏍艰瘎鍒�")
+ @PostMapping("getScoreByHehavior")
+ public Response getScoreByHehavior(@RequestBody SocreHehaviorDto dto) throws ParseException {
+ User uinf= ActionUtil.getUser();
+ dto.setUid(uinf.getId());
+ if(dto.getInuseYear()!=null){
+ int year=ActionUtil.getNowYear();
+ dto.setInuseStartTime(ActionUtil.sdfwithday.parse(ActionUtil.getDayTime(year+1-dto.getInuseYear(),0,1,5)));
+ dto.setInuseEndTime(ActionUtil.sdfwithday.parse(ActionUtil.getDayTime(year,11,31,5)));
+ }
+ if (dto.getProduct()!=null) {
+ if(dto.getInuseYear()!=null){
+ dto.setSelectType(1);
+ }else{
+ dto.setSelectType(2);
+ }
+ }else{
+ if(dto.getInuseYear()!=null){
+ dto.setSelectType(3);
+ }else{
+ dto.setSelectType(4);
+ }
+ }
+ return battTinfService.getScoreByHehavior(dto);
+ }
+
+ @ApiOperation(value = "璁剧疆鏉冮噸(1.2.16)")
+ @PostMapping("setHehavior")
+ public Response setHehavior(@RequestBody List<AppParam> List){
+ return appParamService.setHehavior(List);
+ }
+
+ @ApiOperation(value = "璇诲彇鏉冮噸(1.2.16)")
+ @GetMapping("getHehavior")
+ public Response getHehavior(){
+ return appParamService.getHehavior();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1