From a1f19329352f3083c7c99b182b4e71dfcbf8cb35 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 22 四月 2022 13:59:05 +0800
Subject: [PATCH] 追加查询和更新字段BattGroupNum
---
src/main/java/com/whyc/service/Fbs9100SetparamService.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/Fbs9100SetparamService.java b/src/main/java/com/whyc/service/Fbs9100SetparamService.java
index effcc11..734a0f9 100644
--- a/src/main/java/com/whyc/service/Fbs9100SetparamService.java
+++ b/src/main/java/com/whyc/service/Fbs9100SetparamService.java
@@ -29,8 +29,8 @@
}
//鍙抽敭鏌ョ湅鍙傛暟鍜屽脊鍑烘鐨勫埛鏂版寜閽�-----BTS鍋滄
- public Response serchbyDev_id(int num,Integer testCmd,int devId) {
- boolean bl=sendCmdToFBS9100Dev(num,testCmd!=null?testCmd:0,devId);
+ public Response serchbyDev_id(int num, Integer testCmd, int devId, int battGroupNum) {
+ boolean bl=sendCmdToFBS9100Dev2(num,testCmd!=null?testCmd:0,devId,battGroupNum);
Fbs9100Setparam setparam=mapper.serchbyDev_id(devId);
return new Response().setII(1,setparam,bl,bl==true?"鏌ヨ鎴愬姛!":"璁剧疆9100鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
}
@@ -205,4 +205,75 @@
return res_exe;
}
+ //鏈烘埧鍛戒护鎿嶄綔璁惧鏃剁殑cmd鍜宎ck鏍￠獙 test_type -->榛樿鍚姩娴嬭瘯鐨勭被鍨�
+ public boolean sendCmdToFBS9100Dev2(int cmd, int test_type, int dev_id, int battGroupNum)
+ {
+ int m_cmd = cmd;
+ int m_cmd_ack = cmd;
+ switch(m_cmd) {
+ case FBS9100_ComBase.CMD_Start: m_cmd_ack = FBS9100_ComBase.CMD_StartAck; break;
+ case FBS9100_ComBase.CMD_Stop: m_cmd_ack = FBS9100_ComBase.CMD_StopAck; break;
+ case FBS9100_ComBase.CMD_SetDischargeParm: m_cmd_ack = FBS9100_ComBase.CMD_SetDischargeParmAck; break;
+ case FBS9100_ComBase.CMD_GetDischargeParm: m_cmd_ack = FBS9100_ComBase.CMD_GetDischargeParmAck; break;
+ case FBS9100_ComBase.CMd_SetIp_Tem: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
+ case FBS9100_ComBase.CMd_SetIp_Per: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
+ case FBS9100_ComBase.CMD_GetOffLineYHParam: m_cmd_ack = FBS9100_ComBase.CMD_GetOffLineYHParam_ACK; break;
+ case FBS9100_ComBase.CMD_SetOffLineYHParam: m_cmd_ack = FBS9100_ComBase.CMD_SetOffLineYHParam_ACK; break;
+ case FBS9100_ComBase.CMD_StartOffLine: m_cmd_ack = FBS9100_ComBase.CMD_StartOffLine_ACK; break;
+ case FBS9100_ComBase.CMD_StopOffLine: m_cmd_ack = FBS9100_ComBase.CMD_StopOffLine_ACK; break;
+ case FBS9100_ComBase.CMD_ResetSystem: m_cmd_ack = FBS9100_ComBase.CMD_ResetSystemAck; break;
+ //涓�浣撴満A059
+ case FBS9100_ComBase.CMD_StartDischarge: m_cmd_ack = FBS9100_ComBase.CMD_StartDischargeAck; break;
+ case FBS9100_ComBase.CMD_StopDischarge: m_cmd_ack = FBS9100_ComBase.CMD_StopDischargeAck; break;
+ case FBS9100_ComBase.CMD_PauseDischarge: m_cmd_ack = FBS9100_ComBase.CMD_PauseDischargeAck; break;
+ case FBS9100_ComBase.CMD_StartCharTest: m_cmd_ack = FBS9100_ComBase.CMD_StartCharTestAck; break;
+ case FBS9100_ComBase.CMD_StopCharTest: m_cmd_ack = FBS9100_ComBase.CMD_StopCharTestAck; break;
+ case FBS9100_ComBase.CMD_PauseCharTest: m_cmd_ack = FBS9100_ComBase.CMD_PauseCharTestAck; break;
+ case FBS9100_ComBase.CMD_StartHUOHUATest: m_cmd_ack = FBS9100_ComBase.CMD_StartHUOHUATestACK; break;
+ case FBS9100_ComBase.CMD_StopHUOHUATest: m_cmd_ack = FBS9100_ComBase.CMD_StopHUOHUATestACK; break;
+ case FBS9100_ComBase.CMD_PauseHUOHUATest: m_cmd_ack = FBS9100_ComBase.CMD_PauseHUOHUATestACK; break;
+ //鍥剧墖鏄剧ず
+ case FBS9100_ComBase.CMD_StartShowPic: m_cmd_ack = FBS9100_ComBase.CMD_StartShowPic_ACK; break;
+ case FBS9100_ComBase.CMD_StopShowPic: m_cmd_ack = FBS9100_ComBase.CMD_StopShowPic_ACK; break;
+ case FBS9100_ComBase. CMD_SetNowBatt: m_cmd_ack = FBS9100_ComBase.CMD_SetNowBatt_ACK; break;
+
+ default: return false;
+ }
+ UpdateWrapper updateWrapper=new UpdateWrapper();
+ updateWrapper.set("op_cmd",m_cmd);
+ updateWrapper.set("BattGroupNum",battGroupNum);
+ if(test_type > 0 && cmd == FBS9100_ComBase.CMD_Start){ //鍚姩娴嬭瘯鏃舵湭鐐瑰嚮璁惧畾鍙傛暟鎸夐挳锛屼細鍑虹幇鍚姩鍐呴樆娴嬭瘯bug淇
+ updateWrapper.set("TestCmd",test_type);
+ }
+ updateWrapper.eq("dev_id",dev_id);
+ int flag=mapper.update(null,updateWrapper);
+ boolean res_exe = false;
+ if(flag>0)
+ {
+ PageHelper.startPage(1,1);
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("dev_id",dev_id);
+ for(int n=0; n<40; n++)
+ {
+
+ Fbs9100Setparam fbs9100Setparam=mapper.selectOne(queryWrapper);
+ if(fbs9100Setparam!=null){
+ if(fbs9100Setparam.getOpCmd()==m_cmd_ack){
+ res_exe = true;
+ break;
+ }
+ try {
+ Thread.sleep(250);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }else {
+ break;
+ }
+ }
+ }
+ return res_exe;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1