whyclxw
2020-12-12 7c92c35132d3790cefe0c6f84e086ef8cdc26a9e
修改
5个文件已修改
16 ■■■■ 已修改文件
DyEnvir_system/src/com/fgkj/db/DBUtil.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/electric2mwsystem/Impl/Electric_2MW_alarmImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/electricsystem/Impl/Electric_alarmImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/elemachinery/impl/Devalaram_rtImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/watersystem/Impl/Water_alarmImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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