二期修改提交数据

Administrator

2022-04-26 993f8a639ce8eb9124da3a901065a87eea9f3994

二期修改提交数据

 BattMonitor_FGCD-A059NT/bin/.gitignore

File was deleted

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/base/AppParam$MonitorParam.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/base/AppParam.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/base/BattTestData.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/base/Com.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/base/ComBase.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/base/Crc16.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data/BattData_RT.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data/BattData_RT_Array.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data/BattData_RT_RamDB_Thread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data/BattData_RT_RamDB_Thread_SQL.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data/BattData_RT_SQL.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data/BattStatData.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data/MonVolData.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data_store/InsertDataToMysql_Task.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data_store/InsertDataToMysql_Task_SQL.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/data_store/getInsertDataTaskInstant.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/sql/Com.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/sql/MysqlConnPool.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/sql/MysqlDBBackUp_Thread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/battmonitor/sql/Sql_Mysql.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/batttest/BattAutoStorePro_Thread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/batttest/BattDataTestPro_Thread$BattTestState.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/batttest/BattDataTestPro_Thread$MyBattTestTask.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/batttest/BattDataTestPro_Thread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/batttest/BattResStorePro_Thread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/config/AppConfig.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/comm/BattRealDataPro_Thread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/comm/FBS9100S_DFU.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/comm/FBS9100S_DFU_SQL.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/comm/FBS9100S_SocketClient2.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/comm/FBS9100_ServerSocketThread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/comm/FBS9100_SocketClient.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/comm/FBS9100_SocketClient2.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/comm/FBS9100_Task_Thread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/comm/FBS9100_Task_Thread_SQL.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/ComFn.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/Ecb_Aes.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/Ecb_Crypt.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100S_NT_DCDC_Data.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100S_NT_DCDC_State.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100S_NiBian_Data.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100S_StemNode_State.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_CMCC_Power.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_CalSet.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_CapState.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ChargeState.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_Cmd.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ComBase.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ComBuf.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_Crc16.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_DateTime.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_DateTimeSet.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_DeviceInf.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ParamAlarm.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ParamAnalyze.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ParamBatt.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ParamCharge.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ParamDischarge.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ParamSystem.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ResCapData.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_ResState.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_StatAndParam.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_SysLog.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_SysState.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_TestTime.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/btse/data/FBS9100_VCData.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/comm/FGCD_Export_Thread_SQL.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/comm/FGCD_ServerSocket_Thread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/comm/FGCD_SocketClient_Thread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/comm/FGCD_SocketClient_Thread_SQL.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/comm/FGCD_TestDataDownLoad$ParseFboThread.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/comm/FGCD_TestDataDownLoad.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_BattTestParam.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_Cmd.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_ComBase.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_ComBuf.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_Crc16.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_FileUtils.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_OnlineInfo.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_StateAndParam.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_Station_inf.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_SysState.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_TestFBOFile$FBOFile.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_TestFBOFile.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/data/FGCD_VCData.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/BattCapFactory.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/CsvData.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/FBOFileParseState.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/FboData.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/FboDataCrc16.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/FboDataInf.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/FboDataType.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/FboDateTime.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/FboTestTime.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/IdcData.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/IdcDataInf.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/dev/fgcd/fbo/IdcTestTime.class

Binary files differ

 BattMonitor_FGCD-A059NT/bin/com/version_inf/version_inf.txt

New file
@@ -0,0 +1,38 @@
充放电一体机通讯程序



V1.110  2022-04-26

    1.新增机房信息读取命令,以及更新加载当前机房信息

    2.新增远程升级相关功能



V1.109  2022-03-30

    1.修复充放电以及活化时记录多笔充放电数据问题



V1.108  2022-03-03

    1.修改通信端口号为8060

    2.组1组2的组端电压<1.7V===>0V



V1.107  2022-01-22

    1. 测试状态不能切换电池组,新增记录充放电数据时备注当前数据是电池组1还是电池组2

    2.当前的组端电压修改为当前选中那一组的组端电压，未选中电池组时设置为0



V1.106 2022-01-18

    1. 新增设备版本号读取以及存取

    2. 新增设备电池组切换功能

    3. 新增内窥镜自动拍照功能

    4. 修复切换电池组平台bug



V1.105 2021-08-25

    1. 历史实时数据检测线程中;循环删除检测统计查询占用MySQL资源大且频繁查询，已修改成24小时定期检测删除指定天数之前的历史实时表



