From c2069f08a17f6ea3737f3cbac56873375b325674 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期六, 13 一月 2024 10:26:20 +0800
Subject: [PATCH] 电池单体设置更新
---
src/main/java/com/whyc/dto/BattRtSetDto.java | 14 ++++++++++++++
src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java | 17 +++++++++++++++--
src/main/java/com/whyc/service/CKPowerDevBattRsAlarmService.java | 8 ++++++++
src/main/java/com/whyc/service/CkpowerdevBattRsalarmSetService.java | 5 +++++
4 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/dto/BattRtSetDto.java b/src/main/java/com/whyc/dto/BattRtSetDto.java
index 6a3cb4c..a12160f 100644
--- a/src/main/java/com/whyc/dto/BattRtSetDto.java
+++ b/src/main/java/com/whyc/dto/BattRtSetDto.java
@@ -3,13 +3,19 @@
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtDataSet;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtStateSet;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattSetLog;
+import com.whyc.pojo.db_ckpwrdev_data_rt.CkpowerdevBattRsalarmSet;
import java.util.List;
public class BattRtSetDto {
+ //鍗曚綋
private List<CKPowerDevBattRtDataSet> dataSetList;
+ //缁勭
private CKPowerDevBattRtStateSet stateSet;
+ //杩藉姞 鏍稿璁惧鍛婅瀹炴椂鐘舵��
+ private CkpowerdevBattRsalarmSet rsAlarmSet;
+ //鏃ュ織
private List<CKPowerDevBattSetLog> logList;
public List<CKPowerDevBattRtDataSet> getDataSetList() {
@@ -35,4 +41,12 @@
public void setLogList(List<CKPowerDevBattSetLog> logList) {
this.logList = logList;
}
+
+ public CkpowerdevBattRsalarmSet getRsAlarmSet() {
+ return rsAlarmSet;
+ }
+
+ public void setRsAlarmSet(CkpowerdevBattRsalarmSet rsAlarmSet) {
+ this.rsAlarmSet = rsAlarmSet;
+ }
}
diff --git a/src/main/java/com/whyc/service/CKPowerDevBattRsAlarmService.java b/src/main/java/com/whyc/service/CKPowerDevBattRsAlarmService.java
index 3e3f306..edf0d76 100644
--- a/src/main/java/com/whyc/service/CKPowerDevBattRsAlarmService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevBattRsAlarmService.java
@@ -1,5 +1,7 @@
package com.whyc.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.Response;
import com.whyc.mapper.CkpowerdevBattRsalarmMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CkpowerdevBattRsalarm;
@@ -18,4 +20,10 @@
List<CkpowerdevBattRsalarm> list=mapper.selectList(null);
return new Response<>().setII(1,list!=null,list,"缁勭鍛婅");
}
+
+ public CkpowerdevBattRsalarm get() {
+ QueryWrapper<CkpowerdevBattRsalarm> query = Wrappers.query();
+ query.last(" limit 1");
+ return mapper.selectOne(query);
+ }
}
diff --git a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
index ae092fa..200b5fb 100644
--- a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
@@ -44,11 +44,18 @@
@Autowired
private CKPowerDevBattRtStateService stateService;
+ @Autowired
+ private CKPowerDevBattRsAlarmService rsAlarmService;
+
+ @Autowired
+ private CkpowerdevBattRsalarmSetService rsAlarmSetService;
+
public Response updateMon(BattRtSetDto setDto) {
List<CKPowerDevBattRtDataSet> dataSetList = setDto.getDataSetList();
Integer battIndex = dataSetList.get(0).getBattIndex();
+ CkpowerdevBattRsalarmSet rsAlarmSet = setDto.getRsAlarmSet();
//鏌ヨdata鍜宻tate琛ㄦ暟鎹苟璁剧疆鍒板搴旂殑set琛�
- updateDataFromDataAndStateToSet(dataSetList);
+ updateDataFromDataAndStateAndAlarmToSet(dataSetList);
//璁剧疆state_set琛�,涓庢潕鍐涙矡閫氱‘瀹�,缁勭鍜屽崟浣撹缃�,閮介噰鐢ㄨ缃笅闈㈣繖涓猚md鍊�.鍥犱负鍗曚綋鍜岀粍绔細涓�璧疯缃�
int opCmd;
if(battIndex == 0) {
@@ -65,6 +72,8 @@
stateSet.setBattIndex(battIndex);
stateSet.setOpCmd(opCmd);
update(stateSet);
+ //璁剧疆rsalarm_set
+ rsAlarmSetService.update(rsAlarmSet);
//璇诲彇opCmd杩斿洖鏄惁鎴愬姛
QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query();
Response opStatus =OpCmdUtil.getOpStatus(mapper, query, opCmd,20,battIndex);
@@ -128,25 +137,29 @@
update(stateSet);
}
- private void updateDataFromDataAndStateToSet(List<CKPowerDevBattRtDataSet> dataSetList) {
+ private void updateDataFromDataAndStateAndAlarmToSet(List<CKPowerDevBattRtDataSet> dataSetList) {
Integer battIndex = dataSetList.get(0).getBattIndex();
List<Integer> monNumList = dataSetList.stream().map(CKPowerDevBattRtDataSet::getMonNum).collect(Collectors.toList());
//鑾峰彇瀹炴椂琛ㄦ暟鎹苟鍐欏叆set琛�
List<CKPowerDevBattRtData> rtDataList = dataService.getMonList(battIndex,monNumList);
CKPowerDevBattRtState state = stateService.get(battIndex);
+ CkpowerdevBattRsalarm rsAlarm = rsAlarmService.get();
//灞炴�ц縼绉�
List<CKPowerDevBattRtDataSet> rtSetDataList = new LinkedList<>();
CKPowerDevBattRtStateSet stateSet = new CKPowerDevBattRtStateSet();
+ CkpowerdevBattRsalarmSet rsAlarmSet = new CkpowerdevBattRsalarmSet();
for (CKPowerDevBattRtData temp : rtDataList) {
CKPowerDevBattRtDataSet set = new CKPowerDevBattRtDataSet();
BeanUtils.copyProperties(temp,set);
rtSetDataList.add(set);
}
BeanUtils.copyProperties(state,stateSet);
+ BeanUtils.copyProperties(rsAlarm,rsAlarmSet);
//rt琛ㄦ暟鎹洿鏂板埌set琛ㄤ腑
dataSetService.updateBatch(rtSetDataList);
update(stateSet);
+ rsAlarmSetService.update(rsAlarmSet);
}
diff --git a/src/main/java/com/whyc/service/CkpowerdevBattRsalarmSetService.java b/src/main/java/com/whyc/service/CkpowerdevBattRsalarmSetService.java
index 3e9f7cf..a0c8b72 100644
--- a/src/main/java/com/whyc/service/CkpowerdevBattRsalarmSetService.java
+++ b/src/main/java/com/whyc/service/CkpowerdevBattRsalarmSetService.java
@@ -1,6 +1,7 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.constant.CMD_Constant;
import com.whyc.dto.DevalarmSet;
@@ -29,4 +30,8 @@
QueryWrapper<CKPowerDevAlmParam> query = Wrappers.query();
return OpCmdUtil.getOpStatus(rsMapper,query, CMD_Constant.CMD_SetBattAlarm,20,null);
}
+
+ public void update(CkpowerdevBattRsalarmSet rsAlarmSet) {
+ rsMapper.update(rsAlarmSet,null);
+ }
}
--
Gitblit v1.9.1