Merge branch 'dev_lxw' of http://whychdw@118.89.139.230:10101/r/~whyclxw/Id...

whychdw

2019-11-06 075f5822483f3654337636963cc72a7967831f69

Merge branch 'dev_lxw' of http://whychdw@118.89.139.230:10101/r/~whyclxw/Idce_Lithium.git into dev_lxw

 Idce_Lithium/src/com/fgkj/actions/ram/Fbs9100_stateAction.java

@@ -150,7 +150,13 @@
        return SUCCESS;    
      }
      
  	
       //--------跨域------8KW获取设备实时状态(全部传0)
      public String ser8KW_State_ky(){
          Fbs9100_state fstate=getGson().fromJson(json, Fbs9100_state.class);
          ServiceModel model = service.ser8KW_State_ky(fstate);
        result = tojson(model);
        return SUCCESS;	
      }
      
      //11.1FBS9100设备通信状态查询                 <--     跨域    -->
      public String serchByCondition_ky(){          

 Idce_Lithium/src/com/fgkj/dao/FBS9100_ComBase.java

@@ -76,4 +76,8 @@
    final public static int CMD_TESTCMD_HR = 37;    //核容测试
    final public static int CMD_TESTCMD_RES = 50;    //内阻测试
    final public static int CMD_TESTCMD_NULL = 0;    //不设置测试类型
	
    //8kw设备状态对一个关系
    final public static int CMD_BUFF_DISCH = 4;    //缓冲放电
    final public static int CMD_INDEP_CH= 2;    //独立充电
}

 Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java

@@ -624,10 +624,10 @@
    //------------跨域修改放电参数表中（8KW）
    public boolean update8KW_ky(Object obj) {
        Fbs9100_setparam fs=(Fbs9100_setparam) obj;
        String sql="update db_ram_db.tb_Fbs9100_setparam set testCmd=?,battGroupNum=?  " +
                "chargeCurrSet=?,DCVolHighLimit=?,HourRate=?,DisCurr=?,GroupVol_LOW=?,DisTime=? where dev_id=?";
        String sql="update db_ram_db.tb_Fbs9100_setparam set  " +
                "  chargeCurrSet=?,DCVolHighLimit=?,HourRate=?,DisCurr=?,GroupVol_LOW=?,DisTime=? where dev_id=?";
        Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{
            fs.getTestCmd(),fs.getBattGroupNum(),fs.getChargeCurrSet(),fs.getDCVolHighLimit(),
            fs.getChargeCurrSet(),fs.getDCVolHighLimit(),
            fs.getHourRate(),fs.getDisCurr(),fs.getGroupVol_Low(),
            fs.getDisTime(),fs.getDev_id()});
        return bl;
@@ -727,7 +727,7 @@
                ",db_ram_db.tb_fbs9100_setparam.HourRate,db_ram_db.tb_fbs9100_setparam.DisCurr " +
                ",db_ram_db.tb_fbs9100_setparam.DisTime,db_ram_db.tb_fbs9100_setparam.GroupVol_LOW  " +
                ",db_ram_db.tb_fbs9100_setparam.chargeCurrSet" +
                ",db_ram_db.tb_fbs9100_setparam.testcmd,db_ram_db.tb_fbs9100_setparam.dCVolHighLimit    " +
                ",db_ram_db.tb_fbs9100_setparam.dCVolHighLimit    " +
                " FROM db_battinf.tb_battinf " +
                " LEFT OUTER JOIN db_ram_db.tb_fbs9100_setparam on db_ram_db.tb_fbs9100_setparam.dev_id=db_battinf.tb_battinf.FBSDeviceId  " +
                " WHERE db_battinf.tb_battinf.FBSDeviceId=? limit 1";
@@ -756,7 +756,6 @@
                        fsparam.setGroupVol_Low(rs.getFloat("groupVol_Low"));
                        fsparam.setDCVolHighLimit(rs.getFloat("dCVolHighLimit"));
                        fsparam.setChargeCurrSet(rs.getFloat("chargeCurrSet"));
                        fsparam.setTestCmd(rs.getInt("testCmd"));
                        fbs9100.setFsparam(fsparam);
                        
                        list.add(fbs9100);

 Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java