V1.104 2021-08-24 lijun

    1.新增远程下载充放电一体机历史数据文件以及转储到数据库



V1.103 2021-08-13 lijun

    1.新增历史数据文件目录读取



V1.102 2021-08-10 lijun

    1.新增充放电一体机烟雾报警锁定功能，一次报警后锁定当前告警需确认后更新告警状态



V1.101  
    1.初步完成单体实时数据，充放电数据的实时读取

	

 BattMonitor_FGCD-A059NT/bin/main/main_Monitor_FGCD_A059NT.class

Binary files differ

 BattMonitor_FGCD-A059NT/src/com/battmonitor/sql/Sql_Mysql.java

@@ -132,6 +132,10 @@
    

    public final static String Tb_FboTestData_Inf_Table = DB_FBO_TESTDATA + ".tb_fbotestdata_inf";                //FBO历史数据统计表

    public final static String Tb_FboTestData_Table = DB_FBO_TESTDATA + ".tb_fbotestdata_";                        //FBO历史数据信息表

	
	
    public final static String A059_Station_Inf_Table = DB_BATT_INF + ".`tb_a059_station_inf`";                 //充放电一体机机房信息录入信息表

	
    //--------------------------------------------------------------------------------------------//

    //--------------------------------------------------------------------------------------------//

    public Connection mysql_con = null;


 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.java

@@ -10,6 +10,7 @@
import com.battmonitor.sql.MysqlConnPool;

import com.battmonitor.sql.Sql_Mysql;

import com.dev.fgcd.data.FGCD_ComBase;

import com.dev.fgcd.data.FGCD_Station_inf;

import com.dev.fgcd.data.FGCD_TestFBOFile;

import com.dev.fgcd.data.FGCD_TestFBOFile.FBOFile;

import com.dev.fgcd.fbo.FboData;

@@ -425,4 +426,78 @@
            sql.close_con();

        }

    }

	
    /**

     *     插入或更新当前设备的配置信息

     * @param pool

     */

    public static void insertOrUpdateA059_Station_Inf_Table(MysqlConnPool pool,FGCD_Station_inf station) {

        String sql_str_sel = " SELECT * FROM " + Sql_Mysql.A059_Station_Inf_Table +

                "WHERE dev_num = '"+station.dev_num+"' ";

        ResultSet res = null;

        String sql_str_upd = "UPDATE " + Sql_Mysql.A059_Station_Inf_Table  
                + " SET station_province  = '" + station.station_province +"'"

                + ",station_city = '" + station.station_city +"'"

                + ",station_county = '" + station.station_county +"'"

                + ",station_name = '" + station.station_name + "'"

                + ",station_name_ex = '" + station.station_name_ex + "'"

                + ",dev_name = '" + station.dev_name + "'"

                + ",batt_name = '" + station.batt_name + "'"

                + ",mon_count = " + station.mon_count 
                + ",monStdCap = " + station.monStdCap 
                + ",monStdVol = " + station.monStdVol 
                + ",load_curr = " + station.load_curr

                + ",video_url = '" + station.video_url + "'"

                + ",dev_num = '" + station.dev_num + "'" 
                + ",last_update_time = '" + Com.getDateTimeFormat(station.getLast_update_time(), Com.DTF_YMDhms)+"'"

                + " WHERE dev_num = '" + station.dev_num +"';";

        String sql_str_ins = "INSERT INTO " + Sql_Mysql.A059_Station_Inf_Table  + "(station_province,station_city,station_county,station_name,station_name_ex,dev_name,batt_name,mon_count,monStdCap,monStdVol,load_curr,video_url,dev_num,last_update_time) " + 
                "VALUES('"+station.station_province+"'"

                        + ",'" + station.station_city + "'"

                        + ",'" + station.station_county + "'"

                        + ",'" + station.station_name + "'"

                        + ",'" + station.station_name_ex + "'"

                        + ",'" + station.dev_name + "'"

                        + ",'" + station.batt_name + "'"

                        + "," + station.mon_count + ""

                        + "," + station.monStdCap + ""

                        + "," + station.monStdVol + ""

                        + "," + station.load_curr + ""

                        + ",'" + station.video_url + "'"

                        + ",'" + station.dev_num + "'"

                        + ",'" + Com.getDateTimeFormat(station.last_update_time, Com.DTF_YMDhms) + "'"

                        + ");";

        Sql_Mysql sql = new Sql_Mysql(pool.getConn());

        try {

            res = sql.sqlMysqlQuery(sql_str_sel);

            if(res.next()) {

                //更新设备机房配置信息

                System.out.println(sql_str_upd);

                sql.sqlMysqlExecute(sql_str_upd);

            }else {

                //插入机房配置信息

                sql.sqlMysqlExecute(sql_str_ins);

            }

        } catch (SQLException e) {

            e.printStackTrace();

        } finally {

            if(null != res) {

                try {

                    res.close();

                } catch (SQLException e) {

                    e.printStackTrace();

                }

            }

            sql.close_con();

        }

    }

	
	
