From 6d540cf25c5044cc3cc356e6d8cc58a4ca23414e Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 20 十二月 2023 16:26:51 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
index e7c3306..e1c9e44 100644
--- a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
@@ -44,13 +44,19 @@
CKPowerDevBattRtStateSet stateSet = set.getStateSet();
updateDataFromDataAndStateToSet(dataSet.getBattIndex());
//璁剧疆state_set琛�,涓庢潕鍐涙矡閫氱‘瀹�,缁勭鍜屽崟浣撹缃�,閮介噰鐢ㄨ缃笅闈㈣繖涓猚md鍊�.鍥犱负鍗曚綋鍜岀粍绔細涓�璧疯缃�
- stateSet.setOpCmd(CMD_Constant.CMD_SetBatt1MonData);
+ if(stateSet.getBattIndex() == 0) {
+ stateSet.setOpCmd(CMD_Constant.CMD_SetBatt1MonData);
+ }else if(stateSet.getBattIndex() == 1){
+ stateSet.setOpCmd(CMD_Constant.CMD_SetBatt2MonData);
+ }else{
+ return new Response().set(0,"鏈寚瀹氬叿浣撶殑鐢垫睜缁勬垨鐢垫睜缁勮秴鍑�2缁�,鏃犳硶璁剧疆");
+ }
mapper.update(stateSet,null);
//璁剧疆data_set琛� TODO 寰呯‘瀹氭槸璁剧疆鍗曚綋鏃� 鎵�鏈夊崟浣撹繕鏄煇涓崟浣�
dataSetService.update(dataSet);
//璇诲彇opCmd杩斿洖鏄惁鎴愬姛
QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query();
- Response opStatus =OpCmdUtil.getOpStatus(mapper, query, CMD_Constant.CMD_SetBatt1MonData,20,set.getStateSet().getBattIndex());
+ Response opStatus =OpCmdUtil.getOpStatus(mapper, query, stateSet.getOpCmd(),20,set.getStateSet().getBattIndex());
if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //鎴愬姛
//璁板綍鏃ュ織
Date now = new Date();
--
Gitblit v1.9.1