@@ -321,7 +321,7 @@
        }
        return list;
    }
    //11.1FBS9100设备通信状态查询<-------跨域----------->
    //11.1设备通信状态查询<-------跨域----------->
    public List serchByCondition_ky() {
        String sql="";
        String baseSql="select  distinct tb_fbs9100_state.num,tb_fbs9100_state.dev_ip,tb_fbs9100_state.dev_version,record_datetime,tb_fbs9100_state.dev_id,op_cmd,dev_datetime,dev_testtype,dev_testgroupnum," +
@@ -1210,17 +1210,24 @@
        return list;
    }
    
    //8KW获取设备实时状态
    //8KW获取设备实时状态(全部传0)
    public List ser8KW_State(Object obj){
        Fbs9100_state fstate =(Fbs9100_state) obj;
        String sql="select distinct db_ram_db.tb_fbs9100_state.num,dev_id,dev_alarmstate,dev_workstate,record_datetime,dev_testgroupnum " +
        String sql="select distinct db_ram_db.tb_fbs9100_state.num,dev_id,dev_alarmstate,dev_workstate,record_datetime " +
                     " ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong" +
                     " ,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName3,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FbsDeviceName   " +
                     " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  " +
                     " where   "+
                     " db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id  "
                   + " and dev_id=? ";
    	
                     " db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id  ";
          //设备id
        String dev_sqlT=" and dev_id!=? ";	       
        String dev_sqlF=" and dev_id=? ";	     
        if(fstate.getDev_id()==0){
            sql+=dev_sqlT;
        }else{
            sql+=dev_sqlF;
        }
  		
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{fstate.getDev_id()}, new CallBack() {
              
              public List getResults(ResultSet rs) {
@@ -1230,7 +1237,6 @@
                          Fbs9100_state fstate=new Fbs9100_state();
                          fstate.setNum(rs.getInt("num"));
                          
                          fstate.setDev_testgroupnum(rs.getInt("dev_testgroupnum"));            //被测电池组号
                          fstate.setDev_alarmstate(rs.getInt("dev_alarmstate"));
                          fstate.setStop_reason(Idce_8KW_State.get8KW_stopState(fstate.getDev_alarmstate()));//停止原因
                          fstate.setDev_workstate(rs.getInt("dev_workstate"));
@@ -1265,20 +1271,25 @@
          return list;
        
    }
    //-----------------跨域--------导航上实时查询bts处于放电测试的数据的设备
      public List seachNuclear_cap_ky(){
          String sql="select distinct db_ram_db.tb_fbs9100_state.num,dev_id,dev_alarmstate,dev_workstate,record_datetime,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum " +
                     " ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong" +
                     " ,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type  " +
    //--------跨域------8KW获取设备实时状态(全部传0)
    public List ser8KW_State_ky(Object obj){
        Fbs9100_state fstate =(Fbs9100_state) obj;
        String sql="select distinct db_ram_db.tb_fbs9100_state.num,dev_id,dev_alarmstate,dev_workstate,record_datetime " +
                     " ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong " +
                     " ,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName3,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FbsDeviceName   " +
                     //" ,db_ram_db.tb_batt_rtstate.batt_test_tlong   " +
                     " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  " +//,db_ram_db.tb_batt_rtstate
                     " where   dev_workstate="+FBS9100_ComBase.DISCHARGE+"  "+
                     " and db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id  " +
                     "   " +
                     " " ;
          //System.err.println(sql);
          List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
                     " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  " +
                     " where   "+
                     " db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id  ";
          //设备id
        String dev_sqlT=" and dev_id!=? order by dev_id asc ";	       
        String dev_sqlF=" and dev_id=? order by dev_id asc ";	     
        if(fstate.getDev_id()==0){
            sql+=dev_sqlT;
        }else{
            sql+=dev_sqlF;
        }
  		
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{fstate.getDev_id()}, new CallBack() {
              
              public List getResults(ResultSet rs) {
                  List list=new ArrayList();
@@ -1286,23 +1297,11 @@
                      while(rs.next()){
                          Fbs9100_state fstate=new Fbs9100_state();
                          fstate.setNum(rs.getInt("num"));
                          int dev_alarmstate=rs.getInt("dev_alarmstate");
                          String ContactorState="开关闭合";
                          if(dev_alarmstate==1 ||
                             dev_alarmstate==2 ||
                             dev_alarmstate==3 ||
                             dev_alarmstate==4 ||
                             dev_alarmstate==6 ){
                              ContactorState="开关断开";
                          }else{
                              ContactorState="开关闭合";
                          }
                          fstate.setDev_testgroupnum(rs.getInt("dev_testgroupnum"));            //被测电池组号
  						
                          fstate.setDev_alarmstate(rs.getInt("dev_alarmstate"));
                          fstate.setDev_res_test_state(rs.getInt("dev_res_test_state"));
                          fstate.setDev_testtype(rs.getInt("dev_testtype"));
                          fstate.setNote(ContactorState);
                          fstate.setStop_reason(Idce_8KW_State.get8KW_stopState(fstate.getDev_alarmstate()));//停止原因
                          fstate.setDev_workstate(rs.getInt("dev_workstate"));
                          fstate.setNote(Idce_8KW_State.get8KW_workState(fstate.getDev_workstate()));//当前设备状态
                          fstate.setDev_id(rs.getInt("dev_id"));
                          
                          fstate.setRecord_datetime(rs.getString("record_datetime"));
@@ -1312,23 +1311,66 @@
                          fstate.setDev_captest_cap(rs.getFloat("dev_captest_cap"));
                          fstate.setDev_captest_timelong(rs.getInt("dev_captest_timelong"));
                          
                          fstate.setDev_conresist(rs.getFloat("dev_conresist"));
                          fstate.setDev_concurr(rs.getFloat("dev_concurr"));
                          fstate.setDev_condcurr(rs.getFloat("dev_condcurr"));
                          fstate.setDev_condvoldp(rs.getFloat("dev_condvoldp"));
                          fstate.setDev_61850alarms(rs.getString("dev_61850alarms"));
                          fstate.setDev_last_captest_stop_type(rs.getInt("dev_last_captest_stop_type"));
                          fstate.setDev_temp(rs.getFloat("dev_temp"));
  						
                          fstate.setStationName(rs.getString("stationName"));
                          fstate.setStationName1(rs.getString("stationName1"));
                          fstate.setStationName2(rs.getString("stationName2"));
                          fstate.setStationName3(rs.getString("stationName3"));
                          fstate.setStationName5(rs.getString("stationName5"));
                          fstate.setDeviceName(rs.getString("FbsDeviceName"));
                          /*fstate.setOnline_vols(((Float)rs.getFloat("online_vol")).toString());
                          fstate.setGroup_vols(((Float)rs.getFloat("group_vol")).toString());
                          fstate.setGroup_currs(((Float)rs.getFloat("group_curr")).toString());*/
                          //fstate.setNum(rs.getInt("batt_test_tlong"));
  						
                          list.add(fstate);
                      }
                  } catch (SQLException e) {
                      // TODO Auto-generated catch block
                      e.printStackTrace();
                  }
                  return list;
              }
          });
  		
          return list;
    	
    }
    //-----------------跨域--------导航上实时查询8KW处于放电测试的数据的设备
      public List seachNuclear_cap_ky(){
          String sql="select distinct db_ram_db.tb_fbs9100_state.num,dev_id,dev_alarmstate,dev_workstate,record_datetime " +
                     " ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong  " +
                     " ,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName3,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FbsDeviceName   " +
                     " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  "+
                     " where   dev_workstate="+FBS9100_ComBase.CMD_BUFF_DISCH+"  "+
                     " and db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id  "
                     + " order by db_ram_db.tb_fbs9100_state.dev_id asc " ;
          List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
  			
              public List getResults(ResultSet rs) {
                  List list=new ArrayList();
                  try {
                      while(rs.next()){
                          Fbs9100_state fstate=new Fbs9100_state();
                          fstate.setNum(rs.getInt("num"));
  						
                          fstate.setDev_alarmstate(rs.getInt("dev_alarmstate"));
                          fstate.setStop_reason(Idce_8KW_State.get8KW_stopState(fstate.getDev_alarmstate()));//停止原因
                          fstate.setDev_workstate(rs.getInt("dev_workstate"));
                          fstate.setNote(Idce_8KW_State.get8KW_workState(fstate.getDev_workstate()));//当前设备状态
                          fstate.setDev_id(rs.getInt("dev_id"));
  						
                          fstate.setRecord_datetime(rs.getString("record_datetime"));
                          fstate.setDev_captest_onlinevol(rs.getFloat("dev_captest_onlinevol"));
                          fstate.setDev_captest_groupvol(rs.getFloat("dev_captest_groupvol"));
                          fstate.setDev_captest_curr(rs.getFloat("dev_captest_curr"));
                          fstate.setDev_captest_cap(rs.getFloat("dev_captest_cap"));
                          fstate.setDev_captest_timelong(rs.getInt("dev_captest_timelong"));
  						
  						
                          fstate.setStationName(rs.getString("stationName"));
                          fstate.setStationName1(rs.getString("stationName1"));
                          fstate.setStationName2(rs.getString("stationName2"));
                          fstate.setStationName3(rs.getString("stationName3"));
                          fstate.setStationName5(rs.getString("stationName5"));
                          fstate.setDeviceName(rs.getString("FbsDeviceName"));
  						
                          list.add(fstate);
                      }
                  } catch (SQLException e) {

 Idce_Lithium/src/com/fgkj/services/ram/Fbs9100_stateService.java

@@ -262,6 +262,19 @@
        }
        return model;
    }
    //--------跨域------8KW获取设备实时状态(全部传0)
    public ServiceModel  ser8KW_State_ky(Object obj) {
        List list=((Fbs9100_stateImpl)dao).ser8KW_State_ky(obj);
        if(list!=null && list.size()>0){
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
        }else{
            model.setCode(0);
            model.setMsg("查询失败!");
        }
        return model;
    }
    //-----------跨域----------导航上实时查询bts处于放电测试的数据的设备
    public ServiceModel seachNuclear_cap_ky(){
        List list=((Fbs9100_stateImpl)dao).seachNuclear_cap_ky();