81041
2019-12-02 53abcc9c817ebb28fe36f31fd24c302ea3ce11f8
8KW加解锁充电的功能
6个文件已修改
40 ■■■■■ 已修改文件
Idce_Lithium/WebRoot/WEB-INF/.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/dao/FBS9100_ComBase.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/src/com/fgkj/services/ram/Fbs9100_setparamService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Idce_Lithium/WebRoot/WEB-INF/.gitignore
@@ -1 +1,2 @@
/classes/
/classes/
Idce_Lithium/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
@@ -43,6 +43,10 @@
                 msg="停止"+fbs.getDev_id()+"的设备放电";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
                 msg="获取"+fbs.getDev_id()+"的设备放电参数";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_StartUnlockCharge){
                 msg="启动"+fbs.getDev_id()+"的设备解锁充电";
            }else if(fbs.getNum()==FBS9100_ComBase.CMD_StopUnlockCharge){
                 msg="停止"+fbs.getDev_id()+"的设备解锁充电";
            }
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
            uservice.add(ulog);//将用户的操作记录下来
@@ -184,6 +188,18 @@
        result = tojson(model);        
        return SUCCESS;    
    }
    //-----------跨域实现(解锁充电)设备(8KW)
    public String unlock8KW_ky(){
        Fbs9100_setparam fbs = getGson().fromJson(json, Fbs9100_setparam.class);
        ServiceModel model = service.unlock8KW_ky(fbs);
        {   String msg="解锁设备充电";
            User_log ulog=UinfDaoFactory.CreateULog_ky(UinfDaoFactory.Alter, msg);
            uservice.add(ulog);//将用户的操作记录下来
        }
        result = tojson(model);
        return SUCCESS;
    }
    //-----------------跨域--------------右键查看参数和弹出框的刷新按钮
    public String serchbyDev_id_8KW_ky() {
        Fbs9100_setparam fsparam = getGson().fromJson(json, Fbs9100_setparam.class);
Idce_Lithium/src/com/fgkj/dao/FBS9100_ComBase.java
@@ -10,6 +10,8 @@
    final public static  int CMD_GetDischargeParm=41;
    final public static  int CMd_SetIp_Tem=90;        //    暂时
    final public static  int CMd_SetIp_Per=88;        //    永久
    final public static  int CMD_StartUnlockCharge            =     0xB1;        //    启动解锁充电
    final public static  int CMD_StopUnlockCharge            =     0xB3;        //    停止解锁充电
    //机房命令对应的ack
    final public static  int CMD_StartAck=82;
    public static final  int  CMD_StartChargeTestAck=    66;                //启动充电测试成功
@@ -17,6 +19,8 @@
    final public static  int CMD_SetDischargeParmAck=39;
    final public static  int CMD_GetDischargeParmAck=48;
    final public static  int CMd_SetIpAck=89;        //修改成功
    final public static  int CMD_StartUnlockCharge_Ack        =     0xB2;    //    启动解锁充电
    final public static  int CMD_StopUnlockCharge_Ack        =     0xB4;        //    停止解锁充电
    //一期二期设备分类
    final public static  int EQUIPMENTCLASSIFICATION_ONE=91000000;
    final public static  int EQUIPMENTCLASSIFICATION_TWO=910000000;
@@ -39,7 +43,6 @@
    public static final int     CMD_SetSYSSetParam                =    0x81;//设置系统参数129
    public static final int     CMD_ResetSystemAck                =     0x0F;//15
    public static final int     CMD_ResetSystem                    =     0x10;//重启16
    
    //读取GPRS模块的信号质量
    public static final int     CMD_ReadGPRSCSQ                 =   0x91;
Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -323,7 +323,8 @@
            case FBS9100_ComBase.CMd_SetIp_Tem: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
            case FBS9100_ComBase.CMd_SetIp_Per: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
            case FBS9100_ComBase.CMD_ResetSystem: m_cmd_ack = FBS9100_ComBase.CMD_ResetSystemAck; break;
            case FBS9100_ComBase.CMD_READGPRS_BTS_TASK_INF: m_cmd_ack = FBS9100_ComBase.CMD_READGPRS_BTS_TASK_INFACK; break;
            case FBS9100_ComBase.CMD_StartUnlockCharge: m_cmd_ack = FBS9100_ComBase.CMD_StartUnlockCharge_Ack; break;
            case FBS9100_ComBase.CMD_StopUnlockCharge: m_cmd_ack = FBS9100_ComBase.CMD_StopUnlockCharge_Ack; break;
            default: return false;
        }
        String sql_end = "";
Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
@@ -1338,7 +1338,7 @@
          return list;
        
    }
          public List seachNuclear_cap_ky(){
    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   " +
Idce_Lithium/src/com/fgkj/services/ram/Fbs9100_setparamService.java
@@ -311,6 +311,19 @@
        //System.out.println(model);
        return model;    
    }
    //-----------跨域实现(解锁充电)设备(8KW)
    public ServiceModel unlock8KW_ky(Object obj) {
        Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
        boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(fsparam.getNum(),0, fsparam.getDev_id());
        if(bl){
            model.setCode(1);
            model.setMsg("解锁成功!");
        }else{
            model.setCode(0);
            model.setMsg("解锁失败,请检查网络!");
        }
        return model;
    }
    //-----------------跨域--------------右键查看参数和弹出框的刷新按钮
    public ServiceModel serchbyDev_id_8KW_ky(Object obj) {
        Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;