DB 被谁提交了？

whychw

2020-12-15 15d267b583014a1d0c0a4f5db35a89d0942f061e

DB 被谁提交了？

 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/db/DBUtil.java

@@ -22,13 +22,13 @@
    private static String username="root";
    private static String password="lmx8688139";
//    private static String url="jdbc:mysql://118.89.139.230:3360/db_user";
    private static String url="jdbc:mysql://192.168.43.242:3360/db_user";
//    private static String url="jdbc:mysql://192.168.43.242:3360/db_user";
//  private static String url="jdbc:mysql://123.207.82.239:3360/db_user";
//    private static String url="jdbc:mysql://192.168.10.150:3360/db_user";
//    private static String url="jdbc:mysql://192.168.10.221:3360/db_user";
//    private static String url="jdbc:mysql://192.168.10.130:3360/db_user";
//    private static String url="jdbc:mysql://192.168.10.139:3360/db_user";
//    private static String url="jdbc:mysql://192.168.2.221:3360/db_user";
//  private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
    private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
//  private static String url="jdbc:mysql://192.168.2.88:3360/db_user";
    /*private static String username="root";
    private static String password="123456";*/

 DyEnvir_system/src/com/fgkj/electric2mwsystem/Impl/Electric_2MW_alarmImpl.java

@@ -42,7 +42,7 @@
    @Override
    public List searchAll() {
        String sql=" select *,tb_electric2mw_inf.electric2KW_name from  db_electric2mwsystem.tb_Electric_2MW_alarm,db_electric2mwsystem.tb_electric2mw_inf "
                + "  where tb_Electric_2MW_alarm.electric_id = tb_electric2mw_inf.electric2KW_id  order by tb_Electric_2MW_alarm.electric_id asc,alarm_starttime desc ";
                + "  where tb_Electric_2MW_alarm.electric_id = tb_electric2mw_inf.electric2KW_id  order by tb_Electric_2MW_alarm.electric_id asc ";//,alarm_starttime desc
      
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{}, new CallBack() {
            

 DyEnvir_system/src/com/fgkj/electricsystem/Impl/Electric_alarmImpl.java

@@ -42,7 +42,7 @@
    @Override
    public List searchAll() {
        String sql="select *,electric_name from  db_electricsystem.tb_electric_alarm,db_electricsystem.tb_electric_inf "
                + " where tb_electric_alarm.electric_id = tb_electric_inf.electric_id order by tb_electric_alarm.electric_id asc,alarm_starttime desc ";
                + " where tb_electric_alarm.electric_id = tb_electric_inf.electric_id order by tb_electric_alarm.electric_id asc ";//,alarm_starttime desc
         List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{}, new CallBack() {
                
                @Override

 DyEnvir_system/src/com/fgkj/elemachinery/impl/Devalaram_rtImpl.java

@@ -46,8 +46,8 @@
    //查询电机的实时告警
    @Override
    public List searchAll() {
        String sql=" select * from db_elemachinery.tb_devalaram_rt "
                + "  order by alarm_starttime desc ";
        String sql=" select * from db_elemachinery.tb_devalaram_rt ";
                //+ "  order by alarm_starttime desc ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{}, new CallBack() {
            
            @Override

 DyEnvir_system/src/com/fgkj/watersystem/Impl/Water_alarmImpl.java

@@ -41,7 +41,7 @@
    @Override
    public List searchAll() {
        String sql="select *,tb_water_inf.water_name from db_watersystem.tb_water_alarm,db_watersystem.tb_water_inf "
                + " where db_watersystem.tb_water_alarm.water_id=db_watersystem.tb_water_inf.water_id    order by alarm_starttime desc";
                + " where db_watersystem.tb_water_alarm.water_id=db_watersystem.tb_water_inf.water_id   ";// order by alarm_starttime desc
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{}, new CallBack() {
            
            @Override
@@ -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"));