//    public static void main(String[] args) {

//        FGCD_Station_inf inf = new FGCD_Station_inf();

//        inf.dev_num = "9921";

//        inf.last_update_time = new Date();

//        MysqlConnPool pool = new MysqlConnPool("127.0.0.1", 3360, 5);

//        insertOrUpdateA059_Station_Inf_Table(pool, inf);

//    }

}


 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/data/FGCD_Station_inf.java

New file
@@ -0,0 +1,118 @@
package com.dev.fgcd.data;



import java.util.Date;



/**

 *     显示屏配置信息表

 * @author LiJun

 *

 */

public class FGCD_Station_inf {

	
    public String station_province;        // 'ʡ',

    public String  station_city;        // '市',

    public String   station_county;        // '区县',

    public String   station_name;        // '机房名称',

    public String station_name_ex;        // '拼接了设备编号的机房名称'

    public String   dev_name;            // '设备名称',

    public String   batt_name;            // '电池组名称',

    public int  mon_count;                // '单体个数',

    public float  monStdCap;              //'标称容量',

    public float    monStdVol;          //'标称单体电压',

    public float    load_curr;            //'负载电流',

    public String   video_url;            // '视频监控序列号',

    public String   dev_num;            // '设备编号',

    public Date last_update_time;        // '上一次更新时间',

	
	
    public String getStation_province() {

        return station_province;

    }

    public String getStation_city() {

        return station_city;

    }

    public String getStation_county() {

        return station_county;

    }

    public String getStation_name() {

        return station_name;

    }

    public String getDev_name() {

        return dev_name;

    }

    public String getBatt_name() {

        return batt_name;

    }

    public int getMon_count() {

        return mon_count;

    }

    public float getMonStdCap() {

        return monStdCap;

    }

    public float getMonStdVol() {

        return monStdVol;

    }

    public float getLoad_curr() {

        return load_curr;

    }

    public String getVideo_url() {

        return video_url;

    }

    public String getDev_num() {

        return dev_num;

    }

    public Date getLast_update_time() {

        return last_update_time;

    }

    public void setStation_province(String station_province) {

        this.station_province = station_province;

    }

    public void setStation_city(String station_city) {

        this.station_city = station_city;

    }

    public void setStation_county(String station_county) {

        this.station_county = station_county;

    }

    public void setStation_name(String station_name) {

        this.station_name = station_name;

    }

    public void setDev_name(String dev_name) {

        this.dev_name = dev_name;

    }

    public void setBatt_name(String batt_name) {

        this.batt_name = batt_name;

    }

    public void setMon_count(int mon_count) {

        this.mon_count = mon_count;

    }

    public void setMonStdCap(float monStdCap) {

        this.monStdCap = monStdCap;

    }

    public void setMonStdVol(float monStdVol) {

        this.monStdVol = monStdVol;

    }

    public void setLoad_curr(float load_curr) {

        this.load_curr = load_curr;

    }

    public void setVideo_url(String video_url) {

        this.video_url = video_url;

    }

    public void setDev_num(String dev_num) {

        this.dev_num = dev_num;

    }

    public void setLast_update_time(Date last_update_time) {

        this.last_update_time = last_update_time;

    }

	
	
    @Override

    public String toString() {

        return "FGCD_Station_inf [station_province=" + station_province + ", station_city=" + station_city

                + ", station_county=" + station_county + ", station_name=" + station_name + ", dev_name=" + dev_name

                + ", batt_name=" + batt_name + ", mon_count=" + mon_count + ", monStdCap=" + monStdCap + ", monStdVol="

                + monStdVol + ", load_curr=" + load_curr + ", video_url=" + video_url + ", dev_num=" + dev_num

                + ", last_update_time=" + last_update_time + "]";

    }

	
	
}