From 350ad51d45f4a25f4d7ecbad8bbfb420f56708c6 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 08 四月 2025 14:40:54 +0800
Subject: [PATCH] 更新电池告警及历史接口
---
src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java | 9 ++-
src/main/java/com/whyc/service/SubTableService.java | 9 ++-
src/main/java/com/whyc/service/BattTestInfDataService.java | 6 +-
src/main/java/com/whyc/service/BattAlarmService.java | 16 +++-
src/main/java/com/whyc/service/BattAlarmHisService.java | 16 +++-
src/main/java/com/whyc/service/BattTestInfService.java | 39 +++++++------
src/main/java/com/whyc/controller/BattTestInfController.java | 27 ++++----
7 files changed, 71 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattTestInfController.java b/src/main/java/com/whyc/controller/BattTestInfController.java
index 9297e8e..42467c1 100644
--- a/src/main/java/com/whyc/controller/BattTestInfController.java
+++ b/src/main/java/com/whyc/controller/BattTestInfController.java
@@ -1,4 +1,3 @@
-/*
package com.whyc.controller;
import com.whyc.dto.ReportBattDTO;
@@ -12,30 +11,30 @@
@RestController
@Api(tags = "鐢垫睜缁勫厖鏀剧數璁板綍")
-@RequestMapping("tinf")
+@RequestMapping("battTestInf")
public class BattTestInfController {
@Autowired
private BattTestInfService service;
@Autowired
private BattTestInfDataService dataService;
- @ApiOperation("鏌ヨ鍏呮斁鐢佃褰�")
- @GetMapping("getTinfHis")
- public Response getTinfHis(@RequestParam int binfId
+ @ApiOperation("鏌ヨ鍒嗛〉-鐢垫睜缁勭殑鍏呮斁鐢佃褰�")
+ @GetMapping("getPageByBattGroupId")
+ public Response getPageByBattGroupId(@RequestParam int battGroupId
, @RequestParam int pageNum, @RequestParam int pageSize){
- Response res=service.getTinfHis(binfId,pageNum,pageSize);
- return res;
+ return service.getPageByBattGroupId(battGroupId,pageNum,pageSize);
}
- @ApiOperation("鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�")
- @GetMapping("getTDataHis")
- public Response getTDataHis(@RequestParam int binfId,@RequestParam int testRecordCount){
- Response res=dataService.getTDataHis(binfId,testRecordCount);
+ //鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�
+ @ApiOperation("鏌ヨ鍗曟鏀剧數璁板綍璇︽儏")
+ @GetMapping("getByBattGroupIdAndTestRecordCount")
+ public Response getByBattGroupIdAndTestRecordCount(@RequestParam int battGroupId,@RequestParam int testRecordCount){
+ Response res=dataService.getByBattGroupIdAndTestRecordCount(battGroupId,testRecordCount);
return res;
}
- @PostMapping("searchGroupAssess")
+ /*@PostMapping("searchGroupAssess")
@ApiOperation(value = "钃勭數姹犵粍鍚庤瘎浼�")
public Response searchByCondition(@RequestParam int pageNum,@RequestParam int pageSize, @RequestBody ReportBattDTO tinf) {
return service.searchGroupAssess(pageNum,pageSize,tinf,1001);
@@ -46,6 +45,6 @@
@ApiOperation(value = "鐢垫睜鍗曚綋鎬ц兘璇勪及")
public Response searchMonNumAssess(@RequestParam int binfId,@RequestParam int monNum){
return service.searchMonNumAssess(binfId,monNum);
- }
+ }*/
-}*/
+}
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
index 097e97b..4b45c16 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_alarm;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -12,12 +13,10 @@
import java.util.Date;
@Data
-@AllArgsConstructor
-@NoArgsConstructor
@ToString
@ApiModel(value="鍛婅鍘嗗彶璁板綍", description="")
public class BattAlarmHistory {
- @TableField("num")
+ @TableId("num")
@ApiModelProperty("涓婚敭缂栧彿")
private Integer num;
@@ -49,6 +48,10 @@
@ApiModelProperty("鍛婅鍊�")
private Integer almValue;
+ private Integer almConfirm;
+ private Date almConfirmTime;
+ private Integer almType;
+
@TableField(exist = false)
@ApiModelProperty("鐢垫睜缁勫悕绉�")
diff --git a/src/main/java/com/whyc/service/BattAlarmHisService.java b/src/main/java/com/whyc/service/BattAlarmHisService.java
index 92f3774..6e46ded 100644
--- a/src/main/java/com/whyc/service/BattAlarmHisService.java
+++ b/src/main/java/com/whyc/service/BattAlarmHisService.java
@@ -5,6 +5,7 @@
import com.whyc.pojo.db_alarm.BattAlarm;
import com.whyc.pojo.db_alarm.BattAlarmHistory;
import com.whyc.pojo.db_param.BattAlarmCfg;
+import com.whyc.pojo.db_param.BattAlarmParam;
import com.whyc.util.SubTablePageInfoUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,7 @@
private SubTablePageInfoUtil util;
@Autowired
- private BattAlarmCfgService cfgService;
+ private BattAlarmParamService paramService;
//鏌ヨ鐢垫睜缁勫巻鍙叉椂闂村憡璀�
public Response getHistoryPage(Integer almLevel, String startTime, String endTime,int pageNum,int pageSize)throws ParseException, InterruptedException {
@@ -28,12 +29,17 @@
PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
,"db_alarm","batt_alarm_history",his);
List<BattAlarmHistory> list = pageInfo.getList();
- List<BattAlarmCfg> cfgList = cfgService.getList();
+ List<BattAlarmParam> paramList = paramService.getList();
list.stream().forEach(item->{
Integer almId = item.getAlmId();
- for (int i = 0; i < cfgList.size(); i++) {
- if(almId.intValue() == cfgList.get(i).getAlmId()){
- item.setAlmName(cfgList.get(i).getAlmName());
+ Integer almType = item.getAlmType();
+ for (int i = 0; i < paramList.size(); i++) {
+ if(almId.intValue() == paramList.get(i).getAlmId()){
+ if(almType == 1){
+ item.setAlmName(paramList.get(i).getAlmName().replace("鍛婅","楂樺憡璀�"));
+ }else {
+ item.setAlmName(paramList.get(i).getAlmName().replace("鍛婅","浣庡憡璀�"));
+ }
break;
}
}
diff --git a/src/main/java/com/whyc/service/BattAlarmService.java b/src/main/java/com/whyc/service/BattAlarmService.java
index e4fef40..987a35e 100644
--- a/src/main/java/com/whyc/service/BattAlarmService.java
+++ b/src/main/java/com/whyc/service/BattAlarmService.java
@@ -7,6 +7,7 @@
import com.whyc.mapper.BattAlarmMapper;
import com.whyc.pojo.db_alarm.BattAlarm;
import com.whyc.pojo.db_param.BattAlarmCfg;
+import com.whyc.pojo.db_param.BattAlarmParam;
import com.whyc.util.ActionUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +23,7 @@
private BattAlarmMapper mapper;
@Autowired
- private BattAlarmCfgService cfgService;
+ private BattAlarmParamService paramService;
/*
鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�
@@ -35,12 +36,17 @@
public Response getPage(Integer almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
List<BattAlarm> list=mapper.getList(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
- List<BattAlarmCfg> cfgList = cfgService.getList();
+ List<BattAlarmParam> paramList = paramService.getList();
list.stream().forEach(item->{
Integer almId = item.getAlmId();
- for (int i = 0; i < cfgList.size(); i++) {
- if(almId.intValue() == cfgList.get(i).getAlmId()){
- item.setAlmName(cfgList.get(i).getAlmName());
+ Integer almType = item.getAlmType();
+ for (int i = 0; i < paramList.size(); i++) {
+ if(almId.intValue() == paramList.get(i).getAlmId()){
+ if(almType == 1){
+ item.setAlmName(paramList.get(i).getAlmName().replace("鍛婅","楂樺憡璀�"));
+ }else {
+ item.setAlmName(paramList.get(i).getAlmName().replace("鍛婅","浣庡憡璀�"));
+ }
break;
}
}
diff --git a/src/main/java/com/whyc/service/BattTestInfDataService.java b/src/main/java/com/whyc/service/BattTestInfDataService.java
index 3030069..be7b2b9 100644
--- a/src/main/java/com/whyc/service/BattTestInfDataService.java
+++ b/src/main/java/com/whyc/service/BattTestInfDataService.java
@@ -17,8 +17,8 @@
private SubTableService service;
//鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�
- public Response getTDataHis(int binfId, int testRecordCount) {
- List<BattTestInfData> list=service.getTDataHis(binfId,testRecordCount);
- return new Response().setII(1,list!=null,list,"鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�");
+ public Response getByBattGroupIdAndTestRecordCount(int battGroupId, int testRecordCount) {
+ List<BattTestInfData> list=service.getByBattGroupIdAndTestRecordCount(battGroupId,testRecordCount);
+ return new Response().set(1,list);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BattTestInfService.java b/src/main/java/com/whyc/service/BattTestInfService.java
index 811f037..bf8221a 100644
--- a/src/main/java/com/whyc/service/BattTestInfService.java
+++ b/src/main/java/com/whyc/service/BattTestInfService.java
@@ -1,4 +1,3 @@
-/*
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,6 +12,8 @@
import com.whyc.mapper.BattInfMapper;
import com.whyc.mapper.BattTestInfMapper;
import com.whyc.pojo.*;
+import com.whyc.pojo.db_batt.BattInf;
+import com.whyc.pojo.db_dis_batt.BattTestInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.PageInfoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,15 +41,16 @@
//鏌ヨ鍏呮斁鐢佃褰�
- public Response getTinfHis(int binfId, int pageNum, int pageSize) {
- PageHelper.startPage(pageNum,pageSize);
- QueryWrapper wrapper= Wrappers.query();
- wrapper.eq("binf_id",binfId);
- List<BattTestInf> list=mapper.selectList(wrapper);
- PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鍏呮斁鐢佃褰�");
+ public Response getPageByBattGroupId(int battGroupId, int pageNum, int pageSize) {
+ PageHelper.startPage(pageNum, pageSize);
+ QueryWrapper wrapper = Wrappers.query();
+ wrapper.eq("binf_id", battGroupId);
+ List<BattTestInf> list = mapper.selectList(wrapper);
+ PageInfo pageInfo = new PageInfo(list);
+ return new Response().set(1, pageInfo);
}
+ /*
//1.4鐢垫睜鎬ц兘璇勪及
public Response searchGroupAssess(int pageNum, int pageSize, ReportBattDTO tinf, int userId){
//List<BattInf> battinfList = binfMapper.searchGroupAssess(tinf, userId);
@@ -201,11 +203,11 @@
}
*/
-/*鍔ｅ寲锛氭湰骞村害鏈斁鐢碉紝鍐呴樆鍛婅锛堥鍛婅锛堥噸瑕侊級锛屽憡璀︼紙绱ф�ワ級锛�
- *瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝�硷紝鍐呴樆鍛婅(棰勫憡璀︼紝鍛婅)
- * 瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝鍐呴樆姝ｅ父
- * 瀹归噺姝ｅ父锛屽唴闃诲憡璀�(棰勫憡璀︼紝鍛婅)
- *//*
+ /*鍔ｅ寲锛氭湰骞村害鏈斁鐢碉紝鍐呴樆鍛婅锛堥鍛婅锛堥噸瑕侊級锛屽憡璀︼紙绱ф�ワ級锛�
+ *瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝�硷紝鍐呴樆鍛婅(棰勫憡璀︼紝鍛婅)
+ * 瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝鍐呴樆姝ｅ父
+ * 瀹归噺姝ｅ父锛屽唴闃诲憡璀�(棰勫憡璀︼紝鍛婅)
+ *//*
if (((disNum==0)&&(listALmRes.size()>0))
||((disNum>0)&&(realCap <= capAlarm * monCapStd && realCap >= capChange * monCapStd)&&(listALmRes.size()>0))
@@ -225,7 +227,7 @@
}
//鏌ヨ鐢垫睜鍛婅(2024銆�4.15淇敼)
*/
-/*鏈斁鐢碉細鏈勾搴︽湭鏀剧數
+ /*鏈斁鐢碉細鏈勾搴︽湭鏀剧數
*浼樼锛氭湰骞村害宸叉斁鐢碉紝涓斿閲忓仴搴凤紝鏃犲唴闃诲憡璀︼紙棰勫憡璀︼紙閲嶈锛夛紝鍛婅锛堢揣鎬ワ級锛�
*鍔ｅ寲锛氭湰骞村害鏈斁鐢碉紝鍐呴樆鍛婅锛堥鍛婅锛堥噸瑕侊級锛屽憡璀︼紙绱ф�ワ級锛�
* 瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝�硷紝鍐呴樆鍛婅(棰勫憡璀︼紝鍛婅)
@@ -274,9 +276,9 @@
map.put("flag", 1);
}
*/
-/*鍔ｅ寲锛�
- *瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝��
- *//*
+ /*鍔ｅ寲锛�
+ *瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝��
+ *//*
if (((disNum > 0) && (realCap <= capAlarm * monCapStd && realCap >= capChange * monCapStd))) {
map.put("flag", 2);
@@ -315,4 +317,5 @@
return new Response().set(1, map, "鏌ヨ鎴愬姛");
}
-}*/
+ }*/
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/SubTableService.java b/src/main/java/com/whyc/service/SubTableService.java
index 4a66f0f..4cc80c6 100644
--- a/src/main/java/com/whyc/service/SubTableService.java
+++ b/src/main/java/com/whyc/service/SubTableService.java
@@ -23,9 +23,9 @@
@Autowired
private MybatisSqlExecuteService sqlExecuteService;
//鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�
- public List<BattTestInfData> getTDataHis(int binfId, int testRecordCount) {
- String sql="select * from db_dis_batt.batt_test_inf_"+binfId+" " +
- " where binf_id="+binfId+" " +
+ public List<BattTestInfData> getByBattGroupIdAndTestRecordCount(int battGroupId, int testRecordCount) {
+ String sql="select * from db_dis_batt.batt_test_inf_"+battGroupId+" " +
+ " where binf_id="+battGroupId+" " +
" and test_record_count="+testRecordCount+
" order by test_starttime asc ";
List<BattTestInfData> list=sqlExecuteService.executeQuery_call(sql, new CallBack() {
@@ -115,6 +115,9 @@
data.setAlmId(rs.getInt("alm_id"));
data.setAlmLevel(rs.getInt("alm_level"));
data.setAlmValue(rs.getInt("alm_value"));
+ data.setAlmConfirm(rs.getInt("alm_confirm"));
+ data.setAlmConfirmTime(rs.getTimestamp("alm_confirm_time"));
+ data.setAlmType(rs.getInt("alm_type"));
data.setPowerName(rs.getString("power_name"));
data.setBattGroupName(rs.getString("battGroupName"));
list.add(data);
--
Gitblit v1.9.1