From 428175382b8d7169d4afb0b29a3c722e89162a39 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 23 一月 2024 08:52:02 +0800
Subject: [PATCH] 修改命令
---
src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
index c37b1d9..dc6eb87 100644
--- a/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
@@ -183,17 +183,20 @@
public Response updateStateHrStop(CKPowerDevBattRtStateSet stateSet) {
//1.鍒锋柊rsAlarmSet锛宺tdataSet,rtState鍛婅瀹炴椂鏁版嵁<鎸囧畾榛樿鍒风涓�缁勬暟鎹�>
rsAlarmSetService.updateDataFromDataAndStateAndRsAlarmToSetHrStop();
- //璁剧疆state_set琛�
+ //璁剧疆state_set琛ㄥ拰鍛戒护
UpdateWrapper stateRtWrapper=new UpdateWrapper();
+ stateSet.setOpCmd(CMD_Constant.CMD_SetHRSTopState);
stateRtWrapper.eq("batt_index",0);
mapper.update(stateSet,stateRtWrapper);
//鍙戦�佸懡浠�
- UpdateWrapper wrapper=new UpdateWrapper();
- wrapper.set("op_cmd",CMD_Constant.CMD_SetBattAlarm);
+ /* UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.set("op_cmd",CMD_Constant.CMD_SetHRSTopState);
rsalarmSetMapper.update(null,wrapper);
//璇诲彇opCmd杩斿洖鏄惁鎴愬姛
- QueryWrapper<CkpowerdevBattRsalarmSet> query = Wrappers.query();
- Response opStatus = OpCmdUtil.getOpStatus(rsalarmSetMapper,query, CMD_Constant.CMD_SetBattAlarm,20,null);
+ QueryWrapper<CkpowerdevBattRsalarmSet> query = Wrappers.query();*/
+ //璇诲彇opCmd杩斿洖鏄惁鎴愬姛
+ QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query();
+ Response opStatus = OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_SetHRSTopState,20,null);
if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //鎴愬姛
//璁板綍鏃ュ織
Date now = new Date();
@@ -203,7 +206,7 @@
logList.forEach(log->{
log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
log.setMonNum(0);
- log.setCmdType(CMD_Constant.CMD_SetBattAlarm);
+ log.setCmdType(CMD_Constant.CMD_SetHRSTopState);
log.setBattIndex(0);
log.setCreateTime(now);
log.setCreateDay(now);
@@ -220,12 +223,19 @@
//璁剧疆data_set琛�
rtDataSetMapper.updateBatchInRsAlarm(setDto.getDataSetList());
//鍙戦�佸懡浠�
- UpdateWrapper wrapper=new UpdateWrapper();
- wrapper.set("op_cmd",CMD_Constant.CMD_SetBattAlarm);
+ /*UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.set("op_cmd",CMD_Constant.CMD_SetHRSTopBatt);
rsalarmSetMapper.update(null,wrapper);
//璇诲彇opCmd杩斿洖鏄惁鎴愬姛
- QueryWrapper<CkpowerdevBattRsalarmSet> query = Wrappers.query();
- Response opStatus = OpCmdUtil.getOpStatus(rsalarmSetMapper,query, CMD_Constant.CMD_SetBattAlarm,20,null);
+ QueryWrapper<CkpowerdevBattRsalarmSet> query = Wrappers.query();*/
+ //璁剧疆state_set琛ㄥ拰鍛戒护
+ UpdateWrapper stateRtWrapper=new UpdateWrapper();
+ stateRtWrapper.eq("batt_index",0);
+ stateRtWrapper.set("op_cmd",CMD_Constant.CMD_SetHRSTopBatt);
+ mapper.update(null,stateRtWrapper);
+ //璇诲彇opCmd杩斿洖鏄惁鎴愬姛
+ QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query();
+ Response opStatus = OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_SetHRSTopBatt,20,null);
if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //鎴愬姛
//璁板綍鏃ュ織
Date now = new Date();
@@ -234,7 +244,7 @@
String opNum=setLogMapper.getOpNum()!=null?setLogMapper.getOpNum():"0";
logList.forEach(log->{
log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
- log.setCmdType(CMD_Constant.CMD_SetBattAlarm);
+ log.setCmdType(CMD_Constant.CMD_SetHRSTopBatt);
log.setBattIndex(0);
log.setCreateTime(now);
log.setCreateDay(now);
--
Gitblit v1.9.1