BattMonitor_FBS9100S_Inverter/.classpath
@@ -16,7 +16,7 @@ <classpathentry kind="lib" path="lib/mina-core-2.0.4.jar"/> <classpathentry kind="lib" path="lib/mysql-connector-java-5.1.30-bin.jar"/> <classpathentry kind="lib" path="lib/sqljdbc4.jar"/> <classpathentry kind="lib" path="lib/log4j-api-2.13.3.jar"/> <classpathentry kind="lib" path="lib/log4j-core-2.13.3.jar"/> <classpathentry kind="lib" path="lib/log4j-api-2.15.0.jar"/> <classpathentry kind="lib" path="lib/log4j-core-2.15.0.jar"/> <classpathentry kind="output" path="bin"/> </classpath> BattMonitor_FBS9100S_Inverter/lib/log4j-api-2.13.3.jarBinary files differ
BattMonitor_FBS9100S_Inverter/lib/log4j-api-2.15.0.jarBinary files differ
BattMonitor_FBS9100S_Inverter/lib/log4j-core-2.13.3.jarBinary files differ
BattMonitor_FBS9100S_Inverter/lib/log4j-core-2.15.0.jarBinary files differ
BattMonitor_FBS9100S_Inverter/src/com/batttest/BattResStorePro_Thread.java
@@ -78,6 +78,7 @@ + "`mon_res` FLOAT NOT NULL DEFAULT 0, " + "`mon_ser` FLOAT NOT NULL DEFAULT 0, " + "`conn_res` FLOAT NOT NULL DEFAULT 0, " + "`isStandard` int(11) NOT NULL DEFAULT '0' COMMENT '是否为标准内阻记录[0:不标准;1:标准]'," + "INDEX index_test_record_count (`test_record_count`), " + "PRIMARY KEY (`num`));"; //System.out.println(sql_str); @@ -251,6 +252,7 @@ + "`mon_res` FLOAT NOT NULL DEFAULT 0, " + "`mon_ser` FLOAT NOT NULL DEFAULT 0, " + "`conn_res` FLOAT NOT NULL DEFAULT 0, " + "`isStandard` int(11) NOT NULL DEFAULT '0' COMMENT '是否为标准内阻记录[0:不标准;1:标准]'," + "INDEX index_test_record_count (`test_record_count`), " + "PRIMARY KEY (`num`));"; //System.out.println(sql_str); BattMonitor_FBS9100S_Inverter/src/com/dev/btse/comm/FBS9100S_SocketClient2.java
@@ -20,7 +20,6 @@ import com.battmonitor.dev.FBS9100S_DeviceInf; import com.battmonitor.sql.MysqlConnPool; import com.config.AppConfig; import com.dev.btse.data.ComFn; import com.dev.btse.data.Ecb_Aes; import com.dev.btse.data.FBS9100S_BusCoupleState; import com.dev.btse.data.FBS9100S_LIBMS_AlarmState; @@ -28,6 +27,7 @@ import com.dev.btse.data.FBS9100S_NT_DCDC_Data; import com.dev.btse.data.FBS9100S_NT_DCDC_State; import com.dev.btse.data.FBS9100S_NiBian_Data; import com.dev.btse.data.FBS9100S_SIMData; import com.dev.btse.data.FBS9100S_SX_DCDC_Data; import com.dev.btse.data.FBS9100S_SX_DCDC_Param; import com.dev.btse.data.FBS9100S_StemNode_State; @@ -98,6 +98,8 @@ private FBS9100_JuHengParam mJHParam = null; private FBS9100S_TmpHumSensor mTHsensor = null; //温湿度传感器信息 private FBS9100S_SIMData mSimData = null; private Socket socket = null; private ByteBuffer bytebuffer_for_socket_RX = ByteBuffer.allocate(1500); @@ -293,6 +295,8 @@ mJHParam = new FBS9100_JuHengParam(); mTHsensor = new FBS9100S_TmpHumSensor(); mSimData = new FBS9100S_SIMData(); FBS9100_Task_Thread_SQL.insertFBS9100s_stemnode_state_Table(m_ConnPool, m_StatAndParam.dev_id); FBS9100_Task_Thread_SQL.insertFBS9100s_buscouple_state_Table(m_ConnPool, m_StatAndParam.dev_id); @@ -609,6 +613,10 @@ SocketComm(FBS9100_ComBase.CMD_ReadBusCoupleState, ByteBuffer.allocate(0), socket); } if(0 == (DevReadCount%(50*DevReadCount_Rate))) { //读取机柜表头数据2022-01-06 新增机柜表头数据读取[尚未测试] //SocketComm(FBS9100_ComBase.CMD_GetSimData, ByteBuffer.allocate(0), socket); } } /** @@ -1351,6 +1359,10 @@ if(mTHsensor.putByteBuffer(bf)) { isSuccess = true; } }else if(FBS9100_ComBase.CMD_GetSimData == m_FBS_Cmd.CMD) { if(mSimData.putByteBuffer(bf)) { isSuccess = true; } } } return isSuccess; BattMonitor_FBS9100S_Inverter/src/com/dev/btse/data/FBS9100S_SIMData.java
New file @@ -0,0 +1,85 @@ package com.dev.btse.data; import java.nio.ByteBuffer; public class FBS9100S_SIMData { public final int BYTELEN = 54; public double Ua; //电压有效值 public double Ub; // public double Uc; // public double Uab; //线电压有效值 public double Ubc; //线电压有效值 public double Uca; //线电压有效值 public double Ia; //电流有效值 public double Ib; //电流有效值 public double Ic; //电流有效值 public double P; //总有功功率 public double Q; //总无功功率 public double Pf; //总功率因素 public double Pa; //有功功率 public double Pb; //有功功率 public double Pc; //有功功率 public double Qa; //无功功率 public double Qb; //无功功率 public double Qc; //无功功率 public double Pfa; //功率因素 public double Pfb; //功率因素 public double Pfc; //功率因素 public double Wh1; public double Wh2; public double Varh1; public double Varh2; public double FHz; public int CRC; public boolean putByteBuffer(final ByteBuffer bf) { if(bf.limit() < BYTELEN) return false; ByteBuffer tmpbuf = bf; int crc0 = tmpbuf.getShort(BYTELEN-2) & 0xFFFF; int crc1 = FBS9100_Crc16.CalCRC16(tmpbuf, BYTELEN-2); if(crc0 != crc1) { return false; } tmpbuf.position(0); Ua = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //电压有效值 Ub = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; // Uc = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; // Uab = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //线电压有效值 Ubc = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //线电压有效值 Uca = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //线电压有效值 Ia = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //电流有效值 Ib = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //电流有效值 Ic = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //电流有效值 P = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //总有功功率 Q = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //总无功功率 Pf = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //总功率因素 Pa = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //有功功率 Pb = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //有功功率 Pc = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //有功功率 Qa = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //无功功率 Qb = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //无功功率 Qc = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //无功功率 Pfa = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //功率因素 Pfb = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //功率因素 Pfc = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; //功率因素 Wh1 = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; Wh2 = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; Varh1 = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; Varh2 = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; FHz = FBS9100_ComBase.changeShortToDouble(tmpbuf.getShort())/100; CRC = FBS9100_ComBase.changeShortToInt(tmpbuf.getShort()); tmpbuf.compact(); tmpbuf.flip(); return true; } } BattMonitor_FBS9100S_Inverter/src/com/dev/btse/data/FBS9100_ComBase.java
@@ -95,7 +95,10 @@ public static final int CMD_GetLiBMSData = 0x95; //读取锂电池BMS模拟量 public static final int CMD_GetLiBMSState = 0x96; //读取锂电池BMS告警量 /** * 2022-01-06 edit by lijun 逆变设备新增机柜头数据读取 */ public static final int CMD_GetSimData = 0x99; //读取逆变机柜头数据 //------------ 平台锂电池命令 ----------------------------------------------------------------- public static final int CMD_GetLiDCDCParam_Ack = 0x8D; //读取锂电BTS参数成功 public static final int CMD_SetLiDCDCParam_Ack = 0x8E; //设置锂电BTS参数成功 BattMonitor_FBS9100S_Inverter/src/com/version_inf/version_inf.txt
@@ -1,3 +1,10 @@ V10.643 edit at date 2022-01-06 lijun 1.记录内阻数据时建表语句新增`isStandard`字段用于对比标注内阻数据 2.逆变设备新增机柜表头数据读取 V10.642 edit at date 2021-12-13 lijun 1.修改log4j的开源JAR,修复开源包BUG V10.641 edit at date 2021-11-13 lijun 1.假负载设备新增温湿度传感器信息读取以及连接条阻抗信息读取
@@ -29,7 +29,7 @@ /**************************************************************************/ /**************************************************************************/ public final static boolean app_debug = false; public final static double m_VersionNum = 10.640; public final static double m_VersionNum = 10.643; public final static String m_Version = "Welcome To Use BattMonitorFBS9100S V" + m_VersionNum + " RC_20201110"; /**************************************************************************/
