81041
2019-11-05 98b1c6c9119b6270dfd21f1d29c611a6fcda0ae9
8KW修改
1个文件已添加
6个文件已修改
227 ■■■■■ 已修改文件
Idce_Lithium/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/actions/ram/Fbs9100_stateAction.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/dao/Idce_8KW_State.java 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/dto/ram/Fbs9100_state.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/services/ram/Fbs9100_stateService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
@@ -120,13 +120,7 @@
        Fbs9100_setparam fsparam = getGson().fromJson(json, Fbs9100_setparam.class);
        ServiceModel model = service.serchbyDev_id(fsparam);
        {   String msg="";
            if(fsparam.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
                 msg="修改"+fsparam.getDev_id()+"的设备放电参数";
            }else if(fsparam.getNum()==FBS9100_ComBase.CMD_Start){
                 msg="启动"+fsparam.getDev_id()+"的设备放电";
            }else if(fsparam.getNum()==FBS9100_ComBase.CMD_Stop){
                 msg="停止"+fsparam.getDev_id()+"的设备放电";
            }else if(fsparam.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
            if(fsparam.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
                 msg="获取"+fsparam.getDev_id()+"的设备放电参数";
            }
        User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
@@ -165,13 +159,22 @@
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
                 msg="获取"+fbs.getDev_id()+"的设备放电参数";
            }
            /*User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                uservice.add(ulog);//将用户的操作记录下来
*/            }
        }
        result = tojson(model);        
        return SUCCESS;    
    }
    //右键查看参数和弹出框的刷新按钮
    public String serchbyDev_id_ky() {
        Fbs9100_setparam fsparam = getGson().fromJson(json, Fbs9100_setparam.class);
        ServiceModel model = service.serchbyDev_id(fsparam);
        {   String msg="";
            if(fsparam.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
                 msg="获取"+fsparam.getDev_id()+"的设备放电参数";
            }
        }
        result = tojson(model);
        return SUCCESS;
    }
    //-----------跨域根据机房编号和维护区查询放电机房的信息和放电参数
    public String serchByCondition_ky(){
Idce_Lithium/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -142,7 +142,17 @@
        result = tojson(model);
        return SUCCESS;    
      }
   //11.1FBS9100设备通信状态查询                 <--     跨域    -->
  //8KW获取设备实时状态
      public String ser8KW_State(){
          Fbs9100_state fstate=getGson().fromJson(json, Fbs9100_state.class);
          ServiceModel model = service.ser8KW_State(fstate);
        result = tojson(model);
        return SUCCESS;
      }
      //11.1FBS9100设备通信状态查询                 <--     跨域    -->
      public String serchByCondition_ky(){          
          //isAllowHeaders();                                                //允许跨域访问
          ServiceModel model = new ServiceModel();
Idce_Lithium/src/com/fgkj/dao/Idce_8KW_State.java
New file
@@ -0,0 +1,89 @@
package com.fgkj.dao;
public class Idce_8KW_State {
    //8KW设备状态转换
    public static String get8KW_workState(int workstate){
        String state="停止";
        if(workstate==1){
            state="电阻放电中";
        }
        if(workstate>>1==1){
            state="独立充电中";
        }
        if(workstate>>2==1){
            state="缓冲放电中";
        }
        if(workstate>>3==1){
            state="节能放电中";
        }
        if(workstate>>4==1){
            state="降压充电中";
        }
        if(workstate>>5==1){
            state="UPS模式启动中";
        }
        if(workstate>>6==1){
            state="活化充电中";
        }
        if(workstate>>7==1){
            state="活化放电中";
        }
        if(workstate>>8==1){
            state="活化暂停中";
        }
        return state;
    }
    //8KW设备充放电停止原因
    public static String get8KW_stopState(int workstate){
        String state="正常停止";
        if(workstate==1){
            state="组端电压异常";
        }
        if(workstate>>1==1){
            state="整流器电压异常";
        }
        if(workstate>>2==1){
            state="充放电流异常";
        }
        if(workstate>>3==1){
            state="电阻器故障";
        }
        if(workstate>>4==1){
            state="放电继电器故障";
        }
        if(workstate>>5==1){
            state="充电继电器故障";
        }
        if(workstate>>6==1){
            state="散热器温度异常";
        }
        if(workstate>>7==1){
            state="IGBT异常";
        }
        if(workstate>>8==1){
            state="风扇异常";
        }
        if(workstate>>9==1){
            state="辅助电源异常";
        }
        if(workstate>>10==1){
            state="充电电源异常";
        }
        if(workstate>>11==1){
            state="充放时间到而停止";
        }
        if(workstate>>12==1){
            state="组端电压限制而停止";
        }
        if(workstate>>13==1){
            state="RS485通信异常1分钟内无通信";
        }
        return state;
    }
    public static void main(String[] args) {
        int workstate=4;
        String state=Idce_8KW_State.get8KW_workState(workstate);
        System.out.println(state);
    }
}
Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -409,8 +409,8 @@
    //根据dev_id查询弹出框中的数据
    public List serchbyDev_id(Object obj) {
        Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
        String sql=" select db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
                ",db_battinf.tb_battinf.GroupIndexInFBSDevice,db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.charge_curr_max" +
        String sql=" select db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp" +
                ",db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.charge_curr_max" +
                ",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.battgroupnum" +
@@ -430,8 +430,6 @@
                        binf.setStationName(rs.getString("stationName"));
                        binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
                        binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
                        binf.setBattGroupName(rs.getString("battGroupName"));
                        binf.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));
                        binf.setMonCount(rs.getInt("monCount"));
                        binf.setMonVolStd(rs.getFloat("monVolStd"));
                        binf.setMonCapStd(rs.getFloat("monCapStd"));
Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
@@ -11,6 +11,7 @@
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
import com.fgkj.dao.FBS9100_ComBase;
import com.fgkj.dao.Idce_8KW_State;
import com.fgkj.dao.LimitNumberFactory;
import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.db.DBUtil;
@@ -1208,8 +1209,63 @@
        });
        return list;
    }
  //-----------------跨域--------导航上实时查询bts处于放电测试的数据的设备
    //8KW获取设备实时状态
    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 " +
                     " ,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=? ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{fstate.getDev_id()}, 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_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"));
                          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) {
                      // TODO Auto-generated catch block
                      e.printStackTrace();
                  }
                  return list;
              }
          });
          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" +
