Administrator
2021-02-26 178af5fcc90235029752777672d1fd7173aa0cd6
修改4MW组合界面给定电压和给定电流逻辑
4个文件已修改
15 ■■■■■ 已修改文件
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_4KW_SocketClient_Thread.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/com/version_inf/version_inf.txt 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/main/main_ElectricalSystem_MonitorServer_4KW.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_4KW_SocketClient_Thread.java
@@ -790,13 +790,13 @@
        }
        
        //设置并联给定电压
        if(econn.groupgivecurr > 0) {
        if(econn.groupgivevol > 0) {
            boolean flag = MyModbusUtils.writeHoldingRegister(Electric_4KW_ModbusAddress.getConnAddress(econn.getElectric_id(), "givevol"), econn.groupgivevol, DataType.TWO_BYTE_INT_UNSIGNED, master);
            logs.add(new User_Log(User_Log.Alter,User_Log.electricsystem,getGroupName(econn.electric_id)+"电压给定设置为:"+econn.groupgivevol,flag));        
        }
        
        //设置并联给定电流
        if(econn.groupgivevol > 0) {
        if(econn.groupgivecurr > 0) {
            boolean flag = MyModbusUtils.writeHoldingRegister(Electric_4KW_ModbusAddress.getConnAddress(econn.getElectric_id(), "givecurr"), econn.groupgivecurr, DataType.TWO_BYTE_INT_UNSIGNED, master);
            logs.add(new User_Log(User_Log.Alter,User_Log.electricsystem,getGroupName(econn.electric_id)+"电流给定设置为:"+econn.groupgivecurr,flag));        
        }
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java
@@ -530,7 +530,9 @@
                + " switchoff1 = "+econn.switchoff1+","
                + " switchoff2 = "+econn.switchoff2+","
                + " conn_start = "+econn.conn_start+","
                + " conn_stop = "+econn.conn_stop
                + " conn_stop = "+econn.conn_stop +","
                + " groupgivevol = "+econn.groupgivevol +","
                + " groupgivecurr = "+econn.groupgivecurr
                + "  WHERE electric_id = " + econn.electric_id;
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
        try {
ElectricalSystem_MonitorServer_4KW/src/com/version_inf/version_inf.txt
@@ -11,4 +11,7 @@
    添加设备连接状态记录更新
    
V1.204at 2020-10-14 lijun
    1.提高历史实时数据记录频率(1s记录一笔)
    1.提高历史实时数据记录频率(1s记录一笔)
V1.205 at 2021-02-26 lijun
    1.修改4MW组合界面并联给定电压和给定电流逻辑
ElectricalSystem_MonitorServer_4KW/src/main/main_ElectricalSystem_MonitorServer_4KW.java
@@ -23,7 +23,7 @@
    /**************************************************************************/
    /**************************************************************************/
    public final static boolean app_debug = false;    
    public final static double m_VersionNum = 1.204;
    public final static double m_VersionNum = 1.205;
    public final static String m_Version = "Welcome To Use main_ElectricalSystem_MonitorServer_4KW V" 
                                            + m_VersionNum ;
    /**************************************************************************/