From 4113192f9bf69da7f2b811de53277716141592c7 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 22 十二月 2023 16:04:52 +0800
Subject: [PATCH] 核容设备设置
---
src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
index d331d2a..623faf3 100644
--- a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
@@ -44,27 +44,27 @@
@Autowired
private CKPowerDevBattRtStateService stateService;
- public Response updateMon(BattRtSetDto set) {
- List<CKPowerDevBattRtDataSet> dataSetList = set.getDataSetList();
- CKPowerDevBattRtStateSet stateSet = set.getStateSet();
+ public Response updateMon(BattRtSetDto setDto) {
+ List<CKPowerDevBattRtDataSet> dataSetList = setDto.getDataSetList();
+ Integer battIndex = dataSetList.get(0).getBattIndex();
//鏌ヨdata鍜宻tate琛ㄦ暟鎹苟璁剧疆鍒板搴旂殑set琛�
updateDataFromDataAndStateToSet(dataSetList);
//璁剧疆state_set琛�,涓庢潕鍐涙矡閫氱‘瀹�,缁勭鍜屽崟浣撹缃�,閮介噰鐢ㄨ缃笅闈㈣繖涓猚md鍊�.鍥犱负鍗曚綋鍜岀粍绔細涓�璧疯缃�
- if(stateSet.getBattIndex() == 0) {
- stateSet.setOpCmd(CMD_Constant.CMD_SetBatt1MonData);
- }else if(stateSet.getBattIndex() == 1){
- stateSet.setOpCmd(CMD_Constant.CMD_SetBatt2MonData);
+ int opCmd;
+ if(battIndex == 0) {
+ opCmd = CMD_Constant.CMD_SetBatt1MonData;
+ }else if(battIndex == 1){
+ opCmd =CMD_Constant.CMD_SetBatt2MonData;
}else{
return new Response().set(0,"鏈寚瀹氬叿浣撶殑鐢垫睜缁勬垨鐢垫睜缁勮秴鍑�2缁�,鏃犳硶璁剧疆");
}
- update(stateSet);
//璁剧疆data_set琛�
dataSetService.updateBatch(dataSetList);
//璇诲彇opCmd杩斿洖鏄惁鎴愬姛
QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query();
- Response opStatus =OpCmdUtil.getOpStatus(mapper, query, stateSet.getOpCmd(),20,set.getStateSet().getBattIndex());
+ Response opStatus =OpCmdUtil.getOpStatus(mapper, query, opCmd,20,battIndex);
if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //鎴愬姛
- //璁板綍鏃ュ織
+ /*//璁板綍鏃ュ織
Date now = new Date();
List<CKPowerDevBattSetLog> logList = set.getLogList();
//鏌ヨ鏈�澶х殑鎿嶄綔缂栧彿
@@ -76,7 +76,7 @@
log.setCreateTime(now);
log.setCreateDay(now);
});
- setLogService.addBatch(logList);
+ setLogService.addBatch(logList);*/
}
return opStatus;
}
--
Gitblit v1.9.1