@@ -1286,6 +1342,8 @@
          return list;
      }
    public static void main(String[] args) {
        Fbs9100_stateImpl fi=new Fbs9100_stateImpl();
        /*List<Fbs9100_state> list=fi.searchAll();
@@ -1297,7 +1355,7 @@
        uinf.setUId(1002);
        Fbs9100_state fs=new Fbs9100_state();
        fs.setNum(1002);
        fs.setDev_id(0);
        fs.setDev_id(910000113);
        fs.setDev_workstate(100);
        fs.setDev_errcommcount(2);
        fs.setStationName("");
@@ -1336,8 +1394,9 @@
       //List<Fbs9100_state> list=fi.searchByUid(uinf);
       // List<Fbs9100_state> list=fi.searchDevWorkstate(fs);
       // List<Fbs9100_state> list=fi.seach6185Nuclear_cap(uinf);
        List<Fbs9100_state> list=fi.seachNuclear_cap_ky();
        //List<Fbs9100_state> list=fi.seachNuclear_cap_ky();
        //List<Fbs9100_state> list=fi.searchBtsWorkstate(fs);
        List<Fbs9100_state> list=fi.ser8KW_State(fs);
        System.out.println(list.size());
        for(Fbs9100_state f:list){
            System.out.println(f);
Idce_Lithium/src/com/fgkj/dto/ram/Fbs9100_state.java
@@ -56,6 +56,8 @@
    private float dev_condcurr;//D1导通测试电流
    private String dev_61850alarms;//61850的告警字符串
    private Integer dev_last_captest_stop_type;//核容测试的停止原因
    private String stop_reason;
    public Fbs9100_state() {
        super();
        // TODO Auto-generated constructor stub
@@ -361,6 +363,12 @@
    public void setDev_temp1(float dev_temp1) {
        this.dev_temp1 = dev_temp1;
    }
    public String getStop_reason() {
        return stop_reason;
    }
    public void setStop_reason(String stop_reason) {
        this.stop_reason = stop_reason;
    }
    @Override
    public String toString() {
        return "Fbs9100_state [num=" + num + ", dev_ip=" + dev_ip
@@ -396,7 +404,8 @@
                + dev_concurr + ", dev_condvoldp=" + dev_condvoldp
                + ", dev_condcurr=" + dev_condcurr + ", dev_61850alarms="
                + dev_61850alarms + ", dev_last_captest_stop_type="
                + dev_last_captest_stop_type + "]";
                + dev_last_captest_stop_type + ", stop_reason=" + stop_reason
                + "]";
    }
    
    
Idce_Lithium/src/com/fgkj/services/ram/Fbs9100_stateService.java
@@ -241,13 +241,28 @@
        if(list!=null && list.size()>0){
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
        }else{
            model.setCode(0);
            model.setMsg("查询失败!");
        }
        return model;
    }
  //-----------跨域----------导航上实时查询bts处于放电测试的数据的设备
   //8KW获取设备实时状态
    public ServiceModel  ser8KW_State(Object obj) {
        List list=((Fbs9100_stateImpl)dao).ser8KW_State(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();
        if(list!=null && list.size()>0){