whyclj
2020-12-11 5fcd5ae38559ee132a65a176f5993f03805ff7c0
修改水冷告警后台
2个文件已修改
56 ■■■■ 已修改文件
DyEnvir_system/src/com/fgkj/dao/AlarmDaoFactory.java 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/watersystem/Impl/Water_alarmImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/dao/AlarmDaoFactory.java
@@ -767,7 +767,7 @@
        return ealarm_name;
    }
    //水冷系统故障
    public static String getWalarm_name(int alarm_id){
    public static String getWalarm_name(int water_id,int alarm_id){
        String walarm_name="未知";
        switch (alarm_id) {
        case 129300:walarm_name="冷却水流量变送器故障";break;
@@ -823,10 +823,35 @@
        
        case 129600:walarm_name="供水压力低";break;
        case 129601:walarm_name="供水压力超低";break;
        case 129602:walarm_name="供水压力高";break;
        case 129603:walarm_name="供水压力超高";break;
        case 129604:walarm_name="回水压力低";break;
        case 129605:walarm_name="回水压力超低";break;
        //1号水冷装置部分故障和2,3号水冷装置不一样
        case 129602:
            if(water_id==5003){
                walarm_name="缓冲罐液位高";
            }else{
                walarm_name="供水压力高";
            }
            break;
        case 129603:
            if(water_id==5003){
                walarm_name="缓冲罐液位低";
            }else{
                walarm_name="供水压力超高";
            }
            break;
        case 129604:
            if(water_id==5003){
                walarm_name="缓冲罐液位超低";
            }else{
                walarm_name="回水压力低";
            }
            break;
        case 129605:
            if(water_id==5003){
                walarm_name="补水罐液位低";
            }else{
                walarm_name="回水压力超低";
            }
            break;
        case 129606:walarm_name="外水温度高";break;
        case 129607:walarm_name="外水压力低";break;
        case 129608:walarm_name="缓冲罐压力低";break;
@@ -835,9 +860,20 @@
        case 129611:walarm_name="缓冲罐压力超高";break;
        case 129612:walarm_name="冷却水电导率高";break;
        case 129613:walarm_name="冷却水电导率超高";break;
        case 129614:walarm_name="备用";break;
        case 129615:walarm_name="备用";break;
        case 129614:
            if(water_id==5003){
                walarm_name="加热罐液位高";
            }else{
                walarm_name="备用";
            }
            break;
        case 129615:
            if(water_id==5003){
                walarm_name="加热罐液位低";
            }else{
                walarm_name="备用";
            }
            break;
        case 129700:walarm_name="1#回水温度高";break;
        case 129701:walarm_name="1#回水温度超高";break;
        case 129702:walarm_name="2#回水温度高";break;
DyEnvir_system/src/com/fgkj/watersystem/Impl/Water_alarmImpl.java
@@ -53,7 +53,7 @@
                        w.setWater_id(rs.getInt("water_id"));
                        w.setWater_name(rs.getString("water_name"));
                        w.setAlarm_id(rs.getInt("alarm_id"));
                        w.setAlarm_name(AlarmDaoFactory.getWalarm_name(w.getAlarm_id()));
                        w.setAlarm_name(AlarmDaoFactory.getWalarm_name(w.getWater_id(),w.getAlarm_id()));
                        w.setAlarm_starttime(rs.getTimestamp("alarm_starttime"));
                        w.setAlarm_endtime(rs.getTimestamp("alarm_endtime"));
                        w.setAlarm_confirmtime(rs.getTimestamp("alarm_confirmtime"));
@@ -84,7 +84,7 @@
                        Water_alarm w=new Water_alarm();
                        w.setWater_id(rs.getInt("water_id"));
                        w.setAlarm_id(rs.getInt("alarm_id"));
                        w.setAlarm_name(AlarmDaoFactory.getWalarm_name(w.getAlarm_id()));
                        w.setAlarm_name(AlarmDaoFactory.getWalarm_name(w.getWater_id(),w.getAlarm_id()));
                        w.setAlarm_starttime(rs.getTimestamp("alarm_starttime"));
                        w.setAlarm_endtime(rs.getTimestamp("alarm_endtime"));
                        w.setAlarm_confirmtime(rs.getTimestamp("alarm_confirmtime"));