修改

Administrator

2021-08-09 b244906082a9e1dbae4e1d672dd41e827abb7867

修改

 BattFBS9600XSP2/src/com/battdata_rt/BattData_RT_Array.java

@@ -127,14 +127,14 @@
                    sql_str = "SELECT DISTINCT DeviceId,SignalId,SignalName,CInterFaceId  FROM `db_battinf`.`tb_battinf` WHERE BattGroupId="

                            + rtdata.BattGroupId + " ORDER BY SignalName ASC";

                else {

                    sql_str = "SELECT DISTINCT DeviceId,SignalId,SignalName,CInterFaceId  FROM `db_battinf`.`tb_battinf` WHERE BattGroupId="

                    sql_str = "SELECT DISTINCT DeviceId,SignalId,SignalName,CInterFaceId,DeviceName  FROM `db_battinf`.`tb_battinf` WHERE BattGroupId="

                            + rtdata.BattGroupId + " ORDER BY "

                            + " CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(DeviceName,'-',-2),'-',1)  AS SIGNED) ASC, "

                            + " CAST(TRIM('单体电压' FROM SignalName) AS SIGNED) ASC";

                }



                res = sql.sqlMysqlQuery(sql_str);



                //System.out.println(sql_str);

                boolean mon_data_ready = false;

                while (res.next()) {

                    if (res.getString("SignalName").contains("单体")) {


 BattFBS9600XSP2/src/com/dev/fbs9600/FBS9600_SocketClient2.java

@@ -132,6 +132,8 @@
            FBS9600_State_SQL.insertFBS9100SetParam_Table(conn, m_FBS9600_State);

            

            FBS9600_State_SQL.insertFBS9100State_Table(conn, m_FBS9600_State);

			
            logger.info("设备ID:"+this.m_FBSDevId+"\t电池组组数:"+this.data_Num+Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms));

        }

        

        int run_count = 0;

@@ -157,7 +159,7 @@
                }

                if(run_count % 60 == 0) {

                    if(null != m_RTData[read_mon_index]) {

                        readMonData(m_RTData[read_group_index],read_group_index);

                        readMonData(m_RTData[read_mon_index],read_mon_index);

                        //System.out.println("读取单体数据"+Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms));

                        read_mon_index++;

                        if(!(read_mon_index < data_Num)) {


 BattFBS9600XSP2/src/com/dev/fbs9600/FBS9600_State.java

@@ -101,7 +101,7 @@
            int dev_food = res.getIntValue(1);

            

            this.check_dev_id = dev_head*100000+dev_food;

            //System.out.println(this.check_dev_id+"===="+dev_head+"==="+dev_food);

            System.err.println(this.check_dev_id+"===="+dev_head+"==="+dev_food);

            return true;

        }

        return false;

@@ -137,7 +137,7 @@
            float battcurr = ((short)res.getValue(2))/10;

            int battstate = res.getIntValue(3);            

            if (1 == battstate) {

                battcurr *= -1.0F;

                battcurr = Math.abs(battcurr)* -1.0F;

            }

            dev_currs[index] = battcurr;

            battData_RT.mTestData.updateCurrFrom_FBSDev(battcurr);        


 BattFBS9600XSP2/src/com/dev/modbus4j/MyModbusUtils.java

@@ -341,7 +341,7 @@
        try {
            return master.getMaster().send(batch);
        } catch (ModbusTransportException | ErrorResponseException e) {
            //e.printStackTrace();
            e.printStackTrace();
            isSuccess = false;
        } finally {
            master.addTotalCommCount();